@dcloudio/vue-cli-plugin-uni 2.0.0-32620210831002 → 2.0.0-32920210926001

package/commands/build.js

@@ -2,7 +2,8 @@ const path = require('path')
 
 const {
   runByHBuilderX,
-  isInHBuilderX
+  isInHBuilderX,
+  parseJson
 } = require('@dcloudio/uni-cli-shared')
 
 const uniI18n = require('@dcloudio/uni-cli-i18n')
@@ -45,13 +46,14 @@ module.exports = (api, options) => {
       process.env.UNI_SUBPACKGE = args.subpackage
     }
 
+    const mpPluginPlatforms = ['mp-weixin', 'mp-alipay']
     if (args.plugin) {
-      if (process.env.UNI_PLATFORM === 'mp-weixin') {
+      if (mpPluginPlatforms.includes(process.env.UNI_PLATFORM)) {
         process.env.UNI_MP_PLUGIN = args.plugin
         analysisPluginDir()
       } else {
         console.log()
-        console.error(uniI18n.__('pluginUni.compileToMpPluginOnlySupportWeChat'))
+        console.error(uniI18n.__('pluginUni.compileToMpPluginOnlySupportPlatform'))
         console.log()
         process.exit(0)
       }
@@ -133,7 +135,7 @@ async function build (args, api, options) {
   log()
 
   if (!runByHBuilderX && !runByAliIde) {
-    logWithSpinner(uniI18n.__('pluginUni.startCompileProjectToPlatform', { 0: process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM, 1: process.env.UNI_MP_PLUGIN ? uniI18n.__('platform') : uniI18n.__('plugin') }))
+    logWithSpinner(uniI18n.__('pluginUni.startCompileProjectToPlatform', { 0: process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM, 1: process.env.UNI_MP_PLUGIN ? uniI18n.__('plugin') : uniI18n.__('platform') }))
   }
 
   const targetDir = api.resolve(options.outputDir)
@@ -224,7 +226,7 @@ function analysisPluginDir () {
     process.exit(0)
   }
 
-  const pluginJson = require(pluginJsonPath)
+  const pluginJson = parseJson(fs.readFileSync(pluginJsonPath, 'utf-8'), true)
 
   // main 入口文件是否存在
   process.env.UNI_MP_PLUGIN_MAIN = pluginJson.main

package/generator.js

@@ -79,8 +79,8 @@ module.exports = (api, options, rootOptions) => {
         jest: '^25.4.0'
       },
       browserslist: [
-        'Android >= 4',
-        'ios >= 8'
+        'Android >= 4.4',
+        'ios >= 9'
       ]
     }
   })

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)
@@ -76,6 +92,21 @@ function getCopyWebpackPluginOptions (platformOptions, vueOptions) {
       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
       }
     })
   }
@@ -85,4 +116,4 @@ function getCopyWebpackPluginOptions (platformOptions, vueOptions) {
 module.exports = {
   assetsDir,
   getCopyWebpackPluginOptions
-}
+}

package/lib/env.js

