@module-federation/dts-plugin 0.2.8 → 0.3.1

package/dist/index.js

@@ -85,7 +85,6 @@ var fse = __toESM(require("fs-extra"));
 
 // packages/dts-plugin/src/dev-worker/DevWorker.ts
 var import_path7 = __toESM(require("path"));
-var import_lodash3 = __toESM(require("lodash.clonedeepwith"));
 
 // packages/dts-plugin/src/core/configurations/remotePlugin.ts
 var import_fs3 = require("fs");
@@ -107,7 +106,6 @@ var import_path3 = __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
@@ -117,8 +115,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");
@@ -129,8 +127,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;
@@ -183,7 +185,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);
@@ -221,9 +223,6 @@ 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");
@@ -346,6 +345,11 @@ var import_chalk2 = __toESM(require("chalk"));
 var DEFAULT_WEB_SOCKET_PORT = 16322;
 var WEB_SOCKET_CONNECT_MAGIC_ID = "1hpzW-zo2z-o8io-gfmV1-2cb1d82";
 var WEB_CLIENT_OPTIONS_IDENTIFIER = "__WEB_CLIENT_OPTIONS__";
+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) {
@@ -547,16 +551,6 @@ var UpdateKind;
   UpdateKind2["RELOAD_PAGE"] = "RELOAD_PAGE";
 })(UpdateKind || (UpdateKind = {}));
 
-// 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() {
@@ -1203,7 +1197,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:");
@@ -1262,6 +1257,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 {
@@ -1272,11 +1272,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",
@@ -1487,7 +1483,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}
@@ -1620,6 +1625,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);
@@ -1691,6 +1697,18 @@ var isTSProject = /* @__PURE__ */ __name((dtsOptions, context = process.cwd()) =
     return false;
   }
 }, "isTSProject");
+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({
@@ -1743,6 +1761,7 @@ function getEffectiveRootDir(parsedCommandLine) {
 }
 __name(getEffectiveRootDir, "getEffectiveRootDir");
 var readTsConfig = /* @__PURE__ */ __name(({ tsConfigPath, typesFolder, compiledTypesFolder, context, additionalFilesToCompile }, mapComponentsToExpose) => {
+  var _a4;
   const resolvedTsConfigPath = (0, import_path5.resolve)(context, tsConfigPath);
   const readResult = import_typescript.default.readConfigFile(resolvedTsConfigPath, import_typescript.default.sys.readFile);
   if (readResult.error) {
@@ -1761,6 +1780,7 @@ var readTsConfig = /* @__PURE__ */ __name(({ tsConfigPath, typesFolder, compiled
   };
   rawTsConfigJson.compilerOptions = rawTsConfigJson.compilerOptions || {};
   rawTsConfigJson.compilerOptions = __spreadValues(__spreadValues({}, rawTsConfigJson.compilerOptions), defaultCompilerOptions);
+  (_a4 = rawTsConfigJson.compilerOptions) == null ? true : delete _a4.paths;
   const filesToCompile = [
     ...Object.values(mapComponentsToExpose),
     ...additionalFilesToCompile
@@ -1769,10 +1789,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 = [
@@ -1832,7 +1849,6 @@ __name(generateTypes, "generateTypes");
 
 // packages/dts-plugin/src/core/lib/DtsWorker.ts
 var import_path6 = __toESM(require("path"));
-var import_lodash2 = __toESM(require("lodash.clonedeepwith"));
 
 // packages/dts-plugin/src/core/rpc/index.ts
 var rpc_exports = {};
@@ -2042,11 +2058,24 @@ function createRpcWorker(modulePath, data, memoryLimit, once) {
       return remoteMethod(...args);
     },
     terminate() {
-      var _a4;
-      (_a4 = childProcess == null ? void 0 : childProcess.send) == null ? void 0 : _a4.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;
     },
@@ -2074,11 +2103,7 @@ var _DtsWorker = class _DtsWorker {
     __publicField(this, "rpcWorker");
     __publicField(this, "_options");
     __publicField(this, "_res");
-    this._options = (0, import_lodash2.default)(options, (_value, key) => {
-      if (key === "manifest") {
-        return false;
-      }
-    });
+    this._options = cloneDeepOptions(options);
     this.removeUnSerializationOptions();
     this.rpcWorker = createRpcWorker(import_path6.default.resolve(__dirname, "./fork-generate-dts.js"), {}, void 0, true);
     this._res = this.rpcWorker.connect(this._options);
@@ -2119,7 +2144,13 @@ var _DtsWorker = class _DtsWorker {
   }
   exit() {
     var _a4;
-    (_a4 = this.rpcWorker) == null ? void 0 : _a4.terminate();
+    try {
+      (_a4 = this.rpcWorker) == null ? void 0 : _a4.terminate();
+    } catch (err) {
+      if (isDebugMode()) {
+        console.error(err);
+      }
+    }
   }
 };
 __name(_DtsWorker, "DtsWorker");
@@ -2151,11 +2182,7 @@ var _DevWorker = class _DevWorker {
     __publicField(this, "_rpcWorker");
     __publicField(this, "_options");
     __publicField(this, "_res");
-    this._options = (0, import_lodash3.default)(options, (_value, key) => {
-      if (key === "manifest") {
-        return false;
-      }
-    });
+    this._options = cloneDeepOptions(options);
     this.removeUnSerializationOptions();
     this._rpcWorker = rpc_exports.createRpcWorker(import_path7.default.resolve(__dirname, "./fork-dev-worker.js"), {}, void 0, false);
     this._res = this._rpcWorker.connect(this._options);
@@ -2302,14 +2329,17 @@ var _DevPlugin = class _DevPlugin {
     if (!normalizedDev.disableLiveReload) {
       const TEMP_DIR2 = import_path8.default.join(`${process.cwd()}/node_modules`, import_sdk6.TEMP_DIR);
       const filepath = import_path8.default.join(TEMP_DIR2, `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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/dts-plugin",
-  "version": "0.2.8",
+  "version": "0.3.1",
   "author": "hanric <hanric.zhang@gmail.com>",
   "main": "./dist/index.js",
   "module": "./dist/index.js",