Merge pull request webpack#11433 from samcooke98/samc/fix-module-rebuild

lib/Compilation.js

@@ -2683,26 +2683,27 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 	 * @returns {void}
 	 */
 	removeReasonsOfDependencyBlock(module, block) {
-		const chunkGraph = this.chunkGraph;
-		const iteratorDependency = d => {
-			if (!d.module) {
-				return;
-			}
-			if (d.module.removeReason(module, d)) {
-				for (const chunk of chunkGraph.getModuleChunksIterable(d.module)) {
-					this.patchChunksAfterReasonRemoval(d.module, chunk);
-				}
-			}
-		};
-
 		if (block.blocks) {
 			for (const b of block.blocks) {
 				this.removeReasonsOfDependencyBlock(module, b);
 			}
 		}
 
 		if (block.dependencies) {
-			for (const dep of block.dependencies) iteratorDependency(dep);
+			for (const dep of block.dependencies) {
+				const originalModule = this.moduleGraph.getModule(dep);
+				if (originalModule) {
+					this.moduleGraph.removeConnection(dep);
+
+					if (this.chunkGraph) {
+						for (const chunk of this.chunkGraph.getModuleChunks(
+							originalModule
+						)) {
+							this.patchChunksAfterReasonRemoval(originalModule, chunk);
+						}
+					}
+				}
+			}
 		}
 	}
 
@@ -2730,11 +2731,15 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 	 * @returns {void}
 	 */
 	removeChunkFromDependencies(block, chunk) {
+		/**
+		 * @param {Dependency} d dependency to (maybe) patch up
+		 */
 		const iteratorDependency = d => {
-			if (!d.module) {
+			const depModule = this.moduleGraph.getModule(d);
+			if (!depModule) {
 				return;
 			}
-			this.patchChunksAfterReasonRemoval(d.module, chunk);
+			this.patchChunksAfterReasonRemoval(depModule, chunk);
 		};
 
 		const blocks = block.blocks;

test/configCases/rebuild/finishModules/a.js

@@ -0,0 +1,5 @@
+import { doThings, foo } from "./other-file";
+
+export { doThings, foo };
+
+export const valueFromA = "A";

test/configCases/rebuild/finishModules/index.js

@@ -0,0 +1,20 @@
+import { doThings, foo, valueFromA } from "./a";
+it("should compile", function (done) {
+	expect(doThings("ok")).toBe("ok");
+
+	// Should be replaced by the code in the config.
+	expect(foo.foo).toBe("bar");
+	expect(valueFromA).toBe("A");
+
+	done();
+});
+
+it("should not reference the chunk", () => {
+	expect(__STATS__.chunks.length).toEqual(1);
+	expect(
+		__STATS__.modules
+			.filter(m => m.moduleType !== "runtime")
+			.map(m => m.name)
+			.sort()
+	).toEqual(["./a.js", "./index.js", "./other-file.js"]);
+});

test/configCases/rebuild/finishModules/loader.js

@@ -0,0 +1,5 @@
+module.exports = function (source) {
+	if (this.shouldReplace)
+		return "module.exports = { foo: { foo: 'bar' }, doThings: (v) => v}";
+	return source;
+};

test/configCases/rebuild/finishModules/module.js

@@ -0,0 +1 @@
+export default "foo";

test/configCases/rebuild/finishModules/other-file.js

@@ -0,0 +1,9 @@
+import foo from "./module";
+
+export function doThings(stuff) {
+	return import("./chunk");
+}
+
+export const foo = {
+	foo
+};

test/configCases/rebuild/finishModules/webpack.config.js

@@ -0,0 +1,60 @@
+const { resolve, join } = require("path");
+const { NormalModule } = require("../../../../");
+
+/**
+ * @param {import("../../../../").Compiler} compiler the compiler
+ */
+var testPlugin = compiler => {
+	compiler.hooks.compilation.tap("TestPlugin", compilation => {
+		let shouldReplace = false;
+		NormalModule.getCompilationHooks(compilation).loader.tap(
+			"TestPlugin",
+			loaderContext => {
+				/** @type {any} */ (loaderContext).shouldReplace = shouldReplace;
+			}
+		);
+		compilation.hooks.finishModules.tapAsync(
+			"TestPlugin",
+			function (modules, callback) {
+				const src = resolve(join(__dirname, "other-file.js"));
+
+				/**
+				 *
+				 * @param {any} m test
+				 * @returns {boolean} test
+				 */
+				function matcher(m) {
+					return m.resource && m.resource === src;
+				}
+
+				const module = Array.from(modules).find(matcher);
+
+				if (!module) {
+					throw new Error("something went wrong");
+				}
+
+				shouldReplace = true;
+				compilation.rebuildModule(module, err => {
+					shouldReplace = false;
+					callback(err);
+				});
+			}
+		);
+	});
+};
+
+/** @type {import("../../../../").Configuration} */
+module.exports = {
+	module: {
+		rules: [
+			{
+				test: /other-file/,
+				use: "./loader"
+			}
+		]
+	},
+	optimization: {
+		concatenateModules: false
+	},
+	plugins: [testPlugin]
+};