@module-federation/vite 1.16.6 → 1.16.8

package/lib/index.js

@@ -1,4 +1,4 @@
-import { _ as normalizePathForImport, a as getPackageName, c as hasPackageDependency, d as packageNameEncode, f as resolveImportPath, g as mfWarn, i as getPackageDetectionCwd, l as isNuxtProjectRoot, m as createModuleFederationError, n as getInstalledPackageJson, o as getPackageNameFromNodeModulePath, p as setPackageDetectionCwd, r as getIsRolldown, s as getSharedCacheKey, t as getInstalledPackageEntry, u as packageNameDecode, v as rebaseImport } from "./packageUtils-CYnJFfPP.js";
+import { _ as mfWarn, a as getIsRolldown, c as getPackageNameFromNodeModulePath, d as isNuxtProjectRoot, f as packageNameDecode, g as createModuleFederationError, h as setPackageDetectionCwd, i as getInstalledPackageJson, l as getSharedCacheKey, m as resolveImportPath, o as getPackageDetectionCwd, p as packageNameEncode, r as getInstalledPackageEntry, s as getPackageName, u as hasPackageDependency, v as normalizePathForImport, y as rebaseImport } from "./pluginDts-Cpmdbbr0.js";
 import { createRequire } from "node:module";
 import * as fs$1 from "fs";
 import { existsSync, readFileSync, realpathSync, statSync, writeFileSync } from "fs";
@@ -419,6 +419,7 @@ function getSuffix(name) {
 }
 const patternMap = {};
 const cacheMap = {};
