Merge pull request #10478 from webpack/bugfix/all-modules-dll

flag all modules as used for Dll

lib/DllPlugin.js

@@ -5,8 +5,8 @@
 "use strict";
 
 const DllEntryPlugin = require("./DllEntryPlugin");
+const FlagAllModulesAsUsedPlugin = require("./FlagAllModulesAsUsedPlugin");
 const LibManifestPlugin = require("./LibManifestPlugin");
-const FlagInitialModulesAsUsedPlugin = require("./FlagInitialModulesAsUsedPlugin");
 
 const validateOptions = require("schema-utils");
 const schema = require("../schemas/plugins/DllPlugin.json");
@@ -41,7 +41,7 @@ class DllPlugin {
 		});
 		new LibManifestPlugin(this.options).apply(compiler);
 		if (!this.options.entryOnly) {
-			new FlagInitialModulesAsUsedPlugin("DllPlugin").apply(compiler);
+			new FlagAllModulesAsUsedPlugin("DllPlugin").apply(compiler);
 		}
 	}
 }

lib/FlagAllModulesAsUsedPlugin.js

@@ -0,0 +1,38 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+/** @typedef {import("./Compiler")} Compiler */
+
+class FlagAllModulesAsUsedPlugin {
+	constructor(explanation) {
+		this.explanation = explanation;
+	}
+
+	/**
+	 * @param {Compiler} compiler webpack compiler
+	 * @returns {void}
+	 */
+	apply(compiler) {
+		compiler.hooks.compilation.tap(
+			"FlagAllModulesAsUsedPlugin",
+			compilation => {
+				compilation.hooks.optimizeDependencies.tap(
+					"FlagAllModulesAsUsedPlugin",
+					modules => {
+						for (const module of modules) {
+							module.used = true;
+							module.usedExports = true;
+							module.addReason(null, null, this.explanation);
+						}
+					}
+				);
+			}
+		);
+	}
+}
+
+module.exports = FlagAllModulesAsUsedPlugin;

lib/FlagDependencyUsagePlugin.js

@@ -93,7 +93,7 @@ class FlagDependencyUsagePlugin {
 					};
 
 					for (const module of modules) {
-						module.used = false;
+						if (!module.used) module.used = false;
 					}
 
 					/** @type {[Module, DependenciesBlock, UsedExports][]} */

test/configCases/dll-plugin-side-effects/0-create-dll/dependency.js

@@ -0,0 +1,3 @@
+export default function createB() {
+	return "b";
+}

test/configCases/dll-plugin-side-effects/0-create-dll/dependency2.js

@@ -0,0 +1,3 @@
+export default function createC() {
+	return "c";
+}

test/configCases/dll-plugin-side-effects/0-create-dll/index.js

@@ -0,0 +1,3 @@
+import { a } from "./module";
+
+export default a();

test/configCases/dll-plugin-side-effects/0-create-dll/module.js

@@ -0,0 +1,12 @@
+import createB from "./dependency";
+import createC from "./dependency2";
+
+export function a() {
+	return "a";
+}
+
+export { createB as b };
+
+export function c() {
+	return createC();
+}

test/configCases/dll-plugin-side-effects/0-create-dll/test.config.js

@@ -0,0 +1 @@
+exports.noTests = true;

test/configCases/dll-plugin-side-effects/0-create-dll/webpack.config.js

@@ -0,0 +1,31 @@
+var path = require("path");
+var webpack = require("../../../../");
+
+module.exports = {
+	entry: ["./index"],
+	output: {
+		filename: "dll.js",
+		chunkFilename: "[id].dll.js",
+		libraryTarget: "commonjs2"
+	},
+	module: {
+		rules: [
+			{
+				test: /0-create-dll.(module|dependency)/,
+				sideEffects: false
+			}
+		]
+	},
+	optimization: {
+		usedExports: true,
+		sideEffects: true
+	},
+	plugins: [
+		new webpack.DllPlugin({
+			path: path.resolve(
+				__dirname,
+				"../../../js/config/dll-plugin-side-effects/manifest0.json"
+			)
+		})
+	]
+};

test/configCases/dll-plugin-side-effects/1-use-dll/index.js

@@ -0,0 +1,9 @@
+it("should include all exports and modules in the dll", function() {
+	const { a, b, c } = require("dll/module");
+	expect(typeof a).toBe("function");
+	expect(a()).toBe("a");
+	expect(typeof b).toBe("function");
+	expect(b()).toBe("b");
+	expect(typeof c).toBe("function");
+	expect(c()).toBe("c");
+});

test/configCases/dll-plugin-side-effects/1-use-dll/webpack.config.js

@@ -0,0 +1,12 @@
+var webpack = require("../../../../");
+
+module.exports = {
+	plugins: [
+		new webpack.DllReferencePlugin({
+			manifest: require("../../../js/config/dll-plugin-side-effects/manifest0.json"), // eslint-disable-line node/no-missing-require
+			name: "../0-create-dll/dll.js",
+			scope: "dll",
+			sourceType: "commonjs2"
+		})
+	]
+};

test/configCases/dll-plugin/0-create-dll/webpack.config.js

@@ -27,6 +27,7 @@ module.exports = {
 		]
 	},
 	optimization: {
+		usedExports: true,
 		sideEffects: true
 	},
 	plugins: [

test/configCases/dll-plugin/0-issue-10475/index.js

@@ -0,0 +1,3 @@
+import { constants } from "test-package";
+
+var x = constants;

test/configCases/dll-plugin/0-issue-10475/test.config.js

@@ -0,0 +1 @@
+exports.noTests = true;

test/configCases/dll-plugin/0-issue-10475/webpack.config.js

@@ -0,0 +1,19 @@
+var path = require("path");
+var webpack = require("../../../../");
+
+module.exports = {
+	entry: ["./index.js"],
+	output: {
+		filename: "dll.js",
+		chunkFilename: "[id].dll.js",
+		libraryTarget: "commonjs2"
+	},
+	plugins: [
+		new webpack.DllPlugin({
+			path: path.resolve(
+				__dirname,
+				"../../../js/config/dll-plugin/issue-10475.json"
+			)
+		})
+	]
+};

test/configCases/dll-plugin/1-issue-10475/index.js

@@ -0,0 +1,3 @@
+it("should have all modules", () => {
+	require("dll/index.js");
+});

test/configCases/dll-plugin/1-issue-10475/webpack.config.js

@@ -0,0 +1,12 @@
+var webpack = require("../../../../");
+
+module.exports = {
+	plugins: [
+		new webpack.DllReferencePlugin({
+			manifest: require("../../../js/config/dll-plugin/issue-10475.json"), // eslint-disable-line node/no-missing-require
+			name: "../0-issue-10475/dll.js",
+			scope: "dll",
+			sourceType: "commonjs2"
+		})
+	]
+};