diff --git a/packages/vue-cli-plugin-uni/lib/env.js b/packages/vue-cli-plugin-uni/lib/env.js index 7b91755ed7978edc988f9b3bad31010c8f0effa0..45652a277b39b696e71bef519fcf488d362f41f3 100644 --- a/packages/vue-cli-plugin-uni/lib/env.js +++ b/packages/vue-cli-plugin-uni/lib/env.js @@ -21,7 +21,7 @@ if (process.env.UNI_INPUT_DIR && process.env.UNI_INPUT_DIR.indexOf('./') === 0) process.env.UNI_INPUT_DIR = process.env.UNI_INPUT_DIR || path.resolve(process.cwd(), defaultInputDir) const { - getManifestJson, + getManifestJson, isEnableUniPushV1, isEnableUniPushV2, isUniPushOffline @@ -66,8 +66,6 @@ process.env.VUE_APP_NAME = manifestJsonObj.name process.env.UNI_USING_V3_SCOPED = true -process.env.UNI_CLOUD_PROVIDER = JSON.stringify([]) - // 导出到小程序插件 process.env.UNI_MP_PLUGIN_EXPORT = JSON.stringify(Object.keys(platformOptions.plugins || {}).map(pluginName => platformOptions.plugins[pluginName].export)) @@ -75,7 +73,9 @@ process.env.UNI_MP_PLUGIN_EXPORT = JSON.stringify(Object.keys(platformOptions.pl const isH5 = !process.env.UNI_SUB_PLATFORM && process.env.UNI_PLATFORM === 'h5' const isProduction = process.env.NODE_ENV === 'production' -if (process.env.UNI_CLOUD_SPACES) { +// uniCloud +if (!process.env.UNI_CLOUD_PROVIDER && process.env.UNI_CLOUD_SPACES) { + process.env.UNI_CLOUD_PROVIDER = JSON.stringify([]) try { const spaces = JSON.parse(process.env.UNI_CLOUD_SPACES) if (Array.isArray(spaces)) { @@ -561,4 +561,4 @@ runByHBuilderX && console.log(uniI18n.__('compiling')) module.exports = { manifestPlatformOptions: platformOptions -} +} 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 fa828a72ba38477f7ec946d62b216512bf5b2791..5ff180dee6fcf1b7de8defbc929bd02beda67f3b 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 @@ -628,12 +628,12 @@ function initUniStatistics (manifestJson) { ) delete manifestJson.uniStatistics } - if (!process.env.UNI_CLOUD_SPACES) { + if (!process.env.UNI_CLOUD_PROVIDER) { return } let spaces = [] try { - spaces = JSON.parse(process.env.UNI_CLOUD_SPACES) + spaces = JSON.parse(process.env.UNI_CLOUD_PROVIDER) } catch (e) {} if (!Array.isArray(spaces) || !spaces.length) { return @@ -652,9 +652,9 @@ function initUniStatistics (manifestJson) { } uniStatistics.uniCloud = { provider: space.provider, - spaceId: space.id, + spaceId: space.spaceId, clientSecret: space.clientSecret, - endpoint: space.apiEndpoint + endpoint: space.endpoint } } -} +}