+const idCacheMap = {};
 const VITE_ID_PREFIX = "/@id/";
 const VITE_ENCODED_NULL_BYTE_PREFIX = `${VITE_ID_PREFIX}__x00__`;
 function escapeRegExp$1(value) {
@@ -453,6 +454,8 @@ var VirtualModule = class VirtualModule {
 	suffix;
 	inited = false;
 	code;
+	importId;
+	importIdKey;
 	static findName(tag, str = "") {
 		if (!patternMap[tag]) patternMap[tag] = new RegExp(`(.*${packageNameEncode(tag)}(.+?)${packageNameEncode(tag)}.*)`);
 		const moduleName = (normalizeVirtualModuleId(str).match(patternMap[tag]) || [])[2];
@@ -464,7 +467,7 @@ var VirtualModule = class VirtualModule {
 	}
 	static findById(id) {
 		const normalized = normalizeVirtualModuleId(id);
-		for (const modules of Object.values(cacheMap)) for (const module of Object.values(modules)) if (module.getImportId() === normalized) return module;
+		return normalized.startsWith("virtual:mf:") ? idCacheMap[normalized] : void 0;
 	}
 	constructor(name, tag = "__mf_v__", suffix = "") {
 		this.name = name;
@@ -475,7 +478,13 @@ var VirtualModule = class VirtualModule {
 	}
 	getImportId() {
 		const { internalName: mfName } = getNormalizeModuleFederationOptions();
-		return `virtual:mf:${packageNameEncode(`${mfName}${this.tag}${this.name}${this.tag}`)}${this.suffix}`;
+		const importIdKey = `${mfName}${this.tag}${this.name}${this.tag}`;
+		if (this.importId && this.importIdKey === importIdKey) return this.importId;
+		if (this.importId) delete idCacheMap[this.importId];
+		this.importIdKey = importIdKey;
+		this.importId = `virtual:mf:${packageNameEncode(importIdKey)}${this.suffix}`;
+		idCacheMap[this.importId] = this;
+		return this.importId;
 	}
 	getResolvedId() {
 		return `\0${this.getImportId()}`;
@@ -1084,11 +1093,15 @@ function toViteOptimizedDepVirtualId(id) {
 	return toViteEncodedId(id);
 }
 function getCachedLoadSharePkg(id) {
+	if (!id.includes("__loadShare__")) return;
 	const normalized = normalizeVirtualModuleId(id);
 	if (!normalized.startsWith("virtual:mf:")) return;
-	const pkg = VirtualModule.findName(LOAD_SHARE_TAG, normalized);
-	if (!pkg) return;
-	return pkg;
+	const start = normalized.indexOf(LOAD_SHARE_TAG);
+	if (start === -1) return;
+	const encodedPkgStart = start + 13;
+	const end = normalized.indexOf(LOAD_SHARE_TAG, encodedPkgStart);
+	if (end === -1) return;
+	return packageNameDecode(normalized.slice(encodedPkgStart, end));
 }
 function materializeCachedLoadShareModule(options) {
 	const pkg = getCachedLoadSharePkg(options.id);
@@ -1263,13 +1276,8 @@ let invalidateLocalSharedImportMap;
 function setLocalSharedImportMapInvalidator(invalidator) {
 	invalidateLocalSharedImportMap = invalidator;
 }
-let prevLocalSharedImportMapContent;
 function writeLocalSharedImportMap() {
-	const nextContent = generateLocalSharedImportMap();
-	if (prevLocalSharedImportMapContent !== nextContent) {
-		prevLocalSharedImportMapContent = nextContent;
-		invalidateLocalSharedImportMap?.();
-	}
+	invalidateLocalSharedImportMap?.();
 }
 function shouldUseDirectReactImport() {
 	const isVinext = hasPackageDependency("vinext");
@@ -1380,10 +1388,36 @@ function getOrderedUsedShares() {
 			if (!pkg.endsWith("/")) shares.add(pkg);
 		});
 	} catch {}
-	return Array.from(shares).sort((a, b) => {
+	return orderSharedDependenciesFirst(Array.from(shares).sort((a, b) => {
 		const priority = (pkg) => pkg === "react" ? 0 : pkg === "react-dom" ? 1 : pkg.startsWith("react/") ? 2 : 3;
 		return priority(a) - priority(b) || a.localeCompare(b);
-	});
+	}));
+}
+function orderSharedDependenciesFirst(sharedPackages) {
+	const sharedKeyByPackageName = new Map(sharedPackages.map((pkg) => [getPackageName(pkg), pkg]));
+	const visiting = /* @__PURE__ */ new Set();
+	const visited = /* @__PURE__ */ new Set();
+	const ordered = [];
+	const visit = (pkg) => {
+		if (visited.has(pkg)) return;
+		if (visiting.has(pkg)) return;
+		visiting.add(pkg);
+		const packageJson = getInstalledPackageJson(pkg)?.packageJson;
+		const dependencies = {
+			...packageJson?.dependencies || {},
+			...packageJson?.peerDependencies || {},
+			...packageJson?.optionalDependencies || {}
+		};
+		Object.keys(dependencies).forEach((dependency) => {
+			const sharedDependency = sharedKeyByPackageName.get(dependency);
+			if (sharedDependency) visit(sharedDependency);
+		});
+		visiting.delete(pkg);
+		visited.add(pkg);
+		ordered.push(pkg);
+	};
+	sharedPackages.forEach(visit);
+	return ordered;
 }
 function getShareItemForPreload(pkg) {
 	const shared = getNormalizeModuleFederationOptions().shared;
@@ -1698,13 +1732,18 @@ function resolveRemoteInitMode(shareStrategy, consumer) {
 function shouldDeferRemoteLoad(initMode) {
 	return initMode === "loaded-first-client" || initMode === "loaded-first-unified";
 }
-/** Dev SSR only — build/preview client graphs must keep deferred proxies for static imports. */
-function clientNeedsRealRemoteForHydration(command, enableSsrInit) {
+/** Dev client wrappers can preload remotes while exposing stable proxies. */
+function shouldEagerLoadClientRemoteInDev(command, enableSsrInit) {
 	return enableSsrInit && command === "serve";
 }
-function shouldIncludeDeferredProxy(initMode, consumer, clientNeedsRealRemote, deferRemoteLoad) {
-	if (initMode === "eager") return consumer !== "server" && (consumer === "unified" || !clientNeedsRealRemote);
-	if (consumer === "client" && clientNeedsRealRemote) return false;
+function getEagerDeferredClientInit() {
+	return `__mfRemotePending = __mfStartRemoteLoad().then(__mfAssignRemoteModule);
+      exportModule = __mfCreateDeferredRemoteProxy();`;
+}
+function shouldIncludeDeferredProxy(initMode, consumer, eagerLoadClientRemote, deferRemoteLoad) {
+	if (eagerLoadClientRemote && consumer !== "server") return true;
+	if (initMode === "eager") return consumer !== "server" && (consumer === "unified" || !eagerLoadClientRemote);
+	if (consumer === "client" && eagerLoadClientRemote) return false;
 	return deferRemoteLoad || consumer !== "server";
 }
 /** Codegen shared by every remote virtual module (no top-level await). */
@@ -1883,16 +1922,16 @@ function generateRemotes(id, command, enableSsrInit = false, consumer = "unified
     }`;
 	const realRemoteInit = `__mfRemotePending = __mfStartRemoteLoad().then(__mfAssignRemoteModule);`;
 	const deferredClientInit = `exportModule = __mfCreateDeferredRemoteProxy();`;
-	const clientNeedsRealRemote = clientNeedsRealRemoteForHydration(command, enableSsrInit);
-	const eagerClientInit = clientNeedsRealRemote ? realRemoteInit : deferredClientInit;
-	const loadedFirstClientInit = clientNeedsRealRemote ? realRemoteInit : deferredClientInit;
+	const eagerLoadClientRemote = shouldEagerLoadClientRemoteInDev(command, enableSsrInit);
+	const eagerClientInit = eagerLoadClientRemote ? getEagerDeferredClientInit() : deferredClientInit;
+	const loadedFirstClientInit = eagerLoadClientRemote ? getEagerDeferredClientInit() : deferredClientInit;
 	const environmentSplitInit = (clientInit, serverInit) => consumer === "client" ? clientInit : consumer === "server" ? serverInit : `if (typeof window === "undefined") {
       ${serverInit}
     } else {
       ${clientInit}
     }`;
 	const initExportModule = initMode === "eager" ? environmentSplitInit(eagerClientInit, realRemoteInit) : environmentSplitInit(loadedFirstClientInit, realRemoteInit);
-	const includeProxyHelper = shouldIncludeDeferredProxy(initMode, consumer, clientNeedsRealRemote, deferRemoteLoad);
+	const includeProxyHelper = shouldIncludeDeferredProxy(initMode, consumer, eagerLoadClientRemote, deferRemoteLoad);
 	const deferredProxyCode = getDeferredProxyHelper(id);
 	return `
     ${importLine}
@@ -1909,6 +1948,36 @@ function generateRemotes(id, command, enableSsrInit = false, consumer = "unified
 }
 //#endregion
 //#region src/plugins/pluginAddEntry.ts
+const HOST_INIT_PRELOAD_CHUNKS = [
+	(name) => name === "hostInit",
+	(name) => name === "remoteEntry",
+	(name) => name.startsWith("_virtual_mf"),
+	(name) => name === "index"
+];
+function escapeHtmlAttr(value) {
+	return value.replace(/&/g, "&").replace(/"/g, """);
+}
+function getExistingHrefSet(html) {
+	return new Set(Array.from(html.matchAll(/\bhref\s*=\s*["']([^"']+)["']/gi), (match) => match[1]));
+}
+function injectHostInitPreloads(html, bundle, resolvePath) {
+	const existingHrefs = getExistingHrefSet(html);
+	const seenFiles = /* @__PURE__ */ new Set();
+	const hrefs = [];
+	for (const chunk of Object.values(bundle)) {
+		if (chunk.type !== "chunk") continue;
+		if (!HOST_INIT_PRELOAD_CHUNKS.some((match) => match(chunk.name))) continue;
+		if (seenFiles.has(chunk.fileName)) continue;
+		seenFiles.add(chunk.fileName);
+		const href = resolvePath(chunk.fileName);
+		if (existingHrefs.has(href)) continue;
+		existingHrefs.add(href);
+		hrefs.push(href);
+	}
+	if (hrefs.length === 0) return html;
+	const tags = hrefs.map((href) => `<link rel="modulepreload" crossorigin href="${escapeHtmlAttr(href)}">`).join("");
+	return html.includes("</head>") ? html.replace("</head>", `${tags}</head>`) : `${tags}${html}`;
+}
 function getFirstHtmlEntryFile(entryFiles) {
 	return entryFiles.find((file) => file.endsWith(".html"));
 }
@@ -2047,7 +2116,9 @@ const addEntry = ({ entryName, entryPath, fileName, inject = "entry", forceClien
   await Promise.allSettled(__mfRemotePreloads);` : `await initHost();`;
 		const importCode = `
 (async () => {
-  const { initHost } = await ${importExpression(initSrc)};
+  const __mfHostInit = await ${importExpression(initSrc)};
+  await __mfHostInit.__tla;
+  const { initHost } = __mfHostInit;
   ${preloadBlock}
 })().then(() => ${importExpression(entrySrc)});
 `;
@@ -2215,9 +2286,9 @@ const addEntry = ({ entryName, entryPath, fileName, inject = "entry", forceClien
 			emittedFileName = file;
 			const lastSlash = file.lastIndexOf("/");
 			bootstrapDir = lastSlash !== -1 ? file.slice(0, lastSlash + 1) : "";
-			const resolvePath = (htmlFileName) => {
-				if (!viteConfig.experimental?.renderBuiltUrl) return viteConfig.base + file;
-				const result = viteConfig.experimental.renderBuiltUrl(file, {
+			const resolvePath = (builtFileName, htmlFileName) => {
+				if (!viteConfig.experimental?.renderBuiltUrl) return viteConfig.base + builtFileName;
+				const result = viteConfig.experimental.renderBuiltUrl(builtFileName, {
 					hostId: htmlFileName,
 					hostType: "html",
 					type: "asset",
@@ -2227,11 +2298,11 @@ const addEntry = ({ entryName, entryPath, fileName, inject = "entry", forceClien
 				if (result && typeof result === "object") {
 					if ("runtime" in result) {
 						mfWarn("renderBuiltUrl returned runtime code for HTML injection. Runtime code cannot be used in <script src=\"\">. Falling back to base path.");
-						return viteConfig.base + file;
+						return viteConfig.base + builtFileName;
 					}
-					if (result.relative) return file;
+					if (result.relative) return builtFileName;
 				}
-				return viteConfig.base + file;
+				return viteConfig.base + builtFileName;
 			};
 			const basePrefix = viteConfig.base?.replace(/\/$/, "") ?? "";
 			const stripBase = (p) => basePrefix && p.startsWith(basePrefix + "/") ? p.slice(basePrefix.length) : p;
@@ -2240,7 +2311,7 @@ const addEntry = ({ entryName, entryPath, fileName, inject = "entry", forceClien
 				let htmlAsset = bundle[fileName];
 				if (htmlAsset.type === "chunk") return;
 				let htmlContent = htmlAsset.source.toString() || "";
-				const initPath = resolvePath(fileName);
+				const initPath = resolvePath(file, fileName);
 				const scriptRegex = /<script\b(?=[^>]*\btype=["']module["'])(?=[^>]*\bsrc=["']([^"']+)["'])[^>]*>\s*<\/script>/gi;
 				let rewritten = false;
 				htmlContent = htmlContent.replace(scriptRegex, (scriptTag, entrySrc) => {
@@ -2260,15 +2331,15 @@ const addEntry = ({ entryName, entryPath, fileName, inject = "entry", forceClien
 				});
 				if (!rewritten) {
 					const svelteKitHtml = rewriteSvelteKitInlineStart(htmlContent, initPath);
-					if (svelteKitHtml !== htmlContent) {
-						htmlAsset.source = svelteKitHtml;
-						continue;
-					}
-					const scriptContent = `
+					if (svelteKitHtml !== htmlContent) htmlContent = svelteKitHtml;
+					else {
+						const scriptContent = `
           <script type="module" src="${initPath}"><\/script>
         `;
-					htmlContent = htmlContent.replace("<head>", `<head>${scriptContent}`);
+						htmlContent = htmlContent.replace("<head>", `<head>${scriptContent}`);
+					}
 				}
+				if (waitsForInit) htmlContent = injectHostInitPreloads(htmlContent, bundle, (builtFileName) => resolvePath(builtFileName, fileName));
 				htmlAsset.source = htmlContent;
 			}
 		},
@@ -2408,7 +2479,7 @@ const REACT_REFRESH_PROXY_MODULE = [
 ].join("\n");
 const reactAdapter = {
 	name: "react",
-	pluginNames: ["vite:react-refresh", "vite:react-swc:refresh"],
+	pluginNames: ["vite:react-refresh", "vite:react-swc"],
 	remote: { configureServer({ server }) {
 		let reactRefreshRuntime;
 		server.middlewares.use((req, res, next) => {
@@ -3372,6 +3443,34 @@ function generateRemoteEntrySSR(options) {
 function getBuildVersion() {
 	return process.env["MF_BUILD_VERSION"] ?? "1.0.0";
 }
+/**
+* Builds the manifest `metaData.types` entry.
+*
+* When type generation is enabled, the dts plugin serves the type archive
+* (`<typesFolder>.zip`) and api file (`<typesFolder>.d.ts`). Consumers using
+* `@module-federation/dts-plugin` read `metaData.types.zip` to download those
+* types and throw `Can not get <remote>'s types archive url!` when it is absent.
+* Advertising the relative paths here (resolved against `publicPath` by the
+* consumer) mirrors the webpack/rspack (`@module-federation/enhanced`) plugins.
+*/
+function resolveTypesMeta(dts) {
+	if (dts === false) return {
+		path: "",
+		name: ""
+	};
+	const generateTypes = typeof dts === "object" && dts ? dts.generateTypes : void 0;
+	if (generateTypes === false) return {
+		path: "",
+		name: ""
+	};
+	const typesFolder = typeof generateTypes === "object" && generateTypes?.typesFolder || "@mf-types";
+	return {
+		path: "",
+		name: "",
+		zip: `${typesFolder}.zip`,
+		api: `${typesFolder}.d.ts`
+	};
+}
 const Manifest = () => {
 	const mfOptions = getNormalizeModuleFederationOptions();
 	const { name, filename, getPublicPath, manifest: manifestOptions, varFilename } = mfOptions;
@@ -3435,10 +3534,7 @@ const Manifest = () => {
 									path: "",
 									type: "var"
 								} : void 0,
-								types: {
-									path: "",
-									name: ""
-								},
+								types: resolveTypesMeta(mfOptions.dts),
 								globalName: name,
 								pluginVersion: "0.2.5",
 								publicPath
@@ -3589,10 +3685,7 @@ const Manifest = () => {
 				remoteEntry,
 				ssrRemoteEntry,
 				varRemoteEntry,
-				types: {
-					path: "",
-					name: ""
-				},
+				types: resolveTypesMeta(options.dts),
 				globalName: name,
 				pluginVersion: "0.2.5",
 				...!!getPublicPath ? { getPublicPath } : { publicPath }
@@ -3676,7 +3769,7 @@ function resetIdleTimeout(timeout) {
 	}, timeout * 1e3);
 }
 function pluginModuleParseEnd_default(excludeFn, options) {
-	const idleTimeout = options.moduleParseIdleTimeout;
+	const idleTimeout = options.moduleParseIdleTimeout ?? options.moduleParseTimeout;
 	return [
 		{
 			name: "_",
@@ -3711,6 +3804,9 @@ function pluginModuleParseEnd_default(excludeFn, options) {
 				if (excludeFn(id)) return;
 				parseEndSet.add(id);
 				if (parseStartSet.size === parseEndSet.size && (!expectsExposesParseEnd || exposesParseEnd)) _resolve?.(1);
+			},
+			buildEnd() {
+				_resolve?.(1);
 			}
 		}
 	];
@@ -3973,8 +4069,42 @@ function matchesSharedSource(source, key) {
 	return source === keyBase;
 }
 function findSharedKey(source, shared) {
-	const keys = Object.keys(shared || {});
-	return keys.find((key) => source === key) ?? keys.find((key) => matchesSharedSource(source, key));
+	return getSharedKeyMatcher(shared).find(source);
+}
+const emptySharedKeyMatcher = { find: () => void 0 };
+const sharedKeyMatcherCache = /* @__PURE__ */ new WeakMap();
+function getSharedKeyMatcher(shared) {
+	if (!shared) return emptySharedKeyMatcher;
+	const cached = sharedKeyMatcherCache.get(shared);
+	if (cached) return cached;
+	const keys = Object.keys(shared);
+	const exactKeys = new Set(keys);
+	const commonSubpathKeys = /* @__PURE__ */ new Map();
+	const wildcardKeys = [];
+	let vueKey;
+	for (const key of keys) {
+		const keyBase = key.endsWith("/") ? key.slice(0, -1) : key;
+		if (!vueKey && keyBase === "vue") vueKey = key;
+		if (key.endsWith("/")) wildcardKeys.push({
+			key,
+			base: keyBase
+		});
+		for (const subpath of getCommonSharedSubpaths(keyBase)) if (!commonSubpathKeys.has(subpath)) commonSubpathKeys.set(subpath, key);
+	}
+	const sourceCache = /* @__PURE__ */ new Map();
+	const matcher = { find(source) {
+		if (sourceCache.has(source)) return sourceCache.get(source);
+		let result = exactKeys.has(source) ? source : void 0;
+		if (!result && vueKey) {
+			if (source === "vue/dist/vue.esm-bundler.js" || source === "vue/dist/vue.runtime.esm-bundler.js") result = vueKey;
+		}
+		if (!result) result = commonSubpathKeys.get(source);
+		if (!result) result = wildcardKeys.find(({ base }) => source === base || source.startsWith(`${base}/`))?.key;
+		sourceCache.set(source, result);
+		return result;
+	} };
+	sharedKeyMatcherCache.set(shared, matcher);
+	return matcher;
 }
 function findSharedKeyForSource(source, shared) {
 	const key = findSharedKey(source, shared);
@@ -5036,7 +5166,9 @@ export default __mfShared.default ?? __mfShared;`
 						const optimizeDeps = config.optimizeDeps ??= {};
 						optimizeDeps.include ??= [];
 						optimizeDeps.exclude ??= [];
-						if (isLitShare(key) || key === "react" && hasPackageDependency("react-redux", root)) optimizeDeps.exclude.push(key);
+						const shouldBypassOptimizeDep = isLitShare(key) || key === "react" && hasPackageDependency("react-redux", root);
+						if (optimizeDeps.include.includes(key)) optimizeDeps.exclude = optimizeDeps.exclude.filter((dep) => dep !== key);
+						else if (shouldBypassOptimizeDep) optimizeDeps.exclude.push(key);
 						else optimizeDeps.include.push(key);
 						for (const subpath of getCommonSharedSubpaths(key)) {
 							getLoadShareModulePath(subpath, isRolldown);
@@ -5089,7 +5221,7 @@ export default __mfShared.default ?? __mfShared;`
 const SSR_ONLY_PLUGINS = new Set(["@module-federation/vite/ssrEntryLoader"]);
 function loadPluginDts(options) {
 	if (options.dts === false) return [];
-	return [import("./pluginDts-BaVhdR6i.js").then(({ default: pluginDts }) => pluginDts(options))];
+	return [import("./pluginDts-Cpmdbbr0.js").then((n) => n.n).then(({ default: pluginDts }) => pluginDts(options))];
 }
 function federation(mfUserOptions) {
 	if (isTestEnv()) return [];
@@ -5200,7 +5332,7 @@ function federation(mfUserOptions) {
 		pluginProxyRemotes_default(options),
 		pluginRemoteNamedExports(options),
 		...pluginModuleParseEnd_default((id) => {
-			return id.includes(getHostAutoInitImportId()) || id.includes(remoteEntryId) || id.includes(virtualExposesId) || id.includes(getLocalSharedImportMapPath());
+			return id.includes(getHostAutoInitImportId()) || id.includes(remoteEntryId) || id.includes(virtualExposesId) || id.includes(getLocalSharedImportMapPath()) || id.includes("__loadShare__") || id.includes("__prebuild__");
 		}, {
 			moduleParseTimeout: options.moduleParseTimeout,
 			moduleParseIdleTimeout: options.moduleParseIdleTimeout,
@@ -5482,12 +5614,12 @@ function federation(mfUserOptions) {
 						const prefixToRoot = chunkDir === "." ? "" : `${normalizePathForImport(path$1.relative(chunkDir, "."))}/`;
 						const replacementExpr = prefixToRoot ? `${escapeUnsafeJsSourceChars(JSON.stringify(prefixToRoot))}+$1` : "$1";
 						const replacement = `=function($1){return new URL(${replacementExpr},import.meta.url).href}`;
-						const replaced = chunk.code.replace(/=\(?(\w+)(?:,\w+)?\)?\s*=>\s*[`"'][./][^`"']*[`"']\s*\+\s*\1/, replacement);
+						const replaced = chunk.code.replace(/=\s*\(?(\w+)(?:,\w+)?\)?\s*=>\s*[`"'][./][^`"']*[`"']\s*\+\s*\1/, replacement);
 						if (replaced !== chunk.code) {
 							chunk.code = replaced;
 							continue;
 						}
-						chunk.code = chunk.code.replace(/=function\((\w+)(?:,\w+)?\)\{return\s*[`"'][./][^`"']*[`"']\s*\+\s*\1\s*\}/, replacement);
+						chunk.code = chunk.code.replace(/=\s*function\((\w+)(?:,\w+)?\)\s*\{\s*return\s*[`"'][./][^`"']*[`"']\s*\+\s*\1;?\s*\}/, replacement);
 						chunk.code = chunk.code.replace(/=function\((\w+)(?:,\w+)?\)\{return new URL\("\.\.\/"\+\1,import\.meta\.url\)\.href\}/, replacement);
 						chunk.code = chunk.code.replace(/new URL\("\.\.\/"\+(\w+),import\.meta\.url\)\.href/g, `new URL(${replacementExpr},import.meta.url).href`);
 					}