@dcloudio/vue-cli-plugin-uni 2.0.1-34920220609002 → 2.0.1-35320220729002

package/commands/build.js

@@ -35,7 +35,8 @@ module.exports = (api, options) => {
       '--auto-port': 'specify automator port',
       '--subpackage': 'specify subpackage',
       '--plugin': 'specify mp plugin',
-      '--manifest': 'build manifest.json'
+      '--manifest': 'build manifest.json',
+      '--sourcemap': 'generate sourcemap'
     }
   }, async (args) => {
     for (const key in defaults) {
@@ -72,6 +73,8 @@ module.exports = (api, options) => {
 
     process.env.VUE_CLI_BUILD_TARGET = args.target
 
+    if (args.sourcemap) process.env.SOURCEMAP = args.sourcemap
+
     await build(args, api, options)
 
     delete process.env.VUE_CLI_BUILD_TARGET

package/generator.js

@@ -69,6 +69,7 @@ module.exports = (api, options, rootOptions) => {
         '@dcloudio/uni-quickapp-webview': version,
         '@dcloudio/uni-stat': version,
         '@dcloudio/uni-i18n': version,
+        '@dcloudio/uni-stacktracey': version,
         '@vue/shared': '^3.0.0',
         flyio: '^0.6.2',
         vuex: '^3.2.0'

package/lib/app-plus/index.js

@@ -4,7 +4,8 @@ const webpack = require('webpack')
 const {
   getMainEntry,
   getPlatformStat,
-  getPlatformPush
+  getPlatformPush,
+  getPlatformUniCloud
 } = require('@dcloudio/uni-cli-shared')
 
 const vueLoader = require('@dcloudio/uni-cli-shared/lib/vue-loader')
@@ -62,9 +63,9 @@ const v3 = {
 
     const statCode = getPlatformStat()
     const pushCode = getPlatformPush()
+    const uniCloudCode = getPlatformUniCloud()
 
     const beforeCode = 'import \'uni-pages\';'
-
     if (!webpackConfig.optimization) {
       webpackConfig.optimization = {}
     }
@@ -156,7 +157,7 @@ const v3 = {
             options: {
               compiler: vueLoader.compiler,
               before: [
-                beforeCode + require('../util').getAutomatorCode() + statCode + pushCode +
+                beforeCode + require('../util').getAutomatorCode() + statCode + pushCode + uniCloudCode +
                   getGlobalUsingComponentsCode()
               ]
             }
@@ -270,4 +271,4 @@ if (process.env.UNI_USING_V3) {
   module.exports = v3
 } else {
   module.exports = require('../mp')
-}
+}

package/lib/chain-webpack.js

@@ -104,8 +104,8 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
       '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),
-      'process.env.UNI_STAT_UNI_CLOUD': process.env.UNI_STAT_UNI_CLOUD || '',
-      'process.env.UNI_STAT_DEBUG': process.env.UNI_STAT_DEBUG || '',
+      'process.env.UNI_STAT_UNI_CLOUD': process.env.UNI_STAT_UNI_CLOUD || '""',
+      'process.env.UNI_STAT_DEBUG': process.env.UNI_STAT_DEBUG || '""',
       'process.env.UNI_COMPILER_VERSION': JSON.stringify(process.env.UNI_COMPILER_VERSION),
       'process.env.UNI_APP_VERSION_NAME': JSON.stringify(process.env.UNI_APP_VERSION_NAME),
       'process.env.UNI_APP_VERSION_CODE': JSON.stringify(process.env.UNI_APP_VERSION_CODE)
@@ -150,5 +150,15 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
     if (process.env.BUILD_ENV === 'ali-ide') {
       webpackConfig.plugins.delete('progress')
     }
+    webpackConfig.resolve.alias
+      .delete('@')
+      .set(
+        '@/pages.json',
+        path.resolve(process.env.UNI_INPUT_DIR, 'pages.json') +
+        '?' + JSON.stringify({
+          type: 'origin-pages-json'
+        })
+      )
+      .set('@', path.resolve(process.env.UNI_INPUT_DIR))
   }
 }

package/lib/commands/custom.js

@@ -33,7 +33,8 @@ module.exports = function custom (argv) {
     minimize: process.env.UNI_MINIMIZE === 'true',
     clean: false,
     subpackage: argv.subpackage,
-    plugin: argv.plugin
+    plugin: argv.plugin,
+    sourcemap: argv.sourcemap
   }).catch(err => {
     console.error(err)
     process.exit(1)

package/lib/configure-webpack.js

@@ -267,7 +267,7 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
       })
     }
 
-    if (process.env.NODE_ENV === 'development') {
+    if (process.env.NODE_ENV === 'development' || (process.env.NODE_ENV === 'production' && process.env.SOURCEMAP === 'true')) {
       const sourceMap = require('@dcloudio/uni-cli-shared/lib/source-map')
       let isAppService = false
       if (
@@ -277,15 +277,28 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
       ) {
         isAppService = !!vueOptions.pluginOptions['uni-app-plus'].service
       }
-      if (process.env.UNI_PLATFORM === 'h5' || isAppService) {
-        plugins.push(sourceMap.createEvalSourceMapDevToolPlugin())
-      } else if (
-        process.env.UNI_PLATFORM.indexOf('mp-') === 0 &&
+
+      const useEvalSourceMap = process.env.UNI_PLATFORM === 'h5' || isAppService
+      const useSourceMap = process.env.UNI_PLATFORM.indexOf('mp-') === 0 &&
         process.env.UNI_PLATFORM !== 'mp-baidu' &&
         process.env.UNI_PLATFORM !== 'mp-alipay' &&
         process.env.UNI_PLATFORM !== 'quickapp-webview' // 目前 ov 的开发工具支持 eval 模式
-      ) {
-        plugins.push(sourceMap.createSourceMapDevToolPlugin(process.env.UNI_PLATFORM === 'mp-weixin'))
+
+      if (process.env.NODE_ENV === 'production') {
+        const sourceMapOptions = {
+          noSources: true,
+          append: false
+        }
+        if (isInHBuilderX && process.env.SOURCEMAP_PATH) { sourceMapOptions.filename = process.env.SOURCEMAP_PATH }
+        if (useEvalSourceMap || useSourceMap) {
+          plugins.push(sourceMap.createSourceMapDevToolPlugin(!sourceMapOptions.filename, sourceMapOptions))
+        }
+      } else {
+        if (useEvalSourceMap) {
+          plugins.push(sourceMap.createEvalSourceMapDevToolPlugin())
+        } else if (useSourceMap) {
+          plugins.push(sourceMap.createSourceMapDevToolPlugin(process.env.UNI_PLATFORM === 'mp-weixin' || process.env.UNI_PLATFORM === 'mp-toutiao'))
+        }
       }
     }
 
@@ -351,4 +364,4 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
       watchOptions: require('./util').getWatchOptions()
     }, platformWebpackConfig)
   }
