@dcloudio/vue-cli-plugin-uni 2.0.0 → 2.0.1-33420211227001

package/lib/copy-webpack-options.js

@@ -1,24 +1,31 @@
 const fs = require('fs')
 const path = require('path')
-
+const { compileI18nJsonStr } = require('@dcloudio/uni-i18n')
+const { initI18nOptions } = require('@dcloudio/uni-cli-shared/lib/i18n')
 const assetsDir = 'static'
 
 function getAssetsCopyOption (from, options = {}) {
   if (path.isAbsolute(from)) {
     if (fs.existsSync(from)) {
-      return Object.assign({
-        from,
-        to: path.resolve(process.env.UNI_OUTPUT_DIR)
-      }, options)
+      return Object.assign(
+        {
+          from,
+          to: path.resolve(process.env.UNI_OUTPUT_DIR)
+        },
+        options
+      )
     }
   }
   const to = from
   from = path.resolve(process.env.UNI_INPUT_DIR, from)
   if (fs.existsSync(from)) {
-    return Object.assign({
-      from,
-      to: path.resolve(process.env.UNI_OUTPUT_DIR, to)
-    }, options)
+    return Object.assign(
+      {
+        from,
+        to: path.resolve(process.env.UNI_OUTPUT_DIR, to)
+      },
+      options
+    )
   }
 }
 // 暂未考虑动态添加static目录
@@ -40,29 +47,38 @@ function getAssetsCopyOptions (assetsDir) {
     copyOptions.push(mainAssetsCopyOption)
   }
   // 分包静态资源
