@module-federation/dts-plugin 0.21.3 → 0.21.5

package/dist/fork-generate-dts.js

@@ -182,7 +182,8 @@ var defaultOptions = {
   abortOnError: true,
   extractRemoteTypes: false,
   extractThirdParty: false,
-  outputDir: ""
+  outputDir: "",
+  deleteTsConfig: true
 };
 function getEffectiveRootDir(parsedCommandLine) {
   const compilerOptions = parsedCommandLine.options;
@@ -252,6 +253,9 @@ var readTsConfig = /* @__PURE__ */ __name(({ tsConfigPath, typesFolder, compiled
   rawTsConfigJson.exclude = [];
   "references" in rawTsConfigJson && delete rawTsConfigJson.references;
   rawTsConfigJson.extends = resolvedTsConfigPath;
+  if (rawTsConfigJson.compilerOptions.declarationDir) {
+    delete rawTsConfigJson.compilerOptions.declarationDir;
+  }
   return rawTsConfigJson;
 }, "readTsConfig");
 var TS_EXTENSIONS = [
@@ -315,7 +319,7 @@ var import_path3 = require("path");
 var import_promises2 = require("fs/promises");
 
 // src/core/lib/typeScriptCompiler.ts
-var import_fs_extra = require("fs-extra");
+var import_fs_extra2 = require("fs-extra");
 var import_crypto = __toESM(require("crypto"));
 var import_promises = require("fs/promises");
 var import_path2 = require("path");
@@ -323,130 +327,7 @@ var import_error_codes = require("@module-federation/error-codes");
 var import_third_party_dts_extractor = require("@module-federation/third-party-dts-extractor");
 var import_child_process = require("child_process");
 var import_util = __toESM(require("util"));
-var import_sdk = require("@module-federation/sdk");
-var STARTS_WITH_SLASH = /^\//;
-var DEFINITION_FILE_EXTENSION = ".d.ts";
-var retrieveMfTypesPath = /* @__PURE__ */ __name((tsConfig, remoteOptions) => (0, import_path2.normalize)(tsConfig.compilerOptions.outDir.replace(remoteOptions.compiledTypesFolder, "")), "retrieveMfTypesPath");
-var retrieveOriginalOutDir = /* @__PURE__ */ __name((tsConfig, remoteOptions) => (0, import_path2.normalize)(tsConfig.compilerOptions.outDir.replace(remoteOptions.compiledTypesFolder, "").replace(remoteOptions.typesFolder, "")), "retrieveOriginalOutDir");
-var retrieveMfAPITypesPath = /* @__PURE__ */ __name((tsConfig, remoteOptions) => (0, import_path2.join)(retrieveOriginalOutDir(tsConfig, remoteOptions), `${remoteOptions.typesFolder}.d.ts`), "retrieveMfAPITypesPath");
-function writeTempTsConfig(tsConfig, context, name, cwd) {
-  const createHash = /* @__PURE__ */ __name((contents) => {
-    return import_crypto.default.createHash("md5").update(contents).digest("hex");
-  }, "createHash");
-  const hash = createHash(`${JSON.stringify(tsConfig)}${name}${Date.now()}`);
-  const tempTsConfigJsonPath = (0, import_path2.resolve)(cwd != null ? cwd : context, "node_modules", import_sdk.TEMP_DIR, `tsconfig.${hash}.json`);
-  (0, import_fs_extra.ensureDirSync)((0, import_path2.dirname)(tempTsConfigJsonPath));
-  (0, import_fs_extra.writeFileSync)(tempTsConfigJsonPath, JSON.stringify(tsConfig, null, 2));
-  return tempTsConfigJsonPath;
-}
-__name(writeTempTsConfig, "writeTempTsConfig");
-var removeExt = /* @__PURE__ */ __name((f) => {
-  const vueExt = ".vue";
-  const ext = (0, import_path2.extname)(f);
-  if (ext === vueExt) {
-    return f;
-  }
-  const regexPattern = new RegExp(`\\${ext}$`);
-  return f.replace(regexPattern, "");
-}, "removeExt");
-function getExposeKey(options) {
-  const { filePath, rootDir, outDir, mapExposeToEntry } = options;
-  const relativeFilePath = (0, import_path2.relative)(outDir, filePath.replace(new RegExp(`\\.d.ts$`), ""));
-  return mapExposeToEntry[relativeFilePath];
-}
-__name(getExposeKey, "getExposeKey");
-var processTypesFile = /* @__PURE__ */ __name((options) => __async(void 0, null, function* () {
-  const { outDir, filePath, rootDir, cb, mapExposeToEntry, mfTypePath } = options;
-  if (!(0, import_fs_extra.existsSync)(filePath)) {
-    return;
-  }
-  const stats = yield (0, import_promises.stat)(filePath);
-  if (stats.isDirectory()) {
-    const files = yield (0, import_promises.readdir)(filePath);
-    yield Promise.all(files.map((file) => processTypesFile(__spreadProps(__spreadValues({}, options), {
-      filePath: (0, import_path2.join)(filePath, file)
-    }))));
-  } else if (filePath.endsWith(".d.ts")) {
-    const exposeKey = getExposeKey({
-      filePath,
-      rootDir,
-      outDir,
-      mapExposeToEntry
-    });
-    if (exposeKey) {
-      const sourceEntry = exposeKey === "." ? "index" : exposeKey;
-      const mfeTypeEntry = (0, import_path2.join)(mfTypePath, `${sourceEntry}${DEFINITION_FILE_EXTENSION}`);
-      const mfeTypeEntryDirectory = (0, import_path2.dirname)(mfeTypeEntry);
-      const relativePathToOutput = (0, import_path2.relative)(mfeTypeEntryDirectory, filePath).replace(DEFINITION_FILE_EXTENSION, "").replace(STARTS_WITH_SLASH, "").split(import_path2.sep).join("/");
-      (0, import_fs_extra.ensureDirSync)(mfeTypeEntryDirectory);
-      yield (0, import_promises.writeFile)(mfeTypeEntry, `export * from './${relativePathToOutput}';
-export { default } from './${relativePathToOutput}';`);
-    }
-    const content = yield (0, import_promises.readFile)(filePath, "utf8");
-    cb(content);
-  }
-}), "processTypesFile");
-var compileTs = /* @__PURE__ */ __name((mapComponentsToExpose, tsConfig, remoteOptions) => __async(void 0, null, function* () {
-  var _a2, _b, _c, _d;
-  if (!Object.keys(mapComponentsToExpose).length) {
-    return;
-  }
-  const { compilerOptions } = tsConfig;
-  const tempTsConfigJsonPath = writeTempTsConfig(tsConfig, remoteOptions.context, remoteOptions.moduleFederationConfig.name || "mf", typeof remoteOptions.moduleFederationConfig.dts !== "boolean" ? (_b = (_a2 = remoteOptions.moduleFederationConfig.dts) == null ? void 0 : _a2.cwd) != null ? _b : void 0 : void 0);
-  try {
-    const mfTypePath = retrieveMfTypesPath(tsConfig, remoteOptions);
-    const thirdPartyExtractor = new import_third_party_dts_extractor.ThirdPartyExtractor({
-      destDir: (0, import_path2.resolve)(mfTypePath, "node_modules"),
-      context: remoteOptions.context,
-      exclude: typeof remoteOptions.extractThirdParty === "object" ? remoteOptions.extractThirdParty.exclude : void 0
-    });
-    const execPromise = import_util.default.promisify(import_child_process.exec);
-    const cmd = `npx ${remoteOptions.compilerInstance} --project '${tempTsConfigJsonPath}'`;
-    try {
-      yield execPromise(cmd, {
-        cwd: typeof remoteOptions.moduleFederationConfig.dts !== "boolean" ? (_d = (_c = remoteOptions.moduleFederationConfig.dts) == null ? void 0 : _c.cwd) != null ? _d : void 0 : void 0
-      });
-    } catch (err) {
-      if (compilerOptions.tsBuildInfoFile) {
-        try {
-          yield (0, import_promises.rm)(compilerOptions.tsBuildInfoFile);
-        } catch (e) {
-        }
-      }
-      throw new Error((0, import_error_codes.getShortErrorMsg)(import_error_codes.TYPE_001, import_error_codes.typeDescMap, {
-        cmd
-      }));
-    }
-    const mapExposeToEntry = Object.fromEntries(Object.entries(mapComponentsToExpose).map(([exposed, filename]) => {
-      const normalizedFileName = (0, import_path2.normalize)(filename);
-      let relativeFileName = "";
-      if ((0, import_path2.isAbsolute)(normalizedFileName)) {
-        relativeFileName = (0, import_path2.relative)(tsConfig.compilerOptions.rootDir, normalizedFileName);
-      } else {
-        relativeFileName = (0, import_path2.relative)(tsConfig.compilerOptions.rootDir, (0, import_path2.resolve)(remoteOptions.context, normalizedFileName));
-      }
-      return [
-        removeExt(relativeFileName),
-        exposed
-      ];
-    }));
-    const cb = remoteOptions.extractThirdParty ? thirdPartyExtractor.collectPkgs.bind(thirdPartyExtractor) : () => void 0;
-    yield processTypesFile({
-      outDir: compilerOptions.outDir,
-      filePath: compilerOptions.outDir,
-      rootDir: compilerOptions.rootDir,
-      mfTypePath,
-      cb,
-      mapExposeToEntry
-    });
-    if (remoteOptions.extractThirdParty) {
-      yield thirdPartyExtractor.copyDts();
-    }
-    yield (0, import_promises.rm)(tempTsConfigJsonPath);
-  } catch (err) {
-    throw err;
-  }
-}), "compileTs");
+var import_sdk3 = require("@module-federation/sdk");
 
 // src/server/message/Message.ts
 var _Message = class _Message {
@@ -519,7 +400,7 @@ __name(_FetchTypesAPI, "FetchTypesAPI");
 var FetchTypesAPI = _FetchTypesAPI;
 
 // src/server/utils/index.ts
-var import_sdk3 = require("@module-federation/sdk");
+var import_sdk2 = require("@module-federation/sdk");
 
 // src/server/utils/logTransform.ts
 var import_chalk = __toESM(require("chalk"));
@@ -558,7 +439,7 @@ __name(_BrokerExitLog, "BrokerExitLog");
 var BrokerExitLog = _BrokerExitLog;
 
 // src/server/utils/log.ts
-var import_sdk2 = require("@module-federation/sdk");
+var import_sdk = require("@module-federation/sdk");
 var log4js = __toESM(require("log4js"));
 
 // src/server/constant.ts
@@ -572,7 +453,7 @@ var UpdateMode;
 })(UpdateMode || (UpdateMode = {}));
 
 // src/server/utils/log.ts
-var logger = (0, import_sdk2.createLogger)(`[ ${MF_SERVER_IDENTIFIER} ]`);
+var logger = (0, import_sdk.createLogger)(`[ ${MF_SERVER_IDENTIFIER} ]`);
 function fileLog(msg, module2, level) {
   var _a2, _b;
   if (!((_a2 = process == null ? void 0 : process.env) == null ? void 0 : _a2["FEDERATION_DEBUG"])) {
@@ -619,7 +500,7 @@ __name(error, "error");
 // src/server/utils/index.ts
 function getIdentifier(options) {
   const { ip, name } = options;
-  return `mf ${import_sdk3.SEPARATOR}${name}${ip ? `${import_sdk3.SEPARATOR}${ip}` : ""}`;
+  return `mf ${import_sdk2.SEPARATOR}${name}${ip ? `${import_sdk2.SEPARATOR}${ip}` : ""}`;
 }
 __name(getIdentifier, "getIdentifier");
 
@@ -1321,9 +1202,157 @@ __publicField(_Broker, "DEFAULT_WAITING_TIME", 1.5 * 60 * 60 * 1e3);
 var Broker = _Broker;
 
 // src/server/createKoaServer.ts
-var import_fs_extra2 = __toESM(require("fs-extra"));
+var import_fs_extra = __toESM(require("fs-extra"));
 var import_koa = __toESM(require("koa"));
 
+// src/core/lib/typeScriptCompiler.ts
+var STARTS_WITH_SLASH = /^\//;
+var DEFINITION_FILE_EXTENSION = ".d.ts";
+var retrieveMfTypesPath = /* @__PURE__ */ __name((tsConfig, remoteOptions) => (0, import_path2.normalize)(tsConfig.compilerOptions.outDir.replace(remoteOptions.compiledTypesFolder, "")), "retrieveMfTypesPath");
+var retrieveOriginalOutDir = /* @__PURE__ */ __name((tsConfig, remoteOptions) => (0, import_path2.normalize)(tsConfig.compilerOptions.outDir.replace(remoteOptions.compiledTypesFolder, "").replace(remoteOptions.typesFolder, "")), "retrieveOriginalOutDir");
+var retrieveMfAPITypesPath = /* @__PURE__ */ __name((tsConfig, remoteOptions) => (0, import_path2.join)(retrieveOriginalOutDir(tsConfig, remoteOptions), `${remoteOptions.typesFolder}.d.ts`), "retrieveMfAPITypesPath");
+function writeTempTsConfig(tsConfig, context, name, cwd) {
+  const createHash = /* @__PURE__ */ __name((contents) => {
+    return import_crypto.default.createHash("md5").update(contents).digest("hex");
+  }, "createHash");
+  const hash = createHash(`${JSON.stringify(tsConfig)}${name}${Date.now()}`);
+  const tempTsConfigJsonPath = (0, import_path2.resolve)(cwd != null ? cwd : context, "node_modules", import_sdk3.TEMP_DIR, `tsconfig.${hash}.json`);
+  (0, import_fs_extra2.ensureDirSync)((0, import_path2.dirname)(tempTsConfigJsonPath));
+  (0, import_fs_extra2.writeFileSync)(tempTsConfigJsonPath, JSON.stringify(tsConfig, null, 2));
+  return tempTsConfigJsonPath;
+}
+__name(writeTempTsConfig, "writeTempTsConfig");
+var removeExt = /* @__PURE__ */ __name((f) => {
+  const vueExt = ".vue";
+  const ext = (0, import_path2.extname)(f);
+  if (ext === vueExt) {
+    return f;
+  }
+  const regexPattern = new RegExp(`\\${ext}$`);
+  return f.replace(regexPattern, "");
+}, "removeExt");
+function getExposeKey(options) {
+  const { filePath, rootDir, outDir, mapExposeToEntry } = options;
+  const relativeFilePath = (0, import_path2.relative)(outDir, filePath.replace(new RegExp(`\\.d.ts$`), ""));
+  return mapExposeToEntry[relativeFilePath];
+}
+__name(getExposeKey, "getExposeKey");
+var processTypesFile = /* @__PURE__ */ __name((options) => __async(void 0, null, function* () {
+  const { outDir, filePath, rootDir, cb, mapExposeToEntry, mfTypePath } = options;
+  if (!(0, import_fs_extra2.existsSync)(filePath)) {
+    return;
+  }
+  const stats = yield (0, import_promises.stat)(filePath);
+  if (stats.isDirectory()) {
+    const files = yield (0, import_promises.readdir)(filePath);
+    yield Promise.all(files.map((file) => processTypesFile(__spreadProps(__spreadValues({}, options), {
+      filePath: (0, import_path2.join)(filePath, file)
+    }))));
+  } else if (filePath.endsWith(".d.ts")) {
+    const exposeKey = getExposeKey({
+      filePath,
+      rootDir,
+      outDir,
+      mapExposeToEntry
+    });
+    if (exposeKey) {
+      const sourceEntry = exposeKey === "." ? "index" : exposeKey;
+      const mfeTypeEntry = (0, import_path2.join)(mfTypePath, `${sourceEntry}${DEFINITION_FILE_EXTENSION}`);
+      const mfeTypeEntryDirectory = (0, import_path2.dirname)(mfeTypeEntry);
+      const relativePathToOutput = (0, import_path2.relative)(mfeTypeEntryDirectory, filePath).replace(DEFINITION_FILE_EXTENSION, "").replace(STARTS_WITH_SLASH, "").split(import_path2.sep).join("/");
+      (0, import_fs_extra2.ensureDirSync)(mfeTypeEntryDirectory);
+      yield (0, import_promises.writeFile)(mfeTypeEntry, `export * from './${relativePathToOutput}';
+export { default } from './${relativePathToOutput}';`);
+    }
+    const content = yield (0, import_promises.readFile)(filePath, "utf8");
+    cb(content);
+  }
+}), "processTypesFile");
+var getPMFromUserAgent = /* @__PURE__ */ __name(() => {
+  const userAgent = process.env["npm_config_user_agent"];
+  if (userAgent == null) {
+    return "null";
+  }
+  const name = userAgent.split("/")[0];
+  return name;
+}, "getPMFromUserAgent");
+var resolvePackageManagerExecutable = /* @__PURE__ */ __name(() => {
+  const pm = getPMFromUserAgent();
+  switch (pm) {
+    case "yarn":
+      return "yarn";
+    case "npm":
+    case "pnpm":
+    default:
+      return "npx";
+  }
+}, "resolvePackageManagerExecutable");
+var compileTs = /* @__PURE__ */ __name((mapComponentsToExpose, tsConfig, remoteOptions) => __async(void 0, null, function* () {
+  var _a2, _b, _c, _d;
+  if (!Object.keys(mapComponentsToExpose).length) {
+    return;
+  }
+  const { compilerOptions } = tsConfig;
+  const tempTsConfigJsonPath = writeTempTsConfig(tsConfig, remoteOptions.context, remoteOptions.moduleFederationConfig.name || "mf", typeof remoteOptions.moduleFederationConfig.dts !== "boolean" ? (_b = (_a2 = remoteOptions.moduleFederationConfig.dts) == null ? void 0 : _a2.cwd) != null ? _b : void 0 : void 0);
+  logger.debug(`tempTsConfigJsonPath: ${tempTsConfigJsonPath}`);
+  try {
+    const mfTypePath = retrieveMfTypesPath(tsConfig, remoteOptions);
+    const thirdPartyExtractor = new import_third_party_dts_extractor.ThirdPartyExtractor({
+      destDir: (0, import_path2.resolve)(mfTypePath, "node_modules"),
+      context: remoteOptions.context,
+      exclude: typeof remoteOptions.extractThirdParty === "object" ? remoteOptions.extractThirdParty.exclude : void 0
+    });
+    const execPromise = import_util.default.promisify(import_child_process.exec);
+    const pmExecutable = resolvePackageManagerExecutable();
+    const cmd = `${pmExecutable} ${remoteOptions.compilerInstance} --project '${tempTsConfigJsonPath}'`;
+    try {
+      yield execPromise(cmd, {
+        cwd: typeof remoteOptions.moduleFederationConfig.dts !== "boolean" ? (_d = (_c = remoteOptions.moduleFederationConfig.dts) == null ? void 0 : _c.cwd) != null ? _d : void 0 : void 0
+      });
+    } catch (err) {
+      if (compilerOptions.tsBuildInfoFile) {
+        try {
+          yield (0, import_promises.rm)(compilerOptions.tsBuildInfoFile);
+        } catch (e) {
+        }
+      }
+      throw new Error((0, import_error_codes.getShortErrorMsg)(import_error_codes.TYPE_001, import_error_codes.typeDescMap, {
+        cmd
+      }));
+    }
+    const mapExposeToEntry = Object.fromEntries(Object.entries(mapComponentsToExpose).map(([exposed, filename]) => {
+      const normalizedFileName = (0, import_path2.normalize)(filename);
+      let relativeFileName = "";
+      if ((0, import_path2.isAbsolute)(normalizedFileName)) {
+        relativeFileName = (0, import_path2.relative)(tsConfig.compilerOptions.rootDir, normalizedFileName);
+      } else {
+        relativeFileName = (0, import_path2.relative)(tsConfig.compilerOptions.rootDir, (0, import_path2.resolve)(remoteOptions.context, normalizedFileName));
+      }
+      return [
+        removeExt(relativeFileName),
+        exposed
+      ];
+    }));
+    const cb = remoteOptions.extractThirdParty ? thirdPartyExtractor.collectPkgs.bind(thirdPartyExtractor) : () => void 0;
+    yield processTypesFile({
+      outDir: compilerOptions.outDir,
+      filePath: compilerOptions.outDir,
+      rootDir: compilerOptions.rootDir,
+      mfTypePath,
+      cb,
+      mapExposeToEntry
+    });
+    if (remoteOptions.extractThirdParty) {
+      yield thirdPartyExtractor.copyDts();
+    }
+    if (remoteOptions.deleteTsConfig) {
+      yield (0, import_promises.rm)(tempTsConfigJsonPath);
+    }
+  } catch (err) {
+    throw err;
+  }
+}), "compileTs");
+
 // src/core/lib/archiveHandler.ts
 var retrieveTypesZipPath = /* @__PURE__ */ __name((mfTypesPath, remoteOptions) => (0, import_path3.join)(mfTypesPath.replace(remoteOptions.typesFolder, ""), `${remoteOptions.typesFolder}.zip`), "retrieveTypesZipPath");
 var createTypesArchive = /* @__PURE__ */ __name((tsConfig, remoteOptions) => __async(void 0, null, function* () {

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import { moduleFederationPlugin } from '@module-federation/sdk';
 import { WebpackPluginInstance, Compiler } from 'webpack';
 import { D as DTSManagerOptions } from './DTSManagerOptions-QVchWb0x.js';
-export { i as isTSProject } from './utils-BjKKtOcx.js';
+export { i as isTSProject } from './utils-DxGrqb9N.js';
 import './DTSManager-b15Gfat3.js';
 import 'typescript';
 

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { moduleFederationPlugin } from '@module-federation/sdk';
 import { WebpackPluginInstance, Compiler } from 'webpack';
 import { D as DTSManagerOptions } from './DTSManagerOptions-QVchWb0x.js';
-export { i as isTSProject } from './utils-BjKKtOcx.js';
+export { i as isTSProject } from './utils-DxGrqb9N.js';
 import './DTSManager-b15Gfat3.js';
 import 'typescript';