diff --git a/packages/vue-cli-plugin-uni/lib/configure-webpack.js b/packages/vue-cli-plugin-uni/lib/configure-webpack.js index dea056fec91938192c40f5edb97ecc10693724d5..b0669de5bb5db049cedf838a7ef7243c5e3af8ce 100644 --- a/packages/vue-cli-plugin-uni/lib/configure-webpack.js +++ b/packages/vue-cli-plugin-uni/lib/configure-webpack.js @@ -398,23 +398,32 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt }) }) + const alias = { + '@': path.resolve(process.env.UNI_INPUT_DIR), + './@': path.resolve(process.env + .UNI_INPUT_DIR), // css中的'@/static/logo.png'会被转换成'./@/static/logo.png'加载 + vue$: getPlatformVue(vueOptions), + 'uni-pages': path.resolve(process.env.UNI_INPUT_DIR, 'pages.json'), + 'uni-stat-config': path.resolve(process.env.UNI_INPUT_DIR, 'pages.json') + + '?' + + JSON.stringify({ + type: 'stat' + }), + vuex: require.resolve('@dcloudio/vue-cli-plugin-uni/packages/vuex3'), + '@vue/composition-api': require.resolve('@dcloudio/vue-cli-plugin-uni/packages/@vue/composition-api') + } + + if (process.env.UNI_PLATFORM.startsWith('mp')) { + const BabelRuntimeVersions = require('@babel/runtime/package.json').version.split('.') + if (BabelRuntimeVersions[0] === '7' && Number(BabelRuntimeVersions[1]) >= 18) { + alias['@babel/runtime/regenerator'] = require.resolve('@dcloudio/vue-cli-plugin-uni/packages/@babel/runtime/regenerator') + } + } + return merge({ devtool: false, resolve: { - alias: { - '@': path.resolve(process.env.UNI_INPUT_DIR), - './@': path.resolve(process.env - .UNI_INPUT_DIR), // css中的'@/static/logo.png'会被转换成'./@/static/logo.png'加载 - vue$: getPlatformVue(vueOptions), - 'uni-pages': path.resolve(process.env.UNI_INPUT_DIR, 'pages.json'), - 'uni-stat-config': path.resolve(process.env.UNI_INPUT_DIR, 'pages.json') + - '?' + - JSON.stringify({ - type: 'stat' - }), - vuex: require.resolve('@dcloudio/vue-cli-plugin-uni/packages/vuex3'), - '@vue/composition-api': require.resolve('@dcloudio/vue-cli-plugin-uni/packages/@vue/composition-api') - }, + alias, modules: [ process.env.UNI_INPUT_DIR, path.resolve(process.env.UNI_INPUT_DIR, 'node_modules') diff --git a/packages/vue-cli-plugin-uni/packages/@babel/runtime/regenerator/index.js b/packages/vue-cli-plugin-uni/packages/@babel/runtime/regenerator/index.js new file mode 100644 index 0000000000000000000000000000000000000000..b678a977334ee7380c8d0ad964eb12f1eac90488 --- /dev/null +++ b/packages/vue-cli-plugin-uni/packages/@babel/runtime/regenerator/index.js @@ -0,0 +1,4 @@ +// TODO(Babel 8): Remove this file. + +var runtime = require('@babel/runtime/helpers/regeneratorRuntime')() +module.exports = runtime