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

package/commands/build.js

@@ -2,9 +2,14 @@ const path = require('path')
 
 const {
   runByHBuilderX,
-  isInHBuilderX
+  isInHBuilderX,
+  parseJson,
+  parsePagesJson,
+  parseManifestJson
 } = require('@dcloudio/uni-cli-shared')
 
+const uniI18n = require('@dcloudio/uni-cli-i18n')
+
 const defaults = {
   clean: true,
   target: 'app',
@@ -29,7 +34,8 @@ module.exports = (api, options) => {
       '--auto-host': 'specify automator host',
       '--auto-port': 'specify automator port',
       '--subpackage': 'specify subpackage',
-      '--plugin': 'specify plugin'
+      '--plugin': 'specify plugin',
+      '--manifest': 'build manifest.json'
     }
   }, async (args) => {
     for (const key in defaults) {
@@ -38,17 +44,24 @@ module.exports = (api, options) => {
       }
     }
 
-    const platforms = ['mp-weixin', 'mp-qq', 'mp-baidu', 'mp-alipay', 'mp-toutiao']
+    if (args.manifest && process.env.UNI_PLATFORM === 'app-plus') {
+      return buildManifestJson()
+    }
+
+    const platforms = ['mp-weixin', 'mp-qq', 'mp-baidu', 'mp-alipay', 'mp-toutiao', 'mp-lark']
     if (args.subpackage && platforms.includes(process.env.UNI_PLATFORM)) {
       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.error('编译到小程序插件只支持微信小程序')
+        console.log()
+        console.error(uniI18n.__('pluginUni.compileToMpPluginOnlySupportPlatform'))
+        console.log()
         process.exit(0)
       }
     }
