fix DllPlugin flagging

sokra · sokra · commit 95407047c480 · 2017-11-21T13:09:32.000+01:00
diff --git a/lib/DllPlugin.js b/lib/DllPlugin.js
@@ -31,7 +31,7 @@ class DllPlugin {
 			return true;
 		});
 		compiler.apply(new LibManifestPlugin(this.options));
-		compiler.apply(new FlagInitialModulesAsUsedPlugin());
+		compiler.apply(new FlagInitialModulesAsUsedPlugin("DllPlugin"));
 	}
 }
 
diff --git a/lib/FlagInitialModulesAsUsedPlugin.js b/lib/FlagInitialModulesAsUsedPlugin.js
@@ -5,6 +5,10 @@
 "use strict";
 
 class FlagInitialModulesAsUsedPlugin {
+	constructor(explaination) {
+		this.explaination = explaination;
+	}
+
 	apply(compiler) {
 		compiler.plugin("compilation", (compilation) => {
 			compilation.plugin("after-optimize-chunks", (chunks) => {
@@ -15,6 +19,7 @@ class FlagInitialModulesAsUsedPlugin {
 					chunk.forEachModule((module) => {
 						module.used = true;
 						module.usedExports = true;
+						module.addReason(null, null, this.explaination);
 					});
 				});
 			});
diff --git a/lib/Module.js b/lib/Module.js
@@ -143,7 +143,7 @@ class Module extends DependenciesBlock {
 	}
 
 	get optional() {
-		return this.reasons.length > 0 && this.reasons.every(r => r.dependency.optional);
+		return this.reasons.length > 0 && this.reasons.every(r => r.dependency && r.dependency.optional);
 	}
 
 	forEachChunk(fn) {
@@ -180,8 +180,8 @@ class Module extends DependenciesBlock {
 		}
 	}
 
-	addReason(module, dependency) {
-		this.reasons.push(new ModuleReason(module, dependency));
+	addReason(module, dependency, explaination) {
+		this.reasons.push(new ModuleReason(module, dependency, explaination));
 	}
 
 	removeReason(module, dependency) {
diff --git a/lib/ModuleReason.js b/lib/ModuleReason.js
@@ -7,9 +7,10 @@
 const util = require("util");
 
 class ModuleReason {
-	constructor(module, dependency) {
+	constructor(module, dependency, explaination) {
 		this.module = module;
 		this.dependency = dependency;
+		this.explaination = explaination;
 		this._chunks = null;
 	}
 
diff --git a/lib/optimize/ModuleConcatenationPlugin.js b/lib/optimize/ModuleConcatenationPlugin.js
@@ -84,13 +84,22 @@ class ModuleConcatenationPlugin {
 					}
 
 					// Module must only be used by Harmony Imports
-					const nonHarmonyReasons = module.reasons.filter(reason => !(reason.dependency instanceof HarmonyImportDependency));
+					const nonHarmonyReasons = module.reasons.filter(reason => !reason.dependency || !(reason.dependency instanceof HarmonyImportDependency));
 					if(nonHarmonyReasons.length > 0) {
-						const importingModules = new Set(nonHarmonyReasons.map(r => r.module));
+						const importingModules = new Set(nonHarmonyReasons.map(r => r.module).filter(Boolean));
+						const importingExplainations = new Set(nonHarmonyReasons.map(r => r.explaination).filter(Boolean));
 						const importingModuleTypes = new Map(Array.from(importingModules).map(m => [m, new Set(nonHarmonyReasons.filter(r => r.module === m).map(r => r.dependency.type).sort())]));
 						setBailoutReason(module, (requestShortener) => {
 							const names = Array.from(importingModules).map(m => `${m.readableIdentifier(requestShortener)} (referenced with ${Array.from(importingModuleTypes.get(m)).join(", ")})`).sort();
-							return `Module is referenced from these modules with unsupported syntax: ${names.join(", ")}`;
+							const explainations = Array.from(importingExplainations).sort();
+							if(names.length > 0 && explainations.length === 0)
+								return `Module is referenced from these modules with unsupported syntax: ${names.join(", ")}`;
+							else if(names.length === 0 && explainations.length > 0)
+								return `Module is referenced by: ${explainations.join(", ")}`;
+							else if(names.length > 0 && explainations.length > 0)
+								return `Module is referenced from these modules with unsupported syntax: ${names.join(", ")} and by: ${explainations.join(", ")}`;
+							else
+								return "Module is referenced in a unsupported way";
 						});
 						continue;
 					}

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class DllPlugin {`
`31`	`31`	`return true;`
`32`	`32`	`});`
`33`	`33`	`compiler.apply(new LibManifestPlugin(this.options));`
`34`		`- compiler.apply(new FlagInitialModulesAsUsedPlugin());`
	`34`	`+ compiler.apply(new FlagInitialModulesAsUsedPlugin("DllPlugin"));`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ class Module extends DependenciesBlock {`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`get optional() {`
`146`		`- return this.reasons.length > 0 && this.reasons.every(r => r.dependency.optional);`
	`146`	`+ return this.reasons.length > 0 && this.reasons.every(r => r.dependency && r.dependency.optional);`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`forEachChunk(fn) {`
`@@ -180,8 +180,8 @@ class Module extends DependenciesBlock {`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`
`183`		`- addReason(module, dependency) {`
`184`		`- this.reasons.push(new ModuleReason(module, dependency));`
	`183`	`+ addReason(module, dependency, explaination) {`
	`184`	`+ this.reasons.push(new ModuleReason(module, dependency, explaination));`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`removeReason(module, dependency) {`