Merge branch 'dcloudio:master' into master

zam157 · web-flow · commit 7bfe4c7550f5 · 2025-05-18T06:38:57.000+08:00
diff --git a/lerna.json b/lerna.json
@@ -10,5 +10,5 @@
       "message": "chore(release): publish %s"
     }
   },
-  "version": "2.0.2-4060420250429001"
+  "version": "2.0.2-4060520250512001"
 }
diff --git a/packages/uni-app-plus-nvue/package.json b/packages/uni-app-plus-nvue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-app-plus-nvue",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app app-plus-nvue",
   "main": "dist/index.js",
   "repository": {
diff --git a/packages/uni-app-plus/package.json b/packages/uni-app-plus/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-app-plus",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app app-plus",
   "main": "dist/index.js",
   "repository": {
diff --git a/packages/uni-app/package.json b/packages/uni-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-app",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app composition-api",
   "main": "dist/index.js",
   "repository": {
diff --git a/packages/uni-automator/package.json b/packages/uni-automator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-automator",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app automator",
   "main": "dist/index.js",
   "repository": {
diff --git a/packages/uni-cli-i18n/package.json b/packages/uni-cli-i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-i18n",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-cli-i18n",
   "main": "lib/index.js",
   "repository": {
diff --git a/packages/uni-cli-shared/package.json b/packages/uni-cli-shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
diff --git a/packages/uni-h5-ui/package.json b/packages/uni-h5-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-h5-ui",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app h5 ui",
   "main": "dist/index.umd.min.js",
   "repository": {
diff --git a/packages/uni-h5/package.json b/packages/uni-h5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-h5",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app h5",
   "main": "dist/index.umd.min.js",
   "repository": {
diff --git a/packages/uni-i18n/package.json b/packages/uni-i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-i18n",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "@dcloudio/uni-i18n",
   "main": "./dist/uni-i18n.cjs.js",
   "module": "./dist/uni-i18n.es.js",
diff --git a/packages/uni-migration/package.json b/packages/uni-migration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-migration",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app migration",
   "main": "lib/index.js",
   "repository": {
diff --git a/packages/uni-mp-alipay/package.json b/packages/uni-mp-alipay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-mp-alipay",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app mp-alipay",
   "main": "dist/index.js",
   "repository": {
diff --git a/packages/uni-mp-baidu/package.json b/packages/uni-mp-baidu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-mp-baidu",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app mp-baidu",
   "main": "dist/index.js",
   "repository": {
diff --git a/packages/uni-mp-harmony/package.json b/packages/uni-mp-harmony/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-mp-harmony",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app mp-harmony",
   "main": "dist/index.js",
   "repository": {
diff --git a/packages/uni-mp-jd/package.json b/packages/uni-mp-jd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-mp-jd",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app mp-jd",
   "main": "dist/index.js",
   "repository": {
diff --git a/packages/uni-mp-kuaishou/package.json b/packages/uni-mp-kuaishou/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-mp-kuaishou",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app mp-kuaishou",
   "main": "dist/index.js",
   "repository": {
diff --git a/packages/uni-mp-lark/package.json b/packages/uni-mp-lark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-mp-lark",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app mp-lark",
   "main": "dist/index.js",
   "repository": {
diff --git a/packages/uni-mp-qq/package.json b/packages/uni-mp-qq/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-mp-qq",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app mp-qq",
   "main": "dist/index.js",
   "repository": {
diff --git a/packages/uni-mp-toutiao/package.json b/packages/uni-mp-toutiao/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-mp-toutiao",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app mp-toutiao",
   "main": "dist/index.js",
   "repository": {
diff --git a/packages/uni-mp-vue/package.json b/packages/uni-mp-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-mp-vue",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "@dcloudio/uni-mp-vue",
   "main": "dist/vue.runtime.esm.js",
   "module": "dist/vue.runtime.esm.js",
diff --git a/packages/uni-mp-weixin/package.json b/packages/uni-mp-weixin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-mp-weixin",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app mp-weixin",
   "main": "dist/index.js",
   "repository": {
diff --git a/packages/uni-mp-xhs/package.json b/packages/uni-mp-xhs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-mp-xhs",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app mp-xhs",
   "main": "dist/index.js",
   "repository": {
diff --git a/packages/uni-quickapp-native/package.json b/packages/uni-quickapp-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-quickapp-native",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app quickapp-native",
   "main": "dist/vue.prod.js",
   "repository": {
diff --git a/packages/uni-quickapp-webview/package.json b/packages/uni-quickapp-webview/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-quickapp-webview",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app quickapp-webview",
   "main": "dist/index.js",
   "repository": {
diff --git a/packages/uni-stacktracey/package.json b/packages/uni-stacktracey/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-stacktracey",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "@dcloudio/uni-stacktracey",
   "main": "dist/uni-stacktracey.cjs.js",
   "module": "dist/uni-stacktracey.es.js",
diff --git a/packages/uni-stat/package.json b/packages/uni-stat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-stat",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "",
   "main": "dist/uni-stat.es.js",
   "repository": {
diff --git a/packages/uni-template-compiler/package.json b/packages/uni-template-compiler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-template-compiler",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-template-compiler",
   "main": "lib/index.js",
   "repository": {
diff --git a/packages/vue-cli-plugin-hbuilderx/package.json b/packages/vue-cli-plugin-hbuilderx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-hbuilderx",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "HBuilderX plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
diff --git a/packages/vue-cli-plugin-uni-optimize/package.json b/packages/vue-cli-plugin-uni-optimize/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-uni-optimize",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app optimize plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
diff --git a/packages/vue-cli-plugin-uni/package.json b/packages/vue-cli-plugin-uni/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "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-4060420250429001",
+    "@dcloudio/uni-stat": "^2.0.2-4060520250512001",
     "buffer-json": "^2.0.0",
     "clone-deep": "^4.0.1",
     "cross-env": "^5.2.0",
diff --git a/packages/webpack-uni-mp-loader/package.json b/packages/webpack-uni-mp-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/webpack-uni-mp-loader",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "webpack-uni-mp-loader",
   "main": "index.js",
   "repository": {
diff --git a/packages/webpack-uni-pages-loader/package.json b/packages/webpack-uni-pages-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/webpack-uni-pages-loader",
-  "version": "2.0.2-4060420250429001",
+  "version": "2.0.2-4060520250512001",
   "description": "uni-app pages.json loader",
   "main": "lib/index.js",
   "repository": {
@@ -21,7 +21,7 @@
     "strip-json-comments": "^2.0.1"
   },
   "uni-app": {
-    "compilerVersion": "4.64"
+    "compilerVersion": "4.65"
   },
   "gitHead": "9e2d0f8e244724fcd64880316c57d837d1778cf8"
 }
diff --git a/src/core/runtime/upx2px.js b/src/core/runtime/upx2px.js
@@ -5,11 +5,21 @@ let deviceWidth = 0
 let deviceDPR = 0
 
 function checkDeviceWidth () {
-  const { windowWidth, pixelRatio, platform } = __PLATFORM__ === 'mp-weixin'
-    ? Object.assign({}, __GLOBAL__.getWindowInfo(), {
-      platform: __GLOBAL__.getDeviceInfo().platform
-    })
-    : __GLOBAL__.getSystemInfoSync() // uni=>__GLOBAL__ runtime 编译目标是 uni 对象，内部不允许直接使用 uni
+  let windowWidth, pixelRatio, platform
+
+  if (__PLATFORM__ === 'mp-weixin') {
+    const windowInfo = typeof wx.getWindowInfo === 'function' && wx.getWindowInfo() ? wx.getWindowInfo() : wx.getSystemInfoSync()
+    const deviceInfo = typeof wx.getDeviceInfo === 'function' && wx.getDeviceInfo() ? wx.getDeviceInfo() : wx.getSystemInfoSync()
+
+    windowWidth = windowInfo.windowWidth
+    pixelRatio = windowInfo.pixelRatio
+    platform = deviceInfo.platform
+  } else {
+    const baseInfo = __GLOBAL__.getSystemInfoSync()
+    windowWidth = baseInfo.windowWidth
+    pixelRatio = baseInfo.pixelRatio
+    platform = baseInfo.platform
+  }
 
   deviceWidth = windowWidth
   deviceDPR = pixelRatio

Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,5 @@`
`10`	`10`	`"message": "chore(release): publish %s"`
`11`	`11`	`}`
`12`	`12`	`},`
`13`		`- "version": "2.0.2-4060420250429001"`
	`13`	`+ "version": "2.0.2-4060520250512001"`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dcloudio/uni-app-plus-nvue",`
`3`		`- "version": "2.0.2-4060420250429001",`
	`3`	`+ "version": "2.0.2-4060520250512001",`
`4`	`4`	`"description": "uni-app app-plus-nvue",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dcloudio/uni-app-plus",`
`3`		`- "version": "2.0.2-4060420250429001",`
	`3`	`+ "version": "2.0.2-4060520250512001",`
`4`	`4`	`"description": "uni-app app-plus",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dcloudio/uni-app",`
`3`		`- "version": "2.0.2-4060420250429001",`
	`3`	`+ "version": "2.0.2-4060520250512001",`
`4`	`4`	`"description": "uni-app composition-api",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dcloudio/uni-automator",`
`3`		`- "version": "2.0.2-4060420250429001",`
	`3`	`+ "version": "2.0.2-4060520250512001",`
`4`	`4`	`"description": "uni-app automator",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dcloudio/uni-cli-i18n",`
`3`		`- "version": "2.0.2-4060420250429001",`
	`3`	`+ "version": "2.0.2-4060520250512001",`
`4`	`4`	`"description": "uni-cli-i18n",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dcloudio/uni-cli-shared",`
`3`		`- "version": "2.0.2-4060420250429001",`
	`3`	`+ "version": "2.0.2-4060520250512001",`
`4`	`4`	`"description": "uni-cli-shared",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dcloudio/uni-h5-ui",`
`3`		`- "version": "2.0.2-4060420250429001",`
	`3`	`+ "version": "2.0.2-4060520250512001",`
`4`	`4`	`"description": "uni-app h5 ui",`
`5`	`5`	`"main": "dist/index.umd.min.js",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dcloudio/uni-h5",`
`3`		`- "version": "2.0.2-4060420250429001",`
	`3`	`+ "version": "2.0.2-4060520250512001",`
`4`	`4`	`"description": "uni-app h5",`
`5`	`5`	`"main": "dist/index.umd.min.js",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dcloudio/uni-i18n",`
`3`		`- "version": "2.0.2-4060420250429001",`
	`3`	`+ "version": "2.0.2-4060520250512001",`
`4`	`4`	`"description": "@dcloudio/uni-i18n",`
`5`	`5`	`"main": "./dist/uni-i18n.cjs.js",`
`6`	`6`	`"module": "./dist/uni-i18n.es.js",`