@dcloudio/vue-cli-plugin-uni 2.0.1-34720220422001 → 2.0.1-34920220607002

package/lib/app-plus/index.js

@@ -2,8 +2,9 @@ const path = require('path')
 const webpack = require('webpack')
 
 const {
-  getMainEntry,
-  getPlatformStat
+  getMainEntry,
+  getPlatformStat,
+  getPlatformPush
 } = require('@dcloudio/uni-cli-shared')
 
 const vueLoader = require('@dcloudio/uni-cli-shared/lib/vue-loader')
@@ -60,6 +61,7 @@ const v3 = {
     const isAppView = !!vueOptions.pluginOptions['uni-app-plus'].view
 
     const statCode = getPlatformStat()
+    const pushCode = getPlatformPush()
 
     const beforeCode = 'import \'uni-pages\';'
 
@@ -154,7 +156,7 @@ const v3 = {
             options: {
               compiler: vueLoader.compiler,
               before: [
-                beforeCode + require('../util').getAutomatorCode() + statCode +
+                beforeCode + require('../util').getAutomatorCode() + statCode + pushCode +
                   getGlobalUsingComponentsCode()
               ]
             }

package/lib/chain-webpack.js

@@ -99,10 +99,16 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
       '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_SUB_PLATFORM': JSON.stringify(process.env.UNI_SUB_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)
+      '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_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)
     }
     if (process.env.UNI_USING_VUE3) {
       Object.assign(defines, {
@@ -145,4 +151,4 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
       webpackConfig.plugins.delete('progress')
     }
   }
-}
+}

package/lib/env.js

@@ -6,6 +6,7 @@ const uniI18n = require('@dcloudio/uni-cli-i18n')
 const moduleAlias = require('module-alias')
 
 require('./error-reporting')
+require('../util/console')
 
 const hasOwnProperty = Object.prototype.hasOwnProperty
 
@@ -19,11 +20,19 @@ 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()
+const {
+  getManifestJson,
+  isEnableUniPushV2,
+  isUniPushOffline
+} = require('@dcloudio/uni-cli-shared/lib/manifest')
+
+const manifestJsonObj = getManifestJson()
 
 process.env.UNI_APP_ID = manifestJsonObj.appid || ''
 process.env.UNI_APP_NAME = manifestJsonObj.name || ''
 process.env.UNI_PLATFORM = process.env.UNI_PLATFORM || 'h5'
+process.env.UNI_APP_VERSION_NAME = manifestJsonObj.versionName
+process.env.UNI_APP_VERSION_CODE = manifestJsonObj.versionCode
 
 // 小程序 vue3 标记
 if (process.env.UNI_PLATFORM.indexOf('mp-') === 0) {
@@ -32,6 +41,13 @@ if (process.env.UNI_PLATFORM.indexOf('mp-') === 0) {
     process.env.UNI_USING_VUE3_OPTIONS_API = true
   }
 }
+// v2 uni-push
+if (isEnableUniPushV2(manifestJsonObj, process.env.UNI_PLATFORM)) {
+  process.env.UNI_PUSH_V2 = true
+  if (process.env.UNI_PLATFORM === 'app-plus' && isUniPushOffline(manifestJsonObj)) {
+    process.env.UNI_PUSH_V2_OFFLINE = true
+  }
+}
 
 // 初始化全局插件对象
 global.uniPlugin = require('@dcloudio/uni-cli-shared/lib/plugin').init()
