@module-federation/dts-plugin 2.4.0 → 2.5.1

package/dist/{Broker-DRFgFvXI.js → Broker-CaenCqdn.js}

@@ -1,6 +1,7 @@
 const require_Action = require('./Action-CzhPMw2i.js');
 let fs = require("fs");
 fs = require_Action.__toESM(fs);
+let url = require("url");
 let path = require("path");
 path = require_Action.__toESM(path);
 let _module_federation_sdk = require("@module-federation/sdk");
@@ -13,7 +14,6 @@ isomorphic_ws = require_Action.__toESM(isomorphic_ws);
 let http = require("http");
 let node_schedule = require("node-schedule");
 node_schedule = require_Action.__toESM(node_schedule);
-let url = require("url");
 
 //#region src/server/message/API/API.ts
 let APIKind = /* @__PURE__ */ function(APIKind) {

package/dist/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @module-federation/dts-plugin
 
+## 2.5.1
+
+### Patch Changes
+
+- b79ba22: Update the dts plugin websocket dependency to a version that includes the CVE-2026-45736 fix.
+- b553153: Fix `__dirname is not defined` ReferenceError when `@module-federation/dts-plugin` is consumed as ESM. `DevWorker`, `DevPlugin`, and `createBroker` now derive `__dirname` from `import.meta.url` (matching the existing `DtsWorker` shim) so the ESM build no longer emits bare `__dirname`.
+- b9b3b8c: Fix Windows manifest type URL resolution in dts-plugin consumeTypes and allow the default IP family option to auto-select with `0`.
+- Updated dependencies [b9b3b8c]
+  - @module-federation/sdk@2.5.1
+  - @module-federation/managers@2.5.1
+  - @module-federation/third-party-dts-extractor@2.5.1
+  - @module-federation/error-codes@2.5.1
+
+## 2.5.0
+
+### Patch Changes
+
+- 13dce52: fix(dts-plugin): read manifest metadata when consuming DTS files from manifest remotes.
+- Updated dependencies [5d4095d]
+- Updated dependencies [0716c11]
+- Updated dependencies [41281f4]
+  - @module-federation/sdk@2.5.0
+  - @module-federation/error-codes@2.5.0
+  - @module-federation/managers@2.5.0
+  - @module-federation/third-party-dts-extractor@2.5.0
+
 ## 2.4.0
 
 ### Patch Changes

package/dist/{consumeTypes-DxGMNavh.js → consumeTypes-FbF0o6AJ.js}

@@ -1,11 +1,11 @@
 const require_Action = require('./Action-CzhPMw2i.js');
-const require_expose_rpc = require('./expose-rpc-CQq6zYK-.js');
+const require_expose_rpc = require('./expose-rpc-XLxmAXIW.js');
+let url = require("url");
 let path = require("path");
 path = require_Action.__toESM(path);
 let crypto = require("crypto");
 let child_process = require("child_process");
 child_process = require_Action.__toESM(child_process);
-let url = require("url");
 let process$1 = require("process");
 process$1 = require_Action.__toESM(process$1);
 

package/dist/core.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-require('./Broker-DRFgFvXI.js');
-const require_expose_rpc = require('./expose-rpc-CQq6zYK-.js');
-const require_consumeTypes = require('./consumeTypes-DxGMNavh.js');
+require('./Broker-CaenCqdn.js');
+const require_expose_rpc = require('./expose-rpc-XLxmAXIW.js');
+const require_consumeTypes = require('./consumeTypes-FbF0o6AJ.js');
 
 exports.DTSManager = require_expose_rpc.DTSManager;
 exports.DtsWorker = require_consumeTypes.DtsWorker;

package/dist/dynamic-remote-type-hints-plugin.d.ts

@@ -1,4 +1,4 @@
-import { CreateScriptHookReturn, GlobalModuleInfo, Manifest, Module, ModuleInfo, RemoteEntryType, RemoteWithEntry, RemoteWithVersion, TreeShakingStatus } from "@module-federation/sdk";
+import { CreateLinkHookReturnDom, CreateScriptHookReturn, GlobalModuleInfo, Manifest, Module, ModuleInfo, RemoteEntryType, RemoteWithEntry, RemoteWithVersion, TreeShakingStatus } from "@module-federation/sdk";
 
 //#region ../runtime-core/dist/utils/hooks/syncHook.d.ts
 //#region src/utils/hooks/syncHook.d.ts
@@ -24,7 +24,7 @@ declare class AsyncHook<T, ExternalEmitReturnType = CallbackReturnType$1> extend
 //#endregion
 //#region ../runtime-core/dist/utils/hooks/syncWaterfallHook.d.ts
 //#region src/utils/hooks/syncWaterfallHook.d.ts
-declare class SyncWaterfallHook<T extends Record<string, any>> extends SyncHook<[T], T> {
+declare class SyncWaterfallHook<T extends Record<string, any>> extends SyncHook<[T], T | void> {
   onerror: (errMsg: string | Error | unknown) => void;
   constructor(type: string);
   emit(data: T): T;
@@ -32,8 +32,8 @@ declare class SyncWaterfallHook<T extends Record<string, any>> extends SyncHook<
 //#endregion
 //#region ../runtime-core/dist/utils/hooks/asyncWaterfallHooks.d.ts
 //#region src/utils/hooks/asyncWaterfallHooks.d.ts
-type CallbackReturnType<T> = T | Promise<T>;
-declare class AsyncWaterfallHook<T extends Record<string, any>> extends SyncHook<[T], CallbackReturnType<T>> {
+type CallbackReturnType<T> = T | void | Promise<T | void>;
+declare class AsyncWaterfallHook<T extends object> extends SyncHook<[T], CallbackReturnType<T>> {
   onerror: (errMsg: string | Error | unknown) => void;
   constructor(type: string);
   emit(data: T): Promise<T>;
@@ -183,6 +183,30 @@ type PreloadOptions = Array<{
   remote: Remote;
   preloadConfig: PreloadConfig;
 }>;
+type ResourceLoadInitiator = 'loadRemote' | 'preloadRemote';
+type ResourceLoadType = 'manifest' | 'remoteEntry' | 'js' | 'css';
+interface ResourceLoadContext {
+  initiator: ResourceLoadInitiator;
+  id: string;
+  resourceType: ResourceLoadType;
+  url?: string;
+}
+type PreloadAssetStatus = 'success' | 'error' | 'timeout' | 'cached';
+interface PreloadAssetResult {
+  url: string;
+  status: PreloadAssetStatus;
+  resourceType: ResourceLoadType;
+  initiator: ResourceLoadInitiator;
+  id: string;
+  error?: unknown;
+}
+interface PreloadRemoteResult {
+  remote: Remote;
+  remoteInfo: RemoteInfo;
+  preloadConfig: PreloadConfig;
+  id: string;
+  results: PreloadAssetResult[];
+}
 type EntryAssets = {
   name: string;
   url: string;
@@ -226,6 +250,15 @@ declare class RemoteHandler {
       options: Options;
       origin: ModuleFederation;
     }>;
+    afterMatchRemote: AsyncHook<[{
+      id: string;
+      options: Options;
+      remote?: Remote;
+      expose?: string;
+      remoteInfo?: RemoteInfo;
+      error?: unknown;
+      origin: ModuleFederation;
+    }], void>;
     onLoad: AsyncHook<[{
       id: string;
       expose: string;
@@ -236,6 +269,18 @@ declare class RemoteHandler {
       exposeModule: any;
       exposeModuleFactory: any;
       moduleInstance: Module$1;
+    }], unknown>;
+    afterLoadRemote: AsyncHook<[{
+      id: string;
+      expose?: string;
+      remote?: RemoteInfo;
+      options?: {
+        loadFactory?: boolean;
+        from?: CallFrom;
+      };
+      error?: unknown;
+      recovered?: boolean;
+      origin: ModuleFederation;
     }], void>;
     handlePreloadModule: SyncHook<[{
       id: string;
@@ -251,6 +296,8 @@ declare class RemoteHandler {
       options?: any;
       from: CallFrom;
       lifecycle: "beforeRequest" | "beforeLoadShare" | "afterResolve" | "onLoad";
+      remote?: RemoteInfo;
+      expose?: string;
       origin: ModuleFederation;
     }], unknown>;
     beforePreloadRemote: AsyncHook<[{
@@ -266,16 +313,19 @@ declare class RemoteHandler {
       remoteSnapshot: ModuleInfo;
       globalSnapshot: GlobalModuleInfo;
     }], Promise<PreloadAssets>>;
-    afterPreloadRemote: AsyncHook<{
+    afterPreloadRemote: AsyncHook<[{
       preloadOps: Array<PreloadRemoteArgs>;
       options: Options;
       origin: ModuleFederation;
-    }, false | void | Promise<false | void>>;
+      results: PreloadRemoteResult[];
+      error?: unknown;
+    }], false | void | Promise<false | void>>;
     loadEntry: AsyncHook<[{
+      origin: ModuleFederation;
       loaderHook: ModuleFederation["loaderHook"];
       remoteInfo: RemoteInfo;
       remoteEntryExports?: RemoteEntryExports;
-    }], Promise<RemoteEntryExports>>;
+    }], void | RemoteEntryExports | Promise<void | RemoteEntryExports>>;
   }>;
   constructor(host: ModuleFederation);
   formatAndRegisterRemote(globalOptions: Options, userOptions: UserOptions): Remote[];
@@ -320,6 +370,25 @@ declare class SharedHandler {
       origin: ModuleFederation;
     }>;
     loadShare: AsyncHook<[ModuleFederation, string, ShareInfos], false | void | Promise<false | void>>;
+    afterLoadShare: SyncHook<[{
+      pkgName: string;
+      shareInfo?: Partial<Shared>;
+      selectedShared?: Partial<Shared>;
+      shared: Options["shared"];
+      shareScopeMap: ShareScopeMap;
+      lifecycle: "loadShare" | "loadShareSync";
+      origin: ModuleFederation;
+    }], void>;
+    errorLoadShare: SyncHook<[{
+      pkgName: string;
+      shareInfo?: Partial<Shared>;
+      shared: Options["shared"];
+      shareScopeMap: ShareScopeMap;
+      lifecycle: "loadShare" | "loadShareSync";
+      origin: ModuleFederation;
+      error?: unknown;
+      recovered?: boolean;
+    }], void>;
     resolveShare: SyncWaterfallHook<{
       shareScopeMap: ShareScopeMap;
       scope: string;
@@ -342,6 +411,8 @@ declare class SharedHandler {
   }>;
   initTokens: InitTokens;
   constructor(host: ModuleFederation);
+  private emitAfterLoadShare;
+  private emitErrorLoadShare;
   registerShared(globalOptions: Options, userOptions: UserOptions): {
     newShareInfos: ShareInfos;
     allShareInfos: {
@@ -421,6 +492,7 @@ declare class SnapshotHandler {
     beforeLoadRemoteSnapshot: AsyncHook<[{
       options: Options;
       moduleInfo: Remote;
+      origin: ModuleFederation;
     }], void>;
     loadSnapshot: AsyncWaterfallHook<{
       options: Options;
@@ -451,11 +523,11 @@ declare class SnapshotHandler {
   loadRemoteSnapshotInfo({
     moduleInfo,
     id,
-    expose
+    initiator
   }: {
     moduleInfo: Remote;
     id?: string;
-    expose?: string;
+    initiator?: ResourceLoadInitiator;
   }): Promise<{
     remoteSnapshot: ModuleInfo;
     globalSnapshot: GlobalModuleInfo;
@@ -466,6 +538,7 @@ declare class SnapshotHandler {
     remoteSnapshot: GlobalModuleInfo[string] | undefined;
   };
   private getManifestJson;
+  private loadManifestSnapshot;
 } //#endregion
 //#endregion
 //#region ../runtime-core/dist/utils/load.d.ts
@@ -476,6 +549,7 @@ declare function getRemoteEntry(params: {
   remoteEntryExports?: RemoteEntryExports | undefined;
   getEntryUrl?: (url: string) => string;
   _inErrorHandling?: boolean;
+  resourceContext?: ResourceLoadContext;
 }): Promise<RemoteEntryExports | false | void>;
 //#endregion
 //#region ../runtime-core/dist/core.d.ts
@@ -538,6 +612,7 @@ declare class ModuleFederation {
        * (e.g. preloadRemote / loading remoteEntry).
        */
       remoteInfo?: RemoteInfo;
+      resourceContext?: ResourceLoadContext;
     }], CreateScriptHookReturn>;
     createLink: SyncHook<[{
       url: string;
@@ -548,8 +623,9 @@ declare class ModuleFederation {
        * (e.g. preloadRemote / loading remoteEntry).
        */
       remoteInfo?: RemoteInfo;
-    }], void | HTMLLinkElement>;
-    fetch: AsyncHook<[string, RequestInit, (RemoteInfo | undefined)?], false | void | Promise<Response>>;
+      resourceContext?: ResourceLoadContext;
+    }], CreateLinkHookReturnDom>;
+    fetch: AsyncHook<[string, RequestInit, (RemoteInfo | undefined)?, (ResourceLoadContext | undefined)?], false | void | Promise<Response>>;
     loadEntryError: AsyncHook<[{
       getRemoteEntry: typeof getRemoteEntry;
       origin: ModuleFederation;
@@ -558,11 +634,65 @@ declare class ModuleFederation {
       globalLoading: Record<string, Promise<void | RemoteEntryExports> | undefined>;
       uniqueKey: string;
     }], Promise<Promise<RemoteEntryExports | undefined> | undefined>>;
+    afterLoadEntry: AsyncHook<[{
+      origin: ModuleFederation;
+      remoteInfo: RemoteInfo;
+      remoteEntryExports?: false | void | RemoteEntryExports | undefined;
+      error?: unknown;
+      recovered?: boolean;
+    }], void>;
+    beforeInitRemote: AsyncHook<[{
+      id?: string;
+      remoteInfo: RemoteInfo;
+      remoteSnapshot?: ModuleInfo;
+      origin: ModuleFederation;
+    }], void>;
+    afterInitRemote: AsyncHook<[{
+      id?: string;
+      remoteInfo: RemoteInfo;
+      remoteSnapshot?: ModuleInfo;
+      remoteEntryExports?: RemoteEntryExports;
+      error?: unknown;
+      cached?: boolean;
+      origin: ModuleFederation;
+    }], void>;
+    beforeGetExpose: AsyncHook<[{
+      id: string;
+      expose: string;
+      moduleInfo: RemoteInfo;
+      remoteEntryExports: RemoteEntryExports;
+      origin: ModuleFederation;
+    }], void>;
+    afterGetExpose: AsyncHook<[{
+      id: string;
+      expose: string;
+      moduleInfo: RemoteInfo;
+      remoteEntryExports: RemoteEntryExports;
+      moduleFactory?: RemoteModuleFactory;
+      error?: unknown;
+      origin: ModuleFederation;
+    }], void>;
+    beforeExecuteFactory: AsyncHook<[{
+      id: string;
+      expose: string;
+      moduleInfo: RemoteInfo;
+      loadFactory: boolean;
+      origin: ModuleFederation;
+    }], void>;
+    afterExecuteFactory: AsyncHook<[{
+      id: string;
+      expose: string;
+      moduleInfo: RemoteInfo;
+      loadFactory: boolean;
+      exposeModule?: unknown;
+      error?: unknown;
+      origin: ModuleFederation;
+    }], void>;
     getModuleFactory: AsyncHook<[{
       remoteEntryExports: RemoteEntryExports;
       expose: string;
       moduleInfo: RemoteInfo;
-    }], Promise<(() => Promise<Module$1>) | undefined>>;
+    }], RemoteModuleFactory | Promise<RemoteModuleFactory | undefined> | undefined>;
   }>;
   bridgeHook: PluginSystem<{
     beforeBridgeRender: SyncHook<[Record<string, any>], void | Record<string, any>>;
@@ -607,6 +737,7 @@ declare class ModuleFederation {
 //#region ../runtime-core/dist/module/index.d.ts
 //#region src/module/index.d.ts
 type ModuleOptions = ConstructorParameters<typeof Module$1>[0];
+type RemoteModuleFactory = () => unknown | Promise<unknown>;
 declare class Module$1 {
   remoteInfo: RemoteInfo;
   inited: boolean;
@@ -622,11 +753,11 @@ declare class Module$1 {
     remoteInfo: RemoteInfo;
     host: ModuleFederation;
   });
-  getEntry(): Promise<RemoteEntryExports>;
-  init(id?: string, remoteSnapshot?: ModuleInfo, rawInitScope?: InitScope): Promise<RemoteEntryExports>;
+  getEntry(expose?: string): Promise<RemoteEntryExports>;
+  init(id?: string, remoteSnapshot?: ModuleInfo, rawInitScope?: InitScope, expose?: string): Promise<RemoteEntryExports>;
   get(id: string, expose: string, options?: {
     loadFactory?: boolean;
-  }, remoteSnapshot?: ModuleInfo): Promise<any>;
+  }, remoteSnapshot?: ModuleInfo): Promise<unknown>;
   private wraperFactory;
 } //#endregion
 //#endregion

package/dist/esm/{Broker-z82OgzMe.mjs → Broker-Cmbh_XVO.mjs}

@@ -1,5 +1,6 @@
 import { a as MF_SERVER_IDENTIFIER, c as WEB_SOCKET_CONNECT_MAGIC_ID, i as DEFAULT_WEB_SOCKET_PORT, l as Message, n as ActionKind, o as UpdateMode } from "./Action-DNNg2YDh.mjs";
 import * as fs$1 from "fs";
+import { parse } from "url";
 import * as path$1 from "path";
 import { SEPARATOR, createLogger } from "@module-federation/sdk";
 import net from "net";
@@ -7,7 +8,6 @@ import os from "os";
 import WebSocket from "isomorphic-ws";
 import { createServer } from "http";
 import schedule from "node-schedule";
-import { parse } from "url";
 
 //#region src/server/message/API/API.ts
 let APIKind = /* @__PURE__ */ function(APIKind) {

package/dist/esm/{consumeTypes-DYgYpZMQ.mjs → consumeTypes-COIltElB.mjs}

@@ -1,8 +1,8 @@
-import { a as cloneDeepOptions, n as RpcGMCallTypes, o as getDTSManagerConstructor, s as isDebugMode, t as exposeRpc, x as __exportAll } from "./expose-rpc-B-zm7DmJ.mjs";
+import { a as cloneDeepOptions, n as RpcGMCallTypes, o as getDTSManagerConstructor, s as isDebugMode, t as exposeRpc, x as __exportAll } from "./expose-rpc-ZWQxpg0y.mjs";
+import { fileURLToPath } from "url";
 import path from "path";
 import { randomUUID } from "crypto";
 import * as child_process from "child_process";
-import { fileURLToPath } from "url";
 import * as process$2 from "process";
 
 //#region src/core/rpc/rpc-error.ts

package/dist/esm/core.mjs

@@ -1,5 +1,5 @@
-import { _ as retrieveMfTypesPath, c as isTSProject, d as DTSManager, f as HOST_API_TYPES_FILE_NAME, g as retrieveTypesZipPath, h as retrieveHostConfig, i as retrieveRemoteConfig, l as retrieveTypesAssetsInfo, m as REMOTE_API_TYPES_FILE_NAME, o as getDTSManagerConstructor, p as REMOTE_ALIAS_IDENTIFIER, r as generateTypes, u as validateOptions, v as retrieveOriginalOutDir } from "./expose-rpc-B-zm7DmJ.mjs";
-import "./Broker-z82OgzMe.mjs";
-import { i as rpc_exports, n as generateTypesInChildProcess, r as DtsWorker, t as consumeTypes } from "./consumeTypes-DYgYpZMQ.mjs";
+import { _ as retrieveMfTypesPath, c as isTSProject, d as DTSManager, f as HOST_API_TYPES_FILE_NAME, g as retrieveTypesZipPath, h as retrieveHostConfig, i as retrieveRemoteConfig, l as retrieveTypesAssetsInfo, m as REMOTE_API_TYPES_FILE_NAME, o as getDTSManagerConstructor, p as REMOTE_ALIAS_IDENTIFIER, r as generateTypes, u as validateOptions, v as retrieveOriginalOutDir } from "./expose-rpc-ZWQxpg0y.mjs";
+import "./Broker-Cmbh_XVO.mjs";
+import { i as rpc_exports, n as generateTypesInChildProcess, r as DtsWorker, t as consumeTypes } from "./consumeTypes-COIltElB.mjs";
 
 export { DTSManager, DtsWorker, HOST_API_TYPES_FILE_NAME, REMOTE_ALIAS_IDENTIFIER, REMOTE_API_TYPES_FILE_NAME, consumeTypes, generateTypes, generateTypesInChildProcess, getDTSManagerConstructor, isTSProject, retrieveHostConfig, retrieveMfTypesPath, retrieveOriginalOutDir, retrieveRemoteConfig, retrieveTypesAssetsInfo, retrieveTypesZipPath, rpc_exports as rpc, validateOptions };

package/dist/esm/{expose-rpc-B-zm7DmJ.mjs → expose-rpc-ZWQxpg0y.mjs}

@@ -1,7 +1,8 @@
 import { a as MF_SERVER_IDENTIFIER, n as ActionKind, o as UpdateMode, r as DEFAULT_TAR_NAME, t as Action } from "./Action-DNNg2YDh.mjs";
-import { a as getIdentifier, c as logger$1, i as getFreePort, l as LogKind, n as UpdateKind, o as getIPV4, r as fib, s as fileLog, t as Broker, u as APIKind } from "./Broker-z82OgzMe.mjs";
+import { a as getIdentifier, c as logger$1, i as getFreePort, l as LogKind, n as UpdateKind, o as getIPV4, r as fib, s as fileLog, t as Broker, u as APIKind } from "./Broker-Cmbh_XVO.mjs";
 import { createRequire } from "node:module";
 import fs, { existsSync, mkdirSync, writeFileSync } from "fs";
+import { fileURLToPath } from "url";
 import path, { dirname, extname, isAbsolute, join, normalize, relative, resolve, sep } from "path";
 import { cp, mkdir, readFile, readdir, rm, stat, writeFile } from "fs/promises";
 import { utils } from "@module-federation/managers";
@@ -87,6 +88,8 @@ var UpdatePublisherAction = class extends Action {
 
 //#endregion
 //#region src/server/broker/createBroker.ts
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 function createBroker() {
 	const sub = fork(path.resolve(__dirname, "./start-broker.js"), [], {
 		detached: true,
@@ -667,7 +670,7 @@ const defaultOptions$1 = {
 	remoteTypeUrls: {},
 	timeout: 6e4,
 	typesOnBuild: false,
-	family: 4
+	family: 0
 };
 const buildZipUrl = (hostOptions, url) => {
 	const remoteUrl = new URL(url, "file:");
@@ -688,12 +691,14 @@ const retrieveRemoteInfo = (options) => {
 	let zipUrl = "";
 	let apiTypeUrl = "";
 	const name = parsedInfo.name || remoteAlias;
-	if (typeof remoteTypeUrls === "object" && remoteTypeUrls[name]) {
-		zipUrl = remoteTypeUrls[name].zip;
-		apiTypeUrl = remoteTypeUrls[name].api;
+	const remoteTypeUrl = typeof remoteTypeUrls === "object" && remoteTypeUrls[name];
+	if (remoteTypeUrl) {
+		zipUrl = remoteTypeUrl.zip;
+		apiTypeUrl = remoteTypeUrl.api;
 	}
-	if (!zipUrl && url) zipUrl = buildZipUrl(hostOptions, url);
-	if (!apiTypeUrl && zipUrl) apiTypeUrl = buildApiTypeUrl(zipUrl);
+	const shouldResolveTypeUrlsByConvention = Boolean(url && !url.includes(MANIFEST_EXT));
+	if (!zipUrl && shouldResolveTypeUrlsByConvention) zipUrl = buildZipUrl(hostOptions, url);
+	if (!apiTypeUrl && zipUrl && (remoteTypeUrl || shouldResolveTypeUrlsByConvention)) apiTypeUrl = buildApiTypeUrl(zipUrl);
 	return {
 		name,
 		url,
@@ -879,13 +884,14 @@ var DTSManager = class {
 				else publicPath = getPublicPath();
 			}
 			if (publicPath === "auto") publicPath = inferAutoPublicPath(remoteInfo.url);
-			remoteInfo.zipUrl = new URL(path.join(addProtocol(publicPath), manifestJson.metaData.types.zip)).href;
+			const normalizedPublicPath = addProtocol(publicPath).endsWith("/") ? addProtocol(publicPath) : `${addProtocol(publicPath)}/`;
+			remoteInfo.zipUrl = new URL(manifestJson.metaData.types.zip, normalizedPublicPath).href;
 			if (!manifestJson.metaData.types.api) {
 				console.warn(`Can not get ${remoteInfo.name}'s api types url!`);
 				remoteInfo.apiTypeUrl = "";
 				return remoteInfo;
 			}
-			remoteInfo.apiTypeUrl = new URL(path.join(addProtocol(publicPath), manifestJson.metaData.types.api)).href;
+			remoteInfo.apiTypeUrl = new URL(manifestJson.metaData.types.api, normalizedPublicPath).href;
 			return remoteInfo;
 		} catch (_err) {
 			fileLog(`fetch manifest failed, ${_err}, ${remoteInfo.name} will be ignored`, "requestRemoteManifest", "error");

package/dist/esm/fork-dev-worker.mjs

@@ -1,7 +1,7 @@
-import { _ as retrieveMfTypesPath, b as ModuleFederationDevServer, g as retrieveTypesZipPath, h as retrieveHostConfig, i as retrieveRemoteConfig, n as RpcGMCallTypes, o as getDTSManagerConstructor, t as exposeRpc, y as createHttpServer } from "./expose-rpc-B-zm7DmJ.mjs";
+import { _ as retrieveMfTypesPath, b as ModuleFederationDevServer, g as retrieveTypesZipPath, h as retrieveHostConfig, i as retrieveRemoteConfig, n as RpcGMCallTypes, o as getDTSManagerConstructor, t as exposeRpc, y as createHttpServer } from "./expose-rpc-ZWQxpg0y.mjs";
 import { o as UpdateMode, r as DEFAULT_TAR_NAME } from "./Action-DNNg2YDh.mjs";
-import { n as UpdateKind, o as getIPV4, s as fileLog } from "./Broker-z82OgzMe.mjs";
-import "./consumeTypes-DYgYpZMQ.mjs";
+import { n as UpdateKind, o as getIPV4, s as fileLog } from "./Broker-Cmbh_XVO.mjs";
+import "./consumeTypes-COIltElB.mjs";
 import "./core.mjs";
 import { t as getIpFromEntry } from "./utils-CkPvDGOy.mjs";
 import { decodeName } from "@module-federation/sdk";

package/dist/esm/fork-generate-dts.mjs

@@ -1,5 +1,5 @@
-import { n as RpcGMCallTypes, r as generateTypes, t as exposeRpc } from "./expose-rpc-B-zm7DmJ.mjs";
-import "./Broker-z82OgzMe.mjs";
+import { n as RpcGMCallTypes, r as generateTypes, t as exposeRpc } from "./expose-rpc-ZWQxpg0y.mjs";
+import "./Broker-Cmbh_XVO.mjs";
 
 //#region src/core/lib/forkGenerateDts.ts
 async function forkGenerateDts(options) {

package/dist/esm/index.mjs

@@ -1,20 +1,23 @@
-import { a as cloneDeepOptions, c as isTSProject, l as retrieveTypesAssetsInfo, n as RpcGMCallTypes, r as generateTypes, u as validateOptions } from "./expose-rpc-B-zm7DmJ.mjs";
+import { a as cloneDeepOptions, c as isTSProject, l as retrieveTypesAssetsInfo, n as RpcGMCallTypes, r as generateTypes, u as validateOptions } from "./expose-rpc-ZWQxpg0y.mjs";
 import { s as WEB_CLIENT_OPTIONS_IDENTIFIER } from "./Action-DNNg2YDh.mjs";
-import { c as logger$1, o as getIPV4 } from "./Broker-z82OgzMe.mjs";
-import { a as createRpcWorker, n as generateTypesInChildProcess, t as consumeTypes } from "./consumeTypes-DYgYpZMQ.mjs";
+import { c as logger$1, o as getIPV4 } from "./Broker-Cmbh_XVO.mjs";
+import { a as createRpcWorker, n as generateTypesInChildProcess, t as consumeTypes } from "./consumeTypes-COIltElB.mjs";
 import "./core.mjs";
 import fs from "fs";
+import { fileURLToPath } from "url";
 import * as path$1 from "path";
 import path from "path";
 import { rm } from "fs/promises";
 import { TEMP_DIR, infrastructureLogger, logger, normalizeOptions } from "@module-federation/sdk";
 
 //#region src/dev-worker/DevWorker.ts
+const __filename$1 = fileURLToPath(import.meta.url);
+const __dirname$1 = path.dirname(__filename$1);
 var DevWorker = class {
 	constructor(options) {
 		this._options = cloneDeepOptions(options);
 		this.removeUnSerializationOptions();
-		this._rpcWorker = createRpcWorker(path.resolve(__dirname, "./fork-dev-worker.js"), {}, void 0, false);
+		this._rpcWorker = createRpcWorker(path.resolve(__dirname$1, "./fork-dev-worker.js"), {}, void 0, false);
 		this._res = this._rpcWorker.connect(this._options);
 	}
 	removeUnSerializationOptions() {
@@ -71,6 +74,8 @@ function getCompilerOutputDir(compiler) {
 
 //#endregion
 //#region src/plugins/DevPlugin.ts
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 var PROCESS_EXIT_CODE = /* @__PURE__ */ function(PROCESS_EXIT_CODE) {
 	PROCESS_EXIT_CODE[PROCESS_EXIT_CODE["SUCCESS"] = 0] = "SUCCESS";
 	PROCESS_EXIT_CODE[PROCESS_EXIT_CODE["FAILURE"] = 1] = "FAILURE";

package/dist/esm/start-broker.mjs

@@ -1,4 +1,4 @@
-import { s as fileLog, t as Broker } from "./Broker-z82OgzMe.mjs";
+import { s as fileLog, t as Broker } from "./Broker-Cmbh_XVO.mjs";
 
 //#region src/server/broker/startBroker.ts
 let broker;

package/dist/{expose-rpc-CQq6zYK-.js → expose-rpc-XLxmAXIW.js}

@@ -1,7 +1,8 @@
 const require_Action = require('./Action-CzhPMw2i.js');
-const require_Broker = require('./Broker-DRFgFvXI.js');
+const require_Broker = require('./Broker-CaenCqdn.js');
 let fs = require("fs");
 fs = require_Action.__toESM(fs);
+let url = require("url");
 let path = require("path");
 path = require_Action.__toESM(path);
 let fs_promises = require("fs/promises");
@@ -78,8 +79,10 @@ var UpdatePublisherAction = class extends require_Action.Action {
 
 //#endregion
 //#region src/server/broker/createBroker.ts
+const __filename$1 = (0, url.fileURLToPath)(require("url").pathToFileURL(__filename).href);
+const __dirname$1 = path.default.dirname(__filename$1);
 function createBroker() {
-	const sub = (0, child_process.fork)(path.default.resolve(__dirname, "./start-broker.js"), [], {
+	const sub = (0, child_process.fork)(path.default.resolve(__dirname$1, "./start-broker.js"), [], {
 		detached: true,
 		stdio: "ignore",
 		env: process.env
@@ -658,7 +661,7 @@ const defaultOptions$1 = {
 	remoteTypeUrls: {},
 	timeout: 6e4,
 	typesOnBuild: false,
-	family: 4
+	family: 0
 };
 const buildZipUrl = (hostOptions, url) => {
 	const remoteUrl = new URL(url, "file:");
@@ -679,12 +682,14 @@ const retrieveRemoteInfo = (options) => {
 	let zipUrl = "";
 	let apiTypeUrl = "";
 	const name = parsedInfo.name || remoteAlias;
-	if (typeof remoteTypeUrls === "object" && remoteTypeUrls[name]) {
-		zipUrl = remoteTypeUrls[name].zip;
-		apiTypeUrl = remoteTypeUrls[name].api;
+	const remoteTypeUrl = typeof remoteTypeUrls === "object" && remoteTypeUrls[name];
+	if (remoteTypeUrl) {
+		zipUrl = remoteTypeUrl.zip;
+		apiTypeUrl = remoteTypeUrl.api;
 	}
-	if (!zipUrl && url) zipUrl = buildZipUrl(hostOptions, url);
-	if (!apiTypeUrl && zipUrl) apiTypeUrl = buildApiTypeUrl(zipUrl);
+	const shouldResolveTypeUrlsByConvention = Boolean(url && !url.includes(_module_federation_sdk.MANIFEST_EXT));
+	if (!zipUrl && shouldResolveTypeUrlsByConvention) zipUrl = buildZipUrl(hostOptions, url);
+	if (!apiTypeUrl && zipUrl && (remoteTypeUrl || shouldResolveTypeUrlsByConvention)) apiTypeUrl = buildApiTypeUrl(zipUrl);
 	return {
 		name,
 		url,
@@ -870,13 +875,14 @@ var DTSManager = class {
 				else publicPath = getPublicPath();
 			}
 			if (publicPath === "auto") publicPath = (0, _module_federation_sdk.inferAutoPublicPath)(remoteInfo.url);
-			remoteInfo.zipUrl = new URL(path.default.join(addProtocol(publicPath), manifestJson.metaData.types.zip)).href;
+			const normalizedPublicPath = addProtocol(publicPath).endsWith("/") ? addProtocol(publicPath) : `${addProtocol(publicPath)}/`;
+			remoteInfo.zipUrl = new URL(manifestJson.metaData.types.zip, normalizedPublicPath).href;
 			if (!manifestJson.metaData.types.api) {
 				console.warn(`Can not get ${remoteInfo.name}'s api types url!`);
 				remoteInfo.apiTypeUrl = "";
 				return remoteInfo;
 			}
-			remoteInfo.apiTypeUrl = new URL(path.default.join(addProtocol(publicPath), manifestJson.metaData.types.api)).href;
+			remoteInfo.apiTypeUrl = new URL(manifestJson.metaData.types.api, normalizedPublicPath).href;
 			return remoteInfo;
 		} catch (_err) {
 			require_Broker.fileLog(`fetch manifest failed, ${_err}, ${remoteInfo.name} will be ignored`, "requestRemoteManifest", "error");

package/dist/fork-dev-worker.js

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_Action = require('./Action-CzhPMw2i.js');
-const require_Broker = require('./Broker-DRFgFvXI.js');
-const require_expose_rpc = require('./expose-rpc-CQq6zYK-.js');
-require('./consumeTypes-DxGMNavh.js');
+const require_Broker = require('./Broker-CaenCqdn.js');
+const require_expose_rpc = require('./expose-rpc-XLxmAXIW.js');
+require('./consumeTypes-FbF0o6AJ.js');
 require('./core.js');
 const require_utils = require('./utils-7KqCZHbb.js');
 let _module_federation_sdk = require("@module-federation/sdk");

package/dist/fork-generate-dts.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-require('./Broker-DRFgFvXI.js');
-const require_expose_rpc = require('./expose-rpc-CQq6zYK-.js');
+require('./Broker-CaenCqdn.js');
+const require_expose_rpc = require('./expose-rpc-XLxmAXIW.js');
 
 //#region src/core/lib/forkGenerateDts.ts
 async function forkGenerateDts(options) {

package/dist/iife/launch-web-client.iife.js

@@ -56,7 +56,7 @@
 	}({});
 
 //#endregion
-//#region ../../node_modules/.pnpm/isomorphic-ws@5.0.0_ws@8.18.0/node_modules/isomorphic-ws/browser.js
+//#region ../../node_modules/.pnpm/isomorphic-ws@5.0.0_ws@8.21.0/node_modules/isomorphic-ws/browser.js
 	var ws = null;
 	if (typeof WebSocket !== "undefined") ws = WebSocket;
 	else if (typeof MozWebSocket !== "undefined") ws = MozWebSocket;

package/dist/index.d.ts

@@ -35,7 +35,7 @@ declare const normalizeConsumeTypesOptions: ({
     runtimePkgs?: string[];
     remoteTypeUrls?: (() => Promise<moduleFederationPlugin.RemoteTypeUrls>) | moduleFederationPlugin.RemoteTypeUrls;
     timeout?: number;
-    family?: 4 | 6;
+    family?: 0 | 4 | 6;
     typesOnBuild?: boolean;
     implementation: string;
     context: string;

package/dist/index.js

@@ -1,22 +1,25 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_Action = require('./Action-CzhPMw2i.js');
-const require_Broker = require('./Broker-DRFgFvXI.js');
-const require_expose_rpc = require('./expose-rpc-CQq6zYK-.js');
-const require_consumeTypes = require('./consumeTypes-DxGMNavh.js');
+const require_Broker = require('./Broker-CaenCqdn.js');
+const require_expose_rpc = require('./expose-rpc-XLxmAXIW.js');
+const require_consumeTypes = require('./consumeTypes-FbF0o6AJ.js');
 require('./core.js');
 let fs = require("fs");
 fs = require_Action.__toESM(fs);
+let url = require("url");
 let path = require("path");
 path = require_Action.__toESM(path);
 let fs_promises = require("fs/promises");
 let _module_federation_sdk = require("@module-federation/sdk");
 
 //#region src/dev-worker/DevWorker.ts
+const __filename$2 = (0, url.fileURLToPath)(require("url").pathToFileURL(__filename).href);
+const __dirname$2 = path.default.dirname(__filename$2);
 var DevWorker = class {
 	constructor(options) {
 		this._options = require_expose_rpc.cloneDeepOptions(options);
 		this.removeUnSerializationOptions();
-		this._rpcWorker = require_consumeTypes.createRpcWorker(path.default.resolve(__dirname, "./fork-dev-worker.js"), {}, void 0, false);
+		this._rpcWorker = require_consumeTypes.createRpcWorker(path.default.resolve(__dirname$2, "./fork-dev-worker.js"), {}, void 0, false);
 		this._res = this._rpcWorker.connect(this._options);
 	}
 	removeUnSerializationOptions() {
@@ -73,6 +76,8 @@ function getCompilerOutputDir(compiler) {
 
 //#endregion
 //#region src/plugins/DevPlugin.ts
+const __filename$1 = (0, url.fileURLToPath)(require("url").pathToFileURL(__filename).href);
+const __dirname$1 = path.default.dirname(__filename$1);
 var PROCESS_EXIT_CODE = /* @__PURE__ */ function(PROCESS_EXIT_CODE) {
 	PROCESS_EXIT_CODE[PROCESS_EXIT_CODE["SUCCESS"] = 0] = "SUCCESS";
 	PROCESS_EXIT_CODE[PROCESS_EXIT_CODE["FAILURE"] = 1] = "FAILURE";
@@ -94,7 +99,7 @@ var DevPlugin = class DevPlugin {
 	}
 	static ensureLiveReloadEntry(options, filePath) {
 		ensureTempDir(filePath);
-		const liveReloadEntryWithOptions = fs.default.readFileSync(path.default.join(__dirname, "./iife/launch-web-client.iife.js")).toString("utf-8").replace(require_Action.WEB_CLIENT_OPTIONS_IDENTIFIER, JSON.stringify(options));
+		const liveReloadEntryWithOptions = fs.default.readFileSync(path.default.join(__dirname$1, "./iife/launch-web-client.iife.js")).toString("utf-8").replace(require_Action.WEB_CLIENT_OPTIONS_IDENTIFIER, JSON.stringify(options));
 		fs.default.writeFileSync(filePath, liveReloadEntryWithOptions);
 	}
 	_stopWhenSIGTERMOrSIGINT() {
@@ -139,7 +144,7 @@ var DevPlugin = class DevPlugin {
 		if (!name) throw new Error("name is required if you want to enable dev server!");
 		if (!normalizedDev.disableDynamicRemoteTypeHints) {
 			if (!this._options.runtimePlugins) this._options.runtimePlugins = [];
-			this._options.runtimePlugins.push(path.default.resolve(__dirname, "dynamic-remote-type-hints-plugin.js"));
+			this._options.runtimePlugins.push(path.default.resolve(__dirname$1, "dynamic-remote-type-hints-plugin.js"));
 		}
 		if (!normalizedDev.disableLiveReload) {
 			const TEMP_DIR = path.default.join(`${process.cwd()}/node_modules`, _module_federation_sdk.TEMP_DIR);

package/dist/start-broker.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_Broker = require('./Broker-DRFgFvXI.js');
+const require_Broker = require('./Broker-CaenCqdn.js');
 
 //#region src/server/broker/startBroker.ts
 let broker;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/dts-plugin",
-  "version": "2.4.0",
+  "version": "2.5.1",
   "author": "hanric <hanric.zhang@gmail.com>",
   "main": "./dist/index.js",
   "module": "./dist/esm/index.mjs",
@@ -70,11 +70,11 @@
     "isomorphic-ws": "5.0.0",
     "undici": "7.24.7",
     "node-schedule": "2.1.1",
-    "ws": "8.18.0",
-    "@module-federation/error-codes": "2.4.0",
-    "@module-federation/sdk": "2.4.0",
-    "@module-federation/managers": "2.4.0",
-    "@module-federation/third-party-dts-extractor": "2.4.0"
+    "ws": "8.21.0",
+    "@module-federation/error-codes": "2.5.1",
+    "@module-federation/managers": "2.5.1",
+    "@module-federation/sdk": "2.5.1",
+    "@module-federation/third-party-dts-extractor": "2.5.1"
   },
   "devDependencies": {
     "@types/node-schedule": "2.1.7",
@@ -86,7 +86,7 @@
     "directory-tree": "3.5.2",
     "vitest": "1.6.0",
     "webpack": "^5.104.1",
-    "@module-federation/runtime": "2.4.0"
+    "@module-federation/runtime": "2.5.1"
   },
   "peerDependencies": {
     "typescript": "^4.9.0 || ^5.0.0",