@dcloudio/vue-cli-plugin-uni 2.0.2-4080720251210002 → 2.0.2-5000420260318002

package/lib/chain-webpack.js

@@ -149,9 +149,7 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
 
     platformOptions.chainWebpack(webpackConfig, vueOptions, api)
     // define
-    const deferredCreated = process.env.UNI_PLATFORM === 'mp-toutiao' ||
-      process.env.UNI_PLATFORM === 'quickapp-webview' ||
-      process.env.UNI_PLATFORM === 'mp-harmony'
+    const deferredCreated = process.env.UNI_PLATFORM === 'mp-toutiao' || process.env.UNI_PLATFORM === 'quickapp-webview'
     const defines = {
       // UNI_ENV好像没用
       __UNI_FEATURE_PROMISE__: JSON.stringify(false),

package/lib/env.js

@@ -141,12 +141,20 @@ if (!process.env.UNI_CLOUD_PROVIDER && process.env.UNI_CLOUD_SPACES) {
         }
         switch (space.provider) {
           case 'aliyun':
-          case 'dcloud':
             return {
               provider: space.provider || 'aliyun',
               spaceName: space.name,
               spaceId: space.id,
               clientSecret: space.clientSecret,
+              endpoint: space.apiEndpoint,
+              failoverEndpoint: space.failoverEndpoint
+            }
+          case 'dcloud':
+            return {
+              provider: space.provider || 'dcloud',
+              spaceName: space.name,
+              spaceId: space.id,
+              clientSecret: space.clientSecret,
               endpoint: space.apiEndpoint
             }
           case 'alipay': {
@@ -156,7 +164,9 @@ if (!process.env.UNI_CLOUD_PROVIDER && process.env.UNI_CLOUD_SPACES) {
               spaceId: space.id,
               spaceAppId: space.spaceAppId,
               accessKey: space.accessKey,
-              secretKey: space.secretKey
+              secretKey: space.secretKey,
+              endpoint: space.apiEndpoint,
+              failoverEndpoint: space.failoverEndpoint
             }
           }
           case 'tencent':
@@ -164,7 +174,8 @@ if (!process.env.UNI_CLOUD_PROVIDER && process.env.UNI_CLOUD_SPACES) {
             return {
               provider: space.provider,
               spaceName: space.name,
-              spaceId: space.id
+              spaceId: space.id,
+              failoverEndpoint: space.failoverEndpoint
             }
           }
         }

package/lib/mp/index.js

@@ -12,7 +12,8 @@ const {
   getPlatformUniCloud,
   createSource,
   deleteAsset,
-  getDevUniConsoleCode
+  getDevUniConsoleCode,
+  runByHBuilderX
 } = require('@dcloudio/uni-cli-shared')
 
 const WebpackUniAppPlugin = require('../../packages/webpack-uni-app-loader/plugin/index')
@@ -22,6 +23,7 @@ const modifyVueLoader = require('../vue-loader')
 const {
   createTemplateCacheLoader
 } = require('../cache-loader')
+const { getFilterPaths } = require('./utils')
 
 function createUniMPPlugin () {
   const WebpackUniMPPlugin = require('@dcloudio/webpack-uni-mp-loader/lib/plugin/index-new')
@@ -196,6 +198,16 @@ module.exports = {
       ...createWxMpIndependentPlugins()
     ]
 
+    try {
+      if (runByHBuilderX) {
+        require(path.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'uni_helpers/lib/bytenode'))
+        const {
+          UUWP
+        } = require(path.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'uni_helpers'))
+        plugins.push(new UUWP(getFilterPaths))
+      }
+    } catch (e) {}
+
     if ((process.env.UNI_SUBPACKGE || process.env.UNI_MP_PLUGIN) && process.env.UNI_SUBPACKGE !== 'main') {
       plugins.push(new PreprocessAssetsPlugin())
     }

package/lib/mp/utils.js

