From 901f7cb38eb089e851a704f41cd79cee4113cc97 Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Fri, 22 Apr 2022 13:34:30 +0800 Subject: [PATCH] feat: add default space --- .../lib/platforms/app-plus/index.js | 51 +++++++++++++++---- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js index 0dc7e52a9..5347a47dc 100644 --- a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js +++ b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js @@ -150,15 +150,7 @@ module.exports = function (pagesJson, userManifestJson, isAppView) { } ) - // 根节点配置了统计 - if (manifestJson.uniStatistics) { - manifestJson.plus.uniStatistics = merge.recursive( - true, - manifestJson.uniStatistics, - manifestJson.plus.uniStatistics - ) - delete manifestJson.uniStatistics - } + initUniStatistics(manifestJson) const splashscreenOptions = userManifestJson['app-plus'] && userManifestJson['app-plus'].splashscreen @@ -617,4 +609,45 @@ module.exports = function (pagesJson, userManifestJson, isAppView) { ) } return [app, manifest] +} + +function initUniStatistics (manifestJson) { + // 根节点配置了统计 + if (manifestJson.uniStatistics) { + manifestJson.plus.uniStatistics = merge.recursive( + true, + manifestJson.uniStatistics, + manifestJson.plus.uniStatistics + ) + delete manifestJson.uniStatistics + } + if (!process.env.UNI_CLOUD_SPACES) { + return + } + let spaces = [] + try { + spaces = JSON.parse(process.env.UNI_CLOUD_SPACES) + } catch (e) {} + if (!Array.isArray(spaces) || !spaces.length) { + return + } + const space = spaces[0] + if (!space) { + return + } + const uniStatistics = manifestJson.plus && manifestJson.plus.uniStatistics + if (!uniStatistics) { + return + } + if (uniStatistics.version === 2 || uniStatistics.version === '2') { + if (uniStatistics.uniCloud && uniStatistics.uniCloud.spaceId) { + return + } + uniStatistics.uniCloud = { + provider: space.provider, + spaceId: space.id, + clientSecret: space.clientSecret, + endpoint: space.apiEndpoint + } + } } -- GitLab