@@ -23,6 +23,7 @@ const manifestJsonObj = require('@dcloudio/uni-cli-shared/lib/manifest').getMani
 
 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) {
@@ -58,7 +59,9 @@ if (process.env.UNI_CLOUD_SPACES) {
       const hasUniCloudSpace = spaces.length > 0
       if (spaces.length === 1) {
         const space = spaces[0]
-        console.log(uniI18n.__('pluginUni.currentProjectDefaultSpaceId', { 0: space.id }))
+        console.log(uniI18n.__('pluginUni.currentProjectDefaultSpaceId', {
+          0: space.id
+        }))
       }
 
       if (
@@ -66,19 +69,23 @@ if (process.env.UNI_CLOUD_SPACES) {
         isH5 &&
         isProduction
       ) {
-        console.warn(uniI18n.__('pluginUni.unicloudReleaseH5', { 0: 'https://uniapp.dcloud.io/uniCloud/quickstart?id=useinh5' }))
+        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' }))
+        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,
@@ -86,7 +93,7 @@ if (process.env.UNI_CLOUD_SPACES) {
           }
         } else {
           return {
-            provider: 'tencent',
+            provider: space.provider || 'tencent',
             spaceName: space.name,
             spaceId: space.id
           }
@@ -122,6 +129,12 @@ if (process.env.NODE_ENV === 'production') { // 发行模式,不启用 cache
   delete process.env.UNI_USING_CACHE
 }
 
+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,
   isSupportSubPackages,
@@ -295,7 +308,9 @@ if (
     process.env.UNI_USING_STAT = true
     if (!process.UNI_STAT_CONFIG.appid && process.env.NODE_ENV === 'production') {
       console.log()
-      console.warn(uniI18n.__('pluginUni.uniStatisticsNoAppid', { 0: 'https://ask.dcloud.net.cn/article/36303' }))
+      console.warn(uniI18n.__('pluginUni.uniStatisticsNoAppid', {
+        0: 'https://ask.dcloud.net.cn/article/36303'
+      }))
       console.log()
     }
   }
@@ -324,7 +339,10 @@ let hasNVue = false
 const compileModeUrl = 'https://ask.dcloud.net.cn/article/36074'
 if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
   const compileMode = (process.env.UNI_USING_V3_NATIVE ? '（v3）' : '') + '：' + (isNVueCompiler ? 'uni-app' : 'weex')
-  console.log(uniI18n.__('pluginUni.nvueCompileModeForDetail', { 0: compileMode, 1: compileModeUrl }))
+  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 = ''
@@ -332,7 +350,8 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
       const pagesPkg = require('@dcloudio/webpack-uni-pages-loader/package.json')
       if (pagesPkg) {
         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 : '')
+        info = uniI18n.__('compilerVersion') + '：' + pagesPkg['uni-app'].compilerVersion + (process.env.UNI_USING_V3
+          ? v3Tips : '')
       }
       if (process.env.UNI_USING_V3) {
         console.log(info)
@@ -346,7 +365,10 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
           if (needWarning) {
             console.log(warningMsg)
           }
-          console.log(uniI18n.__('pluginUni.nvueCompileModeForDetail', { 0: (isNVueCompiler ? 'uni-app' : 'weex'), 1: compileModeUrl }))
+          console.log(uniI18n.__('pluginUni.nvueCompileModeForDetail', {
+            0: (isNVueCompiler ? 'uni-app' : 'weex'),
+            1: compileModeUrl
+          }))
         } else {
           console.log(info)
           if (needWarning) {
@@ -467,7 +489,9 @@ if (
 }
 
 if (process.env.UNI_PLATFORM.startsWith('mp-')) {
-  console.log(uniI18n.__('pluginUni.mpBrowserKernelDifference', { 0: 'https://uniapp.dcloud.io/matter?id=mp' }))
+  console.log(uniI18n.__('pluginUni.mpBrowserKernelDifference', {
+    0: 'https://uniapp.dcloud.io/matter?id=mp'
+  }))
 }
 
 runByHBuilderX && console.log(uniI18n.__('compiling'))

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 () {
@@ -172,7 +174,7 @@ module.exports = {
     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(/-/g, '_')}__ = __webpack_require__;`
+      beforeCode += `${process.env.UNI_PLATFORM === 'mp-alipay' ? 'my' : 'wx'}.__webpack_require_${process.env.UNI_MP_PLUGIN.replace(/-/g, '_')}__ = __webpack_require__;`
 
       const UNI_MP_PLUGIN_MAIN = process.env.UNI_MP_PLUGIN_MAIN
       if (UNI_MP_PLUGIN_MAIN) {
@@ -309,4 +311,4 @@ module.exports = {
     webpackConfig.plugins.delete('preload')
     webpackConfig.plugins.delete('prefetch')
   }
-}
+}

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-32620210831002",
+  "version": "2.0.0-32920210926001",
   "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-32620210831002",
+    "@dcloudio/uni-stat": "^2.0.0-32920210926001",
     "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": "7c737dd6ca9e9001216a91e0bd98362200bff617"
+  "gitHead": "5e7404fe087c97dfc46bfa7b0ab9044a2fa90142"
 }

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