@@ -0,0 +1,55 @@
+const path = require('path')
+const fs = require('fs')
+const { parseJson } = require('@dcloudio/uni-cli-shared/lib/json')
+const { normalizePath } = require('@dcloudio/uni-cli-shared/lib/util')
+
+function getFilterPaths () {
+  const inputDir = normalizePath(process.env.UNI_INPUT_DIR)
+  const pagesJsonPath = path.join(inputDir, 'pages.json')
+  const pagesJson = parseJson(
+    fs.readFileSync(pagesJsonPath, 'utf-8'),
+    true
+  )
+  const allPagesJson = parseJson(
+    fs.readFileSync(pagesJsonPath, 'utf-8'),
+    false
+  )
+
+  const pages = pagesJson.pages.map(page =>
+    normalizePath(path.join(inputDir, page.path))
+  )
+  const allPages = allPagesJson.pages.map(page =>
+    normalizePath(path.join(inputDir, page.path))
+  )
+
+  const subPackages = (pagesJson.subPackages || pagesJson.subpackages || [])
+    .map(subPackage =>
+      subPackage.pages.map(page =>
+        normalizePath(path.join(inputDir, subPackage.root, page.path))
+      )
+    )
+    .flat()
+  const allSubPackages = (
+    allPagesJson.subPackages ||
+    allPagesJson.subpackages ||
+    []
+  )
+    .map(subPackage =>
+      subPackage.pages.map(page =>
+        normalizePath(path.join(inputDir, subPackage.root, page.path))
+      )
+    )
+    .flat()
+  const EXTNAME_VUE = ['.vue', '.nvue']
+  const filterFiles = [
+    ...allPages.filter(page => !pages.includes(page)),
+    ...allSubPackages.filter(page => !subPackages.includes(page))
+  ]
+    .map(file => EXTNAME_VUE.map(ext => file + ext))
+    .flat()
+  return filterFiles
+}
+
+module.exports = {
+  getFilterPaths
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.2-4080720251210002",
+  "version": "2.0.2-5000420260318002",
   "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-4080720251210002",
+    "@dcloudio/uni-stat": "^2.0.2-5000420260318002",
     "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": "18c75eccfcdabb303c0675cafdc44bc3cf58d7be"
+  "gitHead": "5ee212292b880f06dde5d198e5ceb09f9d3769e1"
 }

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

@@ -3,6 +3,10 @@
   Author Tobias Koppers @sokra
   Modified by Evan You @yyx990803
 */
+const {
+  createRpx2Unit,
+  getRpx2Unit
+} = require('@dcloudio/uni-cli-shared/lib/style')
 
 import listToStyles from './listToStyles'
 
@@ -230,6 +234,8 @@ var VAR_WINDOW_LEFT = /var\(--window-left\)/gi
 var VAR_WINDOW_RIGHT = /var\(--window-right\)/gi
 
 var statusBarHeight = false
