chore: adjust

Author: 2heal1

packages/manifest/src/ManifestManager.ts

@@ -11,7 +11,6 @@ import {
 import { isDev } from './utils';
 import logger from './logger';
 import type { Compilation, Compiler } from 'webpack';
-import { ManifestInfo } from './types';
 
 interface GenerateManifestOptions {
   compilation: Compilation;
@@ -33,16 +32,13 @@ class ManifestManager {
     return getManifestFileName(this._options.manifest).manifestFileName;
   }
 
-  updateManifest(options: GenerateManifestOptions): void {
-    const { compilation, compiler } = options;
+  updateManifest(options: GenerateManifestOptions): Manifest {
     const manifest = this.generateManifest(options);
-    const source = new compiler.webpack.sources.RawSource(
-      JSON.stringify(manifest, null, 2),
-    );
-    compilation.updateAsset(this.fileName, source);
+
+    return manifest;
   }
 
-  async generateManifest(options: GenerateManifestOptions): Promise<Manifest> {
+  generateManifest(options: GenerateManifestOptions): Manifest {
     const { publicPath, stats, compiler } = options;
     // Initialize manifest with required properties from stats
     const { id, name, metaData } = stats;

packages/manifest/src/StatsManager.ts

@@ -529,11 +529,7 @@ class StatsManager {
     this._sharedManager.init(options);
   }
 
-  updateStats(
-    stats: Stats,
-    compiler: Compiler,
-    compilation: Compilation,
-  ): Stats {
+  updateStats(stats: Stats, compiler: Compiler): Stats {
     const { metaData } = stats;
     if (!metaData.types) {
       metaData.types = getTypesMetaInfo(this._options, compiler.context);
@@ -545,10 +541,6 @@ class StatsManager {
     // rspack not support legacy prefetch, and this field should be removed in the future
     metaData.prefetchInterface = false;
 
-    compilation.updateAsset(
-      this.fileName,
-      new compiler.webpack.sources.RawSource(JSON.stringify(stats, null, 2)),
-    );
     return stats;
   }
 

packages/manifest/src/StatsPlugin.ts

@@ -7,7 +7,6 @@ import { ManifestManager } from './ManifestManager';
 import { StatsManager } from './StatsManager';
 import { PLUGIN_IDENTIFIER } from './constants';
 import logger from './logger';
-import { StatsInfo, ManifestInfo, ResourceInfo } from './types';
 
 export class StatsPlugin implements WebpackPluginInstance {
   readonly name = 'StatsPlugin';
@@ -62,26 +61,63 @@ export class StatsPlugin implements WebpackPluginInstance {
             );
             // new rspack should hit
             if (existedStats) {
-              const updatedStats = this._statsManager.updateStats(
+              let updatedStats = this._statsManager.updateStats(
                 JSON.parse(existedStats.source.source().toString()),
                 compiler,
-                compilation,
               );
-              this._manifestManager.updateManifest({
+              if (
+                typeof this._options.manifest === 'object' &&
+                this._options.manifest.additionalData
+              ) {
+                updatedStats =
+                  (await this._options.manifest.additionalData({
+                    stats: updatedStats,
+                    compiler,
+                    compilation,
+                    bundler: this._bundler,
+                  })) || updatedStats;
+              }
+
+              compilation.updateAsset(
+                this._statsManager.fileName,
+                new compiler.webpack.sources.RawSource(
+                  JSON.stringify(updatedStats, null, 2),
+                ),
+              );
+              const updatedManifest = this._manifestManager.updateManifest({
                 compilation,
                 stats: updatedStats,
                 publicPath: this._statsManager.getPublicPath(compiler),
                 compiler,
                 bundler: this._bundler,
               });
+              const source = new compiler.webpack.sources.RawSource(
+                JSON.stringify(updatedManifest, null, 2),
+              );
+              compilation.updateAsset(this._manifestManager.fileName, source);
+
               return;
             }
 
             // webpack + legacy rspack
-            const stats = await this._statsManager.generateStats(
+            let stats = await this._statsManager.generateStats(
               compiler,
               compilation,
             );
+
+            if (
+              typeof this._options.manifest === 'object' &&
+              this._options.manifest.additionalData
+            ) {
+              stats =
+                (await this._options.manifest.additionalData({
+                  stats,
+                  compiler,
+                  compilation,
+                  bundler: this._bundler,
+                })) || stats;
+            }
+
             const manifest = await this._manifestManager.generateManifest({
               compilation,
               stats: stats,
@@ -90,18 +126,6 @@ export class StatsPlugin implements WebpackPluginInstance {
               bundler: this._bundler,
             });
 
-            if (
-              typeof this._options.manifest === 'object' &&
-              this._options.manifest.additionalData
-            ) {
-              await this._options.manifest.additionalData({
-                stats,
-                compiler,
-                compilation,
-                manifest,
-                bundler: this._bundler,
-              });
-            }
             compilation.emitAsset(
               this._statsManager.fileName,
               new compiler.webpack.sources.RawSource(

packages/sdk/src/types/plugins/ModuleFederationPlugin.ts

@@ -115,7 +115,6 @@ export type DataPrefetch = boolean;
 
 export interface AdditionalDataOptions {
   stats: Stats;
-  manifest?: Manifest;
   compiler: webpack.Compiler;
   compilation: webpack.Compilation;
   bundler: 'webpack' | 'rspack';
@@ -124,7 +123,9 @@ export interface PluginManifestOptions {
   filePath?: string;
   disableAssetsAnalyze?: boolean;
   fileName?: string;
-  additionalData?: (options: AdditionalDataOptions) => Promise<void> | void;
+  additionalData?: (
+    options: AdditionalDataOptions,
+  ) => Promise<void | Stats> | Stats | void;
 }
 
 export interface PluginDevOptions {