diff --git a/packages/uni-app-plus/dist/uni.runtime.esm.js b/packages/uni-app-plus/dist/uni.runtime.esm.js index 2d99c29be262a23e1b37c5f78995682a1a23256a..9372956283d236a6d587f8ea41b5d817ceba687d 100644 --- a/packages/uni-app-plus/dist/uni.runtime.esm.js +++ b/packages/uni-app-plus/dist/uni.runtime.esm.js @@ -13374,11 +13374,15 @@ function weexGetSystemInfoSync() { } const getDeviceInfo = defineSyncApi('getDeviceInfo', () => { weexGetSystemInfoSync(); - const { deviceBrand, deviceModel, osName, osVersion } = systemInfo; + const { deviceBrand, deviceModel, osName, osVersion, deviceOrientation, deviceType, } = systemInfo; const brand = deviceBrand.toLowerCase(); return { deviceBrand: brand, deviceModel, + devicePixelRatio: plus.screen.scale, + deviceId: deviceId$1(), + deviceOrientation, + deviceType, brand, model: deviceModel, system: `${osName === 'ios' ? 'iOS' : 'Android'} ${osVersion}`, @@ -13417,15 +13421,12 @@ const getSystemInfoSync = defineSyncApi('getSystemInfoSync', () => { const appBaseInfo = getAppBaseInfo(); _initSystemInfo = true; const { osName, osLanguage, osVersion } = systemInfo; - const { pixelRatio } = windowInfo; const osLanguageSplit = osLanguage.split('-'); const osLanguageSplitLast = osLanguageSplit[osLanguageSplit.length - 1]; let _osLanguage = `${osLanguageSplit[0]}${osLanguageSplitLast ? '-' + osLanguageSplitLast : ''}`; let extraData = { errMsg: 'getSystemInfo:ok', fontSizeSetting: appBaseInfo.hostFontSizeSetting, - devicePixelRatio: pixelRatio, - deviceId: deviceId$1(), uniCompileVersion: __uniConfig.compilerVersion, uniRuntimeVersion: __uniConfig.compilerVersion, osLanguage: _osLanguage, @@ -13434,7 +13435,7 @@ const getSystemInfoSync = defineSyncApi('getSystemInfoSync', () => { extraData.romName = osName; extraData.romVersion = osVersion; } - const _systemInfo = extend(windowInfo, systemInfo, deviceInfo, appBaseInfo, extraData); + const _systemInfo = extend(systemInfo, windowInfo, deviceInfo, appBaseInfo, extraData); delete _systemInfo.screenTop; delete _systemInfo.enableDebug; delete _systemInfo.theme; diff --git a/packages/uni-cloud/lib/uni.plugin.js b/packages/uni-cloud/lib/uni.plugin.js index 8899617feb8db8a4c4f02033d33f8a9c0d0a7c14..78be5e99fc2ed0c39b71ac62ef7e0b04d4ec0808 100644 --- a/packages/uni-cloud/lib/uni.plugin.js +++ b/packages/uni-cloud/lib/uni.plugin.js @@ -71,6 +71,9 @@ function initUniCloudEnv() { } spaces.forEach((s) => uniCloudSpaces.push(s)); process.env.UNI_CLOUD_PROVIDER = JSON.stringify(uniCloudSpaces.map((space) => { + if (space.provider === 'tcb') { + space.provider = 'tencent'; + } if (space.clientSecret) { return { provider: space.provider || 'aliyun', diff --git a/packages/uni-h5/dist/uni-h5.cjs.js b/packages/uni-h5/dist/uni-h5.cjs.js index f827275ff805166794fd73eedd72abe66df77e69..733c79cdb8d27f110a5ed781cc678179a7ab84f5 100644 --- a/packages/uni-h5/dist/uni-h5.cjs.js +++ b/packages/uni-h5/dist/uni-h5.cjs.js @@ -10021,6 +10021,20 @@ const getStorageInfoSync = /* @__PURE__ */ defineSyncApi("getStorageInfoSync", ( const getStorageInfo = /* @__PURE__ */ defineAsyncApi("getStorageInfo", (_, { resolve }) => { resolve(getStorageInfoSync()); }); +const UUID_KEY = "__DC_STAT_UUID"; +const storage = window.localStorage || window.sessionStorage || {}; +let deviceId; +function deviceId$1() { + deviceId = deviceId || storage[UUID_KEY]; + if (!deviceId) { + deviceId = Date.now() + "" + Math.floor(Math.random() * 1e7); + try { + storage[UUID_KEY] = deviceId; + } catch (error) { + } + } + return deviceId; +} let browserInfo; function initBrowserInfo() { { @@ -10029,10 +10043,23 @@ function initBrowserInfo() { } const getDeviceInfo = /* @__PURE__ */ defineSyncApi("getDeviceInfo", () => { initBrowserInfo(); - const { deviceBrand, deviceModel, brand, model, platform, system } = browserInfo; + const { + deviceBrand, + deviceModel, + brand, + model, + platform, + system, + deviceOrientation, + deviceType + } = browserInfo; return { deviceBrand, deviceModel, + devicePixelRatio: window.devicePixelRatio, + deviceId: deviceId$1(), + deviceOrientation, + deviceType, brand, model, system, diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js index 7022145b2b877d1c85841b85900a94403ec587f8..5c9772f2d9a8bb48399c7f8868a9b9a813c7e761 100644 --- a/packages/uni-h5/dist/uni-h5.es.js +++ b/packages/uni-h5/dist/uni-h5.es.js @@ -16417,7 +16417,7 @@ function getBrowserInfo() { osversion += ` x${framework[1]}`; } } else if (isMac) { - osname = "Mac"; + osname = "macOS"; const _osversion = osversionFind && osversionFind.match(/Mac OS X (.+)/) || ""; if (osversion) { osversion = _osversion[1].replace(/_/g, "."); @@ -16532,10 +16532,23 @@ function initBrowserInfo() { } const getDeviceInfo = /* @__PURE__ */ defineSyncApi("getDeviceInfo", () => { initBrowserInfo(); - const { deviceBrand, deviceModel, brand, model, platform, system } = browserInfo; + const { + deviceBrand, + deviceModel, + brand, + model, + platform, + system, + deviceOrientation, + deviceType + } = browserInfo; return { deviceBrand, deviceModel, + devicePixelRatio: window.devicePixelRatio, + deviceId: deviceId$1(), + deviceOrientation, + deviceType, brand, model, system, @@ -16573,24 +16586,11 @@ const getSystemInfoSync = /* @__PURE__ */ defineSyncApi("getSystemInfoSync", () const deviceInfo = getDeviceInfo(); const appBaseInfo = getAppBaseInfo(); _initBrowserInfo = true; - const { - ua: ua2, - deviceType, - browserName, - browseVersion, - osname, - osversion, - deviceOrientation - } = browserInfo; - const { pixelRatio: pixelRatio2 } = windowInfo; + const { ua: ua2, browserName, browseVersion, osname, osversion } = browserInfo; const systemInfo = extend(windowInfo, deviceInfo, appBaseInfo, { ua: ua2, - deviceType, browserName, browseVersion, - deviceId: deviceId$1(), - devicePixelRatio: pixelRatio2, - deviceOrientation, uniPlatform: "web", uniCompileVersion: __uniConfig.compilerVersion, uniRuntimeVersion: __uniConfig.compilerVersion, diff --git a/packages/uni-mp-alipay/dist/uni.api.esm.js b/packages/uni-mp-alipay/dist/uni.api.esm.js index c04c9f67c1755eabf94b709d170d987de7ecbfe9..97de436e307e0eb37b0dc1fa603c594c4e71b2f9 100644 --- a/packages/uni-mp-alipay/dist/uni.api.esm.js +++ b/packages/uni-mp-alipay/dist/uni.api.esm.js @@ -961,7 +961,7 @@ function populateParameters(fromRes, toRes) { osVersion, hostTheme: theme, hostVersion, - hostLanguage: language.split('_', '-'), + hostLanguage: language.replace('_', '-'), hostName: _hostName, hostSDKVersion: _SDKVersion, hostFontSizeSetting: fontSizeSetting, diff --git a/packages/uni-mp-baidu/dist/uni.api.esm.js b/packages/uni-mp-baidu/dist/uni.api.esm.js index f2bad3182be26c5f41676003e58c7ab3747b36e7..2d0d448b9d8b94968ddb6d5eb21d2b3bb284fb38 100644 --- a/packages/uni-mp-baidu/dist/uni.api.esm.js +++ b/packages/uni-mp-baidu/dist/uni.api.esm.js @@ -954,7 +954,7 @@ function populateParameters(fromRes, toRes) { osVersion, hostTheme: theme, hostVersion, - hostLanguage: language.split('_', '-'), + hostLanguage: language.replace('_', '-'), hostName: _hostName, hostSDKVersion: _SDKVersion, hostFontSizeSetting: fontSizeSetting, diff --git a/packages/uni-mp-kuaishou/dist/uni.api.esm.js b/packages/uni-mp-kuaishou/dist/uni.api.esm.js index d992370db81da9bb5c6823d4efa64da0dc2f6e24..4b88be0f8d2a88eac4d0d74e8e694573e281b314 100644 --- a/packages/uni-mp-kuaishou/dist/uni.api.esm.js +++ b/packages/uni-mp-kuaishou/dist/uni.api.esm.js @@ -960,7 +960,7 @@ function populateParameters(fromRes, toRes) { osVersion, hostTheme: theme, hostVersion, - hostLanguage: language.split('_', '-'), + hostLanguage: language.replace('_', '-'), hostName: _hostName, hostSDKVersion: _SDKVersion, hostFontSizeSetting: fontSizeSetting, diff --git a/packages/uni-mp-lark/dist/uni.api.esm.js b/packages/uni-mp-lark/dist/uni.api.esm.js index 483729163f2c230a7c262a07f9125af264cf909d..adbfd1da5cef91d07267e2424ddb33b04da7e980 100644 --- a/packages/uni-mp-lark/dist/uni.api.esm.js +++ b/packages/uni-mp-lark/dist/uni.api.esm.js @@ -948,7 +948,7 @@ function populateParameters(fromRes, toRes) { osVersion, hostTheme: theme, hostVersion, - hostLanguage: language.split('_', '-'), + hostLanguage: language.replace('_', '-'), hostName: _hostName, hostSDKVersion: _SDKVersion, hostFontSizeSetting: fontSizeSetting, diff --git a/packages/uni-mp-qq/dist/uni.api.esm.js b/packages/uni-mp-qq/dist/uni.api.esm.js index 428669001a0be51adbe6838db109c91fc7ef8f30..92e2f93685a6d29e5991cd4c731f07c6fbbdf817 100644 --- a/packages/uni-mp-qq/dist/uni.api.esm.js +++ b/packages/uni-mp-qq/dist/uni.api.esm.js @@ -958,7 +958,7 @@ function populateParameters(fromRes, toRes) { osVersion, hostTheme: theme, hostVersion, - hostLanguage: language.split('_', '-'), + hostLanguage: language.replace('_', '-'), hostName: _hostName, hostSDKVersion: _SDKVersion, hostFontSizeSetting: fontSizeSetting, diff --git a/packages/uni-mp-toutiao/dist/uni.api.esm.js b/packages/uni-mp-toutiao/dist/uni.api.esm.js index fa72bf4d12ab17f8cdadbc6a529522ed24d25f1a..254dc1cbd3c51e2eacdeef13f30479d7213b0c74 100644 --- a/packages/uni-mp-toutiao/dist/uni.api.esm.js +++ b/packages/uni-mp-toutiao/dist/uni.api.esm.js @@ -948,7 +948,7 @@ function populateParameters(fromRes, toRes) { osVersion, hostTheme: theme, hostVersion, - hostLanguage: language.split('_', '-'), + hostLanguage: language.replace('_', '-'), hostName: _hostName, hostSDKVersion: _SDKVersion, hostFontSizeSetting: fontSizeSetting, diff --git a/packages/uni-mp-weixin/dist/uni.api.esm.js b/packages/uni-mp-weixin/dist/uni.api.esm.js index d6f32558b3cc3a5576c2b29b713c61491cd972f9..4251103aa0ffee1479933a63ecd03b883a7c1a5d 100644 --- a/packages/uni-mp-weixin/dist/uni.api.esm.js +++ b/packages/uni-mp-weixin/dist/uni.api.esm.js @@ -929,7 +929,7 @@ function populateParameters(fromRes, toRes) { osVersion, hostTheme: theme, hostVersion, - hostLanguage: language.split('_', '-'), + hostLanguage: language.replace('_', '-'), hostName: _hostName, hostSDKVersion: _SDKVersion, hostFontSizeSetting: fontSizeSetting, diff --git a/packages/uni-mp-weixin/dist/uni.compiler.js b/packages/uni-mp-weixin/dist/uni.compiler.js index 305aa97f31e24dac90e3edea292cec011a2cdba0..05148b824e482f80d918f2c2bd95e28f7ec1461d 100644 --- a/packages/uni-mp-weixin/dist/uni.compiler.js +++ b/packages/uni-mp-weixin/dist/uni.compiler.js @@ -116,6 +116,7 @@ const customElements = [ 'page-meta', 'navigation-bar', 'match-media', + 'ad-custom', ]; const compilerOptions = { nodeTransforms: [uniCliShared.transformRef, uniCliShared.transformComponentLink, transformAd], diff --git a/packages/uni-quickapp-webview/dist/uni.api.esm.js b/packages/uni-quickapp-webview/dist/uni.api.esm.js index ee92bf998151a4aa3e200a92482089b9a83a7459..1720dc72f0cdc6edb0a343654be61b1d7d4296a8 100644 --- a/packages/uni-quickapp-webview/dist/uni.api.esm.js +++ b/packages/uni-quickapp-webview/dist/uni.api.esm.js @@ -957,7 +957,7 @@ function populateParameters(fromRes, toRes) { osVersion, hostTheme: theme, hostVersion, - hostLanguage: language.split('_', '-'), + hostLanguage: language.replace('_', '-'), hostName: _hostName, hostSDKVersion: _SDKVersion, hostFontSizeSetting: fontSizeSetting,