@module-federation/vite 1.16.14 → 1.16.16

package/lib/index.d.ts

@@ -49,7 +49,7 @@ type ModuleFederationOptions = {
     version?: string;
     shareScope?: string;
     singleton?: boolean;
-    requiredVersion?: string;
+    requiredVersion?: moduleFederationPlugin.SharedConfig['requiredVersion'];
     strictVersion?: boolean;
     import?: moduleFederationPlugin.SharedConfig['import'];
   }> | undefined;

package/lib/index.js

@@ -1,4 +1,4 @@
-import { _ as createModuleFederationError, a as getIsRolldown, b as rebaseImport, c as getPackageNameFromNodeModulePath, d as isNuxtProjectRoot, f as packageNameDecode, g as sharedCacheHelperCode, h as setPackageDetectionCwd, i as getInstalledPackageJson, l as getSharedCacheDescriptor, m as resolveImportPath, o as getPackageDetectionCwd, p as packageNameEncode, r as getInstalledPackageEntry, s as getPackageName, u as hasPackageDependency, v as mfWarn, y as normalizePathForImport } from "./pluginDts-CTAHkt4C.js";
+import { _ as createModuleFederationError, a as getIsRolldown, b as rebaseImport, c as getPackageNameFromNodeModulePath, d as isNuxtProjectRoot, f as packageNameDecode, g as sharedCacheHelperCode, h as setPackageDetectionCwd, i as getInstalledPackageJson, l as getSharedCacheDescriptor, m as resolveImportPath, o as getPackageDetectionCwd, p as packageNameEncode, r as getInstalledPackageEntry, s as getPackageName, u as hasPackageDependency, v as mfWarn, y as normalizePathForImport } from "./pluginDts-Bo95ELmX.js";
 import { createRequire } from "node:module";
 import * as fs$2 from "fs";
 import { existsSync, readFileSync, realpathSync, statSync, writeFileSync } from "fs";
@@ -192,6 +192,51 @@ const COMMON_SHARED_SUBPATHS = {
 	],
 	zustand: ["zustand/vanilla", "zustand/react"]
 };
+const VITE_DEFAULT_ASSET_TYPES = [
+	"apng",
+	"bmp",
+	"png",
+	"jpe?g",
+	"jfif",
+	"pjpeg",
+	"pjp",
+	"gif",
+	"svg",
+	"ico",
+	"webp",
+	"avif",
+	"cur",
+	"jxl",
+	"mp4",
+	"webm",
+	"ogg",
+	"mp3",
+	"wav",
+	"flac",
+	"aac",
+	"opus",
+	"mov",
+	"m4a",
+	"vtt",
+	"woff2?",
+	"eot",
+	"ttf",
+	"otf",
+	"webmanifest",
+	"pdf",
+	"txt"
+];
+const ASSET_LIKE_IMPORT_RE = new RegExp(`\\.(${[...[
+	"css",
+	"scss",
+	"sass",
+	"less",
+	"styl",
+	"stylus"
+], ...VITE_DEFAULT_ASSET_TYPES].join("|")})(?:[?#].*)?$`, "i");
+function isAssetLikeImport(source) {
+	return ASSET_LIKE_IMPORT_RE.test(source);
+}
 function removeTrailingSlash(value) {
 	return value.endsWith("/") ? value.slice(0, -1) : value;
 }
