@dcloudio/vue-cli-plugin-uni 2.0.2-5000620260331001 → 2.0.2-5010420260703001

package/lib/env.js

@@ -35,6 +35,9 @@ const {
   hasPushModule,
   isEnableSecureNetwork
 } = require('@dcloudio/uni-cli-shared/lib/manifest')
+const {
+  resolveStatEnable
+} = require('@dcloudio/uni-cli-shared/lib/stat')
 
 const manifestJsonObj = getManifestJson()
 
@@ -474,62 +477,132 @@ process.env.MERGE_VIRTUAL_HOST_ATTRIBUTES = (!!platformOptions.mergeVirtualHostA
 process.env.UNI_STATISTICS_CONFIG = '""'
 process.env.UNI_STAT_UNI_CLOUD = '""'
 process.env.UNI_STAT_DEBUG = '""'
+
+const MP_WEIXIN_USE_PRELOAD_ASSETS_REPORT = true
+
+/** 公有版小程序 GET 上报域名 */
+const STAT_MP_REQUEST_DOMAIN = 'tongji-collector.dcloud.net.cn'
+const STAT_MP_DOMAIN_DOC_URL = 'https://uniapp.dcloud.net.cn/uni-stat-public.html'
+const STAT_WARN_NO_APPID =
+  '当前应用未配置 appid，无法使用 uni 统计，详情参考：https://ask.dcloud.net.cn/article/36303'
+const STAT_PRIVATE_ANDROID_WARN =
+  '【重要】因 HBuilderX 3.4.9 版本起，uni统计2.0 调整了安卓端 deviceId 获取方式，导致 uni统计2.0 App-Android平台部分统计数据不准确。如使用了HBuilderX 3.4.9 - 3.6.4版本且开通了uni统计2.0的应用，需要使用HBuilderX3.6.7及以上版本重新发布应用并升级 uniAdmin 云函数解决，详见：https://ask.dcloud.net.cn/article/40097'
+
+/**
+ * 解析 manifest.uniStatistics 的统计类型。
+ * 优先 type（public/private）；缺失或非法时回退 version（2=private，其余=public）。
+ */
+function resolveUniStatType (uniStatistics) {
+  const type = String(uniStatistics.type || '').trim()
+  if (type === 'public' || type === 'private') {
+    return type
+  }
+  return Number(uniStatistics.version) === 2 ? 'private' : 'public'
+}
+
+/**
+ * 是否应向 main 入口自动 import 统计运行时。
+ * uni-app x 暂不自动 import；enable 按子→根→默认(true) 三级规则解析。
+ */
+function shouldAutoImportStatRuntime (rootStat, platformStat) {
+  if (process.env.UNI_APP_X === 'true') {
+    return false
+  }
+  return resolveStatEnable(rootStat, platformStat)
+}
+
+/** 构建期统计提示输出（与 uni-stat vite 插件 uniStatLog 一致） */
+function uniStatLog (text) {
+  console.log()
+  console.warn(text)
+  console.log()
+}
+
+/** uni 统计 2.0 构建期「已开启」基础文案 */
+const STAT_ENABLED_TIP_BASE = '已开启 uni统计 2.0'
+
+/**
+ * 构建期「统计已开启」简短提示。
+ * public → 已开启uni 统计 2.0；private → 已开启uni 统计 2.0（私有版）
+ */
+function formatStatEnabledTip (statType) {
+  if (statType === 'private') {
+    return `${STAT_ENABLED_TIP_BASE}（私有版）`
+  }
+  return STAT_ENABLED_TIP_BASE
+}
+
+/** 小程序公有版 request 合法域名提示（合并「已开启」与域名说明） */
+function formatMpStatDomainTip () {
+  return `${STAT_ENABLED_TIP_BASE}，为保障数据正常上报，请在小程序后台配置 request 合法域名：${STAT_MP_REQUEST_DOMAIN}。详情：${STAT_MP_DOMAIN_DOC_URL}`
+}
+
+/**
+ * 是否需要在构建期提示配置小程序 request 合法域名。
+ * 微信默认 preload 信标不走 uni.request，无需配置；开关关闭时与其它小程序一致。
+ */
+function shouldShowMpDomainTip (platform, statType) {
+  if (statType !== 'public' || !platform.startsWith('mp-')) {
+    return false
+  }
+  if (platform === 'mp-weixin' && MP_WEIXIN_USE_PRELOAD_ASSETS_REPORT) {
+    return false
+  }
+  return true
+}
+
+/** 输出构建期「统计已开启」提示 */
+function logStatEnabledTip (platform, statType) {
+  if (shouldShowMpDomainTip(platform, statType)) {
+    uniStatLog(formatMpStatDomainTip())
+    return
+  }
+  uniStatLog(formatStatEnabledTip(statType))
+}
+
 if (
   process.env.UNI_USING_COMPONENTS ||
   process.env.UNI_PLATFORM === 'h5'
 ) { // 自定义组件模式或 h5 平台
+  const rootStat = manifestJsonObj.uniStatistics
+  const platformStat = platformOptions.uniStatistics
   const uniStatistics = Object.assign(
-    manifestJsonObj.uniStatistics || {},
-    platformOptions.uniStatistics || {}
+    {},
+    rootStat || {},
+    platformStat || {}
   )
 
-  if (uniStatistics.enable === true) {
-    const uniStatLog = (text) => {
-      console.log()
-      console.warn(text)
-      console.log()
-    }
-    const version = Number(uniStatistics.version) === 2 ? '2' : '1'
-    process.env.UNI_USING_STAT = version
-    // 获取服务空间配置信息
-    const uniCloudConfig = uniStatistics.uniCloud || {}
-    process.env.UNI_STATISTICS_CONFIG = JSON.stringify(uniStatistics)
-    process.env.UNI_STAT_UNI_CLOUD = JSON.stringify(uniCloudConfig)
-    process.env.UNI_STAT_DEBUG = uniStatistics.debug === true ? 'true' : 'false'
+  // 始终注入完整 manifest.uniStatistics；enable 仅控制是否自动 import
+  process.env.UNI_STATISTICS_CONFIG = JSON.stringify(uniStatistics)
+  process.env.UNI_STAT_DEBUG = uniStatistics.debug === true ? 'true' : 'false'
+
+  if (shouldAutoImportStatRuntime(rootStat, platformStat)) {
+    const statType = resolveUniStatType(uniStatistics)
+    const platform = process.env.UNI_PLATFORM
+    let autoImport = true
 
     if (process.env.NODE_ENV === 'production') {
       if (!process.UNI_STAT_CONFIG.appid) {
-        uniStatLog(uniI18n.__('pluginUni.uniStatisticsNoAppid', {
-          0: 'https://ask.dcloud.net.cn/article/36303'
-        }))
+        uniStatLog(STAT_WARN_NO_APPID)
+        autoImport = false
       } else {
-        if (!uniStatistics.version) {
-          uniStatLog(uniI18n.__('pluginUni.uniStatisticsNoVersion', {
-            0: 'https://uniapp.dcloud.io/uni-stat-v2.html'
-          }))
-        } else {
-          uniStatLog(`已开启 uni统计${uniStatistics.version}.0 版本`)
-          if (version === '2') {
-            uniStatLog(
-              '【重要】因 HBuilderX 3.4.9 版本起，uni统计2.0 调整了安卓端 deviceId 获取方式，导致 uni统计2.0 App-Android平台部分统计数据不准确。如使用了HBuilderX 3.4.9 - 3.6.4版本且开通了uni统计2.0的应用，需要使用HBuilderX3.6.7及以上版本重新发布应用并升级 uniAdmin 云函数解决，详见：https://ask.dcloud.net.cn/article/40097'
-            )
-          }
+        logStatEnabledTip(platform, statType)
+        if (statType === 'private') {
+          uniStatLog(STAT_PRIVATE_ANDROID_WARN)
         }
       }
     } else {
-      if (!uniStatistics.version) {
-        uniStatLog(uniI18n.__('pluginUni.uniStatisticsNoVersion', {
-          0: 'https://uniapp.dcloud.io/uni-stat-v2.html'
-        }))
-      } else {
-        uniStatLog(`已开启 uni统计${uniStatistics.version}.0 版本`)
-        if (version === '2') {
-          uniStatLog(
-            '【重要】因 HBuilderX 3.4.9 版本起，uni统计2.0 调整了安卓端 deviceId 获取方式，导致 uni统计2.0 App-Android平台部分统计数据不准确。如使用了HBuilderX 3.4.9 - 3.6.4版本且开通了uni统计2.0的应用，需要使用HBuilderX3.6.7及以上版本重新发布应用并升级 uniAdmin 云函数解决，详见：https://ask.dcloud.net.cn/article/40097'
-          )
-        }
+      logStatEnabledTip(platform, statType)
+      if (statType === 'private') {
+        uniStatLog(STAT_PRIVATE_ANDROID_WARN)
       }
     }
+
+    if (autoImport) {
+      process.env.UNI_USING_STAT = statType
+      const uniCloudConfig = uniStatistics.uniCloud || {}
+      process.env.UNI_STAT_UNI_CLOUD = JSON.stringify(uniCloudConfig)
+    }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.2-5000620260331001",
+  "version": "2.0.2-5010420260703001",
   "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.2-5000620260331001",
+    "@dcloudio/uni-stat": "^2.0.2-5010420260703001",
     "buffer-json": "^2.0.0",
     "clone-deep": "^4.0.1",
     "cross-env": "^5.2.0",
@@ -41,5 +41,5 @@
     "copy-webpack-plugin": ">=5",
     "postcss": ">=7"
   },
-  "gitHead": "13a6e3256dc24fa617dd712ee1181139ba703dff"
+  "gitHead": "1c5133598ec498d2b70a910c263433697d8dcc0e"
 }

package/packages/app-vue-style-loader/lib/addStylesClient.js

@@ -3,13 +3,13 @@
   Author Tobias Koppers @sokra
   Modified by Evan You @yyx990803
 */
-const {
-  createRpx2Unit,
-  getRpx2Unit
-} = require('@dcloudio/uni-cli-shared/lib/style')
+const styleUtils = require('@dcloudio/uni-cli-shared/lib/style')
 
 import listToStyles from './listToStyles'
 
+const createRpx2Unit = styleUtils.createRpx2Unit
+const getRpx2Unit = styleUtils.getRpx2Unit
+
 var hasDocument = typeof document !== 'undefined'
 
 if (typeof DEBUG !== 'undefined' && DEBUG) {

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

@@ -1,6 +1,6 @@
 /*!
  * Vue.js v2.6.11
- * (c) 2014-2022 Evan You
+ * (c) 2014-2026 Evan You
  * Released under the MIT License.
  */
 'use strict';
@@ -526,7 +526,7 @@ var hasProto = '__proto__' in {};
 var inBrowser = typeof window !== 'undefined';
 var inWeex = typeof WXEnvironment !== 'undefined' && !!WXEnvironment.platform;
 var weexPlatform = inWeex && WXEnvironment.platform.toLowerCase();
-var UA = inBrowser && window.navigator.userAgent.toLowerCase();
+var UA = inBrowser && window.navigator && window.navigator.userAgent && window.navigator.userAgent.toLowerCase();
 var isIE = UA && /msie|trident/.test(UA);
 var isIE9 = UA && UA.indexOf('msie 9.0') > 0;
 var isEdge = UA && UA.indexOf('edge/') > 0;
@@ -1004,7 +1004,8 @@ function observe (value, asRootData) {
     !isServerRendering() &&
     (Array.isArray(value) || isPlainObject(value)) &&
     Object.isExtensible(value) &&
-    !value._isVue
+    !value._isVue &&
+    !value.__v_isMPComponent
   ) {
     ob = new Observer(value);
   }
@@ -2718,7 +2719,8 @@ function renderSlot (
   name,
   fallback,
   props,
-  bindObject
+  bindObject,
+  slotVm
 ) {
   var scopedSlotFn = this.$scopedSlots[name];
   var nodes;
@@ -2734,7 +2736,7 @@ function renderSlot (
       props = extend(extend({}, bindObject), props);
     }
     // fixed by xxxxxx app-plus scopedSlot
-    nodes = scopedSlotFn(props, this, props._i) || fallback;
+    nodes = scopedSlotFn(props, slotVm || this, props._i) || fallback;
   } else {
     nodes = this.$slots[name] || fallback;
   }
@@ -7937,11 +7939,67 @@ function getStyle (vnode, checkChild) {
 var cssVarRE = /^--/;
 var importantRE = /\s*!important$/;
 
+// rpx2rem
+var defaultRpx2Unit = {
+  unit: 'rem',
+  unitRatio: 10 / 320,
+  unitPrecision: 5
+};
+
+var Rpx2Unit = Object.assign({}, defaultRpx2Unit);
+
+function getRpx2Unit () {
+  return Rpx2Unit
+}
+
+function toFixed (number, precision) {
+  var multiplier = Math.pow(10, precision + 1);
+  var wholeNumber = Math.floor(number * multiplier);
+  return (Math.round(wholeNumber / 10) * 10) / multiplier
+}
+
+function _rpx2Unit (rpx, unit, unitRatio, unitPrecision) {
+  if (unitRatio === 1) {
+    return ("" + rpx + unit)
+  }
+  var value = toFixed(rpx * unitRatio, unitPrecision);
+  return value === 0 ? '0' : ("" + value + unit)
+}
+
+function createRpx2Unit (unit, unitRatio, unitPrecision) {
+  // ignore: rpxCalcIncludeWidth
+  /**
+   * @param {string | number} val
+   * @returns {string}
+   */
+  return function (val) {
+    if (typeof val === 'string') {
+      return val.replace(unitRE, function (m, $1) {
+        if (!$1) {
+          return m
+        }
+
+        return _rpx2Unit(parseFloat($1), unit, unitRatio, unitPrecision)
+      })
+    } else if (typeof val === 'number') {
+      return _rpx2Unit(val, unit, unitRatio, unitPrecision)
+    }
+  }
+}
+
+var rpx2unit = createRpx2Unit(getRpx2Unit().unit, getRpx2Unit().unitRatio, getRpx2Unit().unitPrecision);
+
 // upx,rpx 正则匹配
 var unitRE = /\b([+-]?\d+(\.\d+)?)[r|u]px\b/g;
 
 var transformUnit = function (val) {
   if (typeof val === 'string') {
+    try {
+      var config = __uniConfig.globalStyle || __uniConfig.window || {};
+      if (config.dynamicRpx === true) {
+        return rpx2unit(val)
+      }
+    } catch (error) {}
     return val.replace(unitRE, function (a, b) {
       /* eslint-disable no-undef */
       return uni.upx2px(b) + 'px'
@@ -11552,12 +11610,17 @@ function genScopedSlot (
   el,
   state
 ) {
+  state.isInScopeSlot = true;
   var isLegacySyntax = el.attrsMap['slot-scope'];
   if (el.if && !el.ifProcessed && !isLegacySyntax) {
-    return genIf(el, state, genScopedSlot, "null")
+    var res$1 = genIf(el, state, genScopedSlot, "null");
+    state.isInScopeSlot = false;
+    return res$1
   }
   if (el.for && !el.forProcessed) {
-    return genFor(el, state, genScopedSlot)
+    var res$2 = genFor(el, state, genScopedSlot);
+    state.isInScopeSlot = false;
+    return res$2
   }
   var slotScope = el.slotScope === emptySlotScopeToken
     ? ""
@@ -11570,7 +11633,9 @@ function genScopedSlot (
       : genElement(el, state)) + "}";
   // reverse proxy v-slot without scope on this.$slots
   var reverseProxy = slotScope ? "" : ",proxy:true";
-  return ("{key:" + (el.slotTarget || "\"default\"") + ",fn:" + fn + reverseProxy + "}")
+  var res = "{key:" + (el.slotTarget || "\"default\"") + ",fn:" + fn + reverseProxy + "}";
+  state.isInScopeSlot = false;
+  return res
 }
 
 function genChildren (
@@ -11656,7 +11721,6 @@ function genComment (comment) {
 function genSlot (el, state) {
   var slotName = el.slotName || '"default"';
   var children = genChildren(el, state);
-  var res = "_t(" + slotName + (children ? ("," + children) : '');
   var attrs = el.attrs || el.dynamicAttrs
     ? genProps((el.attrs || []).concat(el.dynamicAttrs || []).map(function (attr) { return ({
         // slot props are camelized
@@ -11666,16 +11730,16 @@ function genSlot (el, state) {
       }); }))
     : null;
   var bind$$1 = el.attrsMap['v-bind'];
-  if ((attrs || bind$$1) && !children) {
-    res += ",null";
-  }
-  if (attrs) {
-    res += "," + attrs;
-  }
-  if (bind$$1) {
-    res += (attrs ? '' : ',null') + "," + bind$$1;
-  }
-  return res + ')'
+ 
+  var args = [];
+  args.push(slotName);
+  args.push(children || 'null');
+  args.push(attrs || 'null');
+  args.push(bind$$1 || 'null');
+  if (state.isInScopeSlot) {
+    args.push('_svm');
+  }
+  return ("_t(" + (args.join(',')) + ")")
 }
 
 // componentName is el.component, take it as argument to shun flow's pessimistic refinement