@module-federation/dts-plugin 0.2.8 → 0.3.1

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;
@@ -169,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);
@@ -207,9 +210,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");
@@ -334,6 +334,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) {
@@ -639,16 +644,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() {
@@ -1275,12 +1270,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* () {
@@ -1543,11 +1538,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));
@@ -1689,7 +1684,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:");
@@ -1748,6 +1744,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 {
@@ -1758,11 +1759,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",
@@ -1973,7 +1970,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}
@@ -2106,6 +2112,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);
@@ -2123,6 +2130,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({
@@ -2175,6 +2194,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) {
@@ -2193,6 +2213,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
@@ -2201,10 +2222,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 = [
@@ -2251,9 +2269,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, {
@@ -2462,11 +2477,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';