fix(cli): fix global components

enable global components, record the origin app.json file content.
WeBankFinTech · Jul 22, 2019 · 42c31dd · 42c31dd
1 parent e0cc3b4
commit 42c31dd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 38 deletions.
diff --git a/packages/wxa-cli/package-lock.json b/packages/wxa-cli/package-lock.json
diff --git a/packages/wxa-cli/src/compilers/index.js b/packages/wxa-cli/src/compilers/index.js
@@ -191,12 +191,12 @@ export default class Compiler {
         }
 
         if (mdl.src === this.$scheduer.APP_CONFIG_PATH) {
+            this.$scheduer.appConfigs = Object.assign({}, mdl.json);
             // global components in wxa;
             // delete custom field in app.json or wechat devtool will get wrong.
             delete mdl.json['wxa.globalComponents'];
         }
 
-
         mdl.code = JSON.stringify(mdl.json, void(0), 4);
         return children;
     }

diff --git a/packages/wxa-cli/src/schedule.js b/packages/wxa-cli/src/schedule.js
@@ -185,9 +185,6 @@ class Schedule {
 
             // if module is app.json, then add Page entry points.
             if (dep.meta && dep.meta.source === this.APP_CONFIG_PATH) {
-                this.appConfigs = {...dep.json};
-                debug('app configs is %O', dep.json);
-
                 let oldPages = new Map(this.$pageArray.entries());
                 let newPages = this.addPageEntryPoint();
                 newPages = new Map(newPages.map((page)=>[page.src, page]));