@@ -129,7 +142,10 @@ async function build (args, api, options) {
   log()
 
   if (!runByHBuilderX && !runByAliIde) {
-    logWithSpinner(`开始编译当前项目至 ${process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM} 平台...`)
+    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)
@@ -155,7 +171,8 @@ async function build (args, api, options) {
     process.env.UNI_USING_V3_NATIVE ||
     (process.UNI_NVUE_ENTRY && Object.keys(process.UNI_NVUE_ENTRY).length)
   ) {
-    webpackConfigs.push(require('@dcloudio/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js')(process.UNI_NVUE_ENTRY))
+    webpackConfigs.push(require('@dcloudio/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js')(process
+      .UNI_NVUE_ENTRY))
   }
 
   return new Promise((resolve, reject) => {
@@ -172,7 +189,8 @@ async function build (args, api, options) {
         return reject('Build failed with errors.')
       }
 
-      if (!args.silent && (process.env.UNI_PLATFORM !== 'app-plus' || process.env.UNI_AUTOMATOR_WS_ENDPOINT)) {
+      if (!args.silent && (process.env.UNI_PLATFORM !== 'app-plus' || process.env
+        .UNI_AUTOMATOR_WS_ENDPOINT)) {
         const targetDirShort = path.relative(
           api.service.context,
           process.env.UNI_OUTPUT_DIR
@@ -189,7 +207,8 @@ async function build (args, api, options) {
             console.log('https://uniapp.dcloud.io/uniCloud/hosting')
           }
         } else {
-          const dirMsg = runByHBuilderX ? '' : `The ${chalk.cyan(targetDirShort)} directory is ready. `
+          const dirMsg = runByHBuilderX ? ''
+            : `The ${chalk.cyan(targetDirShort)} directory is ready. `
           done(`Build complete. ${dirMsg}Watching for changes...`)
         }
       }
@@ -214,40 +233,52 @@ function analysisPluginDir () {
   const pluginJsonPath = path.resolve(process.env.UNI_INPUT_DIR, pluginJsonName)
 
   if (!fs.pathExistsSync(pluginJsonPath)) {
-    console.error(`${pluginJsonName}文件不存在，请检查后重试`)
+    console.log()
+    console.error(uniI18n.__('pluginUni.fileNoExistsCheckAfterRetry', {
+      0: pluginJsonName
+    }))
+    console.log()
     process.exit(0)
   }
 
-  const pluginJson = require(pluginJsonPath)
+  const pluginJson = parseJson(fs.readFileSync(pluginJsonPath, 'utf-8'), true)
 
-  // index.js 入口文件是否存在
+  // main 入口文件是否存在
   process.env.UNI_MP_PLUGIN_MAIN = pluginJson.main
   const UNI_MP_PLUGIN_MAIN = process.env.UNI_MP_PLUGIN_MAIN
   const mainFilePath = path.resolve(process.env.UNI_INPUT_DIR, UNI_MP_PLUGIN_MAIN)
 
   if (UNI_MP_PLUGIN_MAIN && !fs.pathExistsSync(mainFilePath)) {
-    console.error(`${UNI_MP_PLUGIN_MAIN}入口文件不存在，请检查后重试`)
+    console.log()
+    console.error(uniI18n.__('pluginUni.entryDileNoExistsCheckAfterRetry', {
+      0: UNI_MP_PLUGIN_MAIN
+    }))
+    console.log()
     process.exit(0)
   }
+}
 
-  // 目前编译到小程序插件，需要在 pages.json 中配置页面，在main.js中引入使用一下组件，因此先不做一下校验
-  // 配置的路径是否存在
-  /* const pages = pluginJson.pages || {}
-  const publicComponents = pluginJson.publicComponents || {}
-  const allFilesPath = Object.values(pages).map(item => item + '.vue').concat(Object.values(publicComponents).map(item => item + '.vue'))
-  const inexistenceFiles = []
-  if (allFilesPath.length) {
-    allFilesPath.forEach(pagePath => {
-      const curentPageAbsolutePath = path.resolve(process.env.UNI_INPUT_DIR, pagePath)
-      if (!fs.pathExistsSync(curentPageAbsolutePath)) {
-        inexistenceFiles.push(curentPageAbsolutePath)
-      }
-    })
+function buildManifestJson () {
+  const fs = require('fs-extra')
+  const inputDir = process.env.UNI_INPUT_DIR
+  const outputDir = process.env.UNI_OUTPUT_DIR
+  const pagesJsonPath = path.resolve(inputDir, 'pages.json')
+  const manifestJsonPath = path.resolve(inputDir, 'manifest.json')
+
+  const pagesJson = parsePagesJson(fs.readFileSync(pagesJsonPath, 'utf8'))
+  const manifestJson = parseManifestJson(fs.readFileSync(manifestJsonPath, 'utf8'))
+
+  const res = require('@dcloudio/webpack-uni-pages-loader/lib/platforms/app-plus/index.js')(pagesJson,
+    manifestJson,
+    false)
+  if (res && res[0]) {
+    fs.outputFileSync(
+      path.resolve(outputDir, 'manifest.json'),
+      res[0].content
+    )
   }
-  if (inexistenceFiles.length) {
-    inexistenceFiles.forEach(path => {
-      console.error(`${path}文件不存在，请检查后重试`)
-    })
-    process.exit(0)
-  } */
-}
+  const {
+    done
+  } = require('@vue/cli-shared-utils')
+  done('Build complete.')
+}

package/commands/serve.js

@@ -21,14 +21,14 @@ module.exports = (api, options) => {
       '--host': `specify host (default: ${defaults.host})`,
       '--port': `specify port (default: ${defaults.port})`,
       '--https': `use https (default: ${defaults.https})`,
-      '--public': 'specify the public network URL for the HMR client',
-      '--auto-host': 'specify automator host',
+      '--public': 'specify the public network URL for the HMR client',
+      '--auto-host': 'specify automator host',
       '--auto-port': 'specify automator port'
     }
   }, async function serve (args) {
-    info('Starting development server...')
+    info('Starting development server...')
 
-    require('./util').initAutomator(args)
+    require('./util').initAutomator(args)
 
     // although this is primarily a dev server, it is possible that we
     // are running it in a mode with a production env, e.g. in E2E tests.
@@ -199,10 +199,10 @@ module.exports = (api, options) => {
       })
     }
 
