@module-federation/dts-plugin 0.2.7 → 0.3.0

package/dist/esm/{chunk-G7ONFBMA.js → chunk-XKCIYRDL.js}

@@ -1,6 +1,6 @@
 import {
   __name
-} from "./chunk-MQRIERJP.js";
+} from "./chunk-6DND574L.js";
 
 // packages/dts-plugin/src/dev-worker/utils.ts
 var DEFAULT_LOCAL_IPS = [

package/dist/esm/core.js

@@ -1,9 +1,15 @@
 import {
-  DTSManager,
   DtsWorker,
   consumeTypes,
-  generateTypes,
   generateTypesInChildProcess,
+  rpc_exports
+} from "./chunk-DEW2PNCR.js";
+import {
+  DTSManager,
+  HOST_API_TYPES_FILE_NAME,
+  REMOTE_ALIAS_IDENTIFIER,
+  REMOTE_API_TYPES_FILE_NAME,
+  generateTypes,
   getDTSManagerConstructor,
   isTSProject,
   retrieveHostConfig,
@@ -12,22 +18,16 @@ import {
   retrieveRemoteConfig,
   retrieveTypesAssetsInfo,
   retrieveTypesZipPath,
-  rpc_exports,
   validateOptions
-} from "./chunk-ZLQBXHXA.js";
-import {
-  HOST_API_TYPES_FILE_NAME,
-  REMOTE_ALIAS_IDENTIFIER,
-  REMOTE_API_TYPES_FILE_NAME,
-  UpdateMode
-} from "./chunk-MQRIERJP.js";
+} from "./chunk-SFEGBRA3.js";
+import "./chunk-HKRTV6ZH.js";
+import "./chunk-6DND574L.js";
 export {
   DTSManager,
   DtsWorker,
   HOST_API_TYPES_FILE_NAME,
   REMOTE_ALIAS_IDENTIFIER,
   REMOTE_API_TYPES_FILE_NAME,
-  UpdateMode,
   consumeTypes,
   generateTypes,
   generateTypesInChildProcess,

package/dist/esm/dynamic-remote-type-hints-plugin.js

@@ -1,13 +1,13 @@
 import {
   getIpFromEntry
-} from "./chunk-G7ONFBMA.js";
+} from "./chunk-XKCIYRDL.js";
 import {
   AddDynamicRemoteAction,
   DEFAULT_WEB_SOCKET_PORT,
   FetchTypesAction,
   WEB_SOCKET_CONNECT_MAGIC_ID,
   __name
-} from "./chunk-MQRIERJP.js";
+} from "./chunk-6DND574L.js";
 
 // packages/dts-plugin/src/server/createWebsocket.ts
 import WebSocket from "isomorphic-ws";

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

@@ -1,25 +1,29 @@
+import {
+  rpc_exports
+} from "./chunk-DEW2PNCR.js";
 import {
   ModuleFederationDevServer,
   createKoaServer,
-  fileLog,
   getDTSManagerConstructor,
-  getIPV4,
   retrieveHostConfig,
   retrieveMfTypesPath,
   retrieveRemoteConfig,
-  retrieveTypesZipPath,
-  rpc_exports
-} from "./chunk-ZLQBXHXA.js";
+  retrieveTypesZipPath
+} from "./chunk-SFEGBRA3.js";
+import {
+  fileLog,
+  getIPV4
+} from "./chunk-HKRTV6ZH.js";
 import {
   getIpFromEntry
-} from "./chunk-G7ONFBMA.js";
+} from "./chunk-XKCIYRDL.js";
 import {
   DEFAULT_TAR_NAME,
   UpdateKind,
   UpdateMode,
   __async,
   __name
-} from "./chunk-MQRIERJP.js";
+} from "./chunk-6DND574L.js";
 
 // packages/dts-plugin/src/dev-worker/forkDevWorker.ts
 import { decodeName } from "@module-federation/sdk";

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

