fix: resolve some conflict merge from master

Author: fanniehuang(黄敏)

packages/wxa-cli/scripts/buildLib.sh

@@ -1,11 +1,6 @@
 # npx webpack  "./lib/shim/promise.finally.js" --mode production --env.platform=node  -o ./lib-dist/es/promise.finally.js
 
 # cp -R ./src/tester/wxa-e2eTest ./lib-dist/wxa-e2eTest
-cp ./src/tester/wxa-e2eTest/e2eRecord2jsTpl.ejs ./dist/tester/wxa-e2eTest
-mkdir ./lib-dist/wxa-e2eTest
-cp ./src/tester/wxa-e2eTest/e2eTestSuite.js ./lib-dist/wxa-e2eTest/
-cp ./src/tester/wxa-e2eTest/e2eRecordBtn.wxa ./lib-dist/wxa-e2eTest/
-echo $MODE;
 
 if test "$MODE" = 'dev'
 then
@@ -24,3 +19,9 @@ else
 
     npx babel ./lib/wxa_wrap.js --out-dir ./lib-dist/
 fi
+
+cp ./src/tester/wxa-e2eTest/e2eRecord2jsTpl.ejs ./dist/tester/wxa-e2eTest
+mkdir ./lib-dist/wxa-e2eTest
+cp ./src/tester/wxa-e2eTest/e2eTestSuite.js ./lib-dist/wxa-e2eTest/
+cp ./src/tester/wxa-e2eTest/e2eRecordBtn.wxa ./lib-dist/wxa-e2eTest/
+echo $MODE;

packages/wxa-cli/src/builder.js

@@ -22,8 +22,7 @@ let debug = debugPKG('WXA:Builder');
 class Builder {
     constructor(wxaConfigs) {
         this.current = process.cwd();
-        this.wxaConfigs = wxaConfigs;
-
+        this.wxaConfigs = wxaConfigs[0];
         // default wxa configurations.
         this.wxaConfigs.resolve.appConfigPath = path.join(this.wxaConfigs.context, 'app.json');
         if (this.wxaConfigs.resolve.wxaExt[0] !== '.') this.wxaConfigs.resolve.wxaExt = '.'+this.wxaConfigs.resolve.wxaExt;

packages/wxa-cli/src/compilers/wxa.js

@@ -1,6 +1,5 @@
 import path from 'path';
 import {readFile, error, isFile, isEmpty} from '../utils';
-import {DOMParser} from 'xmldom';
 import Coder from '../helpers/coder';
 import logger from '../helpers/logger';
 import DependencyResolver from '../helpers/dependencyResolver';

packages/wxa-cli/src/tester/e2eTester.js

@@ -8,7 +8,7 @@ import logger from '../helpers/logger';
 import simplify from '../helpers/simplifyObj';
 import {applyPlugins, readFile, writeFile} from '../utils.js';
 import COLOR from '../const/color';
-
+import {DirectiveBroker} from '../directive/directiveBroker';
 import crypto from 'crypto';
 import debugPKG from 'debug';
 import path from 'path';
@@ -45,7 +45,6 @@ class TesterScheduler extends Schedule {
             if (dep.meta && dep.meta.source === this.APP_SCRIPT_PATH) {
                 this.tryWrapWXATestSuite(dep);
             }
-
             if (dep.meta && dep.meta.source === this.APP_CONFIG_PATH) {
                 this.tryAddGlobalTestComponent(dep);
             }
@@ -123,7 +122,7 @@ class TesterScheduler extends Schedule {
 
     tryAddGlobalTestComponent(mdl) {
         try {
-            let appConfigs = JSON.parse(mdl.code);
+            let appConfigs = JSON.parse(mdl.content);
 
             appConfigs['wxa.globalComponents'] = {
                 ...appConfigs['wxa.globalComponents'],
@@ -153,14 +152,17 @@ class TesterBuilder extends Builder {
         }
         await this.hooks.beforeRun.promise(this);
 
-        this.schedule = new TesterScheduler(this.loader);
-        applyPlugins(this.wxaConfigs.plugins || [], this.schedule);
-        this.schedule.progress.toggle(cmd.progress);
-        this.schedule.set('cmdOptions', cmd);
-        this.schedule.set('wxaConfigs', this.wxaConfigs || {});
+        this.scheduler = new TesterScheduler(this.loader);
+        this.directiveBroker = new DirectiveBroker(this.scheduler);
+
+        applyPlugins(this.wxaConfigs.plugins || [], this.scheduler);
+        this.scheduler.progress.toggle(cmd.progress);
+        this.scheduler.set('cmdOptions', cmd);
+        this.scheduler.set('wxaConfigs', this.wxaConfigs || {});
+        this.scheduler.set('directiveBroker', this.directiveBroker);
 
         debug('builder wxaConfigs is %O', this.wxaConfigs);
-        debug('schedule options is %O', this.schedule);
+        debug('schedule options is %O', this.scheduler);
         try {
             await this.handleEntry(cmd);
         } catch (error) {

packages/wxa-cli/src/wxa.js

@@ -1,8 +1,6 @@
 import commander from 'commander';
 import inquirer from 'inquirer';
-import deepmerge from 'deepmerge';
 import path from 'path';
-import DefaultWxaConfigs from './const/defaultWxaConfigs';
 import Builder from './builder';
 import Tester from './tester/index';
 import https from 'https';
@@ -13,6 +11,7 @@ import {spawnDevToolCli} from './toolcli';
 import {getConfigs} from './getConfigs';
 import {WXA_PROJECT_NAME} from './const/wxaConfigs';
 import {isEmpty} from './utils';
+import logger from './helpers/logger';
 
 const version = require('../package.json').version;
 
@@ -97,8 +96,7 @@ commander
 .option('--cli-path [cliPath]', '微信开发者工具路径')
 .action((cmd)=>{
     logger.info('Hey', `This is ${chalk.keyword('orange')('wxa@'+version)}, Running in ${chalk.keyword('orange')(process.env.NODE_ENV || 'development')}, Tester Mode`);
-    let wxaConfigs = getWxaConfigs();
-
+    let wxaConfigs = getConfigs();
     new Tester(cmd, wxaConfigs).build();
 });
 
@@ -160,7 +158,7 @@ commander
 .option('-m, --multi', '三方开发模式，一次操作多个项目')
 .option('-p, --project <project>', '三方开发模式，单独指定操作的项目')
 .action(async (cmd)=>{
-    let wxaConfigs = getWxaConfigs();
+    let wxaConfigs = getConfigs();
 
     let newCli = wrapWxaConfigs((subWxaConfigs, cmd)=>{
         let cli = new Toolcli(subWxaConfigs);