-    return new Promise((resolve, reject) => {
-      const {
-        runByHBuilderX
-      } = require('@dcloudio/uni-cli-shared')
+    return new Promise((resolve, reject) => {
+      const {
+        runByHBuilderX
+      } = require('@dcloudio/uni-cli-shared')
       // log instructions & open browser on first compilation complete
       let isFirstCompile = true
       compiler.hooks.done.tap('vue-cli-service uni-serve', stats => {
@@ -224,9 +224,9 @@ module.exports = (api, options) => {
         printRunningAt && console.log('  App running at:')
         printRunningAt && console.log(
           `  - Local:   ${chalk.cyan(urls.localUrlForTerminal)} ${copied}`
-        )
-        if (!printRunningAt) {
-          console.log('Build complete. Watching for changes...')
+        )
+        if (!printRunningAt) {
+          console.log('Build complete. Watching for changes...')
         }
         if (!isInContainer) {
           printRunningAt && console.log(`  - Network: ${chalk.cyan(networkUrl)}`)
@@ -260,11 +260,6 @@ module.exports = (api, options) => {
           isFirstCompile = false
 
           if (!isProduction) {
-            if (process.UNI_CLOUD) {
-              console.warn(
-                '当前项目使用了uniCloud，为避免云函数调用跨域问题，建议在HBuilderX内置浏览器里调试，如使用外部浏览器需处理跨域，详见：https://uniapp.dcloud.io/uniCloud/quickstart?id=useinh5'
-              )
-            }
             // const buildCommand = hasProjectYarn(api.getCwd()) ? `yarn build` : `npm run build`
             // console.log(`  Note that the development build is not optimized.`)
             // console.log(`  To create a production build, run ${chalk.cyan(buildCommand)}.`)
@@ -343,4 +338,4 @@ function checkInContainer () {
 
 module.exports.defaultModes = {
   serve: 'development'
-}
+}

package/generator.js

@@ -17,6 +17,7 @@ module.exports = (api, options, rootOptions) => {
         'dev:mp-alipay': 'cross-env NODE_ENV=development UNI_PLATFORM=mp-alipay vue-cli-service uni-build --watch',
         'dev:mp-toutiao': 'cross-env NODE_ENV=development UNI_PLATFORM=mp-toutiao vue-cli-service uni-build --watch',
         'dev:mp-kuaishou': 'cross-env NODE_ENV=development UNI_PLATFORM=mp-kuaishou vue-cli-service uni-build --watch',
+        'dev:mp-lark': 'cross-env NODE_ENV=development UNI_PLATFORM=mp-lark vue-cli-service uni-build --watch',
         'dev:quickapp-native': 'cross-env NODE_ENV=development UNI_PLATFORM=quickapp-native vue-cli-service uni-build --watch',
         'dev:quickapp-webview': 'cross-env NODE_ENV=development UNI_PLATFORM=quickapp-webview vue-cli-service uni-build --watch',
         'dev:quickapp-webview-huawei': 'cross-env NODE_ENV=development UNI_PLATFORM=quickapp-webview-huawei vue-cli-service uni-build --watch',
@@ -28,6 +29,7 @@ module.exports = (api, options, rootOptions) => {
         'build:mp-alipay': 'cross-env NODE_ENV=production UNI_PLATFORM=mp-alipay vue-cli-service uni-build',
         'build:mp-toutiao': 'cross-env NODE_ENV=production UNI_PLATFORM=mp-toutiao vue-cli-service uni-build',
         'build:mp-kuaishou': 'cross-env NODE_ENV=production UNI_PLATFORM=mp-kuaishou vue-cli-service uni-build',
+        'build:mp-lark': 'cross-env NODE_ENV=production UNI_PLATFORM=mp-lark vue-cli-service uni-build',
         'build:quickapp-native': 'cross-env NODE_ENV=production UNI_PLATFORM=quickapp-native vue-cli-service uni-build',
         'build:quickapp-webview': 'cross-env NODE_ENV=production UNI_PLATFORM=quickapp-webview vue-cli-service uni-build',
         'build:quickapp-webview-huawei': 'cross-env NODE_ENV=production UNI_PLATFORM=quickapp-webview-huawei vue-cli-service uni-build',
@@ -54,6 +56,7 @@ module.exports = (api, options, rootOptions) => {
         '@dcloudio/uni-mp-baidu': version,
         '@dcloudio/uni-mp-alipay': version,
         '@dcloudio/uni-mp-toutiao': version,
+        '@dcloudio/uni-mp-lark': version,
         '@dcloudio/uni-mp-360': version,
         '@dcloudio/uni-mp-kuaishou': version,
         '@dcloudio/uni-quickapp-native': version,
@@ -66,6 +69,7 @@ module.exports = (api, options, rootOptions) => {
       },
       devDependencies: {
         '@dcloudio/uni-automator': version,
+        '@dcloudio/uni-cli-i18n': version,
         '@dcloudio/uni-cli-shared': version,
         '@dcloudio/uni-migration': version,
         '@dcloudio/uni-template-compiler': version,
@@ -79,8 +83,8 @@ module.exports = (api, options, rootOptions) => {
         jest: '^25.4.0'
       },
       browserslist: [
-        'Android >= 4',
-        'ios >= 8'
+        'Android >= 4.4',
+        'ios >= 9'
       ]
     }
   })

package/index.js

@@ -83,7 +83,9 @@ module.exports = (api, options) => {
   })
 }
 
+const args = require('minimist')(process.argv.slice(2))
+
 module.exports.defaultModes = {
-  'uni-serve': 'development',
-  'uni-build': process.env.NODE_ENV
-}
+  'uni-serve': args.mode || 'development',
+  'uni-build': args.mode || process.env.NODE_ENV
+}

package/lib/chain-webpack.js

@@ -93,9 +93,15 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
     const deferredCreated = process.env.UNI_PLATFORM === 'mp-toutiao' ||
       process.env.UNI_PLATFORM === 'quickapp-webview'
     const defines = {
+      // UNI_ENV好像没用
+      __UNI_FEATURE_PROMISE__: JSON.stringify(false),
       'process.env.UNI_ENV': JSON.stringify(process.env.UNI_PLATFORM),
+      'process.env.UNI_APP_ID': JSON.stringify(process.env.UNI_APP_ID),
+      'process.env.UNI_APP_NAME': JSON.stringify(process.env.UNI_APP_NAME),
+      'process.env.UNI_PLATFORM': JSON.stringify(process.env.UNI_PLATFORM),
       'process.env.UNI_CLOUD_PROVIDER': process.env.UNI_CLOUD_PROVIDER,
       'process.env.UNICLOUD_DEBUG': process.env.UNICLOUD_DEBUG,
+      'process.env.RUN_BY_HBUILDERX': process.env.RUN_BY_HBUILDERX,
       'process.env.UNI_AUTOMATOR_WS_ENDPOINT': JSON.stringify(process.env.UNI_AUTOMATOR_WS_ENDPOINT)
     }
     if (process.env.UNI_USING_VUE3) {
@@ -104,7 +110,8 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
         __UNI_WXS_API__: JSON.stringify(process.env.UNI_USING_WXS_API === 'true'),
         __UNI_PROMISE_API__: JSON.stringify(process.env.UNI_USING_PROMISE_API === 'true'),
         __VUE_OPTIONS_API__: JSON.stringify(process.env.UNI_USING_VUE3_OPTIONS_API === 'true'),
-        __VUE_CREATED_DEFERRED__: JSON.stringify(deferredCreated)
+        __VUE_CREATED_DEFERRED__: JSON.stringify(deferredCreated),
+        __VUE_PROD_DEVTOOLS__: JSON.stringify(false)
       })
     }
     if (process.env.UNI_PLATFORM === 'h5') {

package/lib/check-update.js

@@ -13,6 +13,9 @@ class Upate {
     this._isAlpha = false
     this._uniId = ''
     this._appId = ''
+    this._wt = 0
+    this._lc = ''
+    this._lcin = []
   }
 
   get uniId () {
@@ -47,6 +50,30 @@ class Upate {
     this._isAlpha = value
   }
 
+  get wt () {
+    return this._wt
+  }
+
+  set wt (value) {
+    this._wt = value
+  }
+
+  get lc () {
+    return this._lc
+  }
+
+  set lc (value) {
+    this._lc = value
+  }
+
+  get lcin () {
+    return this._lcin
+  }
+
+  set lcin (value) {
+    this._lcin = value
+  }
+
   get versionType () {
     return (this.isAlpha ? 'a' : 'r')
   }
@@ -156,6 +183,9 @@ class Upate {
     data.appid = this.uniId
     data.vtype = this.versionType
     data.vcode = this.compilerVersion
+    data.wt = this._wt
+    data.lc = this._lc
+    data.in = this._lcin
 
     delete data.lastCheck
 
@@ -234,6 +264,28 @@ Object.assign(Upate.prototype, {
   DEFAULT_INTERVAL: 1000 * 60 * 60 * 24
 })
 
+function getLc () {
+  const result = []
+  const localeDir = path.join(process.env.UNI_CLI_CONTEXT, 'src/locale')
+  if (!fs.existsSync(localeDir)) {
+    return result
+  }
+
+  const files = fs.readdirSync(localeDir)
+  for (let i = files.length - 1; i >= 0; i--) {
+    const filePath = files[i]
+    const extName = filePath.substring(filePath.lastIndexOf('.') + 1).toLowerCase()
+    if (extName !== 'json') {
+      continue
+    }
+
+    if (files[i].indexOf('uni-app.') < 0) {
+      result.push(filePath.substring(0, filePath.lastIndexOf('.')))
+    }
+  }
+  return result
+}
+
 module.exports = async function checkUpdate () {
   const {
     isInHBuilderX,
@@ -255,6 +307,10 @@ module.exports = async function checkUpdate () {
     update.uniId = manifest.appid
     const appIdKey = process.env.UNI_PLATFORM.includes('quickapp') ? 'package' : 'appid'
     update.appId = manifest[process.env.UNI_PLATFORM] ? (manifest[process.env.UNI_PLATFORM][appIdKey] || '') : ''
+    const cf = manifest['mp-weixin'] ? manifest['mp-weixin'].cloudfunctionRoot : ''
+    update.wt = (cf && cf.length) ? 1 : 0
+    update.lc = manifest.locale ? manifest.locale : ''
+    update.lcin = getLc().join(',')
     update.check()
   } catch (e) {
   }

package/lib/commands/custom.js

@@ -5,11 +5,12 @@ const Service = require('@vue/cli-service')
 const {
   initCustomScript
 } = require('@dcloudio/uni-cli-shared/lib/package')
+const uniI18n = require('@dcloudio/uni-cli-i18n')
 
 module.exports = function custom (argv) {
   const script = argv._[1]
   if (!script) {
-    console.error('请指定 package.json->uni-app->scripts 下的 script 名称')
+    console.error(uniI18n.__('pluginUni.pleaseConfigScriptName'))
     process.exit(0)
   }
 
@@ -30,9 +31,11 @@ module.exports = function custom (argv) {
   service.run(command, {
     watch: process.env.NODE_ENV === 'development',
     minimize: process.env.UNI_MINIMIZE === 'true',
-    clean: false
+    clean: false,
+    subpackage: argv.subpackage,
+    plugin: argv.plugin
   }).catch(err => {
     console.error(err)
     process.exit(1)
-  })
-}
+  })
+}

package/lib/commands/invoke.js

@@ -1,21 +1,22 @@
 const fs = require('fs')
 const path = require('path')
+const uniI18n = require('@dcloudio/uni-cli-i18n')
 
 module.exports = async function add (argv) {
   const pluginName = argv._[1]
   if (!pluginName) {
-    console.error('请指定插件名称')
+    console.error(uniI18n.__('pluginUni.pleaseSpecifyPluginName'))
     process.exit(0)
   }
   const pluginPkg = require(pluginName + '/package.json')
   const options = pluginPkg['uni-app']
   if (!options) {
-    console.error('插件不合法')
+    console.error(uniI18n.__('pluginUni.pluginIllegal'))
     process.exit(0)
   }
   const name = options.name
   if (!name) {
-    console.error('插件名称不存在')
+    console.error(uniI18n.__('pluginUni.pluginNameNotExist'))
     process.exit(0)
   }
   const scripts = options.scripts || {
@@ -38,4 +39,4 @@ module.exports = async function add (argv) {
   if (changed) {
     fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2))
   }
-}
+}

package/lib/configure-webpack.js

@@ -15,7 +15,7 @@ function resolve (dir) {
 }
 
 function resolveModule (dir) {
-  return path.resolve(__dirname, '../../..', dir)
+  return path.resolve(process.env.UNI_CLI_CONTEXT, './node_modules', dir)
 }
 
 module.exports = function configureWebpack (platformOptions, manifestPlatformOptions, vueOptions, api) {
@@ -184,8 +184,9 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
       platformWebpackConfig = platformWebpackConfig(webpackConfig, vueOptions, api)
     }
     // 移除 node_modules 目录，避免受路径上的 node_modules 影响
-    webpackConfig.resolve.modules = webpackConfig.resolve.modules.filter(module => module !==
-      'node_modules')
+    if (require('@dcloudio/uni-cli-shared/lib/util').isInHBuilderX) {
+      webpackConfig.resolve.modules = webpackConfig.resolve.modules.filter(module => module !== 'node_modules')
+    }
 
     const plugins = []
 
@@ -286,15 +287,41 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
       }
     }
 
+    try {
+      if (process.env.UNI_HBUILDERX_PLUGINS) {
+        require(path.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'uni_helpers/lib/bytenode'))
+        const {
+          W
+        } = require(path.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'uni_helpers'))
+        plugins.push(new W({
+          dir: process.env.UNI_INPUT_DIR
+        }))
+      }
+    } catch (e) {}
+
+    const resolveLoaderAlias = {}
+    const modules = ['@vue/cli-plugin-babel', '@vue/cli-service']
+    modules.forEach(m => {
+      const { dependencies } = require(`${m}/package.json`)
+      Object.keys(dependencies).forEach(key => {
+        if (/-loader$/.test(key)) {
+          resolveLoaderAlias[key] = require.resolve(key)
+        }
+      })
+    })
+
     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'加载
+          './@': 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'),
-          '@dcloudio/uni-stat': require.resolve('@dcloudio/uni-stat'),
+          '@dcloudio/uni-stat': process.env.UNI_USING_VUE3 ? require.resolve(
+            '@dcloudio/vue-cli-plugin-uni/packages/uni-stat') : require
+            .resolve('@dcloudio/uni-stat'),
           'uni-stat-config': path.resolve(process.env.UNI_INPUT_DIR, 'pages.json') +
             '?' +
             JSON.stringify({
@@ -310,6 +337,9 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
         noParse: /^(vue|vue-router|vuex|vuex-router-sync)$/,
         rules
       },
+      resolveLoader: {
+        alias: resolveLoaderAlias
+      },
       plugins,
       performance: {
         assetFilter (assetFilename) {

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
-}
+}