+var rpx2unit = createRpx2Unit(getRpx2Unit().unit, getRpx2Unit().unitRatio, getRpx2Unit().unitPrecision)
+
 function processCss(css) {
 	if (!uni.canIUse('css.var')) { //不支持 css 变量
     if (statusBarHeight === false) {
@@ -246,9 +252,10 @@ function processCss(css) {
             .replace(VAR_WINDOW_LEFT, '0px')
             .replace(VAR_WINDOW_RIGHT, '0px')
 	}
+  const dynamicRpx = (__uniConfig.globalStyle || __uniConfig.window || {}).dynamicRpx === true
   return css.replace(/\{[\s\S]+?\}|@media.+?\{/g, function (css) {
     return css.replace(UPX_RE, function (a, b) {
-      return uni.upx2px(b) + 'px'
+      return dynamicRpx ? rpx2unit(b) : uni.upx2px(b) + 'px'
     })
   })
 }

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

@@ -3,6 +3,10 @@
   Author Tobias Koppers @sokra
   Modified by Evan You @yyx990803
 */
+const {
+	createRpx2Unit,
+	getRpx2Unit
+} = require('@dcloudio/uni-cli-shared/lib/style')
 
 import listToStyles from './listToStyles'
 
@@ -239,6 +243,9 @@ var VAR_WINDOW_BOTTOM = /var\(--window-bottom\)/gi
 var VAR_WINDOW_LEFT = /var\(--window-left\)/gi
 var VAR_WINDOW_RIGHT = /var\(--window-right\)/gi
 
+var rpx2unit = createRpx2Unit(getRpx2Unit().unit, getRpx2Unit().unitRatio, getRpx2Unit().unitPrecision)
+var dynamicRpx = null
+
 function processCss(css) {
 	var page = getPage()
 	if (typeof uni !== 'undefined' && !uni.canIUse('css.var')) { //不支持 css 变量
@@ -258,7 +265,10 @@ function processCss(css) {
         return css
       }
 			return css.replace(UPX_RE, function (a, b) {
-				return uni.upx2px(b) + 'px'
+				if (dynamicRpx === null) {
+					dynamicRpx = __uniConfig && (__uniConfig.globalStyle || __uniConfig.window || {}).dynamicRpx === true
+				}
+      	return dynamicRpx ? rpx2unit(b) : uni.upx2px(b) + 'px'
 			})
 		})
 }

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

@@ -1,6 +1,6 @@
 /*!
  * Vue.js v2.6.11
- * (c) 2014-2024 Evan You
+ * (c) 2014-2025 Evan You
  * Released under the MIT License.
  */
 /*  */
@@ -513,7 +513,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 && 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;
@@ -2677,7 +2677,8 @@ function renderSlot (
   name,
   fallback,
   props,
-  bindObject
+  bindObject,
+  slotVm
 ) {
   var scopedSlotFn = this.$scopedSlots[name];
   var nodes;
@@ -2693,7 +2694,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;
   }
@@ -5535,6 +5536,218 @@ function type(obj) {
     return Object.prototype.toString.call(obj)
 }
 
+/**
+ * rfdc v1.4.1
+ * David Mark Clements <david.clements@nearform.com>
+ * Really Fast Deep Clone
+ * [npm](https://www.npmjs.com/package/rfdc) [homePage](https://github.com/davidmarkclements/rfdc.git)
+ */
+
+/**
+ * @typedef {{proto?: boolean; circles?: boolean; reviver: (key: string, value: any) => any; constructorHandlers?: any[];}} Options
+ */
+
+function copyBuffer(cur) {
+  if (cur instanceof Buffer) {
+    return Buffer.from(cur)
+  }
+
+  return new cur.constructor(cur.buffer.slice(), cur.byteOffset, cur.length)
+}
+
+/**
+ *
+ * @param {Options} opts
+ * @returns {(o: any) => any}
+ */
+function rfdc(opts) {
+  opts = opts || {};
+  if (opts.circles) { return rfdcCircles(opts) }
+
+  var constructorHandlers = new Map();
+  constructorHandlers.set(Date, function (o) { return new Date(o); });
+  constructorHandlers.set(Map, function (o, fn) { return new Map(cloneArray(Array.from(o), fn)); });
+  constructorHandlers.set(Set, function (o, fn) { return new Set(cloneArray(Array.from(o), fn)); });
+  if (opts.constructorHandlers) {
+    opts.constructorHandlers.forEach(function (handler) {
+      constructorHandlers.set(handler[0], handler[1]);
+    });
+  }
+
+  var handler = null;
+
+  return opts.proto ? cloneProto : clone
+
+  function cloneArray(a, fn) {
+    var keys = Object.keys(a);
+    var a2 = new Array(keys.length);
+    for (var i = 0; i < keys.length; i++) {
+      var k = keys[i];
+      var cur = a[k];
+      if (typeof cur !== 'object' || cur === null) {
+        a2[k] = cur;
+      } else if (cur.constructor !== Object && (handler = constructorHandlers.get(cur.constructor))) {
+        a2[k] = handler(cur, fn);
+      } else if (ArrayBuffer.isView(cur)) {
+        a2[k] = copyBuffer(cur);
+      } else {
+        a2[k] = fn(cur);
+      }
+    }
+    return a2
+  }
+
+  function clone(o) {
+    if (typeof o !== 'object' || o === null) { return o }
+    if (Array.isArray(o)) { return cloneArray(o, clone) }
+    if (o.constructor !== Object && (handler = constructorHandlers.get(o.constructor))) {
+      return handler(o, clone)
+    }
+    var o2 = {};
+    for (var k in o) {
+      if (Object.hasOwnProperty.call(o, k) === false) { continue }
+      var cur = o[k];
+      if (typeof cur !== 'object' || cur === null) {
+        o2[k] = cur;
+      } else if (cur.constructor !== Object && (handler = constructorHandlers.get(cur.constructor))) {
+        o2[k] = handler(cur, clone);
+      } else if (ArrayBuffer.isView(cur)) {
+        o2[k] = copyBuffer(cur);
+      } else {
+        o2[k] = clone(opts.reviver ? opts.reviver(k, cur) : cur);
+      }
+    }
+    return o2
+  }
+
+  function cloneProto(o) {
+    if (typeof o !== 'object' || o === null) { return o }
+    if (Array.isArray(o)) { return cloneArray(o, cloneProto) }
+    if (o.constructor !== Object && (handler = constructorHandlers.get(o.constructor))) {
+      return handler(o, cloneProto)
+    }
+    var o2 = {};
+    for (var k in o) {
+      var cur = o[k];
+      if (typeof cur !== 'object' || cur === null) {
+        o2[k] = cur;
+      } else if (cur.constructor !== Object && (handler = constructorHandlers.get(cur.constructor))) {
+        o2[k] = handler(cur, cloneProto);
+      } else if (ArrayBuffer.isView(cur)) {
+        o2[k] = copyBuffer(cur);
+      } else {
+        o2[k] = cloneProto(opts.reviver ? opts.reviver(k, cur) : cur);
+      }
+    }
+    return o2
+  }
+}
+
+function rfdcCircles(opts) {
+  var refs = [];
+  var refsNew = [];
+
+  var constructorHandlers = new Map();
+  constructorHandlers.set(Date, function (o) { return new Date(o); });
+  constructorHandlers.set(Map, function (o, fn) { return new Map(cloneArray(Array.from(o), fn)); });
+  constructorHandlers.set(Set, function (o, fn) { return new Set(cloneArray(Array.from(o), fn)); });
+  if (opts.constructorHandlers) {
+    opts.constructorHandlers.forEach(function (handler) {
+      constructorHandlers.set(handler[0], handler[1]);
+    });
+  }
+
+  var handler = null;
+  return opts.proto ? cloneProto : clone
+
+  function cloneArray(a, fn) {
+    var keys = Object.keys(a);
+    var a2 = new Array(keys.length);
+    for (var i = 0; i < keys.length; i++) {
+      var k = keys[i];
+      var cur = a[k];
+      if (typeof cur !== 'object' || cur === null) {
+        a2[k] = cur;
+      } else if (cur.constructor !== Object && (handler = constructorHandlers.get(cur.constructor))) {
+        a2[k] = handler(cur, fn);
+      } else if (ArrayBuffer.isView(cur)) {
+        a2[k] = copyBuffer(cur);
+      } else {
+        var index = refs.indexOf(cur);
+        if (index !== -1) {
+          a2[k] = refsNew[index];
+        } else {
+          a2[k] = fn(cur);
+        }
+      }
+    }
+    return a2
+  }
+
+  function clone(o) {
+    if (typeof o !== 'object' || o === null) { return o }
+    if (Array.isArray(o)) { return cloneArray(o, clone) }
+    if (o.constructor !== Object && (handler = constructorHandlers.get(o.constructor))) {
+      return handler(o, clone)
+    }
+    var o2 = {};
+    refs.push(o);
+    refsNew.push(o2);
+    for (var k in o) {
+      if (Object.hasOwnProperty.call(o, k) === false) { continue }
+      var cur = o[k];
+      if (typeof cur !== 'object' || cur === null) {
+        o2[k] = cur;
+      } else if (cur.constructor !== Object && (handler = constructorHandlers.get(cur.constructor))) {
+        o2[k] = handler(cur, clone);
+      } else if (ArrayBuffer.isView(cur)) {
+        o2[k] = copyBuffer(cur);
+      } else {
+        var i = refs.indexOf(cur);
+        if (i !== -1) {
+          o2[k] = refsNew[i];
+        } else {
+          o2[k] = clone(opts.reviver ? opts.reviver(k, cur) : cur);
+        }
+      }
+    }
+    refs.pop();
+    refsNew.pop();
+    return o2
+  }
+
+  function cloneProto(o) {
+    if (typeof o !== 'object' || o === null) { return o }
+    if (Array.isArray(o)) { return cloneArray(o, cloneProto) }
+    if (o.constructor !== Object && (handler = constructorHandlers.get(o.constructor))) {
+      return handler(o, cloneProto)
+    }
+    var o2 = {};
+    refs.push(o);
+    refsNew.push(o2);
+    for (var k in o) {
+      var cur = o[k];
+      if (typeof cur !== 'object' || cur === null) {
+        o2[k] = cur;
+      } else if (cur.constructor !== Object && (handler = constructorHandlers.get(cur.constructor))) {
+        o2[k] = handler(cur, cloneProto);
+      } else if (ArrayBuffer.isView(cur)) {
+        o2[k] = copyBuffer(cur);
+      } else {
+        var i = refs.indexOf(cur);
+        if (i !== -1) {
+          o2[k] = refsNew[i];
+        } else {
+          o2[k] = cloneProto(opts.reviver ? opts.reviver(k, cur) : cur);
+        }
+      }
+    }
+    refs.pop();
+    refsNew.pop();
+    return o2
+  }
+}
+
 /*  */
 
 function flushCallbacks$1(vm) {
@@ -5608,6 +5821,8 @@ function clearInstance(key, value) {
   return value
 }
 
+var cloneDeepCircles = rfdc({ circles: true, reviver: clearInstance });
+
 function cloneWithData(vm) {
   // 确保当前 vm 所有数据被同步
   var ret = Object.create(null);
@@ -5639,7 +5854,7 @@ function cloneWithData(vm) {
     ret['value'] = vm.value;
   }
 
-  return JSON.parse(JSON.stringify(ret, clearInstance))
+  return cloneDeepCircles(ret)
 }
 
 var patch = function(oldVnode, vnode) {