@module-federation/dts-plugin 0.9.0 → 0.9.1

package/dist/index.js

@@ -88,12 +88,12 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // packages/dts-plugin/src/plugins/DevPlugin.ts
-var import_fs_extra3 = __toESM(require("fs-extra"));
+var import_fs_extra4 = __toESM(require("fs-extra"));
 var import_path9 = __toESM(require("path"));
 
 // packages/dts-plugin/src/dev-worker/createDevWorker.ts
 var path5 = __toESM(require("path"));
-var fse = __toESM(require("fs-extra"));
+var fse2 = __toESM(require("fs-extra"));
 
 // packages/dts-plugin/src/dev-worker/DevWorker.ts
 var import_path7 = __toESM(require("path"));
@@ -117,6 +117,7 @@ var import_ansi_colors = __toESM(require("ansi-colors"));
 var import_path3 = __toESM(require("path"));
 var import_promises3 = require("fs/promises");
 var import_fs = __toESM(require("fs"));
+var import_fs_extra3 = __toESM(require("fs-extra"));
 var import_sdk5 = require("@module-federation/sdk");
 var import_third_party_dts_extractor2 = require("@module-federation/third-party-dts-extractor");
 
@@ -1226,7 +1227,8 @@ var defaultOptions = {
   context: process.cwd(),
   abortOnError: true,
   consumeAPITypes: false,
-  runtimePkgs: []
+  runtimePkgs: [],
+  remoteTypeUrls: {}
 };
 var buildZipUrl = /* @__PURE__ */ __name((hostOptions, url) => {
   const remoteUrl = new URL(url, "file:");
@@ -1242,18 +1244,31 @@ var buildApiTypeUrl = /* @__PURE__ */ __name((zipUrl) => {
 }, "buildApiTypeUrl");
 var retrieveRemoteInfo = /* @__PURE__ */ __name((options) => {
   const { hostOptions, remoteAlias, remote } = options;
+  const { remoteTypeUrls } = hostOptions;
   let decodedRemote = remote;
   if (decodedRemote.startsWith(import_sdk4.ENCODE_NAME_PREFIX)) {
     decodedRemote = (0, import_sdk4.decodeName)(decodedRemote, import_sdk4.ENCODE_NAME_PREFIX);
   }
   const parsedInfo = (0, import_sdk4.parseEntry)(decodedRemote, void 0, "@");
   const url = "entry" in parsedInfo ? parsedInfo.entry : parsedInfo.name === decodedRemote ? decodedRemote : "";
-  const zipUrl = url ? buildZipUrl(hostOptions, url) : "";
+  let zipUrl = "";
+  let apiTypeUrl = "";
+  const name = parsedInfo.name || remoteAlias;
+  if (typeof remoteTypeUrls === "object" && remoteTypeUrls[name]) {
+    zipUrl = remoteTypeUrls[name].zip;
+    apiTypeUrl = remoteTypeUrls[name].api;
+  }
+  if (!zipUrl && url) {
+    zipUrl = buildZipUrl(hostOptions, url);
+  }
+  if (!apiTypeUrl && zipUrl) {
+    apiTypeUrl = buildApiTypeUrl(zipUrl);
+  }
   return {
-    name: parsedInfo.name || remoteAlias,
+    name,
     url,
     zipUrl,
-    apiTypeUrl: buildApiTypeUrl(zipUrl),
+    apiTypeUrl,
     alias: remoteAlias
   };
 }, "retrieveRemoteInfo");
@@ -1329,6 +1344,7 @@ var DTSManager = (_a = class {
   }
   extractRemoteTypes(options) {
     return __async(this, null, function* () {
+      var _a3;
       const { remoteOptions, tsConfig } = options;
       if (!remoteOptions.extractRemoteTypes) {
         return;
@@ -1343,20 +1359,29 @@ var DTSManager = (_a = class {
         }
       }
       const mfTypesPath = retrieveMfTypesPath(tsConfig, remoteOptions);
-      if (hasRemotes) {
-        const tempHostOptions = {
-          moduleFederationConfig: remoteOptions.moduleFederationConfig,
-          typesFolder: import_path3.default.join(mfTypesPath, "node_modules"),
-          remoteTypesFolder: (remoteOptions == null ? void 0 : remoteOptions.hostRemoteTypesFolder) || remoteOptions.typesFolder,
-          deleteTypesFolder: true,
-          context: remoteOptions.context,
-          implementation: remoteOptions.implementation,
-          abortOnError: false
-        };
-        yield this.consumeArchiveTypes(tempHostOptions);
+      if (hasRemotes && this.options.host) {
+        try {
+          const { hostOptions } = retrieveHostConfig(this.options.host);
+          const remoteTypesFolder = import_path3.default.resolve(hostOptions.context, hostOptions.typesFolder);
+          const targetDir = import_path3.default.join(mfTypesPath, "node_modules");
+          if (import_fs.default.existsSync(remoteTypesFolder)) {
+            const targetFolder = import_path3.default.resolve(remoteOptions.context, targetDir);
+            yield import_fs_extra3.default.ensureDir(targetFolder);
+            yield import_fs_extra3.default.copy(remoteTypesFolder, targetFolder, {
+              overwrite: true
+            });
+          }
+        } catch (err) {
+          if (((_a3 = this.options.host) == null ? void 0 : _a3.abortOnError) === false) {
+            fileLog(`Unable to copy remote types, ${err}`, "extractRemoteTypes", "error");
+          } else {
+            throw err;
+          }
+        }
       }
     });
   }
+  // it must execute after consumeTypes
   generateTypes() {
     return __async(this, null, function* () {
       var _a3;
@@ -1369,6 +1394,18 @@ var DTSManager = (_a = class {
         if (!Object.keys(mapComponentsToExpose).length) {
           return;
         }
+        if (tsConfig.compilerOptions.tsBuildInfoFile) {
+          try {
+            const tsBuildInfoFile = import_path3.default.resolve(remoteOptions.context, tsConfig.compilerOptions.tsBuildInfoFile);
+            const mfTypesPath = retrieveMfTypesPath(tsConfig, remoteOptions);
+            if (!import_fs.default.existsSync(mfTypesPath)) {
+              import_fs.default.rmSync(tsBuildInfoFile, {
+                force: true
+              });
+            }
+          } catch (e) {
+          }
+        }
         yield this.extractRemoteTypes({
           remoteOptions,
           tsConfig,
@@ -1398,7 +1435,7 @@ var DTSManager = (_a = class {
       } catch (error2) {
         if (((_a3 = this.options.remote) == null ? void 0 : _a3.abortOnError) === false) {
           if (this.options.displayErrorInTerminal) {
-            logger.error(`Unable to compile federated types${error2}`);
+            logger.error(`Unable to compile federated types ${error2}`);
           }
         } else {
           throw error2;
@@ -1412,6 +1449,9 @@ var DTSManager = (_a = class {
         if (!remoteInfo.url.includes(import_sdk5.MANIFEST_EXT)) {
           return remoteInfo;
         }
+        if (remoteInfo.zipUrl) {
+          return remoteInfo;
+        }
         const url = remoteInfo.url;
         const res = yield axiosGet(url);
         const manifestJson = res.data;
@@ -1477,8 +1517,10 @@ var DTSManager = (_a = class {
         apiTypeFile = apiTypeFile.replaceAll(REMOTE_ALIAS_IDENTIFIER, remoteInfo.alias);
         const filePath = import_path3.default.join(destinationPath, REMOTE_API_TYPES_FILE_NAME);
         import_fs.default.writeFileSync(filePath, apiTypeFile);
+        const existed = this.loadedRemoteAPIAlias.has(remoteInfo.alias);
         this.loadedRemoteAPIAlias.add(remoteInfo.alias);
         fileLog(`success`, "downloadAPITypes", "info");
+        return existed;
       } catch (err) {
         fileLog(`Unable to download "${remoteInfo.name}" api types, ${err}`, "downloadAPITypes", "error");
       }
@@ -1620,7 +1662,10 @@ hostName: ${hostName}`, "updateTypes", "info");
               // use remoteTarPath first
               zipUrl: remoteTarPath || requiredRemoteInfo.zipUrl
             }));
-            yield this.downloadAPITypes(requiredRemoteInfo, destinationPath);
+            const addNew = yield this.downloadAPITypes(requiredRemoteInfo, destinationPath);
+            if (addNew) {
+              this.consumeAPITypes(hostOptions);
+            }
             fileLog(`consumeTypes end`, "updateTypes", "info");
           }), "consumeTypes");
           fileLog(`loadedRemoteInfo: ${JSON.stringify(loadedRemoteInfo, null, 2)}`, "updateTypes", "info");
@@ -1638,7 +1683,6 @@ hostName: ${hostName}`, "updateTypes", "info");
             } else if (updatedRemoteInfo) {
               const consumeDynamicRemoteTypes = /* @__PURE__ */ __name(() => __async(this, null, function* () {
                 yield consumeTypes2(this.updatedRemoteInfos[updatedRemoteInfo.name]);
-                this.consumeAPITypes(hostOptions);
               }), "consumeDynamicRemoteTypes");
               if (!this.updatedRemoteInfos[updatedRemoteInfo.name]) {
                 const parsedRemoteInfo = retrieveRemoteInfo({
@@ -1756,10 +1800,13 @@ function cloneDeepOptions(options) {
     "manifest",
     "async"
   ];
-  return (0, import_lodash.default)(options, (_value, key) => {
+  return (0, import_lodash.default)(options, (value, key) => {
     if (typeof key === "string" && excludeKeys.includes(key)) {
       return false;
     }
+    if (typeof value === "function") {
+      return false;
+    }
   });
 }
 __name(cloneDeepOptions, "cloneDeepOptions");
@@ -2287,7 +2334,7 @@ function removeLogFile() {
   return __async(this, null, function* () {
     try {
       const logDir = path5.resolve(process.cwd(), ".mf/typesGenerate.log");
-      yield fse.remove(logDir);
+      yield fse2.remove(logDir);
     } catch (err) {
       console.error("removeLogFile error", "forkDevWorker", err);
     }
@@ -2331,27 +2378,29 @@ var PROCESS_EXIT_CODE;
 function ensureTempDir(filePath) {
   try {
     const dir = import_path9.default.dirname(filePath);
-    import_fs_extra3.default.ensureDirSync(dir);
+    import_fs_extra4.default.ensureDirSync(dir);
   } catch (_err) {
   }
 }
 __name(ensureTempDir, "ensureTempDir");
 var _DevPlugin = class _DevPlugin {
-  constructor(options, dtsOptions, fetchTypesPromise) {
+  constructor(options, dtsOptions, generateTypesPromise, fetchRemoteTypeUrlsPromise) {
     __publicField(this, "name", "MFDevPlugin");
     __publicField(this, "_options");
     __publicField(this, "_devWorker");
     __publicField(this, "dtsOptions");
-    __publicField(this, "fetchTypesPromise");
+    __publicField(this, "generateTypesPromise");
+    __publicField(this, "fetchRemoteTypeUrlsPromise");
     this._options = options;
-    this.fetchTypesPromise = fetchTypesPromise;
+    this.generateTypesPromise = generateTypesPromise;
     this.dtsOptions = dtsOptions;
+    this.fetchRemoteTypeUrlsPromise = fetchRemoteTypeUrlsPromise;
   }
   static ensureLiveReloadEntry(options, filePath) {
     ensureTempDir(filePath);
-    const liveReloadEntry = import_fs_extra3.default.readFileSync(import_path9.default.join(__dirname, "./iife/launch-web-client.js")).toString("utf-8");
+    const liveReloadEntry = import_fs_extra4.default.readFileSync(import_path9.default.join(__dirname, "./iife/launch-web-client.js")).toString("utf-8");
     const liveReloadEntryWithOptions = liveReloadEntry.replace(WEB_CLIENT_OPTIONS_IDENTIFIER, JSON.stringify(options));
-    import_fs_extra3.default.writeFileSync(filePath, liveReloadEntryWithOptions);
+    import_fs_extra4.default.writeFileSync(filePath, liveReloadEntryWithOptions);
   }
   _stopWhenSIGTERMOrSIGINT() {
     process.on("SIGTERM", () => {
@@ -2463,11 +2512,16 @@ var _DevPlugin = class _DevPlugin {
     if (remote && !(remote == null ? void 0 : remote.tsConfigPath) && typeof normalizedDtsOptions === "object" && normalizedDtsOptions.tsConfigPath) {
       remote.tsConfigPath = normalizedDtsOptions.tsConfigPath;
     }
-    this.fetchTypesPromise.then(() => {
+    Promise.all([
+      this.generateTypesPromise,
+      this.fetchRemoteTypeUrlsPromise
+    ]).then(([_, remoteTypeUrls]) => {
       this._devWorker = createDevWorker({
         name,
         remote,
-        host,
+        host: __spreadProps(__spreadValues({}, host), {
+          remoteTypeUrls
+        }),
         extraOptions,
         disableLiveReload: normalizedDev.disableHotTypesReload,
         disableHotTypesReload: normalizedDev.disableHotTypesReload
@@ -2487,25 +2541,26 @@ var import_sdk10 = require("@module-federation/sdk");
 // packages/dts-plugin/src/plugins/ConsumeTypesPlugin.ts
 var import_sdk8 = require("@module-federation/sdk");
 var _ConsumeTypesPlugin = class _ConsumeTypesPlugin {
-  constructor(pluginOptions, dtsOptions, defaultOptions3, callback) {
+  constructor(pluginOptions, dtsOptions, defaultOptions3, fetchRemoteTypeUrlsResolve) {
     __publicField(this, "pluginOptions");
     __publicField(this, "dtsOptions");
     __publicField(this, "defaultOptions");
     __publicField(this, "callback");
+    __publicField(this, "fetchRemoteTypeUrlsResolve");
     this.pluginOptions = pluginOptions;
     this.dtsOptions = dtsOptions;
     this.defaultOptions = defaultOptions3;
-    this.callback = callback;
+    this.fetchRemoteTypeUrlsResolve = fetchRemoteTypeUrlsResolve;
   }
   apply(compiler) {
-    const { dtsOptions, defaultOptions: defaultOptions3, pluginOptions, callback } = this;
+    const { dtsOptions, defaultOptions: defaultOptions3, pluginOptions, fetchRemoteTypeUrlsResolve } = this;
     if (isPrd()) {
-      callback();
+      fetchRemoteTypeUrlsResolve(void 0);
       return;
     }
     const normalizedConsumeTypes = (0, import_sdk8.normalizeOptions)(true, defaultOptions3, "mfOptions.dts.consumeTypes")(dtsOptions.consumeTypes);
     if (!normalizedConsumeTypes) {
-      callback();
+      fetchRemoteTypeUrlsResolve(void 0);
       return;
     }
     const finalOptions = {
@@ -2518,10 +2573,17 @@ var _ConsumeTypesPlugin = class _ConsumeTypesPlugin {
       displayErrorInTerminal: dtsOptions.displayErrorInTerminal
     };
     validateOptions(finalOptions.host);
-    const promise = consumeTypes(finalOptions).then(() => {
-      callback();
-    }).catch(() => {
-      callback();
+    const fetchRemoteTypeUrlsPromise = typeof normalizedConsumeTypes.remoteTypeUrls === "function" ? normalizedConsumeTypes.remoteTypeUrls() : Promise.resolve(normalizedConsumeTypes.remoteTypeUrls);
+    const promise = fetchRemoteTypeUrlsPromise.then((remoteTypeUrls) => {
+      consumeTypes(__spreadProps(__spreadValues({}, finalOptions), {
+        host: __spreadProps(__spreadValues({}, finalOptions.host), {
+          remoteTypeUrls
+        })
+      })).then(() => {
+        fetchRemoteTypeUrlsResolve(remoteTypeUrls);
+      }).catch(() => {
+        fetchRemoteTypeUrlsResolve(remoteTypeUrls);
+      });
     });
     compiler.hooks.thisCompilation.tap("mf:generateTypes", (compilation) => {
       compilation.hooks.processAssets.tapPromise({
@@ -2544,25 +2606,26 @@ var import_fs4 = __toESM(require("fs"));
 var import_path10 = __toESM(require("path"));
 var import_sdk9 = require("@module-federation/sdk");
 var _GenerateTypesPlugin = class _GenerateTypesPlugin {
-  constructor(pluginOptions, dtsOptions, defaultOptions3, consumeTypesPromise, callback) {
+  constructor(pluginOptions, dtsOptions, defaultOptions3, fetchRemoteTypeUrlsPromise, callback) {
     __publicField(this, "pluginOptions");
     __publicField(this, "dtsOptions");
     __publicField(this, "defaultOptions");
-    __publicField(this, "consumeTypesPromise");
+    __publicField(this, "fetchRemoteTypeUrlsPromise");
     __publicField(this, "callback");
     this.pluginOptions = pluginOptions;
     this.dtsOptions = dtsOptions;
     this.defaultOptions = defaultOptions3;
-    this.consumeTypesPromise = consumeTypesPromise;
+    this.fetchRemoteTypeUrlsPromise = fetchRemoteTypeUrlsPromise;
     this.callback = callback;
   }
   apply(compiler) {
-    const { dtsOptions, defaultOptions: defaultOptions3, pluginOptions, consumeTypesPromise, callback } = this;
+    const { dtsOptions, defaultOptions: defaultOptions3, pluginOptions, fetchRemoteTypeUrlsPromise, callback } = this;
     const normalizedGenerateTypes = (0, import_sdk9.normalizeOptions)(true, defaultOptions3, "mfOptions.dts.generateTypes")(dtsOptions.generateTypes);
     if (!normalizedGenerateTypes) {
       callback();
       return;
     }
+    const normalizedConsumeTypes = (0, import_sdk9.normalizeOptions)(true, defaultOptions3, "mfOptions.dts.consumeTypes")(dtsOptions.consumeTypes);
     const finalOptions = {
       remote: __spreadValues({
         implementation: dtsOptions.implementation,
@@ -2570,6 +2633,10 @@ var _GenerateTypesPlugin = class _GenerateTypesPlugin {
         outputDir: getCompilerOutputDir(compiler),
         moduleFederationConfig: pluginOptions
       }, normalizedGenerateTypes),
+      host: normalizedConsumeTypes === false ? void 0 : __spreadValues({
+        context: compiler.context,
+        moduleFederationConfig: pluginOptions
+      }, normalizedGenerateTypes),
       extraOptions: dtsOptions.extraOptions || {},
       displayErrorInTerminal: dtsOptions.displayErrorInTerminal
     };
@@ -2677,7 +2744,7 @@ var _GenerateTypesPlugin = class _GenerateTypesPlugin {
           compilation.constructor.PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER
         )
       }, () => __async(this, null, function* () {
-        yield consumeTypesPromise;
+        yield fetchRemoteTypeUrlsPromise;
         const emitTypesFilesPromise = emitTypesFiles(compilation);
         if (isProd) {
           yield emitTypesFilesPromise;
@@ -2701,8 +2768,8 @@ var _DtsPlugin = class _DtsPlugin {
       generateAPITypes: true,
       compileInChildProcess: true,
       abortOnError: false,
-      extractThirdParty: true,
-      extractRemoteTypes: true
+      extractThirdParty: false,
+      extractRemoteTypes: false
     };
     const defaultConsumeTypes = {
       abortOnError: false,
@@ -2717,17 +2784,17 @@ var _DtsPlugin = class _DtsPlugin {
     if (typeof normalizedDtsOptions !== "object") {
       return;
     }
-    let consumeTypesPromiseResolve;
-    const consumeTypesPromise = new Promise((resolve5) => {
-      consumeTypesPromiseResolve = resolve5;
+    let fetchRemoteTypeUrlsResolve;
+    const fetchRemoteTypeUrlsPromise = new Promise((resolve5) => {
+      fetchRemoteTypeUrlsResolve = resolve5;
     });
     let generateTypesPromiseResolve;
     const generateTypesPromise = new Promise((resolve5) => {
       generateTypesPromiseResolve = resolve5;
     });
-    new DevPlugin(options, normalizedDtsOptions, generateTypesPromise).apply(compiler);
-    new GenerateTypesPlugin(options, normalizedDtsOptions, defaultGenerateTypes, consumeTypesPromise, generateTypesPromiseResolve).apply(compiler);
-    new ConsumeTypesPlugin(options, normalizedDtsOptions, defaultConsumeTypes, consumeTypesPromiseResolve).apply(compiler);
+    new DevPlugin(options, normalizedDtsOptions, generateTypesPromise, fetchRemoteTypeUrlsPromise).apply(compiler);
+    new GenerateTypesPlugin(options, normalizedDtsOptions, defaultGenerateTypes, fetchRemoteTypeUrlsPromise, generateTypesPromiseResolve).apply(compiler);
+    new ConsumeTypesPlugin(options, normalizedDtsOptions, defaultConsumeTypes, fetchRemoteTypeUrlsResolve).apply(compiler);
   }
 };
 __name(_DtsPlugin, "DtsPlugin");

package/dist/package.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/dts-plugin",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "author": "hanric <hanric.zhang@gmail.com>",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -60,10 +60,10 @@
     "log4js": "6.9.1",
     "node-schedule": "2.1.1",
     "ws": "8.18.0",
-    "@module-federation/sdk": "0.9.0",
-    "@module-federation/managers": "0.9.0",
-    "@module-federation/third-party-dts-extractor": "0.9.0",
-    "@module-federation/error-codes": "0.9.0"
+    "@module-federation/sdk": "0.9.1",
+    "@module-federation/managers": "0.9.1",
+    "@module-federation/third-party-dts-extractor": "0.9.1",
+    "@module-federation/error-codes": "0.9.1"
   },
   "devDependencies": {
     "@types/ws": "8.5.12",
@@ -73,7 +73,7 @@
     "@vue/tsconfig": "^0.5.1",
     "vue-tsc": "^2.0.26",
     "rimraf": "~3.0.2",
-    "@module-federation/runtime": "0.9.0"
+    "@module-federation/runtime": "0.9.1"
   },
   "peerDependencies": {
     "typescript": "^4.9.0 || ^5.0.0",