@@ -2,11 +2,12 @@ import {
   RpcGMCallTypes,
   exposeRpc,
   generateTypes
-} from "./chunk-ZLQBXHXA.js";
+} from "./chunk-SFEGBRA3.js";
+import "./chunk-HKRTV6ZH.js";
 import {
   __async,
   __name
-} from "./chunk-MQRIERJP.js";
+} from "./chunk-6DND574L.js";
 
 // packages/dts-plugin/src/core/lib/forkGenerateDts.ts
 function forkGenerateDts(options) {

package/dist/esm/index.js

@@ -1,13 +1,18 @@
 import {
   consumeTypes,
-  generateTypes,
   generateTypesInChildProcess,
-  getIPV4,
+  rpc_exports
+} from "./chunk-DEW2PNCR.js";
+import {
+  cloneDeepOptions,
+  generateTypes,
   isTSProject,
   retrieveTypesAssetsInfo,
-  rpc_exports,
   validateOptions
-} from "./chunk-ZLQBXHXA.js";
+} from "./chunk-SFEGBRA3.js";
+import {
+  getIPV4
+} from "./chunk-HKRTV6ZH.js";
 import {
   WEB_CLIENT_OPTIONS_IDENTIFIER,
   __async,
@@ -15,7 +20,7 @@ import {
   __publicField,
   __spreadProps,
   __spreadValues
-} from "./chunk-MQRIERJP.js";
+} from "./chunk-6DND574L.js";
 
 // packages/dts-plugin/src/plugins/DevPlugin.ts
 import fs from "fs-extra";
@@ -27,17 +32,12 @@ import * as fse from "fs-extra";
 
 // packages/dts-plugin/src/dev-worker/DevWorker.ts
 import path from "path";