@@ -233,7 +278,10 @@ function getCommonSharedSubpathFromNodeModulePath(source, sharedKey) {
 function resolvePublicPath(options, viteBase, originalBase) {
 	if (options.publicPath && options.publicPath !== "auto") return options.publicPath;
 	if (!originalBase) return "auto";
-	if (viteBase) return ensureTrailingSlash(viteBase);
+	if (viteBase) {
+		if (viteBase === "./") return "auto";
+		return ensureTrailingSlash(viteBase);
+	}
 	return "auto";
 }
 //#endregion
@@ -312,7 +360,7 @@ function searchPackageVersion(sharedName) {
 	return typeof version === "string" ? version : void 0;
 }
 function inferVersionFromRequiredVersion(requiredVersion) {
-	if (!requiredVersion) return void 0;
+	if (typeof requiredVersion !== "string") return void 0;
 	return requiredVersion.match(/\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?/)?.[0];
 }
 function getLitExportSubpathShares(sharedName) {
@@ -345,7 +393,7 @@ function normalizeShareItem(key, shareItem) {
 		shareConfig: {
 			import: shareItem.import,
 			singleton: shareItem.singleton || false,
-			requiredVersion: shareItem.requiredVersion || (isImportFalse || shareItem.version ? "*" : version ? `^${version}` : "*"),
+			requiredVersion: shareItem.requiredVersion !== void 0 ? shareItem.requiredVersion : isImportFalse || shareItem.version ? "*" : version ? `^${version}` : "*",
 			strictVersion: !!shareItem.strictVersion
 		}
 	};
@@ -610,7 +658,7 @@ function getSsrCapabilities(viteMajor, command, hasRemotes) {
 * @returns {string} The resulting JavaScript source code string.
 */
 function serializeRuntimeOptions(options) {
-	const seenObjects = /* @__PURE__ */ new WeakSet();
+	const ancestors = /* @__PURE__ */ new WeakSet();
 	/**
 	* Recursive inner function to serialize any value into a source code string.
 	*/
@@ -628,16 +676,18 @@ function serializeRuntimeOptions(options) {
 		if (val instanceof Date) return `new Date(${JSON.stringify(val.toISOString())})`;
 		if (val instanceof RegExp) return `new RegExp(${JSON.stringify(val.source)}, ${JSON.stringify(val.flags)})`;
 		if (type === "object") {
-			if (seenObjects.has(val)) return `"__circular__"`;
-			seenObjects.add(val);
-		}
-		if (Array.isArray(val)) return `[${val.map(valueToCode).join(", ")}]`;
-		if (val instanceof Map) return `new Map([${Array.from(val.entries()).map(([k, v]) => `[${valueToCode(k)}, ${valueToCode(v)}]`).join(", ")}])`;
-		if (val instanceof Set) return `new Set([${Array.from(val.values()).map(valueToCode).join(", ")}])`;
-		if (type === "object") {
-			const properties = [];
-			for (const key in val) if (Object.prototype.hasOwnProperty.call(val, key)) properties.push(`${JSON.stringify(key)}: ${valueToCode(val[key])}`);
-			return `{${properties.join(", ")}}`;
+			if (ancestors.has(val)) return `"__circular__"`;
+			ancestors.add(val);
+			try {
+				if (Array.isArray(val)) return `[${val.map(valueToCode).join(", ")}]`;
+				if (val instanceof Map) return `new Map([${Array.from(val.entries()).map(([k, v]) => `[${valueToCode(k)}, ${valueToCode(v)}]`).join(", ")}])`;
+				if (val instanceof Set) return `new Set([${Array.from(val.values()).map(valueToCode).join(", ")}])`;
+				const properties = [];
+				for (const key in val) if (Object.prototype.hasOwnProperty.call(val, key)) properties.push(`${JSON.stringify(key)}: ${valueToCode(val[key])}`);
+				return `{${properties.join(", ")}}`;
+			} finally {
+				ancestors.delete(val);
+			}
 		}
 		return JSON.stringify(String(val));
 	}
@@ -1001,6 +1051,25 @@ function resolveRelativeModule(filePath, specifier) {
 		if (existsSync(candidate)) return candidate;
 	}
 }
+function resolveReExportModule(filePath, specifier) {
+	if (specifier.startsWith(".")) return resolveRelativeModule(filePath, specifier);
+	const esmEntry = getInstalledPackageEntry(specifier, {
+		cwd: path$1.dirname(filePath),
+		conditions: [
+			"browser",
+			"import",
+			"module",
+			"default"
+		],
+		resolveSubpathWithRequire: false
+	});
+	if (esmEntry) return esmEntry;
+	try {
+		return resolveFileLikeModule(createRequire$1(pathToFileURL(filePath)).resolve(specifier));
+	} catch {
+		return;
+	}
+}
 function getNamedExportsViaRegex(source, filePath, visited) {
 	const names = /* @__PURE__ */ new Set();
 	visited = visited || /* @__PURE__ */ new Set();
@@ -1044,8 +1113,7 @@ function getNamedExportsViaRegex(source, filePath, visited) {
 		const starExportRegex = /export\s+\*\s+from\s+['"]([^'"]+)['"]/g;
 		while ((match = starExportRegex.exec(source)) !== null) {
 			const specifier = match[1];
-			if (!specifier.startsWith(".")) continue;
-			const resolvedPath = resolveRelativeModule(filePath, specifier);
+			const resolvedPath = resolveReExportModule(filePath, specifier);
 			if (!resolvedPath || visited.has(resolvedPath)) continue;
 			try {
 				const reExportNames = getNamedExportsViaRegex(readFileSync(resolvedPath, "utf-8"), resolvedPath, visited);
@@ -1363,13 +1431,18 @@ function generateLazyWorkspaceSingletonExports(namedExports, importSource, cache
       __mfWriteSharedCache(__mfModuleCache.share, ${cacheDescriptor}, exportModule);
       __mfApplyLazyShareExports(exportModule);`}
       } else {
-        (__mfModuleCache.pendingShareLoads ||= []).push(initPromise.then(() =>
-          import(${escapeGeneratedStringLiteral(importSource)}).then((mod) => {
+        (__mfModuleCache.pendingShareLoads ||= []).push(initPromise.then(() => {
+          exportModule = __mfReadSharedCache(__mfModuleCache.share, ${cacheDescriptor});
+          if (exportModule !== undefined) {
+            __mfApplyLazyShareExports(exportModule);
+            return;
+          }
+          return import(${escapeGeneratedStringLiteral(importSource)}).then((mod) => {
             exportModule = __mfNormalizeShareModule(mod);
             __mfWriteSharedCache(__mfModuleCache.share, ${cacheDescriptor}, exportModule);
             __mfApplyLazyShareExports(exportModule);
-          })
-        ));
+          });
+        }));
       }
     } else {
       __mfApplyLazyShareExports(exportModule);
@@ -1381,7 +1454,7 @@ function prependWorkspaceSingletonSsrImport(code) {
 	if (!code.includes("if (import.meta.env.SSR)")) return code;
 	if (!code.includes(WORKSPACE_SINGLETON_SSR_LOCAL_SHARE)) return code;
 	if (code.includes("import * as __mfLocalShare")) return code;
-	const importMatch = code.match(/initPromise\.then\(\(\)\s*=>\s*\n\s*import\((["'])(.+?)\1\)\.then\(\(mod\)\s*=>\s*\{[\s\S]*?__mfApplyLazyShareExports/);
+	const importMatch = code.match(/initPromise\.then\(\(\)\s*=>\s*\{[\s\S]*?\breturn import\((["'])(.+?)\1\)\.then\(\(mod\)\s*=>\s*\{[\s\S]*?__mfApplyLazyShareExports/) ?? code.match(/initPromise\.then\(\(\)\s*=>\s*\n\s*import\((["'])(.+?)\1\)\.then\(\(mod\)\s*=>\s*\{[\s\S]*?__mfApplyLazyShareExports/);
 	if (!importMatch) return code;
 	const quote = importMatch[1];
 	return `import * as __mfLocalShare from ${quote}${importMatch[2]}${quote};\n${code}`;
@@ -1548,7 +1621,7 @@ function generateLocalSharedImportMap() {
 	return `
     import {loadShare} from "@module-federation/runtime";
     const importMap = {
-      ${Array.from(getUsedShares()).sort().map((pkg) => {
+      ${getOrderedUsedShares().map((pkg) => {
 		const shareItem = getNormalizeShareItem(pkg);
 		return `
         ${JSON.stringify(pkg)}: async () => {
@@ -1559,7 +1632,7 @@ function generateLocalSharedImportMap() {
 	}).join(",")}
     }
       const usedShared = {
-      ${Array.from(getUsedShares()).sort().map((key) => {
+      ${getOrderedUsedShares().map((key) => {
 		const shareItem = getNormalizeShareItem(key);
 		if (!shareItem) return null;
 		return `
@@ -1635,9 +1708,15 @@ function getOrderedUsedShares() {
 }
 function orderSharedDependenciesFirst(sharedPackages) {
 	const sharedKeyByPackageName = /* @__PURE__ */ new Map();
+	const subpathKeysByPackageName = /* @__PURE__ */ new Map();
 	sharedPackages.forEach((pkg) => {
 		const packageName = getPackageName(pkg);
 		if (!sharedKeyByPackageName.get(packageName) || pkg === packageName) sharedKeyByPackageName.set(packageName, pkg);
+		if (pkg !== packageName) {
+			const subpaths = subpathKeysByPackageName.get(packageName);
+			if (subpaths) subpaths.push(pkg);
+			else subpathKeysByPackageName.set(packageName, [pkg]);
+		}
 	});
 	const visiting = /* @__PURE__ */ new Set();
 	const visited = /* @__PURE__ */ new Set();
@@ -1646,7 +1725,8 @@ function orderSharedDependenciesFirst(sharedPackages) {
 		if (visited.has(pkg)) return;
 		if (visiting.has(pkg)) return;
 		visiting.add(pkg);
-		const packageJson = getInstalledPackageJson(pkg)?.packageJson;
+		const packageName = getPackageName(pkg);
+		const packageJson = getInstalledPackageJson(pkg)?.packageJson ?? (pkg !== packageName ? getInstalledPackageJson(packageName)?.packageJson : void 0);
 		const dependencies = {
 			...packageJson?.dependencies || {},
 			...packageJson?.peerDependencies || {},
@@ -1656,6 +1736,7 @@ function orderSharedDependenciesFirst(sharedPackages) {
 			const sharedDependency = sharedKeyByPackageName.get(dependency);
 			if (sharedDependency) visit(sharedDependency);
 		});
+		if (pkg === packageName) (subpathKeysByPackageName.get(packageName) || []).forEach(visit);
 		visiting.delete(pkg);
 		visited.add(pkg);
 		ordered.push(pkg);
@@ -1729,8 +1810,33 @@ function hasImportFalseShared$1(options) {
 	return Object.values(options.shared ?? {}).some((share) => share?.shareConfig?.import === false);
 }
 function generateRuntimeSharedCacheSeedCode() {
+	const seedOrder = getOrderedUsedShares();
 	return `
-    for (const [pkg, share] of Object.entries(usedShared)) {
+    const __mfSeedOrder = ${JSON.stringify(seedOrder)};
+    const __mfSeedKeys = __mfSeedOrder.filter((pkg) => usedShared[pkg] !== undefined);
+    const __mfSeedPackageName = (pkg) => pkg.startsWith('@')
+      ? pkg.split('/').slice(0, 2).join('/')
+      : pkg.split('/')[0];
+    for (const pkg of Object.keys(usedShared)) {
+      if (__mfSeedKeys.includes(pkg)) continue;
+      const packageName = __mfSeedPackageName(pkg);
+      const rootIndex = __mfSeedKeys.indexOf(packageName);
+      if (rootIndex === -1) {
+        __mfSeedKeys.push(pkg);
+        continue;
+      }
+      let insertIndex = rootIndex;
+      while (
+        insertIndex > 0 &&
+        __mfSeedPackageName(__mfSeedKeys[insertIndex - 1]) === packageName &&
+        __mfSeedKeys[insertIndex - 1] !== packageName
+      ) {
+        insertIndex--;
+      }
+      __mfSeedKeys.splice(insertIndex, 0, pkg);
+    }
+    for (const pkg of __mfSeedKeys) {
+      const share = usedShared[pkg];
       const cacheDescriptor = __mfGetSharedCacheDescriptor(pkg, share.shareConfig?.singleton, share.version, share.scope);
       if (share.shareConfig?.import === false || __mfReadSharedCache(__mfModuleCache.share, cacheDescriptor) !== undefined) {
         continue;
@@ -1762,7 +1868,7 @@ function getHostAutoInitSharedSeedItems() {
 	return getOrderedUsedShares().map((pkg) => ({
 		pkg,
 		shareItem: getShareItemForPreload(pkg)
-	})).filter(({ shareItem }) => shareItem?.shareConfig.import === false).sort((a, b) => {
+	})).filter(({ shareItem }) => shareItem?.shareConfig?.import === false).sort((a, b) => {
 		const priority = (pkg) => pkg === "vue" ? 0 : pkg === "pinia" ? 1 : 2;
 		const aIsLocal = !!getLocalProviderImportPath(a.pkg);
 		const bIsLocal = !!getLocalProviderImportPath(b.pkg);
@@ -1955,6 +2061,9 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
   async function getExposes(moduleName) {
     const exposesMap = await getExposesMap()
     if (!(moduleName in exposesMap)) throw new Error(\`[Module Federation] Module \${moduleName} does not exist in container.\`)
+    if (__mfModuleCache.pendingShareLoads) {
+      await Promise.all(__mfModuleCache.pendingShareLoads)
+    }
     return (exposesMap[moduleName])().then(res => () => res)
   }
   export {
@@ -1968,6 +2077,7 @@ let currentHostAutoInitRemoteEntryId = REMOTE_ENTRY_ID;
 let currentHostAutoInitCommand = "build";
 function generateHostAutoInitCode(remoteEntryImport, _command = "build") {
 	const shouldPreloadShares = getNormalizeModuleFederationOptions().shareStrategy !== "loaded-first";
+	const hostInitShareOrder = JSON.stringify(getOrderedUsedShares());
 	return `
     ${getRuntimeModuleCacheBootstrapCode()}
     let hostInitPromise;
@@ -1981,7 +2091,11 @@ function generateHostAutoInitCode(remoteEntryImport, _command = "build") {
           const {usedShared} = await import("${getLocalSharedImportMapPath()}");
           ${normalizeRuntimeShareCode}
           ${shouldPreloadShares ? `
-          for (const [pkg, share] of Object.entries(usedShared)) {
+          const __mfHostInitShareOrder = ${hostInitShareOrder}
+            .concat(Object.keys(usedShared).filter((pkg) => !${hostInitShareOrder}.includes(pkg)));
+          for (const pkg of __mfHostInitShareOrder) {
+            const share = usedShared[pkg];
+            if (!share) continue;
             const cacheDescriptor = __mfGetSharedCacheDescriptor(pkg, share.shareConfig?.singleton, share.version, share.scope);
             if (__mfReadSharedCache(__mfModuleCache.share, cacheDescriptor) !== undefined) {
               continue;
@@ -3936,7 +4050,7 @@ const Manifest = () => {
 		const varRemoteEntry = varFilename ? {
 			name: varFilename,
 			path: "",
-			type: "module"
+			type: "var"
 		} : void 0;
 		const remotes = Array.from(Object.entries(getUsedRemotesMap())).flatMap(([remoteKey, modules]) => Array.from(modules).map((moduleKey) => ({
 			federationContainerName: options.remotes[remoteKey].entry,
@@ -4576,7 +4690,7 @@ function proxySharedModule(options) {
 				const key = findSharedKeyForSource(source, shared);
 				if (!key) return;
 				if (useDirectReactImport && key === "react") return;
-				if (/\.css$/.test(source)) return;
+				if (isAssetLikeImport(source)) return;
 				if (isBuildConfigImporter(importer)) return;
 				if (useDirectReactImport && source === "react") return;
 				if (importer && importer.includes("localSharedImportMap")) return;
@@ -5622,7 +5736,7 @@ function createEarlyVirtualModulesPlugin(options) {
 								if (isSharedResolverInternalImporter(importer)) return;
 								const key = findSharedKey(source, shared);
 								if (!key) return;
-								if (source.endsWith(".css")) return;
+								if (isAssetLikeImport(source)) return;
 								const shareItem = shared[key];
 								const isReactSingleton = source === "react" && key === "react" && shareItem.shareConfig?.singleton === true;
 								const isReactRequire = options?.kind?.startsWith("require") && isReactSingleton;
@@ -5658,7 +5772,7 @@ function createEarlyVirtualModulesPlugin(options) {
 									if (args.kind === "entry-point") return;
 									if (!args.importer || args.namespace === "mf-shared") return;
 									if (isSharedResolverInternalImporter(args.importer)) return;
-									if (!findSharedKey(args.path, shared) || args.path.endsWith(".css")) return;
+									if (!findSharedKey(args.path, shared) || isAssetLikeImport(args.path)) return;
 									return {
 										path: args.path,
 										namespace: "mf-shared"
@@ -5769,7 +5883,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-CTAHkt4C.js").then((n) => n.n).then(({ default: pluginDts }) => pluginDts(options))];
+	return [import("./pluginDts-Bo95ELmX.js").then((n) => n.n).then(({ default: pluginDts }) => pluginDts(options))];
 }
 function federation(mfUserOptions) {
 	if (isTestEnv()) return [];

package/lib/{pluginDts-CTAHkt4C.js → pluginDts-Bo95ELmX.js}

@@ -141,12 +141,47 @@ function resolveExportsEntry(exportsField, conditions = DEFAULT_EXPORT_CONDITION
 		if (resolved) return resolved;
 	}
 }
+function substituteExportsWildcard(target, patternMatch) {
+	if (typeof target === "string") return target.split("*").join(patternMatch);
+	if (Array.isArray(target)) return target.map((entry) => substituteExportsWildcard(entry, patternMatch));
+	if (target && typeof target === "object") {
+		const source = target;
+		const out = {};
+		for (const key of Object.keys(source)) out[key] = substituteExportsWildcard(source[key], patternMatch);
+		return out;
+	}
+	return target;
+}
+function matchExportsSubpath(record, subpath) {
+	if (subpath in record) return record[subpath];
+	let bestKey;
+	let bestBaseLength = -1;
+	let bestKeyLength = -1;
+	for (const key of Object.keys(record)) {
+		const wildcardIndex = key.indexOf("*");
+		if (wildcardIndex === -1) continue;
+		const patternBase = key.slice(0, wildcardIndex);
+		const patternTrailer = key.slice(wildcardIndex + 1);
+		if (patternTrailer.includes("*")) continue;
+		if (!subpath.startsWith(patternBase) || !subpath.endsWith(patternTrailer)) continue;
+		if (subpath.length <= patternBase.length + patternTrailer.length) continue;
+		if (patternBase.length > bestBaseLength || patternBase.length === bestBaseLength && key.length > bestKeyLength) {
+			bestKey = key;
+			bestBaseLength = patternBase.length;
+			bestKeyLength = key.length;
+		}
+	}
+	if (bestKey === void 0) return void 0;
+	const patternTrailer = bestKey.slice(bestKey.indexOf("*") + 1);
+	const patternMatch = subpath.slice(bestBaseLength, subpath.length - patternTrailer.length);
+	return substituteExportsWildcard(record[bestKey], patternMatch);
+}
 function getPackageExportsTarget(pkg, packageName, exportsField) {
 	if (typeof exportsField === "string") return pkg === packageName ? exportsField : void 0;
 	if (!exportsField || typeof exportsField !== "object") return void 0;
 	const record = exportsField;
 	const subpath = pkg === packageName ? "." : `.${pkg.slice(packageName.length)}`;
-	if (subpath !== ".") return record[subpath];
+	if (subpath !== ".") return matchExportsSubpath(record, subpath);
 	return record["."] ?? (!Object.keys(record).some((key) => key.startsWith(".")) ? record : void 0);
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/vite",
-  "version": "1.16.14",
+  "version": "1.16.16",
   "description": "Vite plugin for Module Federation",
   "type": "module",
   "main": "./lib/index.js",