fix(cli): e2e babel default config #80

WeBankFinTech · Sep 16, 2020 · 7d90e5c · 7d90e5c
1 parent 992c5cb
commit 7d90e5c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/packages/wxa-cli/src/const/defaultBabelConfigs.js b/packages/wxa-cli/src/const/defaultBabelConfigs.js
@@ -6,24 +6,34 @@ const cwd = process.cwd();
 const babelRuntime = path.join(cwd, 'node_modules', '@babel/runtime/package.json');
 let hasRuntime = existsSync(babelRuntime);
 
-const defaultConfigs = {
-    'cwd': path.join(__dirname, '../../'),
-    'sourceMap': false,
-    'presets': ['@babel/preset-env'],
+const commonConfigs = {
     'plugins': [
         ['@babel/plugin-proposal-decorators', {'decoratorsBeforeExport': true}],
         ['@babel/plugin-proposal-class-properties'],
     ],
-    'ignore': [
-        'node_modules',
-        'wxa-cli',
-    ],
-};
+    'presets': ['@babel/preset-env'],
 
+}
 if (hasRuntime) {
     const pkg = require(babelRuntime);
 
-    defaultConfigs.plugins.unshift(['@babel/plugin-transform-runtime', {'version': pkg.version || '7.2.0'}]);
+    commonConfigs.plugins.unshift(['@babel/plugin-transform-runtime', {'version': pkg.version || '7.2.0'}]);
 }
 
+const defaultConfigs = {
+    'cwd': path.join(__dirname, '../../'),
+    'sourceMap': false,
+    overrides: [{
+        exclude: [/node_modules/,  /wxa-cli/],
+        ...commonConfigs
+    }
+    ,{
+        test: /wxa-e2eTest/,
+        ...commonConfigs
+    }
+
+]
+};
+
+
 export default defaultConfigs;
diff --git a/packages/wxa-cli/src/helpers/wrapWxa.js b/packages/wxa-cli/src/helpers/wrapWxa.js
@@ -1,6 +1,6 @@
 export default function(code, category='', path) {
     let temp = `
-var wrapWxa = require('wxa://wxa_wrap').default;
+var wrapWxa = require('wxa://wxa_wrap.js').default;
 wrapWxa(exports, "${category.toUpperCase()}", "${path}");
 
 ${code}`;