fix: changeDevtoolModuleFilename not work problem (#1402)

Author: yifancong

examples/rspack-banner-minimal/package.json

@@ -19,9 +19,9 @@
   },
   "devDependencies": {
     "@rsdoctor/rspack-plugin": "workspace:*",
-    "@rspack/cli": "1.4.11",
-    "@rspack/core": "1.4.11",
-    "@rspack/plugin-react-refresh": "1.4.3",
+    "@rspack/cli": "1.6.1",
+    "@rspack/core": "1.6.1",
+    "@rspack/plugin-react-refresh": "1.5.2",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",
     "react-refresh": "^0.14.0",

examples/rspack-layers-minimal/package.json

@@ -18,9 +18,9 @@
   },
   "devDependencies": {
     "@rsdoctor/rspack-plugin": "workspace:*",
-    "@rspack/cli": "1.4.11",
-    "@rspack/core": "1.4.11",
-    "@rspack/plugin-react-refresh": "^1.4.3",
+    "@rspack/cli": "1.6.1",
+    "@rspack/core": "1.6.1",
+    "@rspack/plugin-react-refresh": "^1.5.2",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",
     "react-refresh": "^0.14.0",

examples/rspack-minimal/package.json

@@ -21,9 +21,9 @@
   },
   "devDependencies": {
     "@rsdoctor/rspack-plugin": "workspace:*",
-    "@rspack/cli": "1.4.11",
-    "@rspack/core": "1.4.11",
-    "@rspack/plugin-react-refresh": "^1.4.3",
+    "@rspack/cli": "1.6.1",
+    "@rspack/core": "1.6.1",
+    "@rspack/plugin-react-refresh": "^1.5.2",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",
     "react-refresh": "^0.14.0",

packages/core/src/inner-plugins/plugins/bundle.ts

@@ -15,16 +15,7 @@ export class InternalBundlePlugin<
     try {
       // bundle depends on module graph
       this.scheduler.ensureModulesChunksGraphApplied(compiler);
-
-      compiler.hooks.compilation.tap(
-        {
-          name: 'ChangeDevtoolModuleFilename',
-          stage: -100,
-        },
-        () => {
-          this.changeDevtoolModuleFilename(compiler);
-        },
-      );
+      this.changeDevtoolModuleFilename(compiler);
 
       compiler.hooks.compilation.tap(this.tapPostOptions, this.thisCompilation);
       compiler.hooks.done.tapPromise(this.tapPreOptions, this.done.bind(this));
@@ -51,7 +42,7 @@ export class InternalBundlePlugin<
       );
 
       if (devtool.includes('source-map')) {
-        compiler.options.output.devtoolFallbackModuleFilenameTemplate =
+        compiler.options.output.devtoolFallbackModuleFilenameTemplate = () =>
           '[absolute-resource-path]';
       }
     }

packages/core/src/inner-plugins/plugins/sourcemapTool.ts

@@ -97,6 +97,9 @@ export async function collectSourceMaps(
 
     // Group all mappings by generated line number
     const lineMappings = new Map<number, Array<MappingItem>>();
+    // @ts-ignore consumer._absoluteSources maybe has problem.
+    consumer._absoluteSources = consumer._sources;
+
     consumer.eachMapping((m: MappingItem) => {
       if (!lineMappings.has(m.generatedLine)) {
         lineMappings.set(m.generatedLine, []);

packages/graph/src/transform/module-graph/transform.ts

@@ -52,7 +52,13 @@ function getModulesFromChunks(
 ) {
   chunks?.forEach((chunk) => {
     if (chunk.modules?.length) {
-      collectedModules.push(...chunk.modules);
+      collectedModules.push(
+        ...chunk.modules.map((module) => ({
+          ...module,
+          identifier: module.identifier ?? module.moduleIdentifier,
+          name: module.name ?? module.moduleName,
+        })),
+      );
     }
   });
 }
@@ -88,7 +94,7 @@ export function getModuleGraphByStats(
 
     const isConcatenated = Boolean(data.modules && data.modules.length > 0);
     const concatenatedModule = new Module(
-      data.identifier!,
+      data.identifier ?? data.moduleIdentifier!,
       getGetModuleName(root, data),
       data.depth === 0,
       isConcatenated ? SDK.ModuleKind.Concatenation : SDK.ModuleKind.Normal,

packages/types/src/plugin/baseStats.ts

@@ -58,7 +58,9 @@ export interface StatsModule {
   type?: string;
   moduleType?: string;
   identifier?: string;
+  moduleIdentifier?: string;
   name?: string;
+  moduleName?: string;
   id?: string | number;
   chunks?: Array<string | number>;
   size?: number;