diff --git a/packages/vue-cli-plugin-uni/index.js b/packages/vue-cli-plugin-uni/index.js index 212b6ac6cb2ce9bb17034c2c9a525ef0910862db..e24c564e25893fd34db91efe6cb868732e7c8403 100644 --- a/packages/vue-cli-plugin-uni/index.js +++ b/packages/vue-cli-plugin-uni/index.js @@ -52,7 +52,7 @@ module.exports = (api, options) => { Object.assign(options, { // TODO 考虑非 HBuilderX 运行时,可以支持自定义输出目录 outputDir: process.env.UNI_OUTPUT_TMP_DIR || process.env.UNI_OUTPUT_DIR, assetsDir - }, vueConfig) + }, vueConfig) // 注意,此处目前是覆盖关系,后续考虑改为webpack merge逻辑 require('./lib/options')(options) diff --git a/packages/vue-cli-plugin-uni/lib/app-plus/index.js b/packages/vue-cli-plugin-uni/lib/app-plus/index.js index a56a943e0ced58f5332185fbcda20988a00951f3..9ff503242a0fee569d62aa492d7ea13dd47f3464 100644 --- a/packages/vue-cli-plugin-uni/lib/app-plus/index.js +++ b/packages/vue-cli-plugin-uni/lib/app-plus/index.js @@ -52,11 +52,7 @@ function getProvides (isAppService) { const v3 = { vueConfig: { - parallel: false, - transpileDependencies: [ - wxsPath, - runtimePath - ] + parallel: false }, webpackConfig (webpackConfig, vueOptions, api) { const isAppService = !!vueOptions.pluginOptions['uni-app-plus']['service'] diff --git a/packages/vue-cli-plugin-uni/lib/h5/index.js b/packages/vue-cli-plugin-uni/lib/h5/index.js index 9888f4dd92f2ee610d38245657f85508051f2f20..27f5c13faef22e7c0a6bfb7f4637ee035a1b21c1 100644 --- a/packages/vue-cli-plugin-uni/lib/h5/index.js +++ b/packages/vue-cli-plugin-uni/lib/h5/index.js @@ -62,10 +62,6 @@ if (process.env.NODE_ENV !== 'production') { const vueConfig = { parallel: false, // 因为传入了自定义 compiler,避免参数丢失,禁用parallel publicPath, - transpileDependencies: [ - wxsPath, - runtimePath - ], pages: { index: { // page 的入口 diff --git a/packages/vue-cli-plugin-uni/lib/options.js b/packages/vue-cli-plugin-uni/lib/options.js index 318e0a482b235783946cdef97af29591c6c441c8..852a2b79991cc76a3ff97add1a05ace1539468d6 100644 --- a/packages/vue-cli-plugin-uni/lib/options.js +++ b/packages/vue-cli-plugin-uni/lib/options.js @@ -19,6 +19,10 @@ module.exports = function initOptions (options) { options.transpileDependencies.push(path.resolve(process.env.UNI_INPUT_DIR, 'node_modules')) options.transpileDependencies.push('@dcloudio/uni-' + process.env.UNI_PLATFORM) options.transpileDependencies.push('@dcloudio/uni-stat') + // mp runtime + options.transpileDependencies.push('@dcloudio/uni-mp-weixin/dist/mp.js') + // wxs + options.transpileDependencies.push('@dcloudio/uni-mp-weixin/dist/wxs.js') if (process.env.UNI_PLATFORM === 'app-plus') { options.transpileDependencies.push('format-log.js') @@ -64,12 +68,12 @@ module.exports = function initOptions (options) { sassData = `${sassData} @import "@/uni.scss";` } - - if (!options.css.loaderOptions.sass.sassOptions) { - options.css.loaderOptions.sass.sassOptions = {} - } + + if (!options.css.loaderOptions.sass.sassOptions) { + options.css.loaderOptions.sass.sassOptions = {} + } // 指定 outputStyle, 否则 production 模式下会被默认成 compressed - options.css.loaderOptions.sass.sassOptions.outputStyle = 'nested' + options.css.loaderOptions.sass.sassOptions.outputStyle = 'nested' if (sassLoaderVersion < 8) { options.css.loaderOptions.sass.data = sassData