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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (179) hide show
  1. package/commands/build.js +18 -29
  2. package/generator.js +2 -2
  3. package/lib/commands/custom.js +3 -2
  4. package/lib/commands/invoke.js +5 -4
  5. package/lib/configure-webpack.js +3 -1
  6. package/lib/copy-webpack-options.js +55 -21
  7. package/lib/env.js +45 -24
  8. package/lib/mp/index.js +11 -4
  9. package/lib/options.js +4 -2
  10. package/lib/util.js +5 -6
  11. package/package.json +3 -3
  12. package/packages/mp-vue/package.json +1 -0
  13. package/packages/uni-app/LICENSE +202 -0
  14. package/packages/uni-app/dist/uni-app.cjs.js +165 -0
  15. package/packages/uni-app/dist/uni-app.d.ts +61 -0
  16. package/packages/uni-app/dist/uni-app.es.js +108 -0
  17. package/packages/uni-app/package.json +22 -0
  18. package/packages/uni-cloud/dist/index.js +1 -1
  19. package/packages/uni-stat/dist/uni-stat.cjs.js +961 -0
  20. package/packages/uni-stat/dist/uni-stat.es.js +959 -0
  21. package/packages/uni-stat/lib/uni.plugin.js +68 -0
  22. package/packages/uni-stat/package.json +25 -0
  23. package/packages/vue3/node_modules/.yarn-integrity +27 -0
  24. package/packages/vue3/node_modules/@intlify/core-base/LICENSE +20 -0
  25. package/packages/vue3/node_modules/@intlify/core-base/README.md +7 -0
  26. package/packages/vue3/node_modules/@intlify/core-base/dist/core-base.cjs.js +989 -0
  27. package/packages/vue3/node_modules/@intlify/core-base/dist/core-base.cjs.prod.js +735 -0
  28. package/packages/vue3/node_modules/@intlify/core-base/dist/core-base.d.ts +576 -0
  29. package/packages/vue3/node_modules/@intlify/core-base/dist/core-base.esm-browser.js +2771 -0
  30. package/packages/vue3/node_modules/@intlify/core-base/dist/core-base.esm-browser.prod.js +6 -0
  31. package/packages/vue3/node_modules/@intlify/core-base/dist/core-base.esm-bundler.js +965 -0
  32. package/packages/vue3/node_modules/@intlify/core-base/dist/core-base.global.js +2814 -0
  33. package/packages/vue3/node_modules/@intlify/core-base/dist/core-base.global.prod.js +6 -0
  34. package/packages/vue3/node_modules/@intlify/core-base/index.js +7 -0
  35. package/packages/vue3/node_modules/@intlify/core-base/package.json +59 -0
  36. package/packages/vue3/node_modules/@intlify/devtools-if/LICENSE +20 -0
  37. package/packages/vue3/node_modules/@intlify/devtools-if/README.md +13 -0
  38. package/packages/vue3/node_modules/@intlify/devtools-if/dist/devtools-if.cjs.js +15 -0
  39. package/packages/vue3/node_modules/@intlify/devtools-if/dist/devtools-if.cjs.prod.js +15 -0
  40. package/packages/vue3/node_modules/@intlify/devtools-if/dist/devtools-if.d.ts +43 -0
  41. package/packages/vue3/node_modules/@intlify/devtools-if/dist/devtools-if.esm-bundler.js +11 -0
  42. package/packages/vue3/node_modules/@intlify/devtools-if/index.js +7 -0
  43. package/packages/vue3/node_modules/@intlify/devtools-if/package.json +49 -0
  44. package/packages/vue3/node_modules/@intlify/message-compiler/LICENSE +20 -0
  45. package/packages/vue3/node_modules/@intlify/message-compiler/README.md +7 -0
  46. package/packages/vue3/node_modules/@intlify/message-compiler/dist/message-compiler.cjs.js +1400 -0
  47. package/packages/vue3/node_modules/@intlify/message-compiler/dist/message-compiler.cjs.prod.js +1395 -0
  48. package/packages/vue3/node_modules/@intlify/message-compiler/dist/message-compiler.d.ts +197 -0
  49. package/packages/vue3/node_modules/@intlify/message-compiler/dist/message-compiler.esm-browser.js +1348 -0
  50. package/packages/vue3/node_modules/@intlify/message-compiler/dist/message-compiler.esm-browser.prod.js +6 -0
  51. package/packages/vue3/node_modules/@intlify/message-compiler/dist/message-compiler.esm-bundler.js +1329 -0
  52. package/packages/vue3/node_modules/@intlify/message-compiler/dist/message-compiler.global.js +1365 -0
  53. package/packages/vue3/node_modules/@intlify/message-compiler/dist/message-compiler.global.prod.js +6 -0
  54. package/packages/vue3/node_modules/@intlify/message-compiler/index.js +7 -0
  55. package/packages/vue3/node_modules/@intlify/message-compiler/package.json +56 -0
  56. package/packages/vue3/node_modules/@intlify/message-resolver/LICENSE +20 -0
  57. package/packages/vue3/node_modules/@intlify/message-resolver/README.md +7 -0
  58. package/packages/vue3/node_modules/@intlify/message-resolver/dist/message-resolver.cjs.js +302 -0
  59. package/packages/vue3/node_modules/@intlify/message-resolver/dist/message-resolver.cjs.prod.js +302 -0
  60. package/packages/vue3/node_modules/@intlify/message-resolver/dist/message-resolver.d.ts +21 -0
  61. package/packages/vue3/node_modules/@intlify/message-resolver/dist/message-resolver.esm-bundler.js +297 -0
  62. package/packages/vue3/node_modules/@intlify/message-resolver/index.js +7 -0
  63. package/packages/vue3/node_modules/@intlify/message-resolver/package.json +46 -0
  64. package/packages/vue3/node_modules/@intlify/runtime/LICENSE +20 -0
  65. package/packages/vue3/node_modules/@intlify/runtime/README.md +7 -0
  66. package/packages/vue3/node_modules/@intlify/runtime/dist/runtime.cjs.js +116 -0
  67. package/packages/vue3/node_modules/@intlify/runtime/dist/runtime.cjs.prod.js +116 -0
  68. package/packages/vue3/node_modules/@intlify/runtime/dist/runtime.d.ts +95 -0
  69. package/packages/vue3/node_modules/@intlify/runtime/dist/runtime.esm-bundler.js +111 -0
  70. package/packages/vue3/node_modules/@intlify/runtime/index.js +7 -0
  71. package/packages/vue3/node_modules/@intlify/runtime/package.json +51 -0
  72. package/packages/vue3/node_modules/@intlify/shared/LICENSE +20 -0
  73. package/packages/vue3/node_modules/@intlify/shared/README.md +18 -0
  74. package/packages/vue3/node_modules/@intlify/shared/dist/shared.cjs.js +222 -0
  75. package/packages/vue3/node_modules/@intlify/shared/dist/shared.cjs.prod.js +209 -0
  76. package/packages/vue3/node_modules/@intlify/shared/dist/shared.d.ts +145 -0
  77. package/packages/vue3/node_modules/@intlify/shared/dist/shared.esm-bundler.js +192 -0
  78. package/packages/vue3/node_modules/@intlify/shared/index.js +7 -0
  79. package/packages/vue3/node_modules/@intlify/shared/package.json +46 -0
  80. package/packages/vue3/node_modules/@intlify/vue-devtools/LICENSE +20 -0
  81. package/packages/vue3/node_modules/@intlify/vue-devtools/README.md +7 -0
  82. package/packages/vue3/node_modules/@intlify/vue-devtools/dist/vue-devtools.cjs.js +24 -0
  83. package/packages/vue3/node_modules/@intlify/vue-devtools/dist/vue-devtools.cjs.prod.js +24 -0
  84. package/packages/vue3/node_modules/@intlify/vue-devtools/dist/vue-devtools.d.ts +81 -0
  85. package/packages/vue3/node_modules/@intlify/vue-devtools/dist/vue-devtools.esm-bundler.js +18 -0
  86. package/packages/vue3/node_modules/@intlify/vue-devtools/index.js +7 -0
  87. package/packages/vue3/node_modules/@intlify/vue-devtools/package.json +51 -0
  88. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/api/api.d.ts +90 -0
  89. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/api/api.js +2 -0
  90. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/api/app.d.ts +1 -0
  91. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/api/app.js +2 -0
  92. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/api/component.d.ts +76 -0
  93. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/api/component.js +2 -0
  94. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/api/context.d.ts +5 -0
  95. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/api/context.js +2 -0
  96. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/api/hooks.d.ts +169 -0
  97. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/api/hooks.js +2 -0
  98. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/api/index.d.ts +6 -0
  99. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/api/index.js +18 -0
  100. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/api/util.d.ts +4 -0
  101. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/api/util.js +2 -0
  102. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/const.d.ts +1 -0
  103. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/const.js +4 -0
  104. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/env.d.ts +10 -0
  105. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/env.js +16 -0
  106. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/index.d.ts +14 -0
  107. package/packages/vue3/node_modules/@vue/devtools-api/lib/cjs/index.js +31 -0
  108. package/packages/vue3/node_modules/@vue/devtools-api/lib/esm/api/api.js +0 -0
  109. package/packages/vue3/node_modules/@vue/devtools-api/lib/esm/api/app.js +0 -0
  110. package/packages/vue3/node_modules/@vue/devtools-api/lib/esm/api/component.js +0 -0
  111. package/packages/vue3/node_modules/@vue/devtools-api/lib/esm/api/context.js +0 -0
  112. package/packages/vue3/node_modules/@vue/devtools-api/lib/esm/api/hooks.js +0 -0
  113. package/packages/vue3/node_modules/@vue/devtools-api/lib/esm/api/index.js +6 -0
  114. package/packages/vue3/node_modules/@vue/devtools-api/lib/esm/api/util.js +0 -0
  115. package/packages/vue3/node_modules/@vue/devtools-api/lib/esm/const.js +1 -0
  116. package/packages/vue3/node_modules/@vue/devtools-api/lib/esm/env.js +11 -0
  117. package/packages/vue3/node_modules/@vue/devtools-api/lib/esm/index.js +17 -0
  118. package/packages/vue3/node_modules/@vue/devtools-api/package.json +38 -0
  119. package/packages/vue3/node_modules/source-map/CHANGELOG.md +301 -0
  120. package/packages/vue3/node_modules/source-map/LICENSE +28 -0
  121. package/packages/vue3/node_modules/source-map/README.md +742 -0
  122. package/packages/vue3/node_modules/source-map/dist/source-map.debug.js +3234 -0
  123. package/packages/vue3/node_modules/source-map/dist/source-map.js +3233 -0
  124. package/packages/vue3/node_modules/source-map/dist/source-map.min.js +2 -0
  125. package/packages/vue3/node_modules/source-map/dist/source-map.min.js.map +1 -0
  126. package/packages/vue3/node_modules/source-map/lib/array-set.js +121 -0
  127. package/packages/vue3/node_modules/source-map/lib/base64-vlq.js +140 -0
  128. package/packages/vue3/node_modules/source-map/lib/base64.js +67 -0
  129. package/packages/vue3/node_modules/source-map/lib/binary-search.js +111 -0
  130. package/packages/vue3/node_modules/source-map/lib/mapping-list.js +79 -0
  131. package/packages/vue3/node_modules/source-map/lib/quick-sort.js +114 -0
  132. package/packages/vue3/node_modules/source-map/lib/source-map-consumer.js +1145 -0
  133. package/packages/vue3/node_modules/source-map/lib/source-map-generator.js +425 -0
  134. package/packages/vue3/node_modules/source-map/lib/source-node.js +413 -0
  135. package/packages/vue3/node_modules/source-map/lib/util.js +488 -0
  136. package/packages/vue3/node_modules/source-map/package.json +73 -0
  137. package/packages/vue3/node_modules/source-map/source-map.d.ts +98 -0
  138. package/packages/vue3/node_modules/source-map/source-map.js +8 -0
  139. package/packages/vue3/node_modules/vue-i18n/LICENSE +20 -0
  140. package/packages/vue3/node_modules/vue-i18n/README.md +74 -0
  141. package/packages/vue3/node_modules/vue-i18n/dist/vue-i18n.cjs.js +1801 -0
  142. package/packages/vue3/node_modules/vue-i18n/dist/vue-i18n.cjs.prod.js +1685 -0
  143. package/packages/vue3/node_modules/vue-i18n/dist/vue-i18n.d.ts +3302 -0
  144. package/packages/vue3/node_modules/vue-i18n/dist/vue-i18n.esm-browser.js +5052 -0
  145. package/packages/vue3/node_modules/vue-i18n/dist/vue-i18n.esm-browser.prod.js +6 -0
  146. package/packages/vue3/node_modules/vue-i18n/dist/vue-i18n.esm-bundler.js +2226 -0
  147. package/packages/vue3/node_modules/vue-i18n/dist/vue-i18n.global.js +5065 -0
  148. package/packages/vue3/node_modules/vue-i18n/dist/vue-i18n.global.prod.js +6 -0
  149. package/packages/vue3/node_modules/vue-i18n/dist/vue-i18n.runtime.esm-browser.js +3724 -0
  150. package/packages/vue3/node_modules/vue-i18n/dist/vue-i18n.runtime.esm-browser.prod.js +6 -0
  151. package/packages/vue3/node_modules/vue-i18n/dist/vue-i18n.runtime.esm-bundler.js +2224 -0
  152. package/packages/vue3/node_modules/vue-i18n/dist/vue-i18n.runtime.global.js +3737 -0
  153. package/packages/vue3/node_modules/vue-i18n/dist/vue-i18n.runtime.global.prod.js +6 -0
  154. package/packages/vue3/node_modules/vue-i18n/index.js +7 -0
  155. package/packages/vue3/node_modules/vue-i18n/package.json +69 -0
  156. package/packages/vue3/node_modules/vue-i18n/vetur/attributes.json +62 -0
  157. package/packages/vue3/node_modules/vue-i18n/vetur/tags.json +14 -0
  158. package/packages/vue3/package.json +15 -0
  159. package/packages/vue3/yarn.lock +79 -0
  160. package/packages/vuex/dist/vuex.cjs.js +3 -2
  161. package/packages/vuex/dist/vuex.esm-browser.js +4 -3
  162. package/packages/vuex/dist/vuex.esm-bundler.js +4 -3
  163. package/packages/vuex3/CHANGELOG.md +356 -0
  164. package/packages/vuex3/LICENSE +21 -0
  165. package/packages/vuex3/README.md +59 -0
  166. package/packages/vuex3/dist/logger.js +155 -0
  167. package/packages/vuex3/dist/vuex.common.js +1244 -0
  168. package/packages/vuex3/dist/vuex.esm.browser.js +1200 -0
  169. package/packages/vuex3/dist/vuex.esm.browser.min.js +6 -0
  170. package/packages/vuex3/dist/vuex.esm.js +1243 -0
  171. package/packages/vuex3/dist/vuex.js +1250 -0
  172. package/packages/vuex3/dist/vuex.min.js +6 -0
  173. package/packages/vuex3/dist/vuex.mjs +26 -0
  174. package/packages/vuex3/package.json +96 -0
  175. package/packages/vuex3/types/helpers.d.ts +86 -0
  176. package/packages/vuex3/types/index.d.ts +164 -0
  177. package/packages/vuex3/types/logger.d.ts +20 -0
  178. package/packages/vuex3/types/vue.d.ts +18 -0
  179. package/packages/webpack-uni-app-loader/plugin/index.js +3 -2
