Merge pull request #15681 from webpack/fix-concatenation-with-import-…

…module

fix modules concatenation with importModule usage

lib/dependencies/LoaderDependency.js

@@ -7,6 +7,11 @@
 
 const ModuleDependency = require("./ModuleDependency");
 
+/** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
+/** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
+/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+
 class LoaderDependency extends ModuleDependency {
 	/**
 	 * @param {string} request request string
@@ -22,6 +27,14 @@ class LoaderDependency extends ModuleDependency {
 	get category() {
 		return "loader";
 	}
+
+	/**
+	 * @param {ModuleGraph} moduleGraph module graph
+	 * @returns {null | false | function(ModuleGraphConnection, RuntimeSpec): ConnectionState} function to determine if the connection is active
+	 */
+	getCondition(moduleGraph) {
+		return false;
+	}
 }
 
 module.exports = LoaderDependency;

lib/dependencies/LoaderImportDependency.js

@@ -7,6 +7,11 @@
 
 const ModuleDependency = require("./ModuleDependency");
 
+/** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
+/** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
+/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+
 class LoaderImportDependency extends ModuleDependency {
 	/**
 	 * @param {string} request request string
@@ -23,6 +28,14 @@ class LoaderImportDependency extends ModuleDependency {
 	get category() {
 		return "loaderImport";
 	}
+
+	/**
+	 * @param {ModuleGraph} moduleGraph module graph
+	 * @returns {null | false | function(ModuleGraphConnection, RuntimeSpec): ConnectionState} function to determine if the connection is active
+	 */
+	getCondition(moduleGraph) {
+		return false;
+	}
 }
 
 module.exports = LoaderImportDependency;

lib/optimize/ModuleConcatenationPlugin.js

@@ -606,7 +606,7 @@ class ModuleConcatenationPlugin {
 				incomingConnectionsFromNonModules.filter(connection => {
 					// We are not interested in inactive connections
 					// or connections without dependency
-					return connection.isActive(runtime) || connection.dependency;
+					return connection.isActive(runtime);
 				});
 			if (activeNonModulesConnections.length > 0) {
 				const problem = requestShortener => {

test/configCases/concatenate-modules/import-module/a.txt

@@ -0,0 +1 @@
+data

test/configCases/concatenate-modules/import-module/index.js

@@ -0,0 +1,7 @@
+import url from "./loader!!";
+import {url as url2} from "./module1";
+
+it("should compile and run", () => {
+	expect(url).toBe("webpack:///a.txt");
+	expect(url2.toString()).toMatch(/^file:/);
+});

test/configCases/concatenate-modules/import-module/loader.js

@@ -0,0 +1,8 @@
+/** @type {import("../../../../").LoaderDefinitionFunction} */
+module.exports = function () {
+	const callback = this.async();
+	this.importModule("./module1", { baseUri: "webpack://" }, (err, exports) => {
+		if (err) return callback(err);
+		callback(null, `module.exports = ${JSON.stringify(exports.url)}`);
+	});
+};

test/configCases/concatenate-modules/import-module/module1.js

@@ -0,0 +1,3 @@
+const url = new URL("./a.txt", import.meta.url);
+
+export { url }

test/configCases/concatenate-modules/import-module/webpack.config.js

@@ -0,0 +1,6 @@
+/** @type {import("../../../../").Configuration} */
+module.exports = {
+	output: {
+		assetModuleFilename: "[name][ext]"
+	}
+};