fix: yaml extend (#102)

* fix: yaml extends bug

Signed-off-by: xsahxl <xsahxl@126.com>

Author: xsahxl

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/core",
-  "version": "0.1.54",
+  "version": "0.1.55",
   "description": "Serverless Devs Tool Core Component",
   "keywords": [
     "Serverless",

publish.yaml

@@ -2,7 +2,7 @@ Type: Component
 Name: core
 Provider:
   - 阿里云
-Version: 0.1.54
+Version: 0.1.55
 Description: Serverless Devs 核心组件
 HomePage: https://github.com/Serverless-Devs/core
 Tags: #标签详情

src/common/execCommand/getTemplatePath.ts

@@ -81,8 +81,15 @@ async function extendsYaml(spath: string, dotspath: string) {
   }
 
   await isYamlFile(baseYamlPath);
+  // 解析base yaml之前，先合并vars
+  if (data?.vars) {
+    const baseYamlData = await getYamlContent(baseYamlPath);
+    const newData = extend2(true, {}, baseYamlData, { vars: data.vars });
+    // 临时写到dotspath
+    fs.writeFileSync(dotspath, yaml.dump(newData));
+  }
   // 解析base yaml
-  const baseYamlData = await parseYaml(fs.readFileSync(baseYamlPath, 'utf-8'));
+  const baseYamlData = await parseYaml(fs.readFileSync(dotspath, 'utf-8'));
   // 只合并vars
   const newData = extend2(true, {}, { vars: baseYamlData?.vars }, data);
   fs.writeFileSync(dotspath, yaml.dump(newData));

src/daemon/constant.js

@@ -1,3 +1,3 @@
 module.exports = {
-  DEFAULT_CORE_VERSION: '0.1.54',
+  DEFAULT_CORE_VERSION: '0.1.55',
 };