package/commands/build.js CHANGED
@@ -2,9 +2,12 @@ const path = require('path')
2
2
 
3
3
  const {
4
4
  runByHBuilderX,
5
- isInHBuilderX
5
+ isInHBuilderX,
6
+ parseJson
6
7
  } = require('@dcloudio/uni-cli-shared')
7
8
 
9
+ const uniI18n = require('@dcloudio/uni-cli-i18n')
10
+
8
11
  const defaults = {
9
12
  clean: true,
10
13
  target: 'app',
@@ -43,12 +46,15 @@ module.exports = (api, options) => {
43
46
  process.env.UNI_SUBPACKGE = args.subpackage
44
47
  }
45
48
 
49
+ const mpPluginPlatforms = ['mp-weixin', 'mp-alipay']
46
50
  if (args.plugin) {
47
- if (process.env.UNI_PLATFORM === 'mp-weixin') {
51
+ if (mpPluginPlatforms.includes(process.env.UNI_PLATFORM)) {
48
52
  process.env.UNI_MP_PLUGIN = args.plugin
49
53
  analysisPluginDir()
50
54
  } else {
51
- console.error('编译到小程序插件只支持微信小程序')
55
+ console.log()
56
+ console.error(uniI18n.__('pluginUni.compileToMpPluginOnlySupportPlatform'))
57
+ console.log()
52
58
  process.exit(0)
53
59
  }
54
60
  }
@@ -129,7 +135,7 @@ async function build (args, api, options) {
129
135
  log()
130
136
 
131
137
  if (!runByHBuilderX && !runByAliIde) {
132
- logWithSpinner(`开始编译当前项目至 ${process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM} 平台...`)
138
+ logWithSpinner(uniI18n.__('pluginUni.startCompileProjectToPlatform', { 0: process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM, 1: process.env.UNI_MP_PLUGIN ? uniI18n.__('plugin') : uniI18n.__('platform') }))
133
139
  }
134
140
 
135
141
  const targetDir = api.resolve(options.outputDir)
@@ -214,40 +220,23 @@ function analysisPluginDir () {
214
220
  const pluginJsonPath = path.resolve(process.env.UNI_INPUT_DIR, pluginJsonName)
215
221
 
216
222
  if (!fs.pathExistsSync(pluginJsonPath)) {
217
- console.error(`${pluginJsonName}文件不存在,请检查后重试`)
223
+ console.log()
224
+ console.error(uniI18n.__('pluginUni.fileNoExistsCheckAfterRetry', { 0: pluginJsonName }))
225
+ console.log()
218
226
  process.exit(0)
219
227
  }
220
228
 
221
- const pluginJson = require(pluginJsonPath)
229
+ const pluginJson = parseJson(fs.readFileSync(pluginJsonPath, 'utf-8'), true)
222
230
 
223
- // index.js 入口文件是否存在
231
+ // main 入口文件是否存在
224
232
  process.env.UNI_MP_PLUGIN_MAIN = pluginJson.main
225
233
  const UNI_MP_PLUGIN_MAIN = process.env.UNI_MP_PLUGIN_MAIN
226
234
  const mainFilePath = path.resolve(process.env.UNI_INPUT_DIR, UNI_MP_PLUGIN_MAIN)
227
235
 
228
236
  if (UNI_MP_PLUGIN_MAIN && !fs.pathExistsSync(mainFilePath)) {
229
- console.error(`${UNI_MP_PLUGIN_MAIN}入口文件不存在,请检查后重试`)
237
+ console.log()
238
+ console.error(uniI18n.__('pluginUni.entryDileNoExistsCheckAfterRetry', { 0: UNI_MP_PLUGIN_MAIN }))
239
+ console.log()
230
240
  process.exit(0)
231
241
  }
232
-
233
- // 目前编译到小程序插件,需要在 pages.json 中配置页面,在main.js中引入使用一下组件,因此先不做一下校验
234
- // 配置的路径是否存在
235
- /* const pages = pluginJson.pages || {}
236
- const publicComponents = pluginJson.publicComponents || {}
237
- const allFilesPath = Object.values(pages).map(item => item + '.vue').concat(Object.values(publicComponents).map(item => item + '.vue'))
238
- const inexistenceFiles = []
239
- if (allFilesPath.length) {
240
- allFilesPath.forEach(pagePath => {
241
- const curentPageAbsolutePath = path.resolve(process.env.UNI_INPUT_DIR, pagePath)
242
- if (!fs.pathExistsSync(curentPageAbsolutePath)) {
243
- inexistenceFiles.push(curentPageAbsolutePath)
244
- }
245
- })
246
- }
247
- if (inexistenceFiles.length) {
248
- inexistenceFiles.forEach(path => {
249
- console.error(`${path}文件不存在,请检查后重试`)
250
- })
251
- process.exit(0)
252
- } */
253
242
  }
package/generator.js CHANGED
@@ -79,8 +79,8 @@ module.exports = (api, options, rootOptions) => {
79
79
  jest: '^25.4.0'
80
80
  },
81
81
  browserslist: [
82
- 'Android >= 4',
83
- 'ios >= 8'
82
+ 'Android >= 4.4',
83
+ 'ios >= 9'
84
84
  ]
85
85
  }
86
86
  })
