@dcloudio/vue-cli-plugin-uni 2.0.1-alpha-34220220310002 → 2.0.1-alpha-34320220401001

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/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-alpha-34220220310002",
+  "version": "2.0.1-alpha-34320220401001",
   "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-alpha-34220220310002",
+    "@dcloudio/uni-stat": "^2.0.1-alpha-34320220401001",
     "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": "99f66ffc561ae2dd0559f0527e92029c1c56f066"
+  "gitHead": "465307df6c6f92d6f939756c3d625edcf663fe25"
 }

package/packages/mp-vue/dist/mp.runtime.esm.js

@@ -4616,7 +4616,7 @@ function initProps (vm, propsOptions) {
       defineReactive$$1(props, key, value, function () {
         if (!isRoot && !isUpdatingChildComponent) {
           {
-            if(vm.mpHost === 'mp-baidu' || vm.mpHost === 'mp-kuaishou'){//百度、快手 observer 在 setData callback 之后触发，直接忽略该 warn
+            if(vm.mpHost === 'mp-baidu' || vm.mpHost === 'mp-kuaishou' || vm.mpHost === 'mp-xhs'){//百度、快手、小红书 observer 在 setData callback 之后触发，直接忽略该 warn
                 return
             }
             //fixed by xxxxxx __next_tick_pending,uni://form-field 时不告警

package/packages/uni-stat/dist/uni-stat.cjs.js

@@ -85,6 +85,7 @@ const getPlatformName = () => {
     'mp-toutiao': 'tt',
     'mp-qq': 'qq',
     'mp-jd': 'jd',
+    'mp-xhs': 'xhs',
     'quickapp-native': 'qn',
     'mp-kuaishou': 'ks',
   };

package/packages/uni-stat/dist/uni-stat.es.js

@@ -83,6 +83,7 @@ const getPlatformName = () => {
     'mp-toutiao': 'tt',
     'mp-qq': 'qq',
     'mp-jd': 'jd',
+    'mp-xhs': 'xhs',
     'quickapp-native': 'qn',
     'mp-kuaishou': 'ks',
   };