diff --git a/packages/wxa-cli/src/builder.js b/packages/wxa-cli/src/builder.js index a6ee2be4..db501059 100644 --- a/packages/wxa-cli/src/builder.js +++ b/packages/wxa-cli/src/builder.js @@ -22,7 +22,7 @@ let debug = debugPKG('WXA:Builder'); class Builder { constructor(wxaConfigs) { this.current = process.cwd(); - this.wxaConfigs = wxaConfigs[0]; + this.wxaConfigs = wxaConfigs[0] || wxaConfigs; // 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; diff --git a/packages/wxa-cli/src/tester/e2eTester.js b/packages/wxa-cli/src/tester/e2eTester.js index a4d580a6..04caaded 100644 --- a/packages/wxa-cli/src/tester/e2eTester.js +++ b/packages/wxa-cli/src/tester/e2eTester.js @@ -114,8 +114,8 @@ class TesterScheduler extends Schedule { (/exports\.default/gm.test(mdl.code) || /exports\[["']default["']/gm.test(mdl.code)) ) { mdl.code = ` - let $$testSuitePlugin = require('wxa://wxa-e2eTest/e2eTestSuite.js'); - require('@wxa/core').wxa.use($$testSuitePlugin, {record: ${!!this.cmdOptions.record}}); + var __testSuitePlugin = require('wxa://wxa-e2eTest/e2eTestSuite.js'); + require('@wxa/core').wxa.use(__testSuitePlugin, {record: ${!!this.cmdOptions.record}}); ${mdl.code} `; } diff --git a/packages/wxa-cli/src/tester/readMe.md b/packages/wxa-cli/src/tester/readMe.md index 95fcd910..e679d5f7 100644 --- a/packages/wxa-cli/src/tester/readMe.md +++ b/packages/wxa-cli/src/tester/readMe.md @@ -52,7 +52,7 @@ ### 测试脚本回放 * `npm i -g jest` -* 项目下执行 `npm i miniprogram-automator looks-same` +* 项目下执行 `npm i -DE miniprogram-automator looks-same` * 开发者工具修改调试基础库 2.7.3以上(src/project.config.json需同步修改libVersion) * 项目根目录下添加文件`babel.config.js` ``` diff --git a/packages/wxa-cli/src/wxa.js b/packages/wxa-cli/src/wxa.js index 682750a2..315c8e5a 100644 --- a/packages/wxa-cli/src/wxa.js +++ b/packages/wxa-cli/src/wxa.js @@ -106,57 +106,6 @@ commander new Tester(cmd, wxaConfigs).build(); }); -commander -.command('create') -.description('新建模板') -.action(async (cmd)=>{ - logger.info('Hey', `This is ${chalk.keyword('orange')('wxa@'+version)}, Running in ${chalk.keyword('orange')(process.env.NODE_ENV || 'development')}`); - logger.info('Creating', '新建项目中😋'); - - let opts = await inquirer.prompt([ - { - type: 'input', - name: 'projectName', - message: '输入项目名', - validate: (input)=>{ - return !(input == null || input === ''); - }, - }, - { - type: 'list', - name: 'template', - message: '选择模板', - default: 'base', - choices: [ - { - name: '基础模板,默认配置文件', - value: 'base', - }, - { - name: 'Redux模板,使用redux管理全局状态', - value: 'redux', - }, - { - name: 'Vant模板, 使用有赞ui加速小程序开发', - value: 'vant', - }, - { - name: 'Echart模板, 使用echart开发小程序图表', - value: 'echart', - }, - ], - }, - { - type: 'input', - name: 'appid', - message: '小程序APPID', - default: '', - }, - ]); - - new Creator(cmd).run(opts); -}); - commander .command('cli') .description('微信开发者工具命令行调用')