@@ -5,11 +5,12 @@ const Service = require('@vue/cli-service')
5
5
  const {
6
6
  initCustomScript
7
7
  } = require('@dcloudio/uni-cli-shared/lib/package')
8
+ const uniI18n = require('@dcloudio/uni-cli-i18n')
8
9
 
9
10
  module.exports = function custom (argv) {
10
11
  const script = argv._[1]
11
12
  if (!script) {
12
- console.error('请指定 package.json->uni-app->scripts 下的 script 名称')
13
+ console.error(uniI18n.__('pluginUni.pleaseConfigScriptName'))
13
14
  process.exit(0)
14
15
  }
15
16
 
@@ -37,4 +38,4 @@ module.exports = function custom (argv) {
37
38
  console.error(err)
38
39
  process.exit(1)
39
40
  })
40
- }
41
+ }
@@ -1,21 +1,22 @@
1
1
  const fs = require('fs')
2
2
  const path = require('path')
3
+ const uniI18n = require('@dcloudio/uni-cli-i18n')
3
4
 
4
5
  module.exports = async function add (argv) {
5
6
  const pluginName = argv._[1]
6
7
  if (!pluginName) {
7
- console.error('请指定插件名称')
8
+ console.error(uniI18n.__('pluginUni.pleaseSpecifyPluginName'))
8
9
  process.exit(0)
9
10
  }
10
11
  const pluginPkg = require(pluginName + '/package.json')
11
12
  const options = pluginPkg['uni-app']
12
13
  if (!options) {
13
- console.error('插件不合法')
14
+ console.error(uniI18n.__('pluginUni.pluginIllegal'))
14
15
  process.exit(0)
15
16
  }
16
17
  const name = options.name
17
18
  if (!name) {
18
- console.error('插件名称不存在')
19
+ console.error(uniI18n.__('pluginUni.pluginNameNotExist'))
19
20
  process.exit(0)
20
21
  }
21
22
  const scripts = options.scripts || {
@@ -38,4 +39,4 @@ module.exports = async function add (argv) {
38
39
  if (changed) {
39
40
  fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2))
40
41
  }
41
- }
42
+ }
@@ -307,7 +307,9 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
307
307
  .UNI_INPUT_DIR), // css中的'@/static/logo.png'会被转换成'./@/static/logo.png'加载
