From f115e14882c64479b51fc382059b174390249606 Mon Sep 17 00:00:00 2001 From: qiang Date: Fri, 27 May 2022 14:50:23 +0800 Subject: [PATCH] chore: build --- packages/uni-app-plus/dist/uni.runtime.esm.js | 11 ++++--- packages/uni-cloud/lib/uni.plugin.js | 3 ++ packages/uni-h5/dist/uni-h5.cjs.js | 29 ++++++++++++++++- packages/uni-h5/dist/uni-h5.es.js | 32 +++++++++---------- packages/uni-mp-alipay/dist/uni.api.esm.js | 2 +- packages/uni-mp-baidu/dist/uni.api.esm.js | 2 +- packages/uni-mp-kuaishou/dist/uni.api.esm.js | 2 +- packages/uni-mp-lark/dist/uni.api.esm.js | 2 +- packages/uni-mp-qq/dist/uni.api.esm.js | 2 +- packages/uni-mp-toutiao/dist/uni.api.esm.js | 2 +- packages/uni-mp-weixin/dist/uni.api.esm.js | 2 +- packages/uni-mp-weixin/dist/uni.compiler.js | 1 + .../uni-quickapp-webview/dist/uni.api.esm.js | 2 +- 13 files changed, 62 insertions(+), 30 deletions(-) diff --git a/packages/uni-app-plus/dist/uni.runtime.esm.js b/packages/uni-app-plus/dist/uni.runtime.esm.js index 2d99c29be..937295628 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 8899617fe..78be5e99f 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 f827275ff..733c79cdb 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 7022145b2..5c9772f2d 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 c04c9f67c..97de436e3 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 f2bad3182..2d0d448b9 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 d992370db..4b88be0f8 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 483729163..adbfd1da5 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 428669001..92e2f9368 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 fa72bf4d1..254dc1cbd 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 d6f32558b..4251103aa 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 305aa97f3..05148b824 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 ee92bf998..1720dc72f 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, -- GitLab