-import cloneDeepWith from "lodash.clonedeepwith";
 var _DevWorker = class _DevWorker {
   constructor(options) {
     __publicField(this, "_rpcWorker");
     __publicField(this, "_options");
     __publicField(this, "_res");
-    this._options = cloneDeepWith(options, (_value, key) => {
-      if (key === "manifest") {
-        return false;
-      }
-    });
+    this._options = cloneDeepOptions(options);
     this.removeUnSerializationOptions();
     this._rpcWorker = rpc_exports.createRpcWorker(path.resolve(__dirname, "./fork-dev-worker.js"), {}, void 0, false);
     this._res = this._rpcWorker.connect(this._options);
@@ -184,14 +184,17 @@ var _DevPlugin = class _DevPlugin {
     if (!normalizedDev.disableLiveReload) {
       const TEMP_DIR = path3.join(`${process.cwd()}/node_modules`, BasicTempDir);
       const filepath = path3.join(TEMP_DIR, `live-reload.js`);
-      _DevPlugin.ensureLiveReloadEntry({
-        name
-      }, filepath);
-      compiler.hooks.afterPlugins.tap("MFDevPlugin", () => {
-        new compiler.webpack.EntryPlugin(compiler.context, filepath, {
+      if (typeof compiler.options.entry === "object") {
+        _DevPlugin.ensureLiveReloadEntry({
           name
-        }).apply(compiler);
-      });
+        }, filepath);
+        Object.keys(compiler.options.entry).forEach((entry) => {
+          const normalizedEntry = compiler.options.entry[entry];
+          if (typeof normalizedEntry === "object" && Array.isArray(normalizedEntry.import)) {
+            normalizedEntry.import.unshift(filepath);
+          }
+        });
+      }
     }
     const defaultGenerateTypes = {
       compileInChildProcess: true

package/dist/esm/start-broker.js

@@ -1,11 +1,11 @@
 import {
   Broker,
   fileLog
-} from "./chunk-ZLQBXHXA.js";
+} from "./chunk-HKRTV6ZH.js";
 import {
   __async,
   __name
-} from "./chunk-MQRIERJP.js";
+} from "./chunk-6DND574L.js";
 
 // packages/dts-plugin/src/server/broker/startBroker.ts
 var broker;

package/dist/fork-dev-worker.d.mts

@@ -1,4 +1,4 @@
-import { D as DTSManagerOptions } from './DTSManagerOptions-c0728719.js';
+import { D as DTSManagerOptions } from './DTSManagerOptions-7109e8ac.js';
 import '@module-federation/sdk';
 
 interface DevWorkerOptions extends DTSManagerOptions {

package/dist/fork-dev-worker.d.ts

@@ -1,4 +1,4 @@
-import { D as DTSManagerOptions } from './DTSManagerOptions-c0728719.js';
+import { D as DTSManagerOptions } from './DTSManagerOptions-7109e8ac.js';
 import '@module-federation/sdk';
 
 interface DevWorkerOptions extends DTSManagerOptions {

package/dist/fork-dev-worker.js

@@ -93,7 +93,6 @@ var import_path4 = __toESM(require("path"));
 var import_promises3 = require("fs/promises");
 var import_fs = __toESM(require("fs"));
 var import_sdk5 = require("@module-federation/sdk");
-var import_lodash = __toESM(require("lodash.clonedeepwith"));
 var import_third_party_dts_extractor2 = require("@module-federation/third-party-dts-extractor");
 
 // packages/dts-plugin/src/core/lib/archiveHandler.ts
@@ -103,8 +102,8 @@ var import_promises2 = require("fs/promises");
 
 // packages/dts-plugin/src/core/lib/typeScriptCompiler.ts
 var import_fs_extra = require("fs-extra");
+var import_crypto = __toESM(require("crypto"));
 var import_promises = require("fs/promises");
-var import_crypto = require("crypto");
 var import_path = require("path");
 var import_third_party_dts_extractor = require("@module-federation/third-party-dts-extractor");
 var import_child_process = require("child_process");
@@ -115,8 +114,12 @@ var DEFINITION_FILE_EXTENSION = ".d.ts";
 var retrieveMfTypesPath = /* @__PURE__ */ __name((tsConfig, remoteOptions) => (0, import_path.normalize)(tsConfig.compilerOptions.outDir.replace(remoteOptions.compiledTypesFolder, "")), "retrieveMfTypesPath");
 var retrieveOriginalOutDir = /* @__PURE__ */ __name((tsConfig, remoteOptions) => (0, import_path.normalize)(tsConfig.compilerOptions.outDir.replace(remoteOptions.compiledTypesFolder, "").replace(remoteOptions.typesFolder, "")), "retrieveOriginalOutDir");
 var retrieveMfAPITypesPath = /* @__PURE__ */ __name((tsConfig, remoteOptions) => (0, import_path.join)(retrieveOriginalOutDir(tsConfig, remoteOptions), `${remoteOptions.typesFolder}.d.ts`), "retrieveMfAPITypesPath");
-function writeTempTsConfig(tsConfig, context) {
-  const tempTsConfigJsonPath = (0, import_path.resolve)(context, "node_modules", import_sdk.TEMP_DIR, `tsconfig.${(0, import_crypto.randomUUID)()}.json`);
+function writeTempTsConfig(tsConfig, context, name) {
+  const createHash = /* @__PURE__ */ __name((contents) => {
+    return import_crypto.default.createHash("md5").update(contents).digest("hex");
+  }, "createHash");
+  const hash = createHash(`${JSON.stringify(tsConfig)}${name}`);
+  const tempTsConfigJsonPath = (0, import_path.resolve)(context, "node_modules", import_sdk.TEMP_DIR, `tsconfig.${hash}.json`);
   (0, import_fs_extra.ensureDirSync)((0, import_path.dirname)(tempTsConfigJsonPath));
   (0, import_fs_extra.writeFileSync)(tempTsConfigJsonPath, JSON.stringify(tsConfig, null, 2));
   return tempTsConfigJsonPath;
@@ -156,6 +159,7 @@ var processTypesFile = /* @__PURE__ */ __name((options) => __async(void 0, null,
       const mfeTypeEntry = (0, import_path.join)(mfTypePath, `${sourceEntry}${DEFINITION_FILE_EXTENSION}`);
       const mfeTypeEntryDirectory = (0, import_path.dirname)(mfeTypeEntry);
       const relativePathToOutput = (0, import_path.relative)(mfeTypeEntryDirectory, filePath).replace(DEFINITION_FILE_EXTENSION, "").replace(STARTS_WITH_SLASH, "").split(import_path.sep).join("/");
+      (0, import_fs_extra.ensureDirSync)(mfeTypeEntryDirectory);
       yield (0, import_promises.writeFile)(mfeTypeEntry, `export * from './${relativePathToOutput}';
 export { default } from './${relativePathToOutput}';`);
     }
@@ -168,7 +172,7 @@ var compileTs = /* @__PURE__ */ __name((mapComponentsToExpose, tsConfig, remoteO
     return;
   }
   const { compilerOptions } = tsConfig;
-  const tempTsConfigJsonPath = writeTempTsConfig(tsConfig, remoteOptions.context);
+  const tempTsConfigJsonPath = writeTempTsConfig(tsConfig, remoteOptions.context, remoteOptions.moduleFederationConfig.name || "mf");
   try {
     const mfTypePath = retrieveMfTypesPath(tsConfig, remoteOptions);
     const thirdPartyExtractor = new import_third_party_dts_extractor.ThirdPartyExtractor((0, import_path.resolve)(mfTypePath, "node_modules"), remoteOptions.context);
@@ -206,6 +210,9 @@ var compileTs = /* @__PURE__ */ __name((mapComponentsToExpose, tsConfig, remoteO
     }
     yield (0, import_promises.rm)(tempTsConfigJsonPath);
   } catch (err) {
+    if (isDebugMode()) {
+      console.log("tsconfig: ", JSON.stringify(tsConfig, null, 2));
+    }
     throw err;
   }
 }), "compileTs");
@@ -330,6 +337,11 @@ var DEFAULT_WEB_SOCKET_PORT = 16322;
 var WEB_SOCKET_CONNECT_MAGIC_ID = "1hpzW-zo2z-o8io-gfmV1-2cb1d82";
 var MF_SERVER_IDENTIFIER = "Module Federation Dev Server";
 var DEFAULT_TAR_NAME = "@mf-types.zip";
+var UpdateMode;
+(function(UpdateMode2) {
+  UpdateMode2["POSITIVE"] = "POSITIVE";
+  UpdateMode2["PASSIVE"] = "PASSIVE";
+})(UpdateMode || (UpdateMode = {}));
 
 // packages/dts-plugin/src/server/utils/log.ts
 function fileLog(msg, module2, level) {
@@ -635,16 +647,6 @@ var _UpdatePublisherAction = class _UpdatePublisherAction extends Action {
 __name(_UpdatePublisherAction, "UpdatePublisherAction");
 var UpdatePublisherAction = _UpdatePublisherAction;
 
-// packages/dts-plugin/src/core/constant.ts
-var REMOTE_ALIAS_IDENTIFIER = "REMOTE_ALIAS_IDENTIFIER";
-var REMOTE_API_TYPES_FILE_NAME = "apis.d.ts";
-var HOST_API_TYPES_FILE_NAME = "index.d.ts";
-var UpdateMode;
-(function(UpdateMode2) {
-  UpdateMode2["POSITIVE"] = "POSITIVE";
-  UpdateMode2["PASSIVE"] = "PASSIVE";
-})(UpdateMode || (UpdateMode = {}));
-
 // packages/dts-plugin/src/server/broker/Broker.ts
 var _Broker = class _Broker {
   constructor() {
@@ -1271,12 +1273,12 @@ var _ModuleFederationDevServer = class _ModuleFederationDevServer {
       var _a3;
       fileLog(`Current pid: ${process.pid}, publisher:${this._name} connected to ws://${this._ip}:${Broker.DEFAULT_WEB_SOCKET_PORT}, starting service...`, MF_SERVER_IDENTIFIER, "info");
       this._isConnected = true;
-      const startGarfishModule = new AddPublisherAction({
+      const addPublisherAction = new AddPublisherAction({
         name: this._name,
         ip: this._ip,
         remoteTypeTarPath: this._remoteTypeTarPath
       });
-      (_a3 = this._publishWebSocket) == null ? void 0 : _a3.send(JSON.stringify(startGarfishModule));
+      (_a3 = this._publishWebSocket) == null ? void 0 : _a3.send(JSON.stringify(addPublisherAction));
       this._connectSubscribers();
     });
     this._publishWebSocket.on("message", (message) => __async(this, null, function* () {
@@ -1539,11 +1541,11 @@ var _ModuleFederationDevServer = class _ModuleFederationDevServer {
     if (!this._publishWebSocket || !this._isConnected) {
       return;
     }
-    const { updateKind, updateMode, updateSourcePaths } = options;
+    const { updateKind, updateMode, updateSourcePaths, clientName } = options;
     fileLog(`update run, ${this._name} module update, updateKind: ${updateKind}, updateMode: ${updateMode}, updateSourcePaths: ${updateSourcePaths}`, MF_SERVER_IDENTIFIER, "info");
     if (updateKind === UpdateKind.RELOAD_PAGE) {
       const notifyWebClient = new NotifyWebClientAction({
-        name: this._name,
+        name: clientName || this._name,
         updateMode
       });
       this._publishWebSocket.send(JSON.stringify(notifyWebClient));
@@ -1685,7 +1687,8 @@ var defaultOptions = {
   implementation: "",
   context: process.cwd(),
   abortOnError: true,
-  consumeAPITypes: false
+  consumeAPITypes: false,
+  runtimePkgs: []
 };
 var buildZipUrl = /* @__PURE__ */ __name((hostOptions, url) => {
   const remoteUrl = new URL(url, "file:");
@@ -1744,6 +1747,11 @@ var retrieveHostConfig = /* @__PURE__ */ __name((options) => {
   };
 }, "retrieveHostConfig");
 
+// packages/dts-plugin/src/core/constant.ts
+var REMOTE_ALIAS_IDENTIFIER = "REMOTE_ALIAS_IDENTIFIER";
+var REMOTE_API_TYPES_FILE_NAME = "apis.d.ts";
+var HOST_API_TYPES_FILE_NAME = "index.d.ts";
+
 // packages/dts-plugin/src/core/lib/DTSManager.ts
 var _a;
 var DTSManager = (_a = class {
@@ -1754,11 +1762,7 @@ var DTSManager = (_a = class {
     __publicField(this, "loadedRemoteAPIAlias");
     __publicField(this, "extraOptions");
     __publicField(this, "updatedRemoteInfos");
-    this.options = (0, import_lodash.default)(options, (_value, key) => {
-      if (key === "manifest") {
-        return false;
-      }
-    });
+    this.options = cloneDeepOptions(options);
     this.runtimePkgs = [
       "@module-federation/runtime",
       "@module-federation/enhanced/runtime",
@@ -1827,7 +1831,7 @@ var DTSManager = (_a = class {
         if (!Object.keys(mapComponentsToExpose).length) {
           return;
         }
-        this.extractRemoteTypes({
+        yield this.extractRemoteTypes({
           remoteOptions,
           tsConfig,
           mapComponentsToExpose
@@ -1969,7 +1973,16 @@ var DTSManager = (_a = class {
       ...packageTypes,
       "Y"
     ].join(" :\n")} ;`;
-    const pkgsDeclareStr = this.runtimePkgs.map((pkg) => {
+    const runtimePkgs = /* @__PURE__ */ new Set();
+    [
+      ...this.runtimePkgs,
+      ...hostOptions.runtimePkgs
+    ].forEach((pkg) => {
+      runtimePkgs.add(pkg);
+    });
+    const pkgsDeclareStr = [
+      ...runtimePkgs
+    ].map((pkg) => {
       return `declare module "${pkg}" {
       ${remoteKeysStr}
       ${packageTypesStr}
@@ -2102,6 +2115,7 @@ var DTSManager = (_a = class {
 }, __name(_a, "DTSManager"), _a);
 
 // packages/dts-plugin/src/core/lib/utils.ts
+var import_lodash = __toESM(require("lodash.clonedeepwith"));
 function getDTSManagerConstructor(implementation) {
   if (implementation) {
     const NewConstructor = require(implementation);
@@ -2119,6 +2133,18 @@ function isDebugMode() {
   return Boolean(process.env["FEDERATION_DEBUG"]) || process.env["NODE_ENV"] === "test";
 }
 __name(isDebugMode, "isDebugMode");
+function cloneDeepOptions(options) {
+  const excludeKeys = [
+    "manifest",
+    "async"
+  ];
+  return (0, import_lodash.default)(options, (_value, key) => {
+    if (typeof key === "string" && excludeKeys.includes(key)) {
+      return false;
+    }
+  });
+}
+__name(cloneDeepOptions, "cloneDeepOptions");
 function axiosGet(url, config) {
   return __async(this, null, function* () {
     const httpAgent = new import_http2.default.Agent({
@@ -2171,6 +2197,7 @@ function getEffectiveRootDir(parsedCommandLine) {
 }
 __name(getEffectiveRootDir, "getEffectiveRootDir");
 var readTsConfig = /* @__PURE__ */ __name(({ tsConfigPath, typesFolder, compiledTypesFolder, context, additionalFilesToCompile }, mapComponentsToExpose) => {
+  var _a3;
   const resolvedTsConfigPath = (0, import_path5.resolve)(context, tsConfigPath);
   const readResult = import_typescript.default.readConfigFile(resolvedTsConfigPath, import_typescript.default.sys.readFile);
   if (readResult.error) {
@@ -2189,6 +2216,7 @@ var readTsConfig = /* @__PURE__ */ __name(({ tsConfigPath, typesFolder, compiled
   };
   rawTsConfigJson.compilerOptions = rawTsConfigJson.compilerOptions || {};
   rawTsConfigJson.compilerOptions = __spreadValues(__spreadValues({}, rawTsConfigJson.compilerOptions), defaultCompilerOptions);
+  (_a3 = rawTsConfigJson.compilerOptions) == null ? true : delete _a3.paths;
   const filesToCompile = [
     ...Object.values(mapComponentsToExpose),
     ...additionalFilesToCompile
@@ -2197,10 +2225,7 @@ var readTsConfig = /* @__PURE__ */ __name(({ tsConfigPath, typesFolder, compiled
   rawTsConfigJson.files = filesToCompile;
   rawTsConfigJson.exclude = [];
   "references" in rawTsConfigJson && delete rawTsConfigJson.references;
-  const extendsPath = rawTsConfigJson.extends;
-  if (extendsPath && extendsPath.startsWith(".")) {
-    rawTsConfigJson.extends = (0, import_path5.resolve)(context, extendsPath);
-  }
+  rawTsConfigJson.extends = resolvedTsConfigPath;
   return rawTsConfigJson;
 }, "readTsConfig");
 var TS_EXTENSIONS = [
@@ -2247,9 +2272,6 @@ var retrieveRemoteConfig = /* @__PURE__ */ __name((options) => {
   };
 }, "retrieveRemoteConfig");
 
-// packages/dts-plugin/src/core/lib/DtsWorker.ts
-var import_lodash2 = __toESM(require("lodash.clonedeepwith"));
-
 // packages/dts-plugin/src/core/rpc/index.ts
 var rpc_exports = {};
 __export(rpc_exports, {
@@ -2458,11 +2480,24 @@ function createRpcWorker(modulePath, data, memoryLimit, once) {
       return remoteMethod(...args);
     },
     terminate() {
-      var _a3;
-      (_a3 = childProcess == null ? void 0 : childProcess.send) == null ? void 0 : _a3.call(childProcess, {
-        type: RpcGMCallTypes.EXIT,
-        id
-      });
+      try {
+        if (childProcess.connected) {
+          childProcess.send({
+            type: RpcGMCallTypes.EXIT,
+            id
+          }, (err) => {
+            if (err) {
+              console.error("Error sending message:", err);
+            }
+          });
+        }
+      } catch (error2) {
+        if (error2.code === "EPIPE") {
+          console.error("Pipe closed before message could be sent:", error2);
+        } else {
+          console.error("Unexpected error:", error2);
+        }
+      }
       childProcess = void 0;
       remoteMethod = void 0;
     },

package/dist/fork-generate-dts.d.mts

@@ -1,6 +1,6 @@
-import { m as DtsWorkerOptions } from './DtsWorker-90454949.js';
+import { k as DtsWorkerOptions } from './DtsWorker-17de6ba4.js';
 import 'child_process';
-import './DTSManagerOptions-c0728719.js';
+import './DTSManagerOptions-7109e8ac.js';
 import '@module-federation/sdk';
 import 'typescript';
 

package/dist/fork-generate-dts.d.ts

@@ -1,6 +1,6 @@
-import { m as DtsWorkerOptions } from './DtsWorker-90454949.js';
+import { k as DtsWorkerOptions } from './DtsWorker-17de6ba4.js';
 import 'child_process';
-import './DTSManagerOptions-c0728719.js';
+import './DTSManagerOptions-7109e8ac.js';
 import '@module-federation/sdk';
 import 'typescript';