@module-federation/dts-plugin 0.8.7 → 0.8.9

package/dist/fork-generate-dts.js

@@ -159,6 +159,7 @@ __name(exposeRpc, "exposeRpc");
 var import_axios = __toESM(require("axios"));
 var import_http2 = __toESM(require("http"));
 var import_https = __toESM(require("https"));
+var import_sdk6 = require("@module-federation/sdk");
 var import_ansi_colors = __toESM(require("ansi-colors"));
 
 // packages/dts-plugin/src/core/configurations/remotePlugin.ts
@@ -309,7 +310,7 @@ 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 hash = createHash(`${JSON.stringify(tsConfig)}${name}${Date.now()}`);
   const tempTsConfigJsonPath = (0, import_path2.resolve)(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));
@@ -1309,6 +1310,7 @@ var retrieveTypesArchiveDestinationPath = /* @__PURE__ */ __name((hostOptions, d
 var downloadTypesArchive = /* @__PURE__ */ __name((hostOptions) => {
   let retries = 0;
   return (_0) => __async(void 0, [_0], function* ([destinationFolder, fileToDownload]) {
+    var _a2;
     const destinationPath = retrieveTypesArchiveDestinationPath(hostOptions, destinationFolder);
     while (retries++ < hostOptions.maxRetries) {
       try {
@@ -1316,6 +1318,9 @@ var downloadTypesArchive = /* @__PURE__ */ __name((hostOptions) => {
         const response = yield axiosGet(url, {
           responseType: "arraybuffer"
         }).catch(downloadErrorLogger(destinationFolder, url));
+        if (typeof ((_a2 = response.headers) == null ? void 0 : _a2["content-type"]) === "string" && response.headers["content-type"].includes("text/html")) {
+          throw new Error(`${url} receives invalid content-type: ${response.headers["content-type"]}`);
+        }
         try {
           if (hostOptions.deleteTypesFolder) {
             yield (0, import_promises2.rm)(destinationPath, {
@@ -1328,6 +1333,7 @@ var downloadTypesArchive = /* @__PURE__ */ __name((hostOptions) => {
         }
         const zip = new import_adm_zip.default(Buffer.from(response.data));
         zip.extractAllTo(destinationPath, true);
+        fileLog(`zip.extractAllTo success destinationPath: ${destinationPath}; url: ${url}`, "downloadTypesArchive", "info");
         return [
           destinationFolder,
           destinationPath
@@ -1528,7 +1534,9 @@ var DTSManager = (_a = class {
         logger.success("Federated types created correctly");
       } catch (error2) {
         if (((_a2 = this.options.remote) == null ? void 0 : _a2.abortOnError) === false) {
-          logger.error(`Unable to compile federated types, ${error2}`);
+          if (this.options.displayErrorInTerminal) {
+            logger.error(`Unable to compile federated types${error2}`);
+          }
         } else {
           throw error2;
         }
@@ -1607,8 +1615,9 @@ var DTSManager = (_a = class {
         const filePath = import_path4.default.join(destinationPath, REMOTE_API_TYPES_FILE_NAME);
         import_fs2.default.writeFileSync(filePath, apiTypeFile);
         this.loadedRemoteAPIAlias.add(remoteInfo.alias);
+        fileLog(`success`, "downloadAPITypes", "info");
       } catch (err) {
-        fileLog(`Unable to download "${remoteInfo.name}" api types, ${err}`, "consumeTargetRemotes", "error");
+        fileLog(`Unable to download "${remoteInfo.name}" api types, ${err}`, "downloadAPITypes", "error");
       }
     });
   }
@@ -1723,9 +1732,10 @@ var DTSManager = (_a = class {
     return __async(this, null, function* () {
       var _a2, _b, _c;
       try {
-        const { remoteName, updateMode, remoteInfo: updatedRemoteInfo, once } = options;
+        const { remoteName, updateMode, remoteTarPath, remoteInfo: updatedRemoteInfo, once } = options;
         const hostName = (_c = (_b = (_a2 = this.options) == null ? void 0 : _a2.host) == null ? void 0 : _b.moduleFederationConfig) == null ? void 0 : _c.name;
-        fileLog(`updateTypes options:, ${JSON.stringify(options, null, 2)}`, "consumeTypes", "info");
+        fileLog(`options: ${JSON.stringify(options, null, 2)};
+hostName: ${hostName}`, "updateTypes", "info");
         if (updateMode === UpdateMode.POSITIVE && remoteName === hostName) {
           if (!this.options.remote) {
             return;
@@ -1739,13 +1749,23 @@ var DTSManager = (_a = class {
           const { hostOptions, mapRemotesToDownload } = retrieveHostConfig(this.options.host);
           const loadedRemoteInfo = Object.values(remoteAliasMap).find((i) => i.name === remoteName);
           const consumeTypes = /* @__PURE__ */ __name((requiredRemoteInfo) => __async(this, null, function* () {
-            const [_alias, destinationPath] = yield this.consumeTargetRemotes(hostOptions, requiredRemoteInfo);
+            fileLog(`consumeTypes start`, "updateTypes", "info");
+            if (!requiredRemoteInfo.zipUrl) {
+              throw new Error(`Can not get ${requiredRemoteInfo.name}'s types archive url!`);
+            }
+            const [_alias, destinationPath] = yield this.consumeTargetRemotes(hostOptions, __spreadProps(__spreadValues({}, requiredRemoteInfo), {
+              // use remoteTarPath first
+              zipUrl: remoteTarPath || requiredRemoteInfo.zipUrl
+            }));
             yield this.downloadAPITypes(requiredRemoteInfo, destinationPath);
+            fileLog(`consumeTypes end`, "updateTypes", "info");
           }), "consumeTypes");
+          fileLog(`loadedRemoteInfo: ${JSON.stringify(loadedRemoteInfo, null, 2)}`, "updateTypes", "info");
           if (!loadedRemoteInfo) {
             const remoteInfo = Object.values(mapRemotesToDownload).find((item) => {
               return item.name === remoteName;
             });
+            fileLog(`remoteInfo: ${JSON.stringify(remoteInfo, null, 2)}`, "updateTypes", "info");
             if (remoteInfo) {
               if (!this.remoteAliasMap[remoteInfo.alias]) {
                 const requiredRemoteInfo = yield this.requestRemoteManifest(remoteInfo);
@@ -1765,7 +1785,7 @@ var DTSManager = (_a = class {
                 });
                 fileLog(`start request manifest`, "consumeTypes", "info");
                 this.updatedRemoteInfos[updatedRemoteInfo.name] = yield this.requestRemoteManifest(parsedRemoteInfo);
-                fileLog(`end request manifest, this.updatedRemoteInfos[updatedRemoteInfo.name]: ${JSON.stringify(this.updatedRemoteInfos[updatedRemoteInfo.name], null, 2)}`, "consumeTypes", "info");
+                fileLog(`end request manifest, this.updatedRemoteInfos[updatedRemoteInfo.name]: ${JSON.stringify(this.updatedRemoteInfos[updatedRemoteInfo.name], null, 2)}`, "updateTypes", "info");
                 yield consumeDynamicRemoteTypes();
               }
               if (!once && this.updatedRemoteInfos[updatedRemoteInfo.name]) {
@@ -1814,6 +1834,10 @@ function cloneDeepOptions(options) {
   });
 }
 __name(cloneDeepOptions, "cloneDeepOptions");
+var getEnvHeaders = /* @__PURE__ */ __name(() => {
+  const headersStr = (0, import_sdk6.getProcessEnv)()["MF_ENV_HEADERS"] || "{}";
+  return __spreadValues({}, JSON.parse(headersStr));
+}, "getEnvHeaders");
 function axiosGet(url, config) {
   return __async(this, null, function* () {
     const httpAgent = new import_http2.default.Agent({
@@ -1822,10 +1846,12 @@ function axiosGet(url, config) {
     const httpsAgent = new import_https.default.Agent({
       family: 4
     });
-    return import_axios.default.get(url, __spreadValues({
+    return import_axios.default.get(url, __spreadValues(__spreadValues({
       httpAgent,
       httpsAgent
-    }, config));
+    }, {
+      headers: getEnvHeaders()
+    }), config));
   });
 }
 __name(axiosGet, "axiosGet");

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { WebpackPluginInstance, Compiler } from 'webpack';
 import { moduleFederationPlugin } from '@module-federation/sdk';
+import { WebpackPluginInstance, Compiler } from 'webpack';
 
 declare class DtsPlugin implements WebpackPluginInstance {
     options: moduleFederationPlugin.ModuleFederationPluginOptions;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { WebpackPluginInstance, Compiler } from 'webpack';
 import { moduleFederationPlugin } from '@module-federation/sdk';
+import { WebpackPluginInstance, Compiler } from 'webpack';
 
 declare class DtsPlugin implements WebpackPluginInstance {
     options: moduleFederationPlugin.ModuleFederationPluginOptions;