webpack 3.3.0 → 3.5.1

package/lib/optimize/ModuleConcatenationPlugin.js

@@ -7,6 +7,11 @@
 const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
 const ConcatenatedModule = require("./ConcatenatedModule");
 const HarmonyExportImportedSpecifierDependency = require("../dependencies/HarmonyExportImportedSpecifierDependency");
+const HarmonyCompatibilityDependency = require("../dependencies/HarmonyCompatibilityDependency");
+
+function formatBailoutReason(msg) {
+	return "ModuleConcatenation bailout: " + msg;
+}
 
 class ModuleConcatenationPlugin {
 	constructor(options) {
@@ -23,9 +28,9 @@ class ModuleConcatenationPlugin {
 			});
 			const bailoutReasonMap = new Map();
 
-			function setBailoutReason(module, prefix, reason) {
+			function setBailoutReason(module, reason) {
 				bailoutReasonMap.set(module, reason);
-				module.optimizationBailout.push(typeof reason === "function" ? (rs) => `${prefix}: ${reason(rs)}` : `${prefix}: ${reason}`);
+				module.optimizationBailout.push(typeof reason === "function" ? (rs) => formatBailoutReason(reason(rs)) : formatBailoutReason(reason));
 			}
 
 			function getBailoutReason(module, requestShortener) {
@@ -39,33 +44,34 @@ class ModuleConcatenationPlugin {
 				const possibleInners = new Set();
 				for(const module of modules) {
 					// Only harmony modules are valid for optimization
-					if(!module.meta || !module.meta.harmonyModule) {
+					if(!module.meta || !module.meta.harmonyModule || !module.dependencies.some(d => d instanceof HarmonyCompatibilityDependency)) {
+						setBailoutReason(module, "Module is not an ECMAScript module");
 						continue;
 					}
 
 					// Because of variable renaming we can't use modules with eval
 					if(module.meta && module.meta.hasEval) {
-						setBailoutReason(module, "ModuleConcatenation", "eval is used in the module");
-						continue;
-					}
-
-					relevantModules.push(module);
-
-					// Module must not be the entry points
-					if(module.getChunks().some(chunk => chunk.entryModule === module)) {
-						setBailoutReason(module, "ModuleConcatenation (inner)", "module is an entrypoint");
+						setBailoutReason(module, "Module uses eval()");
 						continue;
 					}
 
 					// Exports must be known (and not dynamic)
 					if(!Array.isArray(module.providedExports)) {
-						setBailoutReason(module, "ModuleConcatenation (inner)", "exports are not known");
+						setBailoutReason(module, "Module exports are unknown");
 						continue;
 					}
 
 					// Using dependency variables is not possible as this wraps the code in a function
 					if(module.variables.length > 0) {
-						setBailoutReason(module, "ModuleConcatenation (inner)", "dependency variables are used (i. e. ProvidePlugin)");
+						setBailoutReason(module, `Module uses injected variables (${module.variables.map(v => v.name).join(", ")})`);
+						continue;
+					}
+
+					relevantModules.push(module);
+
+					// Module must not be the entry points
+					if(module.getChunks().some(chunk => chunk.entryModule === module)) {
+						setBailoutReason(module, "Module is an entry point");
 						continue;
 					}
 
@@ -73,9 +79,10 @@ class ModuleConcatenationPlugin {
 					const nonHarmonyReasons = module.reasons.filter(reason => !(reason.dependency instanceof HarmonyImportDependency));
 					if(nonHarmonyReasons.length > 0) {
 						const importingModules = new Set(nonHarmonyReasons.map(r => r.module));
-						setBailoutReason(module, "ModuleConcatenation (inner)", (requestShortener) => {
-							const names = Array.from(importingModules).map(m => m.readableIdentifier(requestShortener)).sort();
-							return `module is used with non-harmony imports from ${names.join(", ")}`;
+						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(", ")}`;
 						});
 						continue;
 					}
@@ -83,7 +90,7 @@ class ModuleConcatenationPlugin {
 					possibleInners.add(module);
 				}
 				// sort by depth
-				// modules with lower depth are more likly suited as roots
+				// modules with lower depth are more likely suited as roots
 				// this improves performance, because modules already selected as inner are skipped
 				relevantModules.sort((a, b) => {
 					return a.depth - b.depth;
@@ -129,22 +136,20 @@ class ModuleConcatenationPlugin {
 				for(const concatConfiguration of concatConfigurations) {
 					if(usedModules.has(concatConfiguration.rootModule))
 						continue;
-					const orderedModules = new Set();
-					this.addInOrder(concatConfiguration.rootModule, concatConfiguration.modules, orderedModules);
-					const newModule = new ConcatenatedModule(concatConfiguration.rootModule, Array.from(orderedModules));
+					const newModule = new ConcatenatedModule(concatConfiguration.rootModule, Array.from(concatConfiguration.modules));
 					concatConfiguration.sortWarnings();
 					for(const warning of concatConfiguration.warnings) {
 						newModule.optimizationBailout.push((requestShortener) => {
 							const reason = getBailoutReason(warning[0], requestShortener);
-							const reasonPrefix = reason ? `: ${reason}` : "";
+							const reasonWithPrefix = reason ? ` (<- ${reason})` : "";
 							if(warning[0] === warning[1])
-								return `ModuleConcatenation: Cannot concat with ${warning[0].readableIdentifier(requestShortener)}${reasonPrefix}`;
+								return formatBailoutReason(`Cannot concat with ${warning[0].readableIdentifier(requestShortener)}${reasonWithPrefix}`);
 							else
-								return `ModuleConcatenation: Cannot concat with ${warning[0].readableIdentifier(requestShortener)} because of ${warning[1].readableIdentifier(requestShortener)}${reasonPrefix}`;
+								return formatBailoutReason(`Cannot concat with ${warning[0].readableIdentifier(requestShortener)} because of ${warning[1].readableIdentifier(requestShortener)}${reasonWithPrefix}`);
 						});
 					}
 					const chunks = concatConfiguration.rootModule.getChunks();
-					for(const m of orderedModules) {
+					for(const m of concatConfiguration.modules) {
 						usedModules.add(m);
 						chunks.forEach(chunk => chunk.removeModule(m));
 					}
@@ -240,16 +245,6 @@ class ModuleConcatenationPlugin {
 		config.set(testConfig);
 		return null;
 	}
-
-	addInOrder(module, unorderedSet, orderedSet) {
-		if(orderedSet.has(module)) return;
-		if(!unorderedSet.has(module)) return;
-		orderedSet.add(module);
-		for(const imp of this.getImports(module))
-			this.addInOrder(imp, unorderedSet, orderedSet);
-		orderedSet.delete(module);
-		orderedSet.add(module);
-	}
 }
 
 class ConcatConfiguration {

package/lib/util/identifier.js

@@ -7,10 +7,32 @@ const looksLikeAbsolutePath = (maybeAbsolutePath) => {
 
 const normalizePathSeparator = (p) => p.replace(/\\/g, "/");
 
-exports.makePathsRelative = (context, identifier) => {
+const _makePathsRelative = (context, identifier) => {
 	return identifier
 		.split(/([|! ])/)
 		.map(str => looksLikeAbsolutePath(str) ?
 			normalizePathSeparator(path.relative(context, str)) : str)
 		.join("");
 };
+
+exports.makePathsRelative = (context, identifier, cache) => {
+	if(!cache) return _makePathsRelative(context, identifier);
+
+	const relativePaths = cache.relativePaths || (cache.relativePaths = new Map());
+
+	let cachedResult;
+	let contextCache = relativePaths.get(context);
+	if(typeof contextCache === "undefined") {
+		relativePaths.set(context, contextCache = new Map());
+	} else {
+		cachedResult = contextCache.get(identifier);
+	}
+
+	if(typeof cachedResult !== "undefined") {
+		return cachedResult;
+	} else {
+		const relativePath = _makePathsRelative(context, identifier);
+		contextCache.set(identifier, relativePath);
+		return relativePath;
+	}
+};

package/lib/webpack.js

@@ -58,64 +58,61 @@ webpack.validate = validateSchema.bind(this, webpackOptionsSchema);
 webpack.validateSchema = validateSchema;
 webpack.WebpackOptionsValidationError = WebpackOptionsValidationError;
 
-function exportPlugins(exports, path, plugins) {
-	plugins.forEach(name => {
-		Object.defineProperty(exports, name, {
+function exportPlugins(obj, mappings) {
+	Object.keys(mappings).forEach(name => {
+		Object.defineProperty(obj, name, {
 			configurable: false,
 			enumerable: true,
-			get() {
-				return require(`${path}/${name}`);
-			}
+			get: mappings[name]
 		});
 	});
 }
 
-exportPlugins(exports, ".", [
-	"DefinePlugin",
-	"NormalModuleReplacementPlugin",
-	"ContextReplacementPlugin",
-	"IgnorePlugin",
-	"WatchIgnorePlugin",
-	"BannerPlugin",
-	"PrefetchPlugin",
-	"AutomaticPrefetchPlugin",
-	"ProvidePlugin",
-	"HotModuleReplacementPlugin",
-	"SourceMapDevToolPlugin",
-	"EvalSourceMapDevToolPlugin",
-	"EvalDevToolModulePlugin",
-	"CachePlugin",
-	"ExtendedAPIPlugin",
-	"ExternalsPlugin",
-	"JsonpTemplatePlugin",
-	"LibraryTemplatePlugin",
-	"LoaderTargetPlugin",
-	"MemoryOutputFileSystem",
-	"ProgressPlugin",
-	"SetVarMainTemplatePlugin",
-	"UmdMainTemplatePlugin",
-	"NoErrorsPlugin",
-	"NoEmitOnErrorsPlugin",
-	"NewWatchingPlugin",
-	"EnvironmentPlugin",
-	"DllPlugin",
-	"DllReferencePlugin",
-	"LoaderOptionsPlugin",
-	"NamedModulesPlugin",
-	"NamedChunksPlugin",
-	"HashedModuleIdsPlugin",
-	"ModuleFilenameHelpers"
-]);
-exportPlugins(exports.optimize = {}, "./optimize", [
-	"AggressiveMergingPlugin",
-	"AggressiveSplittingPlugin",
-	"CommonsChunkPlugin",
-	"ChunkModuleIdRangePlugin",
-	"DedupePlugin",
-	"LimitChunkCountPlugin",
-	"MinChunkSizePlugin",
-	"ModuleConcatenationPlugin",
-	"OccurrenceOrderPlugin",
-	"UglifyJsPlugin"
-]);
-exportPlugins(exports.dependencies = {}, "./dependencies", []);
+exportPlugins(exports, {
+	"DefinePlugin": () => require("./DefinePlugin"),
+	"NormalModuleReplacementPlugin": () => require("./NormalModuleReplacementPlugin"),
+	"ContextReplacementPlugin": () => require("./ContextReplacementPlugin"),
+	"IgnorePlugin": () => require("./IgnorePlugin"),
+	"WatchIgnorePlugin": () => require("./WatchIgnorePlugin"),
+	"BannerPlugin": () => require("./BannerPlugin"),
+	"PrefetchPlugin": () => require("./PrefetchPlugin"),
+	"AutomaticPrefetchPlugin": () => require("./AutomaticPrefetchPlugin"),
+	"ProvidePlugin": () => require("./ProvidePlugin"),
+	"HotModuleReplacementPlugin": () => require("./HotModuleReplacementPlugin"),
+	"SourceMapDevToolPlugin": () => require("./SourceMapDevToolPlugin"),
+	"EvalSourceMapDevToolPlugin": () => require("./EvalSourceMapDevToolPlugin"),
+	"EvalDevToolModulePlugin": () => require("./EvalDevToolModulePlugin"),
+	"CachePlugin": () => require("./CachePlugin"),
+	"ExtendedAPIPlugin": () => require("./ExtendedAPIPlugin"),
+	"ExternalsPlugin": () => require("./ExternalsPlugin"),
+	"JsonpTemplatePlugin": () => require("./JsonpTemplatePlugin"),
+	"LibraryTemplatePlugin": () => require("./LibraryTemplatePlugin"),
+	"LoaderTargetPlugin": () => require("./LoaderTargetPlugin"),
+	"MemoryOutputFileSystem": () => require("./MemoryOutputFileSystem"),
+	"ProgressPlugin": () => require("./ProgressPlugin"),
+	"SetVarMainTemplatePlugin": () => require("./SetVarMainTemplatePlugin"),
+	"UmdMainTemplatePlugin": () => require("./UmdMainTemplatePlugin"),
+	"NoErrorsPlugin": () => require("./NoErrorsPlugin"),
+	"NoEmitOnErrorsPlugin": () => require("./NoEmitOnErrorsPlugin"),
+	"NewWatchingPlugin": () => require("./NewWatchingPlugin"),
+	"EnvironmentPlugin": () => require("./EnvironmentPlugin"),
+	"DllPlugin": () => require("./DllPlugin"),
+	"DllReferencePlugin": () => require("./DllReferencePlugin"),
+	"LoaderOptionsPlugin": () => require("./LoaderOptionsPlugin"),
+	"NamedModulesPlugin": () => require("./NamedModulesPlugin"),
+	"NamedChunksPlugin": () => require("./NamedChunksPlugin"),
+	"HashedModuleIdsPlugin": () => require("./HashedModuleIdsPlugin"),
+	"ModuleFilenameHelpers": () => require("./ModuleFilenameHelpers")
+});
+exportPlugins(exports.optimize = {}, {
+	"AggressiveMergingPlugin": () => require("./optimize/AggressiveMergingPlugin"),
+	"AggressiveSplittingPlugin": () => require("./optimize/AggressiveSplittingPlugin"),
+	"CommonsChunkPlugin": () => require("./optimize/CommonsChunkPlugin"),
+	"ChunkModuleIdRangePlugin": () => require("./optimize/ChunkModuleIdRangePlugin"),
+	"DedupePlugin": () => require("./optimize/DedupePlugin"),
+	"LimitChunkCountPlugin": () => require("./optimize/LimitChunkCountPlugin"),
+	"MinChunkSizePlugin": () => require("./optimize/MinChunkSizePlugin"),
+	"ModuleConcatenationPlugin": () => require("./optimize/ModuleConcatenationPlugin"),
+	"OccurrenceOrderPlugin": () => require("./optimize/OccurrenceOrderPlugin"),
+	"UglifyJsPlugin": () => require("./optimize/UglifyJsPlugin")
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "3.3.0",
+  "version": "3.5.1",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "dependencies": {
@@ -9,7 +9,7 @@
     "ajv": "^5.1.5",
     "ajv-keywords": "^2.0.0",
     "async": "^2.1.2",
-    "enhanced-resolve": "^3.3.0",
+    "enhanced-resolve": "^3.4.0",
     "escope": "^3.6.0",
     "interpret": "^1.0.0",
     "json-loader": "^0.5.4",
@@ -20,12 +20,12 @@
     "mkdirp": "~0.5.0",
     "node-libs-browser": "^2.0.0",
     "source-map": "^0.5.3",
-    "supports-color": "^3.1.0",
-    "tapable": "~0.2.5",
+    "supports-color": "^4.2.1",
+    "tapable": "^0.2.7",
     "uglifyjs-webpack-plugin": "^0.4.6",
     "watchpack": "^1.4.0",
     "webpack-sources": "^1.0.1",
-    "yargs": "^6.0.0"
+    "yargs": "^8.0.2"
   },
   "license": "MIT",
   "devDependencies": {
@@ -39,12 +39,12 @@
     "coveralls": "^2.11.2",
     "css-loader": "^0.28.3",
     "es6-promise-polyfill": "^1.1.1",
-    "eslint": "3.12.2",
-    "eslint-plugin-node": "^3.0.5",
+    "eslint": "^4.3.0",
+    "eslint-plugin-node": "^5.1.1",
     "express": "~4.13.1",
-    "extract-text-webpack-plugin": "^2.0.0-beta",
-    "file-loader": "^0.11.1",
-    "i18n-webpack-plugin": "^0.3.0",
+    "extract-text-webpack-plugin": "^3.0.0",
+    "file-loader": "^0.11.2",
+    "i18n-webpack-plugin": "^1.0.0",
     "istanbul": "^0.4.5",
     "jade": "^1.11.0",
     "jade-loader": "~0.8.0",

package/schemas/webpackOptionsSchema.json

@@ -743,7 +743,7 @@
         }
       ]
     },
-    "warning-filters-types": {
+    "filter-item-types": {
       "anyOf": [
         {
           "instanceof": "RegExp"
@@ -755,6 +755,19 @@
           "instanceof": "Function"
         }
       ]
+    },
+    "filter-types": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/filter-item-types"
+        },
+        {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/filter-item-types"
+          }
+        }
+      ]
     }
   },
   "properties": {
@@ -1009,17 +1022,19 @@
             },
             "warningsFilter": {
               "description": "Suppress warnings that match the specified filters. Filters can be Strings, RegExps or Functions",
-              "anyOf": [
-                {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/definitions/warning-filters-types"
-                  }
-                },
-                {
-                  "$ref": "#/definitions/warning-filters-types"
-                }
-              ]
+              "$ref": "#/definitions/filter-types"
+            },
+            "excludeAssets": {
+              "description": "Suppress assets that match the specified filters. Filters can be Strings, RegExps or Functions",
+              "$ref": "#/definitions/filter-types"
+            },
+            "excludeModules": {
+              "description": "Suppress modules that match the specified filters. Filters can be Strings, RegExps or Functions",
+              "$ref": "#/definitions/filter-types"
+            },
+            "exclude": {
+              "description": "Please use excludeModules instead.",
+              "$ref": "#/definitions/filter-types"
             },
             "errorDetails": {
               "type": "boolean",