fix(dts-plugin): dev plugin should apply after generateTypesPromise r…

…esolved
module-federation · Jan 9, 2025 · ce96460 · ce96460
1 parent 29bedb3
commit ce96460
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/packages/dts-plugin/src/plugins/DtsPlugin.ts b/packages/dts-plugin/src/plugins/DtsPlugin.ts
@@ -39,25 +39,34 @@ export class DtsPlugin implements WebpackPluginInstance {
       return;
     }
 
-    let resolve;
+    let consumeTypesPromiseResolve;
+    const consumeTypesPromise: Promise<void> = new Promise((resolve) => {
+      consumeTypesPromiseResolve = resolve;
+    });
 
-    const fetchTypesPromise: Promise<void> = new Promise((res, rej) => {
-      resolve = res;
+    let generateTypesPromiseResolve;
+    const generateTypesPromise: Promise<void> = new Promise((resolve) => {
+      generateTypesPromiseResolve = resolve;
     });
 
-    new DevPlugin(options, fetchTypesPromise).apply(compiler);
+    // Because the plugin will delete dist/@mf-types.zip while generating types, which will be used in GenerateTypesPlugin
+    // So it should apply after GenerateTypesPlugin
+    new DevPlugin(options, generateTypesPromise).apply(compiler);
 
+    // The exposes files may use remote types, so it need to consume types first, otherwise the generate types will fail
     new GenerateTypesPlugin(
       options,
       normalizedDtsOptions,
       defaultGenerateTypes,
-      fetchTypesPromise,
+      consumeTypesPromise,
+      generateTypesPromiseResolve,
     ).apply(compiler);
+
     new ConsumeTypesPlugin(
       options,
       normalizedDtsOptions,
       defaultConsumeTypes,
-      resolve,
+      consumeTypesPromiseResolve,
     ).apply(compiler);
   }
 }
diff --git a/packages/dts-plugin/src/plugins/GenerateTypesPlugin.ts b/packages/dts-plugin/src/plugins/GenerateTypesPlugin.ts
@@ -18,7 +18,8 @@ export class GenerateTypesPlugin implements WebpackPluginInstance {
   pluginOptions: moduleFederationPlugin.ModuleFederationPluginOptions;
   dtsOptions: moduleFederationPlugin.PluginDtsOptions;
   defaultOptions: moduleFederationPlugin.DtsRemoteOptions;
-  fetchTypesPromise: Promise<void>;
+  consumeTypesPromise: Promise<void>;
+  callback: () => void;
 
   private debounceTimer: NodeJS.Timeout | null = null;
   private isProcessing = false;
@@ -29,17 +30,24 @@ export class GenerateTypesPlugin implements WebpackPluginInstance {
     pluginOptions: moduleFederationPlugin.ModuleFederationPluginOptions,
     dtsOptions: moduleFederationPlugin.PluginDtsOptions,
     defaultOptions: moduleFederationPlugin.DtsRemoteOptions,
-    fetchTypesPromise: Promise<void>,
+    consumeTypesPromise: Promise<void>,
+    callback: () => void,
   ) {
     this.pluginOptions = pluginOptions;
     this.dtsOptions = dtsOptions;
     this.defaultOptions = defaultOptions;
-    this.fetchTypesPromise = fetchTypesPromise;
+    this.consumeTypesPromise = consumeTypesPromise;
+    this.callback = callback;
   }
 
   apply(compiler: Compiler) {
-    const { dtsOptions, defaultOptions, pluginOptions, fetchTypesPromise } =
-      this;
+    const {
+      dtsOptions,
+      defaultOptions,
+      pluginOptions,
+      consumeTypesPromise,
+      callback,
+    } = this;
 
     const normalizedGenerateTypes =
       normalizeOptions<moduleFederationPlugin.DtsRemoteOptions>(
@@ -49,6 +57,7 @@ export class GenerateTypesPlugin implements WebpackPluginInstance {
       )(dtsOptions.generateTypes);
 
     if (!normalizedGenerateTypes) {
+      callback();
       return;
     }
 
@@ -198,7 +207,7 @@ export class GenerateTypesPlugin implements WebpackPluginInstance {
             compilation.constructor.PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER,
         },
         async () => {
-          await fetchTypesPromise;
+          await consumeTypesPromise;
           try {
             if (pluginOptions.dev === false && compiledOnce) {
               return;
@@ -254,7 +263,9 @@ export class GenerateTypesPlugin implements WebpackPluginInstance {
               );
             }
             compiledOnce = true;
+            callback();
           } catch (err) {
+            callback();
             console.error('Error in mf:generateTypes processAssets hook:', err);
           }
         },