@@ -87,6 +103,9 @@ if (process.env.UNI_CLOUD_SPACES) {
       }
 
       process.env.UNI_CLOUD_PROVIDER = JSON.stringify(spaces.map(space => {
+        if (space.provider === 'tcb') {
+          space.provider = 'tencent'
+        }
         if (space.clientSecret) {
           return {
             provider: space.provider || 'aliyun',
@@ -295,10 +314,13 @@ const scopedSlotsCompiler = !platformOptions.scopedSlotsCompiler && platformOpti
   : platformOptions.scopedSlotsCompiler
 process.env.SCOPED_SLOTS_COMPILER = modes.includes(scopedSlotsCompiler) ? scopedSlotsCompiler : modes[1]
 // 快手小程序、小红书小程序 抽象组件编译报错，如未指定 legacy 固定为 augmented 模式
-if ((process.env.UNI_PLATFORM === 'mp-kuaishou' || process.env.UNI_PLATFORM === 'mp-xhs') && process.env.SCOPED_SLOTS_COMPILER !== modes[0]) {
+if ((process.env.UNI_PLATFORM === 'mp-kuaishou' || process.env.UNI_PLATFORM === 'mp-xhs') && process.env
+  .SCOPED_SLOTS_COMPILER !== modes[0]) {
   process.env.SCOPED_SLOTS_COMPILER = modes[2]
 }
 
+process.env.UNI_STAT_UNI_CLOUD = ''
+process.env.UNI_STAT_DEBUG = ''
 if (
   process.env.UNI_USING_COMPONENTS ||
   process.env.UNI_PLATFORM === 'h5'
@@ -310,12 +332,43 @@ if (
 
   if (uniStatistics.enable === true) {
     process.env.UNI_USING_STAT = uniStatistics.version === '2' ? '2' : '1'
-    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.log()
+    // 获取服务空间配置信息
+    const uniCloudConfig = uniStatistics.uniCloud || {}
+    process.env.UNI_STAT_UNI_CLOUD = JSON.stringify(uniCloudConfig)
+    process.env.UNI_STAT_DEBUG = uniStatistics.debug === true ? 'true' : 'false'
+
+    if (process.env.NODE_ENV === 'production') {
+      if (!process.UNI_STAT_CONFIG.appid) {
+        console.log()
+        console.warn(uniI18n.__('pluginUni.uniStatisticsNoAppid', {
+          0: 'https://ask.dcloud.net.cn/article/36303'
+        }))
+        console.log()
+      } else {
+        if (!uniStatistics.version) {
+          console.log()
+          console.warn(uniI18n.__('pluginUni.uniStatisticsNoVersion', {
+            0: 'https://uniapp.dcloud.io/uni-stat-v2.html'
+          }))
+          console.log()
+        } else {
+          console.log()
+          console.warn(`已开启 uni统计${uniStatistics.version}.0 版本`)
+          console.log()
+        }
+      }
+    } else {
+      if (!uniStatistics.version) {
+        console.log()
+        console.warn(uniI18n.__('pluginUni.uniStatisticsNoVersion', {
+          0: 'https://uniapp.dcloud.io/uni-stat-v2.html'
+        }))
+        console.log()
+      } else {
+        console.log()
+        console.warn(`已开启 uni统计${uniStatistics.version}.0 版本`)
+        console.log()
+      }
     }
   }
 }
@@ -340,6 +393,11 @@ const warningMsg =
 const needWarning = !platformOptions.usingComponents || usingComponentsAbsent
 let hasNVue = false
 // 输出编译器版本等信息
+const pagesPkg = require('@dcloudio/webpack-uni-pages-loader/package.json')
+process.env.UNI_COMPILER_VERSION = ''
+if (pagesPkg) {
+  process.env.UNI_COMPILER_VERSION = pagesPkg['uni-app'].compilerVersion
+}
 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')
@@ -349,12 +407,8 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
   }))
 } else if (process.env.UNI_PLATFORM !== 'h5' && process.env.UNI_PLATFORM !== 'quickapp-native') {
   try {
-    let info = ''
+    const info = process.env.UNI_COMPILER_VERSION
     if (process.env.UNI_PLATFORM === 'app-plus') {
-      const pagesPkg = require('@dcloudio/webpack-uni-pages-loader/package.json')
-      if (pagesPkg) {
-        info = uniI18n.__('compilerVersion') + '：' + pagesPkg['uni-app'].compilerVersion
-      }
       if (process.env.UNI_USING_V3) {
         console.log(info)
       } else {
@@ -502,4 +556,4 @@ runByHBuilderX && console.log(uniI18n.__('compiling'))
 
 module.exports = {
   manifestPlatformOptions: platformOptions
-}
+}

package/lib/h5/index.js

@@ -4,8 +4,9 @@ const webpack = require('webpack')
 
 const {
   getMainEntry,
-  getH5Options,
-  getPlatformStat
+  getH5Options,
+  getPlatformStat,
+  getPlatformPush
 } = require('@dcloudio/uni-cli-shared')
 
 const {
@@ -93,7 +94,7 @@ module.exports = {
     let useBuiltIns = 'usage'
 
     const statCode = getPlatformStat()
-
+    const pushCode = getPlatformPush()
     try {
       const babelConfig = require(path.resolve(process.env.UNI_CLI_CONTEXT, 'babel.config.js'))
       useBuiltIns = babelConfig.presets[0][1].useBuiltIns
@@ -117,7 +118,7 @@ module.exports = {
             loader: path.resolve(__dirname, '../../packages/wrap-loader'),
             options: {
               before: [
-                beforeCode + require('../util').getAutomatorCode() + statCode +
+                beforeCode + require('../util').getAutomatorCode() + statCode + pushCode +
                 getGlobalUsingComponentsCode()
               ]
             }

package/lib/mp/index.js

@@ -6,8 +6,9 @@ const {
   getMainEntry,
   normalizePath,
   getPlatformExts,
-  getPlatformCssnano,
-  getPlatformStat
+  getPlatformCssnano,
+  getPlatformStat,
+  getPlatformPush
 } = require('@dcloudio/uni-cli-shared')
 
 const WebpackUniAppPlugin = require('../../packages/webpack-uni-app-loader/plugin/index')
@@ -23,6 +24,8 @@ function createUniMPPlugin () {
   return new WebpackUniMPPlugin()
 }
 
+const createWxMpIndependentPlugins = require('@dcloudio/uni-mp-weixin/lib/createIndependentPlugin')
+
 function getProvides () {
   const uniPath = require('@dcloudio/uni-cli-shared/lib/platform').getMPRuntimePath()
   const uniCloudPath = path.resolve(__dirname, '../../packages/uni-cloud/dist/index.js')
@@ -164,13 +167,15 @@ module.exports = {
     parseEntry()
 
     const statCode = getPlatformStat()
+    const pushCode = getPlatformPush()
 
     let beforeCode = 'import \'uni-pages\';'
 
     const plugins = [
       new WebpackUniAppPlugin(),
       createUniMPPlugin(),
-      new webpack.ProvidePlugin(getProvides())
+      new webpack.ProvidePlugin(getProvides()),
+      ...createWxMpIndependentPlugins()
     ]
 
     if ((process.env.UNI_SUBPACKGE || process.env.UNI_MP_PLUGIN) && process.env.UNI_SUBPACKGE !== 'main') {
@@ -233,7 +238,7 @@ module.exports = {
             loader: path.resolve(__dirname, '../../packages/wrap-loader'),
             options: {
               before: [
-                beforeCode + require('../util').getAutomatorCode() + statCode
+                beforeCode + require('../util').getAutomatorCode() + statCode + pushCode
               ]
             }
           }, {

package/lib/options.js

@@ -23,10 +23,12 @@ module.exports = function initOptions (options) {
   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-i18n')
-  options.transpileDependencies.push('@dcloudio/uni-stat')
+  options.transpileDependencies.push('@dcloudio/uni-stat')
+  options.transpileDependencies.push('@dcloudio/uni-push')
   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')
+  options.transpileDependencies.push('@dcloudio/vue-cli-plugin-uni/packages/uni-stat')
+  options.transpileDependencies.push('@dcloudio/vue-cli-plugin-uni/packages/uni-push')
 
   if (process.env.UNI_PLATFORM !== 'mp-weixin') { // mp runtime
     options.transpileDependencies.push('@dcloudio/uni-mp-weixin')

package/lib/split-chunks.js

@@ -4,6 +4,13 @@ const {
   normalizePath
 } = require('@dcloudio/uni-cli-shared')
 
+const subPkgsInfo = Object.values(process.UNI_SUBPACKAGES)
+const normalFilter = ({ independent }) => !independent
+const independentFilter = ({ independent }) => independent
+const map2Root = ({ root }) => root + '/'
+const normalSubPackageRoots = subPkgsInfo.filter(normalFilter).map(map2Root)
+const independentSubpackageRoots = subPkgsInfo.filter(independentFilter).map(map2Root)
+
 function createCacheGroups () {
   const cacheGroups = {}
   if (process.UNI_CONFUSION) { // 加密
@@ -152,7 +159,7 @@ module.exports = function getSplitChunks () {
   const findSubPackages = function (chunks) {
     return chunks.reduce((pkgs, item) => {
       const name = normalizePath(item.name)
-      const pkgRoot = subPackageRoots.find(root => name.indexOf(root) === 0)
+      const pkgRoot = normalSubPackageRoots.find(root => name.indexOf(root) === 0)
       pkgRoot && pkgs.add(pkgRoot)
       return pkgs
     }, new Set())
@@ -178,7 +185,12 @@ module.exports = function getSplitChunks () {
                 console.log('move module to main chunk:', module.resource,
                   'from', subPackageRoot, 'for component in main package:', resource)
               }
-              return true
+
+              // 独立分包除外
+              const independentRoot = independentSubpackageRoots.find(root => resource.indexOf(root) >= 0)
+              if (!independentRoot) {
+                return true
+              }
             }
           } else {
             return hasMainPackageComponent(m.module, subPackageRoot)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.1-34720220422001",
+  "version": "2.0.1-34920220607002",
   "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-34720220422001",
+    "@dcloudio/uni-stat": "^2.0.1-34920220607002",
     "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": "021b138a8234345830ee7fa11c3eec0b98f1c073"
+  "gitHead": "6a578780ba74bfe8139ab81613f3f73957e3eda9"
 }

package/packages/h5-vue/dist/vue.common.dev.js

@@ -6778,11 +6778,13 @@ function updateWxsProps(oldVnode, vnode) {
     }
 
     vnode.$wxsWatches[prop] = oldWxsWatches[prop] || vnode.context.$watch(watchProp, function(newVal, oldVal) {
+      // vue component / web component
+      var component = vnode.elm.__vue__ || vnode.elm;
       wxsProps[prop](
         newVal,
         oldVal,
         context.$getComponentDescriptor(context, true),
-        vnode.elm.__vue__.$getComponentDescriptor(vnode.elm.__vue__, false)
+        component.$getComponentDescriptor && component.$getComponentDescriptor(component, false)
       );
     }, {
       immediate: true, // 当 prop 的值被设置 WXS 函数就会触发，而不只是值发生改变，所以在页面初始化的时候会调用一次 WxsPropObserver 的函数