webpack 3.5.5 → 3.5.6

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -1,121 +1,124 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const HarmonyImportDependency = require("./HarmonyImportDependency");
-const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDependency");
-const HarmonyAcceptImportDependency = require("./HarmonyAcceptImportDependency");
-const HarmonyAcceptDependency = require("./HarmonyAcceptDependency");
-const HarmonyModulesHelpers = require("./HarmonyModulesHelpers");
-
-module.exports = class HarmonyImportDependencyParserPlugin {
-	constructor(moduleOptions) {
-		this.strictExportPresence = moduleOptions.strictExportPresence;
-		this.strictThisContextOnImports = moduleOptions.strictThisContextOnImports;
-	}
-
-	apply(parser) {
-		parser.plugin("import", (statement, source) => {
-			const dep = new HarmonyImportDependency(source, HarmonyModulesHelpers.getNewModuleVar(parser.state, source), statement.range);
-			dep.loc = statement.loc;
-			parser.state.current.addDependency(dep);
-			parser.state.lastHarmonyImport = dep;
-			return true;
-		});
-		parser.plugin("import specifier", (statement, source, id, name) => {
-			parser.scope.definitions.length--;
-			parser.scope.renames[`$${name}`] = "imported var";
-			if(!parser.state.harmonySpecifier) parser.state.harmonySpecifier = {};
-			parser.state.harmonySpecifier[`$${name}`] = [parser.state.lastHarmonyImport, HarmonyModulesHelpers.getModuleVar(parser.state, source), id];
-			return true;
-		});
-		parser.plugin("expression imported var", (expr) => {
-			const name = expr.name;
-			const settings = parser.state.harmonySpecifier[`$${name}`];
-			const dep = new HarmonyImportSpecifierDependency(settings[0], settings[1], settings[2], name, expr.range, this.strictExportPresence);
-			dep.shorthand = parser.scope.inShorthand;
-			dep.directImport = true;
-			dep.loc = expr.loc;
-			parser.state.current.addDependency(dep);
-			return true;
-		});
-		parser.plugin("expression imported var.*", (expr) => {
-			const name = expr.object.name;
-			const settings = parser.state.harmonySpecifier[`$${name}`];
-			if(settings[2] !== null)
-				return false;
-			const dep = new HarmonyImportSpecifierDependency(settings[0], settings[1], expr.property.name || expr.property.value, name, expr.range, this.strictExportPresence);
-			dep.shorthand = parser.scope.inShorthand;
-			dep.directImport = false;
-			dep.loc = expr.loc;
-			parser.state.current.addDependency(dep);
-			return true;
-		});
-		if(this.strictThisContextOnImports) {
-			// only in case when we strictly follow the spec we need a special case here
-			parser.plugin("call imported var.*", (expr) => {
-				const name = expr.callee.object.name;
-				const settings = parser.state.harmonySpecifier[`$${name}`];
-				if(settings[2] !== null)
-					return false;
-				const dep = new HarmonyImportSpecifierDependency(settings[0], settings[1], expr.callee.property.name || expr.callee.property.value, name, expr.callee.range, this.strictExportPresence);
-				dep.shorthand = parser.scope.inShorthand;
-				dep.directImport = false;
-				dep.namespaceObjectAsContext = true;
-				dep.loc = expr.callee.loc;
-				parser.state.current.addDependency(dep);
-				if(expr.arguments)
-					parser.walkExpressions(expr.arguments);
-				return true;
-			});
-		}
-		parser.plugin("call imported var", (expr) => {
-			const args = expr.arguments;
-			const fullExpr = expr;
-			expr = expr.callee;
-			const name = expr.name;
-			const settings = parser.state.harmonySpecifier[`$${name}`];
-			const dep = new HarmonyImportSpecifierDependency(settings[0], settings[1], settings[2], name, expr.range, this.strictExportPresence);
-			dep.directImport = true;
-			dep.callArgs = args;
-			dep.call = fullExpr;
-			dep.loc = expr.loc;
-			parser.state.current.addDependency(dep);
-			if(args)
-				parser.walkExpressions(args);
-			return true;
-		});
-		parser.plugin("hot accept callback", (expr, requests) => {
-			const dependencies = requests
-				.filter(request => HarmonyModulesHelpers.checkModuleVar(parser.state, request))
-				.map(request => {
-					const dep = new HarmonyAcceptImportDependency(request, HarmonyModulesHelpers.getModuleVar(parser.state, request), expr.range);
-					dep.loc = expr.loc;
-					parser.state.current.addDependency(dep);
-					return dep;
-				});
-			if(dependencies.length > 0) {
-				const dep = new HarmonyAcceptDependency(expr.range, dependencies, true);
-				dep.loc = expr.loc;
-				parser.state.current.addDependency(dep);
-			}
-		});
-		parser.plugin("hot accept without callback", (expr, requests) => {
-			const dependencies = requests
-				.filter(request => HarmonyModulesHelpers.checkModuleVar(parser.state, request))
-				.map(request => {
-					const dep = new HarmonyAcceptImportDependency(request, HarmonyModulesHelpers.getModuleVar(parser.state, request), expr.range);
-					dep.loc = expr.loc;
-					parser.state.current.addDependency(dep);
-					return dep;
-				});
-			if(dependencies.length > 0) {
-				const dep = new HarmonyAcceptDependency(expr.range, dependencies, false);
-				dep.loc = expr.loc;
-				parser.state.current.addDependency(dep);
-			}
-		});
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const HarmonyImportDependency = require("./HarmonyImportDependency");
+const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDependency");
+const HarmonyAcceptImportDependency = require("./HarmonyAcceptImportDependency");
+const HarmonyAcceptDependency = require("./HarmonyAcceptDependency");
+const HarmonyModulesHelpers = require("./HarmonyModulesHelpers");
+
+module.exports = class HarmonyImportDependencyParserPlugin {
+	constructor(moduleOptions) {
+		this.strictExportPresence = moduleOptions.strictExportPresence;
+		this.strictThisContextOnImports = moduleOptions.strictThisContextOnImports;
+	}
+
+	apply(parser) {
+		parser.plugin("import", (statement, source) => {
+			const dep = new HarmonyImportDependency(source, HarmonyModulesHelpers.getNewModuleVar(parser.state, source), statement.range);
+			dep.loc = statement.loc;
+			parser.state.current.addDependency(dep);
+			parser.state.lastHarmonyImport = dep;
+			return true;
+		});
+		parser.plugin("import specifier", (statement, source, id, name) => {
+			parser.scope.definitions.length--;
+			parser.scope.renames[`$${name}`] = "imported var";
+			if(!parser.state.harmonySpecifier) parser.state.harmonySpecifier = {};
+			parser.state.harmonySpecifier[`$${name}`] = [parser.state.lastHarmonyImport, HarmonyModulesHelpers.getModuleVar(parser.state, source), id];
+			return true;
+		});
+		parser.plugin("expression imported var", (expr) => {
+			const name = expr.name;
+			const settings = parser.state.harmonySpecifier[`$${name}`];
+			const dep = new HarmonyImportSpecifierDependency(settings[0], settings[1], settings[2], name, expr.range, this.strictExportPresence);
+			dep.shorthand = parser.scope.inShorthand;
+			dep.directImport = true;
+			dep.loc = expr.loc;
+			parser.state.current.addDependency(dep);
+			return true;
+		});
+		parser.plugin("expression imported var.*", (expr) => {
+			const name = expr.object.name;
+			const settings = parser.state.harmonySpecifier[`$${name}`];
+			if(settings[2] !== null)
+				return false;
+			const dep = new HarmonyImportSpecifierDependency(settings[0], settings[1], expr.property.name || expr.property.value, name, expr.range, this.strictExportPresence);
+			dep.shorthand = parser.scope.inShorthand;
+			dep.directImport = false;
+			dep.loc = expr.loc;
+			parser.state.current.addDependency(dep);
+			return true;
+		});
+		if(this.strictThisContextOnImports) {
+			// only in case when we strictly follow the spec we need a special case here
+			parser.plugin("call imported var.*", (expr) => {
+				if(expr.callee.type !== "MemberExpression") return;
+				if(expr.callee.object.type !== "Identifier") return;
+				const name = expr.callee.object.name;
+				const settings = parser.state.harmonySpecifier[`$${name}`];
+				if(settings[2] !== null)
+					return false;
+				const dep = new HarmonyImportSpecifierDependency(settings[0], settings[1], expr.callee.property.name || expr.callee.property.value, name, expr.callee.range, this.strictExportPresence);
+				dep.shorthand = parser.scope.inShorthand;
+				dep.directImport = false;
+				dep.namespaceObjectAsContext = true;
+				dep.loc = expr.callee.loc;
+				parser.state.current.addDependency(dep);
+				if(expr.arguments)
+					parser.walkExpressions(expr.arguments);
+				return true;
+			});
+		}
+		parser.plugin("call imported var", (expr) => {
+			const args = expr.arguments;
+			const fullExpr = expr;
+			expr = expr.callee;
+			if(expr.type !== "Identifier") return;
+			const name = expr.name;
+			const settings = parser.state.harmonySpecifier[`$${name}`];
+			const dep = new HarmonyImportSpecifierDependency(settings[0], settings[1], settings[2], name, expr.range, this.strictExportPresence);
+			dep.directImport = true;
+			dep.callArgs = args;
+			dep.call = fullExpr;
+			dep.loc = expr.loc;
+			parser.state.current.addDependency(dep);
+			if(args)
+				parser.walkExpressions(args);
+			return true;
+		});
+		parser.plugin("hot accept callback", (expr, requests) => {
+			const dependencies = requests
+				.filter(request => HarmonyModulesHelpers.checkModuleVar(parser.state, request))
+				.map(request => {
+					const dep = new HarmonyAcceptImportDependency(request, HarmonyModulesHelpers.getModuleVar(parser.state, request), expr.range);
+					dep.loc = expr.loc;
+					parser.state.current.addDependency(dep);
+					return dep;
+				});
+			if(dependencies.length > 0) {
+				const dep = new HarmonyAcceptDependency(expr.range, dependencies, true);
+				dep.loc = expr.loc;
+				parser.state.current.addDependency(dep);
+			}
+		});
+		parser.plugin("hot accept without callback", (expr, requests) => {
+			const dependencies = requests
+				.filter(request => HarmonyModulesHelpers.checkModuleVar(parser.state, request))
+				.map(request => {
+					const dep = new HarmonyAcceptImportDependency(request, HarmonyModulesHelpers.getModuleVar(parser.state, request), expr.range);
+					dep.loc = expr.loc;
+					parser.state.current.addDependency(dep);
+					return dep;
+				});
+			if(dependencies.length > 0) {
+				const dep = new HarmonyAcceptDependency(expr.range, dependencies, false);
+				dep.loc = expr.loc;
+				parser.state.current.addDependency(dep);
+			}
+		});
+	}
+};

package/lib/dependencies/HarmonyModulesHelpers.js

@@ -1,85 +1,85 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-class HarmonyModulesHelpers {
-
-	static getModuleVar(state, request) {
-		if(!state.harmonyModules) state.harmonyModules = [];
-		let idx = state.harmonyModules.indexOf(request);
-		if(idx < 0) {
-			idx = state.harmonyModules.length;
-			state.harmonyModules.push(request);
-		}
-		return `__WEBPACK_IMPORTED_MODULE_${idx}_${request.replace(/[^A-Za-z0-9_]/g, "_").replace(/__+/g, "_")}__`;
-	}
-
-	static getNewModuleVar(state, request) {
-		if(state.harmonyModules && state.harmonyModules.indexOf(request) >= 0)
-			return null;
-		return this.getModuleVar(state, request);
-	}
-
-	static checkModuleVar(state, request) {
-		if(!state.harmonyModules || state.harmonyModules.indexOf(request) < 0)
-			return null;
-		return this.getModuleVar(state, request);
-	}
-
-	// checks if an harmony dependency is active in a module according to
-	// precedence rules.
-	static isActive(module, depInQuestion) {
-		const desc = depInQuestion.describeHarmonyExport();
-		if(!desc.exportedName) return true;
-		let before = true;
-		for(const moduleDependency of module.dependencies) {
-			const dep = moduleDependency;
-			if(dep === depInQuestion) {
-				before = false;
-				continue;
-			}
-			if(!dep.describeHarmonyExport) continue;
-			const d = dep.describeHarmonyExport();
-			if(!d || !d.exportedName) continue;
-			if(d.exportedName === desc.exportedName) {
-				if(d.precedence < desc.precedence) {
-					return false;
-				}
-				if(d.precedence === desc.precedence && !before) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	// get a list of named exports defined in a module
-	// doesn't include * reexports.
-	static getActiveExports(module, currentDependency) {
-		const desc = currentDependency && currentDependency.describeHarmonyExport();
-		var currentIndex = currentDependency ? module.dependencies.indexOf(currentDependency) : -1;
-		return module.dependencies.map((dep, idx) => {
-			return {
-				dep: dep,
-				idx: idx
-			};
-		}).reduce((arr, data) => {
-			const dep = data.dep;
-			if(!dep.describeHarmonyExport) return arr;
-			const d = dep.describeHarmonyExport();
-			if(!d) return arr;
-			if(!desc || (d.precedence < desc.precedence) || (d.precedence === desc.precedence && data.idx < currentIndex)) {
-				var names = [].concat(d.exportedName);
-				names.forEach(function(name) {
-					if(name && arr.indexOf(name) < 0)
-						arr.push(name);
-				});
-			}
-			return arr;
-		}, []);
-	}
-}
-
-module.exports = HarmonyModulesHelpers;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class HarmonyModulesHelpers {
+
+	static getModuleVar(state, request) {
+		if(!state.harmonyModules) state.harmonyModules = [];
+		let idx = state.harmonyModules.indexOf(request);
+		if(idx < 0) {
+			idx = state.harmonyModules.length;
+			state.harmonyModules.push(request);
+		}
+		return `__WEBPACK_IMPORTED_MODULE_${idx}_${request.replace(/[^A-Za-z0-9_]/g, "_").replace(/__+/g, "_")}__`;
+	}
+
+	static getNewModuleVar(state, request) {
+		if(state.harmonyModules && state.harmonyModules.indexOf(request) >= 0)
+			return null;
+		return this.getModuleVar(state, request);
+	}
+
+	static checkModuleVar(state, request) {
+		if(!state.harmonyModules || state.harmonyModules.indexOf(request) < 0)
+			return null;
+		return this.getModuleVar(state, request);
+	}
+
+	// checks if an harmony dependency is active in a module according to
+	// precedence rules.
+	static isActive(module, depInQuestion) {
+		const desc = depInQuestion.describeHarmonyExport();
+		if(!desc.exportedName) return true;
+		let before = true;
+		for(let idx = 0; idx < module.dependencies.length; idx++) {
+			const dep = module.dependencies[idx];
+			if(dep === depInQuestion) {
+				before = false;
+				continue;
+			}
+			if(!dep.describeHarmonyExport) continue;
+			const d = dep.describeHarmonyExport();
+			if(!d || !d.exportedName) continue;
+			if(d.exportedName === desc.exportedName) {
+				if(d.precedence < desc.precedence) {
+					return false;
+				}
+				if(d.precedence === desc.precedence && !before) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	// get a list of named exports defined in a module
+	// doesn't include * reexports.
+	static getActiveExports(module, currentDependency) {
+		const desc = currentDependency && currentDependency.describeHarmonyExport();
+		var currentIndex = currentDependency ? module.dependencies.indexOf(currentDependency) : -1;
+		return module.dependencies.map((dep, idx) => {
+			return {
+				dep: dep,
+				idx: idx
+			};
+		}).reduce((arr, data) => {
+			const dep = data.dep;
+			if(!dep.describeHarmonyExport) return arr;
+			const d = dep.describeHarmonyExport();
+			if(!d) return arr;
+			if(!desc || (d.precedence < desc.precedence) || (d.precedence === desc.precedence && data.idx < currentIndex)) {
+				var names = [].concat(d.exportedName);
+				names.forEach(function(name) {
+					if(name && arr.indexOf(name) < 0)
+						arr.push(name);
+				});
+			}
+			return arr;
+		}, []);
+	}
+}
+
+module.exports = HarmonyModulesHelpers;