fix: init project fail when if else

Signed-off-by: zxypro1 <[email protected]>
Serverless-Devs · Nov 7, 2024 · 03ce9cb · 03ce9cb
1 parent c1cfce9
commit 03ce9cb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/packages/engine/package.json b/packages/engine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/engine",
-  "version": "0.1.5-beta.8",
+  "version": "0.1.5-beta.9",
   "description": "a engine lib for serverless-devs",
   "main": "lib/index.js",
   "scripts": {

diff --git a/packages/load-application/package.json b/packages/load-application/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/load-application",
-  "version": "0.0.15-beta.5",
+  "version": "0.0.15-beta.6",
   "description": "load application for serverless-devs",
   "main": "lib/index.js",
   "scripts": {

diff --git a/packages/load-application/src/v3.ts b/packages/load-application/src/v3.ts
@@ -137,6 +137,7 @@ class LoadApplication {
       const newData = parse({ appName }, data);
       fs.writeFileSync(this.spath, newData, 'utf-8');
     } else {
+      this.doArtTemplate(path.join(this.filePath, this.getExtend(this.spath))); // 存在extend，把base yaml也做解析
       const data = fs.readFileSync(path.join(this.filePath, this.getExtend(this.spath)), 'utf-8');
       const { appName } = this.options;
       if (isEmpty(appName)) return;
@@ -148,9 +149,6 @@ class LoadApplication {
   private async parseTemplateYaml(postData: Record<string, any>) {
     if (isEmpty(this.publishData)) return;
     this.publishData = { ...this.publishData, ...postData };
-    if (!isEmpty(this.getExtend(this.spath))) {
-      this.doArtTemplate(path.join(this.filePath, this.getExtend(this.spath)));
-    }
     return this.doArtTemplate(this.spath);
   }
   // 如果存在extend，对extend地址也做一个art-template