308
308
  vue$: getPlatformVue(vueOptions),
309
309
  'uni-pages': path.resolve(process.env.UNI_INPUT_DIR, 'pages.json'),
310
- '@dcloudio/uni-stat': require.resolve('@dcloudio/uni-stat'),
310
+ '@dcloudio/uni-stat': process.env.UNI_USING_VUE3 ? require.resolve(
311
+ '@dcloudio/vue-cli-plugin-uni/packages/uni-stat') : require
312
+ .resolve('@dcloudio/uni-stat'),
311
313
  'uni-stat-config': path.resolve(process.env.UNI_INPUT_DIR, 'pages.json') +
312
314
  '?' +
313
315
  JSON.stringify({
@@ -1,24 +1,31 @@
1
1
  const fs = require('fs')
2
2
  const path = require('path')
3
-
3
+ const { compileI18nJsonStr } = require('@dcloudio/uni-i18n')
4
+ const { initI18nOptions } = require('@dcloudio/uni-cli-shared/lib/i18n')
4
5
  const assetsDir = 'static'
5
6
 
6
7
  function getAssetsCopyOption (from, options = {}) {
7
8
  if (path.isAbsolute(from)) {
8
9
  if (fs.existsSync(from)) {
9
- return Object.assign({
10
- from,
11
- to: path.resolve(process.env.UNI_OUTPUT_DIR)
12
- }, options)
10
+ return Object.assign(
11
+ {
12
+ from,
13
+ to: path.resolve(process.env.UNI_OUTPUT_DIR)
14
+ },
15
+ options
16
+ )
13
17
  }
14
18
  }
15
19
  const to = from
16
20
  from = path.resolve(process.env.UNI_INPUT_DIR, from)
17
21
  if (fs.existsSync(from)) {
18
- return Object.assign({
19
- from,
20
- to: path.resolve(process.env.UNI_OUTPUT_DIR, to)
21
- }, options)
22
+ return Object.assign(
23
+ {
24
+ from,
25
+ to: path.resolve(process.env.UNI_OUTPUT_DIR, to)
26
+ },
27
+ options
28
+ )
22
29
  }
23
30
  }
24
31
  // 暂未考虑动态添加static目录
@@ -40,29 +47,38 @@ function getAssetsCopyOptions (assetsDir) {
40
47
  copyOptions.push(mainAssetsCopyOption)
41
48
  }
42
49
  // 分包静态资源
43
- process.UNI_SUBPACKAGES && Object.keys(process.UNI_SUBPACKAGES).forEach(root => {
44
- const subAssetsCopyOption = getAssetsCopyOption(path.join(root, assetsDir), {
45
- ignore
50
+ process.UNI_SUBPACKAGES &&
51
+ Object.keys(process.UNI_SUBPACKAGES).forEach(root => {
52
+ const subAssetsCopyOption = getAssetsCopyOption(
53
+ path.join(root, assetsDir),
54
+ {
55
+ ignore
56
+ }
57
+ )
58
+ if (subAssetsCopyOption) {
59
+ copyOptions.push(subAssetsCopyOption)
60
+ }
46
61
  })
47
- if (subAssetsCopyOption) {
48
- copyOptions.push(subAssetsCopyOption)
49
- }
50
- })
51
62
  return copyOptions
52
63
  }
53
64
 
54
65
  function getUniModulesAssetsCopyOptions (assetsDir) {
55
66
  const copyOptions = []
56
67
  global.uniModules.forEach(module => {
57
- copyOptions.push(...getAssetsCopyOptions('uni_modules/' + module + '/' + assetsDir))
68
+ copyOptions.push(
69
+ ...getAssetsCopyOptions('uni_modules/' + module + '/' + assetsDir)
70
+ )
58
71
  })
59
72
  return copyOptions
60
73
  }
61
74
 
62
75
  function getCopyWebpackPluginOptions (platformOptions, vueOptions) {
63
- const copyOptions = getAssetsCopyOptions(assetsDir).concat(getUniModulesAssetsCopyOptions(assetsDir))
76
+ const copyOptions = getAssetsCopyOptions(assetsDir).concat(
77
+ getUniModulesAssetsCopyOptions(assetsDir)
78
+ )
64
79
  global.uniPlugin.copyWebpackOptions.forEach(copyWebpackOptions => {
65
- const platformCopyOptions = copyWebpackOptions(platformOptions, vueOptions, copyOptions) || []
80
+ const platformCopyOptions =
81
+ copyWebpackOptions(platformOptions, vueOptions, copyOptions) || []
66
82
  platformCopyOptions.forEach(copyOption => {
67
83
  if (typeof copyOption === 'string') {
68
84
  copyOption = getAssetsCopyOption(copyOption)
@@ -73,7 +89,25 @@ function getCopyWebpackPluginOptions (platformOptions, vueOptions) {
73
89
  if (process.env.UNI_PLATFORM === 'app-plus') {
74
90
  copyOptions.push({
75
91
  from: path.resolve(process.env.UNI_INPUT_DIR, 'android*.json'),
76
- to: '[name].[ext]'
92
+ to: '[name].[ext]',
93
+ globOptions: {
94
+ ignored: require('./util').getWatchOptions().ignored
95
+ },
96
+ transform (content, path) {
97
+ if (path.endsWith('androidPrivacy.json')) {
98
+ const options = initI18nOptions(
99
+ process.env.UNI_PLATFORM,
100
+ process.env.UNI_INPUT_DIR,
101
+ false,
102
+ true
103
+ )
104
+ if (!options) {
105
+ return content
106
+ }
107
+ return compileI18nJsonStr(content.toString(), options)
108
+ }
109
+ return content
110
+ }
77
111
  })
78
112
  }
79
113
  return copyOptions
@@ -82,4 +116,4 @@ function getCopyWebpackPluginOptions (platformOptions, vueOptions) {
82
116
  module.exports = {
83
117
  assetsDir,
84
118
  getCopyWebpackPluginOptions
85
- }
119
+ }
package/lib/env.js CHANGED
@@ -2,6 +2,7 @@ const fs = require('fs')
2
2
  const path = require('path')
3
3
  const mkdirp = require('mkdirp')
4
4
  const loaderUtils = require('loader-utils')
5
+ const uniI18n = require('@dcloudio/uni-cli-i18n')
5
6
  const moduleAlias = require('module-alias')
6
7
 
7
8
  require('./error-reporting')
@@ -21,7 +22,8 @@ process.env.UNI_INPUT_DIR = process.env.UNI_INPUT_DIR || path.resolve(process.cw
21
22
  const manifestJsonObj = require('@dcloudio/uni-cli-shared/lib/manifest').getManifestJson()
22
23
 
23
24
  process.env.UNI_APP_ID = manifestJsonObj.appid || ''
24
- process.env.UNI_APP_NAME = manifestJsonObj.name || ''
25
+ process.env.UNI_APP_NAME = manifestJsonObj.name || ''
26
+ process.env.UNI_PLATFORM = process.env.UNI_PLATFORM || 'h5'
25
27
 
26
28
  // 小程序 vue3 标记
27
29
  if (process.env.UNI_PLATFORM.indexOf('mp-') === 0) {
@@ -57,7 +59,9 @@ if (process.env.UNI_CLOUD_SPACES) {
57
59
  const hasUniCloudSpace = spaces.length > 0
58
60
  if (spaces.length === 1) {
59
61
  const space = spaces[0]
60
- console.log(`本项目的uniCloud使用的默认服务空间spaceId为:${space.id}`)
62
+ console.log(uniI18n.__('pluginUni.currentProjectDefaultSpaceId', {
63
+ 0: space.id
64
+ }))
61
65
  }
62
66
 
63
67
  if (
@@ -65,22 +69,23 @@ if (process.env.UNI_CLOUD_SPACES) {
65
69
  isH5 &&
66
70
  isProduction
67
71
  ) {
68
- console.warn(
69
- '发布H5,需要在uniCloud后台操作,绑定安全域名,否则会因为跨域问题而无法访问。教程参考:https://uniapp.dcloud.io/uniCloud/quickstart?id=useinh5')
72
+ console.warn(uniI18n.__('pluginUni.unicloudReleaseH5', {
73
+ 0: 'https://uniapp.dcloud.io/uniCloud/quickstart?id=useinh5'
74
+ }))
70
75
  } else if (
71
76
  hasUniCloudSpace &&
72
77
  isH5 &&
73
78
  !isProduction
74
79
  ) {
75
- console.warn(
76
- '当前项目使用了uniCloud,为避免云函数调用跨域问题,建议在HBuilderX内置浏览器里调试,如使用外部浏览器需处理跨域,详见:https://uniapp.dcloud.io/uniCloud/quickstart?id=useinh5'
77
- )
80
+ console.warn(uniI18n.__('pluginUni.unicloudShowedRunByHBuilderX', {
81
+ 0: 'https://uniapp.dcloud.io/uniCloud/quickstart?id=useinh5'
82
+ }))
78
83
  }
79
84
 
80
85
  process.env.UNI_CLOUD_PROVIDER = JSON.stringify(spaces.map(space => {
81
86
  if (space.clientSecret) {
82
87
  return {
83
- provider: 'aliyun',
88
+ provider: space.provider || 'aliyun',
84
89
  spaceName: space.name,
85
90
  spaceId: space.id,
86
91
  clientSecret: space.clientSecret,
@@ -88,7 +93,7 @@ if (process.env.UNI_CLOUD_SPACES) {
88
93
  }
89
94
  } else {
90
95
  return {
91
- provider: 'tencent',
96
+ provider: space.provider || 'tencent',
92
97
  spaceName: space.name,
93
98
  spaceId: space.id
94
99
  }
@@ -124,6 +129,12 @@ if (process.env.NODE_ENV === 'production') { // 发行模式,不启用 cache
124
129
  delete process.env.UNI_USING_CACHE
125
130
  }
126
131
 
132
+ process.env.BROWSERSLIST_CONFIG = [
133
+ path.resolve(process.env.UNI_INPUT_DIR, '.browserslistrc'),
134
+ path.resolve(process.env.UNI_CLI_CONTEXT, 'package.json'),
135
+ path.resolve(process.cwd(), 'package.json')
136
+ ].find(file => fs.existsSync(file))
137
+
127
138
  const {
128
139
  normalizePath,
129
140
  isSupportSubPackages,
@@ -297,7 +308,9 @@ if (
297
308
  process.env.UNI_USING_STAT = true
298
309
  if (!process.UNI_STAT_CONFIG.appid && process.env.NODE_ENV === 'production') {
299
310
  console.log()
300
- console.warn('当前应用未配置Appid,无法使用uni统计,详情参考:https://ask.dcloud.net.cn/article/36303')
311
+ console.warn(uniI18n.__('pluginUni.uniStatisticsNoAppid', {
312
+ 0: 'https://ask.dcloud.net.cn/article/36303'
313
+ }))
301
314
  console.log()
302
315
  }
303
316
  }
@@ -323,18 +336,22 @@ const warningMsg =
323
336
  const needWarning = !platformOptions.usingComponents || usingComponentsAbsent
324
337
  let hasNVue = false
325
338
  // 输出编译器版本等信息
339
+ const compileModeUrl = 'https://ask.dcloud.net.cn/article/36074'
326
340
  if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
327
- console.log('当前nvue编译模式' + (process.env.UNI_USING_V3_NATIVE ? '(v3)' : '') + ':' + (isNVueCompiler ? 'uni-app'
328
- : 'weex') +
329
- ' 。编译模式差异见:https://ask.dcloud.net.cn/article/36074')
341
+ const compileMode = (process.env.UNI_USING_V3_NATIVE ? '(v3)' : '') + ':' + (isNVueCompiler ? 'uni-app' : 'weex')
342
+ console.log(uniI18n.__('pluginUni.nvueCompileModeForDetail', {
343
+ 0: compileMode,
344
+ 1: compileModeUrl
345
+ }))
330
346
  } else if (process.env.UNI_PLATFORM !== 'h5' && process.env.UNI_PLATFORM !== 'quickapp-native') {
331
347
  try {
332
348
  let info = ''
333
349
  if (process.env.UNI_PLATFORM === 'app-plus') {
334
350
  const pagesPkg = require('@dcloudio/webpack-uni-pages-loader/package.json')
335
351
  if (pagesPkg) {
336
- const v3Tips = '(v3)详见:https://ask.dcloud.net.cn/article/36599。'
337
- info = '编译器版本:' + pagesPkg['uni-app'].compilerVersion + (process.env.UNI_USING_V3 ? v3Tips : '')
352
+ const v3Tips = `(v3)${uniI18n.__('see')}:https://ask.dcloud.net.cn/article/36599。`
353
+ info = uniI18n.__('compilerVersion') + ':' + pagesPkg['uni-app'].compilerVersion + (process.env.UNI_USING_V3
354
+ ? v3Tips : '')
338
355
  }
339
356
  if (process.env.UNI_USING_V3) {
340
357
  console.log(info)
@@ -348,8 +365,10 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
348
365
  if (needWarning) {
349
366
  console.log(warningMsg)
350
367
  }
351
- console.log('当前nvue编译模式:' + (isNVueCompiler ? 'uni-app' : 'weex') +
352
- ' 。编译模式差异见:https://ask.dcloud.net.cn/article/36074')
368
+ console.log(uniI18n.__('pluginUni.nvueCompileModeForDetail', {
369
+ 0: (isNVueCompiler ? 'uni-app' : 'weex'),
370
+ 1: compileModeUrl
371
+ }))
353
372
  } else {
354
373
  console.log(info)
355
374
  if (needWarning) {
@@ -365,11 +384,11 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
365
384
  } catch (e) {}
366
385
  }
367
386
  if (process.env.NODE_ENV !== 'production') { // 运行模式性能提示
368
- let perfMsg = '请注意运行模式下,因日志输出、sourcemap以及未压缩源码等原因,性能和包体积,均不及发行模式。'
387
+ let perfMsg = uniI18n.__('pluginUni.runDebugMode')
369
388
  if (hasNVue) { // app-nvue
370
- perfMsg = perfMsg + '尤其是app-nvue的sourcemap影响较大'
389
+ perfMsg = perfMsg + uniI18n.__('pluginUni.runDebugModeNvue')
371
390
  } else if (process.env.UNI_PLATFORM.indexOf('mp-') === 0) { // 小程序
372
- perfMsg = perfMsg + '若要正式发布,请点击发行菜单或使用cli发布命令进行发布'
391
+ perfMsg = perfMsg + uniI18n.__('pluginUni.runDebugModeMP')
373
392
  }
374
393
  console.log(perfMsg)
375
394
  }
@@ -406,7 +425,7 @@ if (runByHBuilderX) {
406
425
  '[BABEL] Note: The code generator has deoptimised the styling of')) {
407
426
  const filePath = msg.replace('[BABEL] Note: The code generator has deoptimised the styling of ', '').split(
408
427
  ' as ')[0]
409
- console.log('[警告] `' + path.relative(process.env.UNI_INPUT_DIR, filePath) +
428
+ console.log('[' + uniI18n.__('warning') + '] `' + path.relative(process.env.UNI_INPUT_DIR, filePath) +
410
429
  '` 文件体积超过 500KB,已跳过压缩以及 ES6 转 ES5 的处理,手机端使用过大的js库影响性能。')
411
430
  } else {
412
431
  oldError.apply(console, arguments)
@@ -470,11 +489,13 @@ if (
470
489
  }
471
490
 
472
491
  if (process.env.UNI_PLATFORM.startsWith('mp-')) {
473
- console.log('小程序各家浏览器内核及自定义组件实现机制存在差异,可能存在样式布局兼容问题,参考:https://uniapp.dcloud.io/matter?id=mp')
492
+ console.log(uniI18n.__('pluginUni.mpBrowserKernelDifference', {
493
+ 0: 'https://uniapp.dcloud.io/matter?id=mp'
494
+ }))
474
495
  }
475
496
 
476
- runByHBuilderX && console.log('正在编译中...')
497
+ runByHBuilderX && console.log(uniI18n.__('compiling'))
477
498
 
478
499
  module.exports = {
479
500
  manifestPlatformOptions: platformOptions
480
- }
501
+ }
package/lib/mp/index.js CHANGED
@@ -84,11 +84,13 @@ function processWxss (name, assets) {
84
84
  }
85
85
  }
86
86
 
87
+ const parseRequirePath = path => path.startsWith('common') ? `./${path}` : path
88
+
87
89
  function procssJs (name, assets, hasVendor) {
88
90
  const dirname = path.dirname(name)
89
- const runtimeJsCode = `require('${normalizePath(path.relative(dirname, 'common/runtime.js'))}');`
90
- const vendorJsCode = hasVendor ? `require('${normalizePath(path.relative(dirname, 'common/vendor.js'))}');` : ''
91
- const mainJsCode = `require('${normalizePath(path.relative(dirname, 'common/main.js'))}');`
91
+ const runtimeJsCode = `require('${normalizePath(parseRequirePath(path.relative(dirname, 'common/runtime.js')))}');`
92
+ const vendorJsCode = hasVendor ? `require('${normalizePath(parseRequirePath(path.relative(dirname, 'common/vendor.js')))}');` : ''
93
+ const mainJsCode = `require('${normalizePath(parseRequirePath(path.relative(dirname, 'common/main.js')))}');`
92
94
  const code = `${runtimeJsCode}${vendorJsCode}${mainJsCode}` + assets[name].source().toString()
93
95
  assets[name] = {
94
96
  size () {
@@ -172,7 +174,7 @@ module.exports = {
172
174
  if (process.env.UNI_MP_PLUGIN) {
173
175
  // 小程序插件入口使用
174
176
  // packages\webpack-uni-mp-loader\lib\plugin\index-new.js -> addMPPluginRequire
175
- beforeCode += `wx.__webpack_require_${process.env.UNI_MP_PLUGIN.replace(/-/g, '_')}__ = __webpack_require__;`
177
+ beforeCode += `${process.env.UNI_PLATFORM === 'mp-alipay' ? 'my' : 'wx'}.__webpack_require_${process.env.UNI_MP_PLUGIN.replace(/-/g, '_')}__ = __webpack_require__;`
176
178
 
177
179
  const UNI_MP_PLUGIN_MAIN = process.env.UNI_MP_PLUGIN_MAIN
178
180
  if (UNI_MP_PLUGIN_MAIN) {
@@ -189,6 +191,11 @@ module.exports = {
189
191
  if (process.env.UNI_USING_VUE3) {
190
192
  alias.vuex = require.resolve('@dcloudio/vue-cli-plugin-uni/packages/vuex')
191
193
  alias['@vue/devtools-api'] = require.resolve('@dcloudio/vue-cli-plugin-uni/packages/@vue/devtools-api')
194
+
195
+ alias['vue-i18n'] = require.resolve('@dcloudio/vue-cli-plugin-uni/packages/vue3/node_modules/vue-i18n')
196
+ alias['@dcloudio/uni-app'] = require.resolve('@dcloudio/vue-cli-plugin-uni/packages/uni-app')
197
+ } else {
198
+ alias.vuex = require.resolve('@dcloudio/vue-cli-plugin-uni/packages/vuex3')
192
199
  }
193
200
 
194
201
  return {
package/lib/options.js CHANGED
@@ -27,8 +27,10 @@ module.exports = function initOptions (options) {
27
27
  options.transpileDependencies.push(genTranspileDepRegex(path.resolve(process.env.UNI_INPUT_DIR, 'node_modules')))
28
28
  options.transpileDependencies.push('@dcloudio/uni-' + process.env.UNI_PLATFORM)
29
29
  options.transpileDependencies.push('@dcloudio/uni-i18n')
30
- options.transpileDependencies.push('@dcloudio/uni-stat')
31
- options.transpileDependencies.push('@dcloudio/vue-cli-plugin-uni/packages/uni-cloud')
30
+ options.transpileDependencies.push('@dcloudio/uni-stat')
31
+ options.transpileDependencies.push('@dcloudio/vue-cli-plugin-uni/packages/uni-app')
32
+ options.transpileDependencies.push('@dcloudio/vue-cli-plugin-uni/packages/uni-cloud')
33
+ options.transpileDependencies.push('@dcloudio/vue-cli-plugin-uni/packages/uni-stat')
32
34
 
33
35
  if (process.env.UNI_PLATFORM !== 'mp-weixin') { // mp runtime
34
36
  options.transpileDependencies.push('@dcloudio/uni-mp-weixin')
package/lib/util.js CHANGED
@@ -21,11 +21,10 @@ module.exports = {
21
21
  getWatchOptions () {
22
22
  return {
23
23
  ignored: [
24
- /node_modules/,
25
- path.resolve(process.env.UNI_INPUT_DIR, '*.md'),
26
- path.resolve(process.env.UNI_INPUT_DIR, '.hbuilderx'),
27
- path.resolve(process.env.UNI_INPUT_DIR, '.editorconfig'),
28
- path.resolve(process.env.UNI_INPUT_DIR, '.gitignore'),
24
+ path.resolve(process.env.UNI_INPUT_DIR, '*.md'),
25
+ path.resolve(process.env.UNI_INPUT_DIR, '.hbuilderx'),
26
+ path.resolve(process.env.UNI_INPUT_DIR, '.editorconfig'),
27
+ path.resolve(process.env.UNI_INPUT_DIR, '.gitignore'),
29
28
  path.resolve(process.env.UNI_INPUT_DIR, 'LICENSE'),
30
29
  path.resolve(process.env.UNI_INPUT_DIR, 'unpackage'),
31
30
  path.resolve(process.env.UNI_INPUT_DIR, 'uniCloud-aliyun'),
@@ -35,4 +34,4 @@ module.exports = {
35
34
  ]
36
35
  }
37
36
  }
38
- }
37
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dcloudio/vue-cli-plugin-uni",
3
- "version": "2.0.0-32220210818001",
3
+ "version": "2.0.0-32920210926001",
4
4
  "description": "uni-app plugin for vue-cli 3",
5
5
  "main": "index.js",
6
6
  "repository": {
@@ -17,7 +17,7 @@
17
17
  "author": "fxy060608",
18
18
  "license": "Apache-2.0",
19
19
  "dependencies": {
20
- "@dcloudio/uni-stat": "^2.0.0-32220210818001",
20
+ "@dcloudio/uni-stat": "^2.0.0-32920210926001",
21
21
  "buffer-json": "^2.0.0",
22
22
  "copy-webpack-plugin": "^5.1.1",
23
23
  "cross-env": "^5.2.0",
@@ -37,5 +37,5 @@
37
37
  "wrap-loader": "^0.2.0",
38
38
  "xregexp": "4.0.0"
39
39
  },
40
- "gitHead": "d297b8ae6037fb857408d1d6d140f7d7b4929b91"
40
+ "gitHead": "5e7404fe087c97dfc46bfa7b0ab9044a2fa90142"
41
41
  }
@@ -2,6 +2,7 @@
2
2
  "name": "uni-mp-vue",
3
3
  "version": "2.6.10",
4
4
  "description": "Reactive, component-oriented view layer for modern web interfaces.",
5
+ "main": "dist/mp.runtime.esm.js",
5
6
  "module": "dist/mp.runtime.esm.js",
6
7
  "typings": "types/index.d.ts",
7
8
  "repository": {