-  process.UNI_SUBPACKAGES && Object.keys(process.UNI_SUBPACKAGES).forEach(root => {
-    const subAssetsCopyOption = getAssetsCopyOption(path.join(root, assetsDir), {
-      ignore
+  process.UNI_SUBPACKAGES &&
+    Object.keys(process.UNI_SUBPACKAGES).forEach(root => {
+      const subAssetsCopyOption = getAssetsCopyOption(
+        path.join(root, assetsDir),
+        {
+          ignore
+        }
+      )
+      if (subAssetsCopyOption) {
+        copyOptions.push(subAssetsCopyOption)
+      }
     })
-    if (subAssetsCopyOption) {
-      copyOptions.push(subAssetsCopyOption)
-    }
-  })
   return copyOptions
 }
 
 function getUniModulesAssetsCopyOptions (assetsDir) {
   const copyOptions = []
   global.uniModules.forEach(module => {
-    copyOptions.push(...getAssetsCopyOptions('uni_modules/' + module + '/' + assetsDir))
+    copyOptions.push(
+      ...getAssetsCopyOptions('uni_modules/' + module + '/' + assetsDir)
+    )
   })
   return copyOptions
 }
 
 function getCopyWebpackPluginOptions (platformOptions, vueOptions) {
-  const copyOptions = getAssetsCopyOptions(assetsDir).concat(getUniModulesAssetsCopyOptions(assetsDir))
+  const copyOptions = getAssetsCopyOptions(assetsDir).concat(
+    getUniModulesAssetsCopyOptions(assetsDir)
+  )
   global.uniPlugin.copyWebpackOptions.forEach(copyWebpackOptions => {
-    const platformCopyOptions = copyWebpackOptions(platformOptions, vueOptions, copyOptions) || []
+    const platformCopyOptions =
+      copyWebpackOptions(platformOptions, vueOptions, copyOptions) || []
     platformCopyOptions.forEach(copyOption => {
       if (typeof copyOption === 'string') {
         copyOption = getAssetsCopyOption(copyOption)
@@ -70,10 +86,34 @@ function getCopyWebpackPluginOptions (platformOptions, vueOptions) {
       copyOption && copyOptions.push(copyOption)
     })
   })
+  if (process.env.UNI_PLATFORM === 'app-plus') {
+    copyOptions.push({
+      from: path.resolve(process.env.UNI_INPUT_DIR, 'android*.json'),
+      to: '[name].[ext]',
+      globOptions: {
+        ignored: require('./util').getWatchOptions().ignored
+      },
+      transform (content, path) {
+        if (path.endsWith('androidPrivacy.json')) {
+          const options = initI18nOptions(
+            process.env.UNI_PLATFORM,
+            process.env.UNI_INPUT_DIR,
+            false,
+            true
+          )
+          if (!options) {
+            return content
+          }
+          return compileI18nJsonStr(content.toString(), options)
+        }
+        return content
+      }
+    })
+  }
   return copyOptions
 }
 
 module.exports = {
   assetsDir,
   getCopyWebpackPluginOptions
-}
+}

package/lib/env.js

@@ -2,6 +2,8 @@ const fs = require('fs')
 const path = require('path')
 const mkdirp = require('mkdirp')
 const loaderUtils = require('loader-utils')
+const uniI18n = require('@dcloudio/uni-cli-i18n')
+const moduleAlias = require('module-alias')
 
 require('./error-reporting')
 
@@ -17,10 +19,23 @@ if (process.env.UNI_INPUT_DIR && process.env.UNI_INPUT_DIR.indexOf('./') === 0)
 }
 process.env.UNI_INPUT_DIR = process.env.UNI_INPUT_DIR || path.resolve(process.cwd(), defaultInputDir)
 
+const manifestJsonObj = require('@dcloudio/uni-cli-shared/lib/manifest').getManifestJson()
+
+process.env.UNI_APP_ID = manifestJsonObj.appid || ''
+process.env.UNI_APP_NAME = manifestJsonObj.name || ''
+process.env.UNI_PLATFORM = process.env.UNI_PLATFORM || 'h5'
+
+// 小程序 vue3 标记
+if (process.env.UNI_PLATFORM.indexOf('mp-') === 0) {
+  if (manifestJsonObj.vueVersion === '3' || manifestJsonObj.vueVersion === 3) {
+    process.env.UNI_USING_VUE3 = true
+    process.env.UNI_USING_VUE3_OPTIONS_API = true
+  }
+}
+
 // 初始化全局插件对象
 global.uniPlugin = require('@dcloudio/uni-cli-shared/lib/plugin').init()
 
-const manifestJsonObj = require('@dcloudio/uni-cli-shared/lib/manifest').getManifestJson()
 const platformOptions = manifestJsonObj[process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM] || {}
 // 插件校验环境
 global.uniPlugin.validate.forEach(validate => {
@@ -32,26 +47,48 @@ process.env.VUE_APP_NAME = manifestJsonObj.name
 
 process.env.UNI_USING_V3_SCOPED = true
 
-process.UNI_CLOUD = false
-process.UNI_CLOUD_TCB = false
-process.UNI_CLOUD_ALIYUN = false
 process.env.UNI_CLOUD_PROVIDER = JSON.stringify([])
 
+// 导出到小程序插件
+process.env.UNI_MP_PLUGIN_EXPORT = JSON.stringify(Object.keys(platformOptions.plugins || {}).map(pluginName => platformOptions.plugins[pluginName].export))
+
+const isH5 = !process.env.UNI_SUB_PLATFORM && process.env.UNI_PLATFORM === 'h5'
+const isProduction = process.env.NODE_ENV === 'production'
+
 if (process.env.UNI_CLOUD_SPACES) {
   try {
     const spaces = JSON.parse(process.env.UNI_CLOUD_SPACES)
     if (Array.isArray(spaces)) {
-      process.UNI_CLOUD = spaces.length > 0
-      process.UNI_CLOUD_TCB = !!spaces.find(space => !space.clientSecret)
-      process.UNI_CLOUD_ALIYUN = !!spaces.find(space => space.clientSecret)
+      const hasUniCloudSpace = spaces.length > 0
       if (spaces.length === 1) {
         const space = spaces[0]
-        console.log(`本项目的uniCloud使用的默认服务空间spaceId为：${space.id}`)
+        console.log(uniI18n.__('pluginUni.currentProjectDefaultSpaceId', {
+          0: space.id
+        }))
       }
+
+      if (
+        hasUniCloudSpace &&
+        isH5 &&
+        isProduction
+      ) {
+        console.warn(uniI18n.__('pluginUni.unicloudReleaseH5', {
+          0: 'https://uniapp.dcloud.io/uniCloud/quickstart?id=useinh5'
+        }))
+      } else if (
+        hasUniCloudSpace &&
+        isH5 &&
+        !isProduction
+      ) {
+        console.warn(uniI18n.__('pluginUni.unicloudShowedRunByHBuilderX', {
+          0: 'https://uniapp.dcloud.io/uniCloud/quickstart?id=useinh5'
+        }))
+      }
+
       process.env.UNI_CLOUD_PROVIDER = JSON.stringify(spaces.map(space => {
         if (space.clientSecret) {
           return {
-            provider: 'aliyun',
+            provider: space.provider || 'aliyun',
             spaceName: space.name,
             spaceId: space.id,
             clientSecret: space.clientSecret,
@@ -59,7 +96,7 @@ if (process.env.UNI_CLOUD_SPACES) {
           }
         } else {
           return {
-            provider: 'tencent',
+            provider: space.provider || 'tencent',
             spaceName: space.name,
             spaceId: space.id
           }
@@ -69,22 +106,14 @@ if (process.env.UNI_CLOUD_SPACES) {
   } catch (e) {}
 }
 
-if (
-  process.UNI_CLOUD &&
-  !process.env.UNI_SUB_PLATFORM &&
-  process.env.UNI_PLATFORM === 'h5' &&
-  process.env.NODE_ENV === 'production'
-) {
-  console.warn(
-    '发布H5，需要在uniCloud后台操作，绑定安全域名，否则会因为跨域问题而无法访问。教程参考：https://uniapp.dcloud.io/uniCloud/quickstart?id=useinh5')
-}
-
 // 初始化环境变量
-const defaultOutputDir = '../../../../dist/' +
+process.env.UNI_CLI_CONTEXT = require('@dcloudio/uni-cli-shared/lib/util').getCLIContext()
+
+const defaultOutputDir = './dist/' +
   (process.env.NODE_ENV === 'production' ? 'build' : 'dev') + '/' +
   (process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM)
 
-process.env.UNI_OUTPUT_DEFAULT_DIR = path.resolve(__dirname, defaultOutputDir)
+process.env.UNI_OUTPUT_DEFAULT_DIR = path.resolve(process.env.UNI_CLI_CONTEXT, defaultOutputDir)
 if (process.env.UNI_OUTPUT_DIR && process.env.UNI_OUTPUT_DIR.indexOf('./') === 0) {
   process.env.UNI_OUTPUT_DIR = path.resolve(process.cwd(), process.env.UNI_OUTPUT_DIR)
 }
@@ -97,24 +126,17 @@ if (process.env.UNI_PLATFORM === 'app-plus') {
   process.env.UNI_OUTPUT_TMP_DIR = path.resolve(process.env.UNI_OUTPUT_DIR, '../.tmp/app-plus')
 }
 
-process.env.UNI_CLI_CONTEXT = path.resolve(__dirname, '../../../../')
-
 process.UNI_LIBRARIES = process.UNI_LIBRARIES || ['@dcloudio/uni-ui']
 
 if (process.env.NODE_ENV === 'production') { // 发行模式,不启用 cache
   delete process.env.UNI_USING_CACHE
 }
 
-global.uniModules = []
-try {
-  global.uniModules = fs
-    .readdirSync(path.resolve(process.env.UNI_INPUT_DIR, 'uni_modules'))
-    .filter(module =>
-      fs.existsSync(
-        path.resolve(process.env.UNI_INPUT_DIR, 'uni_modules', module, 'package.json')
-      )
-    )
-} catch (e) {}
+process.env.BROWSERSLIST_CONFIG = [
+  path.resolve(process.env.UNI_INPUT_DIR, '.browserslistrc'),
+  path.resolve(process.env.UNI_CLI_CONTEXT, 'package.json'),
+  path.resolve(process.cwd(), 'package.json')
+].find(file => fs.existsSync(file))
 
 const {
   normalizePath,
@@ -123,6 +145,14 @@ const {
   getPagesJson
 } = require('@dcloudio/uni-cli-shared')
 
+process.env.RUN_BY_HBUILDERX = JSON.stringify(runByHBuilderX)
+
+const {
+  initUniModules
+} = require('@dcloudio/uni-cli-shared/lib/uni_modules')
+
+initUniModules()
+
 const pagesJsonObj = getPagesJson()
 // 读取分包
 process.UNI_SUBPACKAGES = {}
@@ -258,6 +288,16 @@ if (platformOptions.usingComponents === true) {
   }
 }
 
+// 兼容历史配置 betterScopedSlots
+const modes = ['legacy', 'auto', 'augmented']
+const scopedSlotsCompiler = !platformOptions.scopedSlotsCompiler && platformOptions.betterScopedSlots ? modes[2]
+  : platformOptions.scopedSlotsCompiler
+process.env.SCOPED_SLOTS_COMPILER = modes.includes(scopedSlotsCompiler) ? scopedSlotsCompiler : modes[1]
+// 快手小程序抽象组件编译报错，如未指定 legacy 固定为 augmented 模式
+if (process.env.UNI_PLATFORM === 'mp-kuaishou' && process.env.SCOPED_SLOTS_COMPILER !== modes[0]) {
+  process.env.SCOPED_SLOTS_COMPILER = modes[2]
+}
+
 if (
   process.env.UNI_USING_COMPONENTS ||
   process.env.UNI_PLATFORM === 'h5'
@@ -271,7 +311,9 @@ if (
     process.env.UNI_USING_STAT = true
     if (!process.UNI_STAT_CONFIG.appid && process.env.NODE_ENV === 'production') {
       console.log()
-      console.warn('当前应用未配置Appid，无法使用uni统计，详情参考：https://ask.dcloud.net.cn/article/36303')
+      console.warn(uniI18n.__('pluginUni.uniStatisticsNoAppid', {
+        0: 'https://ask.dcloud.net.cn/article/36303'
+      }))
       console.log()
     }
   }
@@ -297,18 +339,22 @@ const warningMsg =
 const needWarning = !platformOptions.usingComponents || usingComponentsAbsent
 let hasNVue = false
 // 输出编译器版本等信息
+const compileModeUrl = 'https://ask.dcloud.net.cn/article/36074'
 if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
-  console.log('当前nvue编译模式' + (process.env.UNI_USING_V3_NATIVE ? '（v3）' : '') + '：' + (isNVueCompiler ? 'uni-app'
-    : 'weex') +
-    ' 。编译模式差异见：https://ask.dcloud.net.cn/article/36074')
+  const compileMode = (process.env.UNI_USING_V3_NATIVE ? '（v3）' : '') + '：' + (isNVueCompiler ? 'uni-app' : 'weex')
+  console.log(uniI18n.__('pluginUni.nvueCompileModeForDetail', {
+    0: compileMode,
+    1: compileModeUrl
+  }))
 } else if (process.env.UNI_PLATFORM !== 'h5' && process.env.UNI_PLATFORM !== 'quickapp-native') {
   try {
     let info = ''
     if (process.env.UNI_PLATFORM === 'app-plus') {
       const pagesPkg = require('@dcloudio/webpack-uni-pages-loader/package.json')
       if (pagesPkg) {
-        const v3Tips = '（v3）详见：https://ask.dcloud.net.cn/article/36599。'
-        info = '编译器版本：' + pagesPkg['uni-app'].compilerVersion + (process.env.UNI_USING_V3 ? v3Tips : '')
+        const v3Tips = `（v3）${uniI18n.__('see')}：https://ask.dcloud.net.cn/article/36599。`
+        info = uniI18n.__('compilerVersion') + '：' + pagesPkg['uni-app'].compilerVersion + (process.env.UNI_USING_V3
+          ? v3Tips : '')
       }
       if (process.env.UNI_USING_V3) {
         console.log(info)
@@ -322,8 +368,10 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
           if (needWarning) {
             console.log(warningMsg)
           }
-          console.log('当前nvue编译模式：' + (isNVueCompiler ? 'uni-app' : 'weex') +
-            ' 。编译模式差异见：https://ask.dcloud.net.cn/article/36074')
+          console.log(uniI18n.__('pluginUni.nvueCompileModeForDetail', {
+            0: (isNVueCompiler ? 'uni-app' : 'weex'),
+            1: compileModeUrl
+          }))
         } else {
           console.log(info)
           if (needWarning) {
@@ -339,23 +387,23 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
   } catch (e) {}
 }
 if (process.env.NODE_ENV !== 'production') { // 运行模式性能提示
-  let perfMsg = '请注意运行模式下，因日志输出、sourcemap以及未压缩源码等原因，性能和包体积，均不及发行模式。'
+  let perfMsg = uniI18n.__('pluginUni.runDebugMode')
   if (hasNVue) { // app-nvue
-    perfMsg = perfMsg + '尤其是app-nvue的sourcemap影响较大'
+    perfMsg = perfMsg + uniI18n.__('pluginUni.runDebugModeNvue')
   } else if (process.env.UNI_PLATFORM.indexOf('mp-') === 0) { // 小程序
-    perfMsg = perfMsg + '若要正式发布，请点击发行菜单或使用cli发布命令进行发布'
+    perfMsg = perfMsg + uniI18n.__('pluginUni.runDebugModeMP')
   }
   console.log(perfMsg)
 }
 
-const moduleAlias = require('module-alias')
-
 // 将 template-compiler 指向修订后的版本
 moduleAlias.addAlias('vue-template-compiler', '@dcloudio/vue-cli-plugin-uni/packages/vue-template-compiler')
 moduleAlias.addAlias('@megalo/template-compiler', '@dcloudio/vue-cli-plugin-uni/packages/@megalo/template-compiler')
 moduleAlias.addAlias('mpvue-template-compiler', '@dcloudio/vue-cli-plugin-uni/packages/mpvue-template-compiler')
 // vue-loader
-moduleAlias.addAlias('vue-loader', '@dcloudio/vue-cli-plugin-uni/packages/vue-loader')
+moduleAlias.addAlias('vue-loader', '@dcloudio/vue-cli-plugin-uni/packages/vue-loader')
+// sass-loader
+moduleAlias.addAlias('sass-loader', '@dcloudio/vue-cli-plugin-uni/packages/sass-loader')
 
 if (process.env.UNI_USING_V3 && process.env.UNI_PLATFORM === 'app-plus') {
   moduleAlias.addAlias('./runtime/getUrl.js', '@dcloudio/vue-cli-plugin-uni/lib/app-plus/getUrl.js')
@@ -367,7 +415,7 @@ if (process.env.UNI_PLATFORM === 'h5') {
   moduleAlias.addAlias('vue-style-loader', '@dcloudio/vue-cli-plugin-uni/packages/h5-vue-style-loader')
 }
 
-if (process.env.UNI_PLATFORM === 'mp-toutiao') {
+if (process.env.UNI_PLATFORM === 'mp-toutiao' || process.env.UNI_PLATFORM === 'mp-lark') {
   // !important 始终带有一个空格
   moduleAlias.addAlias(
     'postcss-normalize-whitespace',
@@ -382,7 +430,7 @@ if (runByHBuilderX) {
       '[BABEL] Note: The code generator has deoptimised the styling of')) {
       const filePath = msg.replace('[BABEL] Note: The code generator has deoptimised the styling of ', '').split(
         ' as ')[0]
-      console.log('[警告] `' + path.relative(process.env.UNI_INPUT_DIR, filePath) +
+      console.log('[' + uniI18n.__('warning') + '] `' + path.relative(process.env.UNI_INPUT_DIR, filePath) +
         '` 文件体积超过 500KB，已跳过压缩以及 ES6 转 ES5 的处理，手机端使用过大的js库影响性能。')
     } else {
       oldError.apply(console, arguments)
@@ -446,10 +494,12 @@ if (
 }
 
 if (process.env.UNI_PLATFORM.startsWith('mp-')) {
-  console.log('小程序各家浏览器内核及自定义组件实现机制存在差异，可能存在样式布局兼容问题，参考：https://uniapp.dcloud.io/matter?id=mp')
+  console.log(uniI18n.__('pluginUni.mpBrowserKernelDifference', {
+    0: 'https://uniapp.dcloud.io/matter?id=mp'
+  }))
 }
 
-runByHBuilderX && console.log('正在编译中...')
+runByHBuilderX && console.log(uniI18n.__('compiling'))
 
 module.exports = {
   manifestPlatformOptions: platformOptions

package/lib/error-reporting.js

@@ -36,12 +36,18 @@ class ErrorReport {
     return this._https
   }
 
-  report (type, err) {
+  report (type, err = '') {
     if (!this._shouldReport(err)) {
       return
     }
+
+    if (typeof err === 'object') {
+      try {
+        err = err.toString()
+      } catch (e) {}
+    }
 
-    err = normalizePath(err)
+    err = normalizePath(err) || ''
     err = err.replace(this._UNI_INPUT_DIR_REG, 'UNI_INPUT_DIR')
     err = err.replace(this._UNI_CLI_CONTEXT_REG, 'UNI_CLI_CONTEXT')
 
@@ -151,5 +157,5 @@ process
     global.__error_reporting__ && global.__error_reporting__('unhandledRejection', reason)
   })
   .on('uncaughtException', err => {
-    global.__error_reporting__ && global.__error_reporting__('uncaughtException', err)
+    global.__error_reporting__ && global.__error_reporting__('uncaughtException', err.stack)
   })

package/lib/h5/index.js

@@ -155,6 +155,9 @@ module.exports = {
         }
       },
       plugins,
+      optimization: {
+        moduleIds: 'hashed'
+      },
       devServer: {
         watchOptions: require('../util').getWatchOptions()
       }

package/lib/mp/index.js

@@ -84,11 +84,13 @@ function processWxss (name, assets) {
   }
 }
 
+const parseRequirePath = path => path.startsWith('common') ? `./${path}` : path
+
 function procssJs (name, assets, hasVendor) {
   const dirname = path.dirname(name)
-  const runtimeJsCode = `require('${normalizePath(path.relative(dirname, 'common/runtime.js'))}');`
-  const vendorJsCode = hasVendor ? `require('${normalizePath(path.relative(dirname, 'common/vendor.js'))}');` : ''
-  const mainJsCode = `require('${normalizePath(path.relative(dirname, 'common/main.js'))}');`
+  const runtimeJsCode = `require('${normalizePath(parseRequirePath(path.relative(dirname, 'common/runtime.js')))}');`
+  const vendorJsCode = hasVendor ? `require('${normalizePath(parseRequirePath(path.relative(dirname, 'common/vendor.js')))}');` : ''
+  const mainJsCode = `require('${normalizePath(parseRequirePath(path.relative(dirname, 'common/main.js')))}');`
   const code = `${runtimeJsCode}${vendorJsCode}${mainJsCode}` + assets[name].source().toString()
   assets[name] = {
     size () {
@@ -128,13 +130,18 @@ class PreprocessAssetsPlugin {
 
 function initSubpackageConfig (webpackConfig, vueOptions) {
   if (process.env.UNI_OUTPUT_DEFAULT_DIR === process.env.UNI_OUTPUT_DIR) { // 未自定义output
-    process.env.UNI_OUTPUT_DIR = path.resolve(process.env.UNI_OUTPUT_DIR, (process.env.UNI_SUBPACKGE || process.env.UNI_MP_PLUGIN))
+    process.env.UNI_OUTPUT_DIR = path.resolve(process.env.UNI_OUTPUT_DIR, (process.env.UNI_SUBPACKGE || process.env
+      .UNI_MP_PLUGIN))
   }
   vueOptions.outputDir = process.env.UNI_OUTPUT_DIR
   webpackConfig.output.path(process.env.UNI_OUTPUT_DIR)
   webpackConfig.output.jsonpFunction('webpackJsonp_' + (process.env.UNI_SUBPACKGE || process.env.UNI_MP_PLUGIN))
 }
 
+function addToUniEntry (fileName) {
+  fileName && (process.UNI_ENTRY[fileName.split('.')[0]] = path.resolve(process.env.UNI_INPUT_DIR, fileName))
+}
+
 module.exports = {
   vueConfig: {
     parallel: false
@@ -168,17 +175,29 @@ module.exports = {
       plugins.push(new PreprocessAssetsPlugin())
     }
 
-    if (process.env.UNI_MP_PLUGIN) {
-      // 小程序插件入口使用
-      // packages\webpack-uni-mp-loader\lib\plugin\index-new.js -> addMPPluginRequire
-      beforeCode += `wx.__webpack_require_${process.env.UNI_MP_PLUGIN.replace('-', '_')}__ = __webpack_require__;`
+    {
+      const globalEnv = process.env.UNI_PLATFORM === 'mp-alipay' ? 'my' : 'wx'
+      ;[].concat(process.env.UNI_MP_PLUGIN ? process.env.UNI_MP_PLUGIN_MAIN : JSON.parse(process.env.UNI_MP_PLUGIN_EXPORT))
+        .forEach(fileName => addToUniEntry(fileName))
+      beforeCode += `${globalEnv}.__webpack_require_${(process.env.UNI_MP_PLUGIN || 'UNI_MP_PLUGIN').replace(/-/g, '_')}__ = __webpack_require__;`
+    }
 
-      const UNI_MP_PLUGIN_MAIN = process.env.UNI_MP_PLUGIN_MAIN
-      if (UNI_MP_PLUGIN_MAIN) {
-        process.UNI_ENTRY[UNI_MP_PLUGIN_MAIN.split('.')[0]] = path.resolve(process.env.UNI_INPUT_DIR, UNI_MP_PLUGIN_MAIN)
-      }
+    const alias = { // 仅 mp-weixin
+      'mpvue-page-factory': require.resolve(
+        '@dcloudio/vue-cli-plugin-uni/packages/mpvue-page-factory')
     }
 
+    if (process.env.UNI_USING_VUE3) {
+      alias.vuex = require.resolve('@dcloudio/vue-cli-plugin-uni/packages/vuex')
+      alias['@vue/devtools-api'] = require.resolve('@dcloudio/vue-cli-plugin-uni/packages/@vue/devtools-api')
+
+      alias['vue-i18n'] = require.resolve('@dcloudio/vue-cli-plugin-uni/packages/vue3/node_modules/vue-i18n')
+      alias['@dcloudio/uni-app'] = require.resolve('@dcloudio/vue-cli-plugin-uni/packages/uni-app')
+    }
+
+    // 使用外层依赖的版本
+    alias['regenerator-runtime'] = require.resolve('regenerator-runtime')
+
     return {
       mode: process.env.NODE_ENV === 'production' ? 'production' : 'development',
       entry () {
@@ -195,10 +214,7 @@ module.exports = {
       },
       resolve: {
         extensions: ['.nvue'],
-        alias: { // 仅 mp-weixin
-          'mpvue-page-factory': require.resolve(
-            '@dcloudio/vue-cli-plugin-uni/packages/mpvue-page-factory')
-        }
+        alias
       },
       module: {
         rules: [{

package/lib/options.js

@@ -26,8 +26,11 @@ module.exports = function initOptions (options) {
   // 增加 src/node_modules 解析
   options.transpileDependencies.push(genTranspileDepRegex(path.resolve(process.env.UNI_INPUT_DIR, 'node_modules')))
   options.transpileDependencies.push('@dcloudio/uni-' + process.env.UNI_PLATFORM)
-  options.transpileDependencies.push('@dcloudio/uni-stat')
-  options.transpileDependencies.push('@dcloudio/vue-cli-plugin-uni/packages/uni-cloud')
+  options.transpileDependencies.push('@dcloudio/uni-i18n')
+  options.transpileDependencies.push('@dcloudio/uni-stat')
+  options.transpileDependencies.push('@dcloudio/vue-cli-plugin-uni/packages/uni-app')
+  options.transpileDependencies.push('@dcloudio/vue-cli-plugin-uni/packages/uni-cloud')
+  options.transpileDependencies.push('@dcloudio/vue-cli-plugin-uni/packages/uni-stat')
 
   if (process.env.UNI_PLATFORM !== 'mp-weixin') { // mp runtime
     options.transpileDependencies.push('@dcloudio/uni-mp-weixin')
@@ -85,7 +88,7 @@ module.exports = function initOptions (options) {
 
   if (sassLoaderVersion < 8) {
     options.css.loaderOptions.sass.data = sassData
-  } else {
+  } else {
     const name = sassLoaderVersion >= 9 ? 'additionalData' : 'prependData'
     options.css.loaderOptions.sass[name] = sassData
   }

package/lib/util.js

@@ -21,11 +21,10 @@ module.exports = {
   getWatchOptions () {
     return {
       ignored: [
-        /node_modules/,
-        path.resolve(process.env.UNI_INPUT_DIR, '*.md'),
-        path.resolve(process.env.UNI_INPUT_DIR, '.hbuilderx'),
-        path.resolve(process.env.UNI_INPUT_DIR, '.editorconfig'),
-        path.resolve(process.env.UNI_INPUT_DIR, '.gitignore'),
+        path.resolve(process.env.UNI_INPUT_DIR, '*.md'),
+        path.resolve(process.env.UNI_INPUT_DIR, '.hbuilderx'),
+        path.resolve(process.env.UNI_INPUT_DIR, '.editorconfig'),
+        path.resolve(process.env.UNI_INPUT_DIR, '.gitignore'),
         path.resolve(process.env.UNI_INPUT_DIR, 'LICENSE'),
         path.resolve(process.env.UNI_INPUT_DIR, 'unpackage'),
         path.resolve(process.env.UNI_INPUT_DIR, 'uniCloud-aliyun'),
@@ -35,4 +34,4 @@ module.exports = {
       ]
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.0",
+  "version": "2.0.1-33420211227001",
   "description": "uni-app plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -17,7 +17,7 @@
   "author": "fxy060608",
   "license": "Apache-2.0",
   "dependencies": {
-    "@dcloudio/uni-stat": "^2.0.0",
+    "@dcloudio/uni-stat": "^2.0.1-33420211227001",
     "buffer-json": "^2.0.0",
     "copy-webpack-plugin": "^5.1.1",
     "cross-env": "^5.2.0",
@@ -37,5 +37,5 @@
     "wrap-loader": "^0.2.0",
     "xregexp": "4.0.0"
   },
-  "gitHead": "b1bdfb4de3f518c1c0fbab242403ea05feced4e3"
+  "gitHead": "f54af18016d88ecbd0776ad013f5c1eb65a8debe"
 }

package/packages/@vue/component-compiler-utils/MODIFY.md

@@ -0,0 +1,5 @@
+dist/compileTemplate
+dist/parse
+dist/parseCustomBlocks
+dist/stylePlugins/scoped.js
+dist/stylePlugins/remove-scoped.js

package/packages/@vue/component-compiler-utils/dist/compileStyle.js

@@ -8,6 +8,11 @@ const trim_1 = __importDefault(require("./stylePlugins/trim"));
 const scoped_1 = __importDefault(require("./stylePlugins/scoped"));
 const styleProcessors_1 = require("./styleProcessors");
 const removeScoped_1 = __importDefault(require("./stylePlugins/remove-scoped"));
+let comments;
+try{
+  comments = require('postcss-discard-comments')
+}catch(e){}
+
 function compileStyle(options) {
     return doCompileStyle(Object.assign({}, options, { isAsync: false }));
 }
@@ -31,6 +36,12 @@ function doCompileStyle(options) {
     } else { // fixed by xxxxxx
         plugins.push(removeScoped_1.default(id));
     }
+    // fixed by xxxxxx
+    if (process.env.UNI_PLATFORM === 'app-plus' && process.env.NODE_ENV === 'production') {
+      if (comments) {
+        plugins.push(comments);
+      }
+    }
     const postCSSOptions = Object.assign({}, postcssOptions, { to: filename, from: filename });
     if (map) {
         postCSSOptions.map = {