diff --git a/packages/uni-h5-vite/src/plugins/manifestJson.ts b/packages/uni-h5-vite/src/plugins/manifestJson.ts index 7fc062ed66adee450b4759bd99ea62c7a9bf24a6..9395ab9f474c57d3f9b21a4749c330b078e36d97 100644 --- a/packages/uni-h5-vite/src/plugins/manifestJson.ts +++ b/packages/uni-h5-vite/src/plugins/manifestJson.ts @@ -1,4 +1,4 @@ -import type { Plugin } from 'vite' +import type { Plugin, ResolvedConfig } from 'vite' import { defineUniManifestJsonPlugin, @@ -23,11 +23,13 @@ const defaultAsync = { export function uniManifestJsonPlugin(): Plugin { return defineUniManifestJsonPlugin((opts) => { + let resolvedConfig: ResolvedConfig return { name: 'uni:h5-manifest-json', enforce: 'pre', configResolved(config) { defaultRouter.assets = config.build.assetsDir + resolvedConfig = config }, transform(code, id) { if (!opts.filter(id)) { @@ -35,7 +37,11 @@ export function uniManifestJsonPlugin(): Plugin { } const manifest = parseJson(code) const { debug, h5 } = manifest - const router = { ...defaultRouter, ...((h5 && h5.router) || {}) } + const router = { + ...defaultRouter, + ...{ base: resolvedConfig.base }, + ...((h5 && h5.router) || {}), + } if (!router.base) { router.base = '/' } diff --git a/packages/uni-h5/dist/uni-h5.cjs.js b/packages/uni-h5/dist/uni-h5.cjs.js index de3c87b888fe357a0aadbdaa93a3f4d0fe6b336b..ba1d60795bb946b26952554cbe218e7543995c29 100644 --- a/packages/uni-h5/dist/uni-h5.cjs.js +++ b/packages/uni-h5/dist/uni-h5.cjs.js @@ -875,8 +875,8 @@ var index$C = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const baseUrl = __IMPORT_META_ENV_BASE_URL__; function addBase(filePath) { + const { base: baseUrl } = __uniConfig.router; if (uniShared.addLeadingSlash(filePath).indexOf(baseUrl) === 0) { return uniShared.addLeadingSlash(filePath); } diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js index 1405ba82c1d5e6841b4c7cd973daa406272b2e31..15863ee6088c4f441f605d1ddaa1ab079a04f22c 100644 --- a/packages/uni-h5/dist/uni-h5.es.js +++ b/packages/uni-h5/dist/uni-h5.es.js @@ -2013,8 +2013,8 @@ var index$y = /* @__PURE__ */ defineBuiltInComponent({ function findElem(vm) { return vm.$el; } -const baseUrl = import.meta.env.BASE_URL; function addBase(filePath) { + const { base: baseUrl } = __uniConfig.router; if (addLeadingSlash(filePath).indexOf(baseUrl) === 0) { return addLeadingSlash(filePath); } diff --git a/packages/uni-h5/src/platform/dom.ts b/packages/uni-h5/src/platform/dom.ts index 8a50fa7166b6c11ce6e86b68ef0ce2afbff7b36c..2caa7f5b6cb64bcffa33f9a3f682c41196032f3e 100644 --- a/packages/uni-h5/src/platform/dom.ts +++ b/packages/uni-h5/src/platform/dom.ts @@ -17,8 +17,9 @@ export function findElem(vm: ComponentPublicInstance) { return vm.$el } -const baseUrl = __IMPORT_META_ENV_BASE_URL__ +// const baseUrl = __IMPORT_META_ENV_BASE_URL__ function addBase(filePath: string) { + const { base: baseUrl } = __uniConfig.router! // filepath可能已经被补充了baseUrl if (addLeadingSlash(filePath).indexOf(baseUrl) === 0) { return addLeadingSlash(filePath)