diff --git a/packages/uni-h5-vite/src/plugins/manifestJson.ts b/packages/uni-h5-vite/src/plugins/manifestJson.ts index 19e4723815ab39fc16db52cb840a1a85c0f60f66..7fc062ed66adee450b4759bd99ea62c7a9bf24a6 100644 --- a/packages/uni-h5-vite/src/plugins/manifestJson.ts +++ b/packages/uni-h5-vite/src/plugins/manifestJson.ts @@ -35,7 +35,6 @@ export function uniManifestJsonPlugin(): Plugin { } const manifest = parseJson(code) const { debug, h5 } = manifest - const appid = (manifest.appid || '').replace('__UNI__', '') const router = { ...defaultRouter, ...((h5 && h5.router) || {}) } if (!router.base) { router.base = '/' @@ -72,7 +71,11 @@ export function uniManifestJsonPlugin(): Plugin { 'column' return { - code: `export const appid = '${appid || ''}' + code: `export const appId = ${JSON.stringify(manifest.appid || '')} + export const appName = ${JSON.stringify(manifest.name || '')} + export const appVersion = ${JSON.stringify(manifest.versionName || '')} + export const appVersionCode = ${JSON.stringify(manifest.versionCode || '')} + export const debug = ${!!debug} export const nvue = ${JSON.stringify({ 'flex-direction': flexDirection, diff --git a/packages/uni-h5-vite/src/plugins/pagesJson.ts b/packages/uni-h5-vite/src/plugins/pagesJson.ts index 137b70f8b1eeec960b335ca5036f61cc566b1fc9..3be353a596796b775a74ab9ae54702178f0b9fa5 100644 --- a/packages/uni-h5-vite/src/plugins/pagesJson.ts +++ b/packages/uni-h5-vite/src/plugins/pagesJson.ts @@ -53,7 +53,7 @@ function generatePagesJsonCode( return ` import { defineAsyncComponent, resolveComponent, createVNode, withCtx, openBlock, createBlock } from 'vue' import { PageComponent, AsyncLoadingComponent, AsyncErrorComponent, useI18n, setupWindow, setupPage } from '@dcloudio/uni-h5' -import { appid, debug, networkTimeout, router, async, sdkConfigs, qqMapKey, googleMapKey, nvue, locale, fallbackLocale } from './${MANIFEST_JSON_JS}' +import { appId, appName, appVersion, appVersionCode, debug, networkTimeout, router, async, sdkConfigs, qqMapKey, googleMapKey, nvue, locale, fallbackLocale } from './${MANIFEST_JSON_JS}' const locales = import.meta.globEager('./locale/*.json') ${importLayoutComponentsCode} const extend = Object.assign @@ -247,26 +247,15 @@ function generateConfig( pagesJson: Record, config: ResolvedConfig ) { - const extraParameters = { - appId: process.env.UNI_APP_ID, - appName: process.env.UNI_APP_NAME, - appVersion: process.env.UNI_APP_VERSION, - appVersionCode: process.env.UNI_APP_VERSION_CODE, - } - delete pagesJson.pages delete pagesJson.subPackages delete pagesJson.subpackages pagesJson.compilerVersion = process.env.UNI_COMPILER_VERSION - return ( - (config.command === 'serve' - ? '' - : `${globalName}['____'+appid+'____']=true -delete ${globalName}['____'+appid+'____'] -`) + - `${globalName}.__uniConfig=extend( - ${JSON.stringify(extraParameters)}, - ${JSON.stringify(pagesJson)},{ + return `${globalName}.__uniConfig=extend(${JSON.stringify(pagesJson)},{ + appId, + appName, + appVersion, + appVersionCode, async, debug, networkTimeout, @@ -280,5 +269,4 @@ delete ${globalName}['____'+appid+'____'] router, }) ` - ) } diff --git a/packages/uni-mp-core/src/api/protocols/enhanceSystemInfo.ts b/packages/uni-mp-core/src/api/protocols/enhanceSystemInfo.ts index dd762e736f5c78e4c49a6cf08858bf09aca955d0..4608a6326c4593acc38f819f681b2f07a3fcad8e 100644 --- a/packages/uni-mp-core/src/api/protocols/enhanceSystemInfo.ts +++ b/packages/uni-mp-core/src/api/protocols/enhanceSystemInfo.ts @@ -1,3 +1,4 @@ +import { extend } from '@vue/shared' import { getDeviceBrand } from '@dcloudio/uni-shared' const UUID_KEY = '__DC_STAT_UUID' @@ -125,5 +126,5 @@ export function populateParameters( browseVersion: '', } - Object.assign(toRes, parameters) + extend(toRes, parameters) } diff --git a/packages/vite-plugin-uni/src/index.ts b/packages/vite-plugin-uni/src/index.ts index afe98d271a446039761717339fae3f2138743070..ebb955a2a76d890afe53dd4c04216d263526ec5e 100644 --- a/packages/vite-plugin-uni/src/index.ts +++ b/packages/vite-plugin-uni/src/index.ts @@ -11,7 +11,6 @@ import { CopyOptions, initModuleAlias, initPreContext, - parseManifestJsonOnce, } from '@dcloudio/uni-cli-shared' import { createConfig } from './config' @@ -34,8 +33,6 @@ const debugUni = debug('uni:plugin') const pkg = require(path.resolve(__dirname, '../package.json')) -const manifestJson = parseManifestJsonOnce(process.env.UNI_INPUT_DIR) - initModuleAlias() rewriteCompilerSfcParse() @@ -45,10 +42,6 @@ process.env.UNI_COMPILER_VERSION_TYPE = pkg.version.includes('alpha') ? 'a' : 'r' -process.env.UNI_APP_ID = manifestJson.appid || '' -process.env.UNI_APP_NAME = manifestJson.name || '' -process.env.UNI_APP_VERSION = manifestJson.versionName || '' -process.env.UNI_APP_VERSION_CODE = manifestJson.versionCode || '' export interface VitePluginUniOptions { vueOptions?: VueOptions vueJsxOptions?: (VueJSXPluginOptions & { babelPlugins?: any[] }) | boolean