@dcloudio/vue-cli-plugin-uni 2.0.1-33920220314003 → 2.0.1-34720220422002

package/generator.js

@@ -19,6 +19,7 @@ module.exports = (api, options, rootOptions) => {
         '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:mp-jd': 'cross-env NODE_ENV=development UNI_PLATFORM=mp-jd vue-cli-service uni-build --watch',
+        'dev:mp-xhs': 'cross-env NODE_ENV=development UNI_PLATFORM=mp-xhs 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',
@@ -32,6 +33,7 @@ module.exports = (api, options, rootOptions) => {
         '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:mp-jd': 'cross-env NODE_ENV=production UNI_PLATFORM=mp-jd vue-cli-service uni-build',
+        'build:mp-xhs': 'cross-env NODE_ENV=production UNI_PLATFORM=mp-xhs 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',
@@ -60,6 +62,7 @@ module.exports = (api, options, rootOptions) => {
         '@dcloudio/uni-mp-toutiao': version,
         '@dcloudio/uni-mp-lark': version,
         '@dcloudio/uni-mp-jd': version,
+        '@dcloudio/uni-mp-xhs': version,
         '@dcloudio/uni-mp-360': version,
         '@dcloudio/uni-mp-kuaishou': version,
         '@dcloudio/uni-quickapp-native': version,

package/lib/app-plus/index.js

@@ -2,7 +2,8 @@ const path = require('path')
 const webpack = require('webpack')
 
 const {
-  getMainEntry
+  getMainEntry,
+  getPlatformStat
 } = require('@dcloudio/uni-cli-shared')
 
 const vueLoader = require('@dcloudio/uni-cli-shared/lib/vue-loader')
@@ -58,7 +59,7 @@ const v3 = {
     const isAppService = !!vueOptions.pluginOptions['uni-app-plus'].service
     const isAppView = !!vueOptions.pluginOptions['uni-app-plus'].view
 
-    const statCode = process.env.UNI_USING_STAT ? 'import \'@dcloudio/uni-stat\';' : ''
+    const statCode = getPlatformStat()
 
     const beforeCode = 'import \'uni-pages\';'
 

package/lib/configure-webpack.js

@@ -323,9 +323,6 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
             .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': 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({

package/lib/env.js

@@ -50,7 +50,8 @@ 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))
+process.env.UNI_MP_PLUGIN_EXPORT = JSON.stringify(Object.keys(platformOptions.plugins || {}).map(pluginName =>
+  platformOptions.plugins[pluginName].export))
 
 const isH5 = !process.env.UNI_SUB_PLATFORM && process.env.UNI_PLATFORM === 'h5'
 const isProduction = process.env.NODE_ENV === 'production'
@@ -293,8 +294,8 @@ const modes = ['legacy', 'auto', 'augmented']
 const scopedSlotsCompiler = !platformOptions.scopedSlotsCompiler && platformOptions.betterScopedSlots ? modes[2]
   : platformOptions.scopedSlotsCompiler
 process.env.SCOPED_SLOTS_COMPILER = modes.includes(scopedSlotsCompiler) ? scopedSlotsCompiler : modes[1]
-// 快手小程序抽象组件编译报错，如未指定 legacy 固定为 augmented 模式
-if (process.env.UNI_PLATFORM === 'mp-kuaishou' && process.env.SCOPED_SLOTS_COMPILER !== modes[0]) {
+// 快手小程序、小红书小程序 抽象组件编译报错，如未指定 legacy 固定为 augmented 模式
+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]
 }
 
@@ -308,7 +309,7 @@ if (
   )
 
   if (uniStatistics.enable === true) {
-    process.env.UNI_USING_STAT = 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', {
@@ -399,9 +400,9 @@ moduleAlias.addAlias('vue-template-compiler', '@dcloudio/vue-cli-plugin-uni/pack
 moduleAlias.addAlias('@megalo/template-compiler', '@dcloudio/vue-cli-plugin-uni/packages/@megalo/template-compiler')
 moduleAlias.addAlias('mpvue-template-compiler', '@dcloudio/vue-cli-plugin-uni/packages/mpvue-template-compiler')
 // vue-loader
-moduleAlias.addAlias('vue-loader', '@dcloudio/vue-cli-plugin-uni/packages/vue-loader')
+moduleAlias.addAlias('vue-loader', '@dcloudio/vue-cli-plugin-uni/packages/vue-loader')
 // sass-loader
-moduleAlias.addAlias('sass-loader', '@dcloudio/vue-cli-plugin-uni/packages/sass-loader')
+moduleAlias.addAlias('sass-loader', '@dcloudio/vue-cli-plugin-uni/packages/sass-loader')
 
 if (process.env.UNI_USING_V3 && process.env.UNI_PLATFORM === 'app-plus') {
   moduleAlias.addAlias('./runtime/getUrl.js', '@dcloudio/vue-cli-plugin-uni/lib/app-plus/getUrl.js')
@@ -501,4 +502,4 @@ runByHBuilderX && console.log(uniI18n.__('compiling'))
 
 module.exports = {
   manifestPlatformOptions: platformOptions
-}
+}

package/lib/h5/compiler-options.js

@@ -10,8 +10,9 @@ function isFunction (expr) {
   try {
     const body = parser.parse(`(${expr})`).program.body[0]
     const expression = body.expression
-    return t.isFunctionDeclaration(body) || t.isArrowFunctionExpression(expression) || t.isFunctionExpression(expression)
-  } catch (error) { }
+    return t.isFunctionDeclaration(body) || t.isArrowFunctionExpression(expression) || t.isFunctionExpression(
+      expression)
+  } catch (error) {}
 }
 
 function processEvent (expr, filterModules) {
@@ -80,31 +81,39 @@ module.exports = {
           })
         }
       }
