@module-federation/vite 1.16.15 → 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

@@ -360,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) {
@@ -393,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
 		}
 	};
@@ -658,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.
 	*/
@@ -676,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));
 	}
@@ -1619,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 () => {
@@ -1630,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 `
@@ -1706,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();
@@ -1717,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 || {},
@@ -1727,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);
@@ -1800,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;
@@ -1833,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);
@@ -2042,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;
@@ -2055,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;
@@ -4010,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,

package/package.json

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