-}
+}

package/lib/env.js

@@ -22,6 +22,7 @@ process.env.UNI_INPUT_DIR = process.env.UNI_INPUT_DIR || path.resolve(process.cw
 
 const {
   getManifestJson,
+  isEnableUniPushV1,
   isEnableUniPushV2,
   isUniPushOffline
 } = require('@dcloudio/uni-cli-shared/lib/manifest')
@@ -47,6 +48,8 @@ if (isEnableUniPushV2(manifestJsonObj, process.env.UNI_PLATFORM)) {
   if (process.env.UNI_PLATFORM === 'app-plus' && isUniPushOffline(manifestJsonObj)) {
     process.env.UNI_PUSH_V2_OFFLINE = true
   }
+} else if (isEnableUniPushV1(manifestJsonObj, process.env.UNI_PLATFORM)) {
+  process.env.UNI_PUSH_V1 = true
 }
 
 // 初始化全局插件对象
@@ -63,8 +66,6 @@ process.env.VUE_APP_NAME = manifestJsonObj.name
 
 process.env.UNI_USING_V3_SCOPED = true
 
-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))
@@ -72,7 +73,9 @@ process.env.UNI_MP_PLUGIN_EXPORT = JSON.stringify(Object.keys(platformOptions.pl
 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) {
+// uniCloud
+if (!process.env.UNI_CLOUD_PROVIDER && process.env.UNI_CLOUD_SPACES) {
+  process.env.UNI_CLOUD_PROVIDER = JSON.stringify([])
   try {
     const spaces = JSON.parse(process.env.UNI_CLOUD_SPACES)
     if (Array.isArray(spaces)) {
@@ -90,7 +93,7 @@ if (process.env.UNI_CLOUD_SPACES) {
         isProduction
       ) {
         console.warn(uniI18n.__('pluginUni.unicloudReleaseH5', {
-          0: 'https://uniapp.dcloud.io/uniCloud/quickstart?id=useinh5'
+          0: 'https://uniapp.dcloud.net.cn/uniCloud/publish.html#useinh5'
         }))
       } else if (
         hasUniCloudSpace &&
@@ -98,7 +101,7 @@ if (process.env.UNI_CLOUD_SPACES) {
         !isProduction
       ) {
         console.warn(uniI18n.__('pluginUni.unicloudShowedRunByHBuilderX', {
-          0: 'https://uniapp.dcloud.io/uniCloud/quickstart?id=useinh5'
+          0: 'https://uniapp.dcloud.net.cn/uniCloud/publish.html#useinh5'
         }))
       }
 
@@ -319,6 +322,8 @@ if ((process.env.UNI_PLATFORM === 'mp-kuaishou' || process.env.UNI_PLATFORM ===
   process.env.SCOPED_SLOTS_COMPILER = modes[2]
 }
 
+process.env.MERGE_VIRTUAL_HOST_ATTRIBUTES = (!!platformOptions.mergeVirtualHostAttributes).toString()
+
 process.env.UNI_STAT_UNI_CLOUD = ''
 process.env.UNI_STAT_DEBUG = ''
 if (

package/lib/h5/index.js

@@ -6,7 +6,8 @@ const {
   getMainEntry,
   getH5Options,
   getPlatformStat,
-  getPlatformPush
+  getPlatformPush,
+  getPlatformUniCloud
 } = require('@dcloudio/uni-cli-shared')
 
 const {
@@ -95,6 +96,7 @@ module.exports = {
 
     const statCode = getPlatformStat()
     const pushCode = getPlatformPush()
+    const uniCloudCode = getPlatformUniCloud()
     try {
       const babelConfig = require(path.resolve(process.env.UNI_CLI_CONTEXT, 'babel.config.js'))
       useBuiltIns = babelConfig.presets[0][1].useBuiltIns
@@ -118,7 +120,7 @@ module.exports = {
             loader: path.resolve(__dirname, '../../packages/wrap-loader'),
             options: {
               before: [
-                beforeCode + require('../util').getAutomatorCode() + statCode + pushCode +
+                beforeCode + require('../util').getAutomatorCode() + statCode + pushCode + uniCloudCode +
                 getGlobalUsingComponentsCode()
               ]
             }
@@ -188,4 +190,4 @@ module.exports = {
       require('./cssnano-options')(webpackConfig)
     }
   }
-}
+}

package/lib/mp/index.js

@@ -8,7 +8,8 @@ const {
   getPlatformExts,
   getPlatformCssnano,
   getPlatformStat,
-  getPlatformPush
+  getPlatformPush,
+  getPlatformUniCloud
 } = require('@dcloudio/uni-cli-shared')
 
 const WebpackUniAppPlugin = require('../../packages/webpack-uni-app-loader/plugin/index')
@@ -168,6 +169,7 @@ module.exports = {
 
     const statCode = getPlatformStat()
     const pushCode = getPlatformPush()
+    const uniCloudCode = getPlatformUniCloud()
 
     let beforeCode = 'import \'uni-pages\';'
 
@@ -189,7 +191,9 @@ module.exports = {
           ? process.env.UNI_MP_PLUGIN_MAIN
           : JSON.parse(process.env.UNI_MP_PLUGIN_EXPORT)
       ).forEach(fileName => addToUniEntry(fileName))
-      beforeCode += `${globalEnv}.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;`
+      beforeCode += `
+// @ts-ignore
+${globalEnv}.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;`
     }
 
     const alias = { // 仅 mp-weixin
@@ -218,8 +222,7 @@ module.exports = {
       output.pathinfo = false
     }
     return {
-      mode: process.env.NODE_ENV === 'production' ? 'production'
-        : 'development',
+      mode: process.env.NODE_ENV === 'production' ? 'production' : 'development',
       entry () {
         return process.UNI_ENTRY
       },
@@ -238,7 +241,7 @@ module.exports = {
             loader: path.resolve(__dirname, '../../packages/wrap-loader'),
             options: {
               before: [
-                beforeCode + require('../util').getAutomatorCode() + statCode + pushCode
+                beforeCode + require('../util').getAutomatorCode() + statCode + pushCode + uniCloudCode
               ]
             }
           }, {
@@ -326,4 +329,4 @@ module.exports = {
     webpackConfig.plugins.delete('preload')
     webpackConfig.plugins.delete('prefetch')
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.1-34920220609002",
+  "version": "2.0.1-35320220729002",
   "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.1-34920220609002",
+    "@dcloudio/uni-stat": "^2.0.1-35320220729002",
     "buffer-json": "^2.0.0",
     "clone-deep": "^4.0.1",
     "copy-webpack-plugin": "^5.1.1",
@@ -39,5 +39,5 @@
     "wrap-loader": "^0.2.0",
     "xregexp": "4.0.0"
   },
-  "gitHead": "d28c71d8a044635b27fbbb7cffb66b59424248d3"
+  "gitHead": "99c489d7a19425ade612162abd21b441260e7ba7"
 }