-      if (el.events) {
+      if (el.events || el.nativeEvents) {
         filterModules = filterModules || []
         const {
           events: eventsMap
         } = deprecated
         // const warnLogs = new Set()
-        Object.keys(el.events).forEach(name => {
-          // 过时事件类型转换
-          if (eventsMap[name]) {
-            el.events[eventsMap[name]] = el.events[name]
-            delete el.events[name]
-            // warnLogs.add(`警告：事件${name}已过时，推荐使用${eventsMap[name]}代替`)
-            name = eventsMap[name]
-          }
-
-          const handlers = el.events[name]
-          if (Array.isArray(handlers)) {
-            handlers.forEach(handler => {
-              handler.value = processEvent(handler.value, filterModules)
-            })
-          } else {
-            handlers.value = processEvent(handlers.value, filterModules)
-          }
-        })
+        normalizeEvent(el.events, eventsMap, filterModules)
+        normalizeEvent(el.nativeEvents, eventsMap, filterModules)
       }
     }
   }]
 }
+
+function normalizeEvent (events, eventsMap, filterModules) {
+  if (!events) {
+    return
+  }
+  Object.keys(events).forEach(name => {
+    // 过时事件类型转换
+    if (eventsMap[name]) {
+      events[eventsMap[name]] = events[name]
+      delete events[name]
+      // warnLogs.add(`警告：事件${name}已过时，推荐使用${eventsMap[name]}代替`)
+      name = eventsMap[name]
+    }
+
+    const handlers = events[name]
+    if (Array.isArray(handlers)) {
+      handlers.forEach(handler => {
+        handler.value = processEvent(handler.value, filterModules)
+      })
+    } else {
+      handlers.value = processEvent(handlers.value, filterModules)
+    }
+  })
+}

package/lib/h5/index.js

@@ -4,7 +4,8 @@ const webpack = require('webpack')
 
 const {
   getMainEntry,
-  getH5Options
+  getH5Options,
+  getPlatformStat
 } = require('@dcloudio/uni-cli-shared')
 
 const {
@@ -91,7 +92,7 @@ module.exports = {
   webpackConfig (webpackConfig) {
     let useBuiltIns = 'usage'
 
-    const statCode = process.env.UNI_USING_STAT ? 'import \'@dcloudio/uni-stat\';' : ''
+    const statCode = getPlatformStat()
 
     try {
       const babelConfig = require(path.resolve(process.env.UNI_CLI_CONTEXT, 'babel.config.js'))

package/lib/mp/index.js

@@ -6,7 +6,8 @@ const {
   getMainEntry,
   normalizePath,
   getPlatformExts,
-  getPlatformCssnano
+  getPlatformCssnano,
+  getPlatformStat
 } = require('@dcloudio/uni-cli-shared')
 
 const WebpackUniAppPlugin = require('../../packages/webpack-uni-app-loader/plugin/index')
@@ -162,7 +163,7 @@ module.exports = {
 
     parseEntry()
 
-    const statCode = process.env.UNI_USING_STAT ? 'import \'@dcloudio/uni-stat\';' : ''
+    const statCode = getPlatformStat()
 
     let beforeCode = 'import \'uni-pages\';'
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.1-33920220314003",
+  "version": "2.0.1-34720220422002",
   "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-33920220314003",
+    "@dcloudio/uni-stat": "^2.0.1-34720220422002",
     "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": "e367d8b4acffd31f7b4377e8f564ac5bad167016"
+  "gitHead": "6577bf36e4d78c84bb8ceedc63bfbd463cb36b4d"
 }

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

@@ -1,6 +1,6 @@
 /*!
  * Vue.js v2.6.11
- * (c) 2014-2021 Evan You
+ * (c) 2014-2022 Evan You
  * Released under the MIT License.
  */
 'use strict';
@@ -6784,7 +6784,8 @@ function updateWxsProps(oldVnode, vnode) {
         context.$getComponentDescriptor(context, true),
         vnode.elm.__vue__.$getComponentDescriptor(vnode.elm.__vue__, false)
       );
-    }, {
+    }, {
+      immediate: true, // 当 prop 的值被设置 WXS 函数就会触发，而不只是值发生改变，所以在页面初始化的时候会调用一次 WxsPropObserver 的函数
       deep: true
     });
   });