webpack 3.6.0 → 3.8.1

package/lib/compareLocations.js

@@ -1,36 +1,36 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-module.exports = function compareLocations(a, b) {
-	if(typeof a === "string") {
-		if(typeof b === "string") {
-			if(a < b) return -1;
-			if(a > b) return 1;
-			return 0;
-		} else if(typeof b === "object") {
-			return 1;
-		} else {
-			return 0;
-		}
-	} else if(typeof a === "object") {
-		if(typeof b === "string") {
-			return -1;
-		} else if(typeof b === "object") {
-			if(a.start && b.start) {
-				const ap = a.start;
-				const bp = b.start;
-				if(ap.line < bp.line) return -1;
-				if(ap.line > bp.line) return 1;
-				if(ap.column < bp.column) return -1;
-				if(ap.column > bp.column) return 1;
-			}
-			if(a.index < b.index) return -1;
-			if(a.index > b.index) return 1;
-			return 0;
-		} else {
-			return 0;
-		}
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+module.exports = function compareLocations(a, b) {
+	if(typeof a === "string") {
+		if(typeof b === "string") {
+			if(a < b) return -1;
+			if(a > b) return 1;
+			return 0;
+		} else if(typeof b === "object") {
+			return 1;
+		} else {
+			return 0;
+		}
+	} else if(typeof a === "object") {
+		if(typeof b === "string") {
+			return -1;
+		} else if(typeof b === "object") {
+			if(a.start && b.start) {
+				const ap = a.start;
+				const bp = b.start;
+				if(ap.line < bp.line) return -1;
+				if(ap.line > bp.line) return 1;
+				if(ap.column < bp.column) return -1;
+				if(ap.column > bp.column) return 1;
+			}
+			if(a.index < b.index) return -1;
+			if(a.index > b.index) return 1;
+			return 0;
+		} else {
+			return 0;
+		}
+	}
+};

package/lib/dependencies/AMDDefineDependency.js

@@ -1,142 +1,142 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const NullDependency = require("./NullDependency");
-
-class AMDDefineDependency extends NullDependency {
-	constructor(range, arrayRange, functionRange, objectRange, namedModule) {
-		super();
-		this.range = range;
-		this.arrayRange = arrayRange;
-		this.functionRange = functionRange;
-		this.objectRange = objectRange;
-		this.namedModule = namedModule;
-	}
-
-	get type() {
-		return "amd define";
-	}
-}
-
-AMDDefineDependency.Template = class AMDDefineDependencyTemplate {
-	get definitions() {
-		return {
-			f: [
-				"var __WEBPACK_AMD_DEFINE_RESULT__;",
-				`!(__WEBPACK_AMD_DEFINE_RESULT__ = #.call(exports, __webpack_require__, exports, module),
-				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`
-			],
-			o: [
-				"",
-				"!(module.exports = #)"
-			],
-			of: [
-				"var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;",
-				`!(__WEBPACK_AMD_DEFINE_FACTORY__ = (#),
-				__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
-				(__WEBPACK_AMD_DEFINE_FACTORY__.call(exports, __webpack_require__, exports, module)) :
-				__WEBPACK_AMD_DEFINE_FACTORY__),
-				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`
-			],
-			af: [
-				"var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;",
-				`!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, __WEBPACK_AMD_DEFINE_RESULT__ = #.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__),
-				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`
-			],
-			ao: [
-				"",
-				"!(#, module.exports = #)"
-			],
-			aof: [
-				"var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;",
-				`!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, __WEBPACK_AMD_DEFINE_FACTORY__ = (#),
-				__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
-				(__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__),
-				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`
-			],
-			lf: [
-				"var XXX, XXXmodule;",
-				"!(XXXmodule = { id: YYY, exports: {}, loaded: false }, XXX = #.call(XXXmodule.exports, __webpack_require__, XXXmodule.exports, XXXmodule), XXXmodule.loaded = true, XXX === undefined && (XXX = XXXmodule.exports))"
-			],
-			lo: [
-				"var XXX;",
-				"!(XXX = #)"
-			],
-			lof: [
-				"var XXX, XXXfactory, XXXmodule;",
-				"!(XXXfactory = (#), (XXXmodule = { id: YYY, exports: {}, loaded: false }), XXX = (typeof XXXfactory === 'function' ? (XXXfactory.call(XXXmodule.exports, __webpack_require__, XXXmodule.exports, XXXmodule)) : XXXfactory), (XXXmodule.loaded = true), XXX === undefined && (XXX = XXXmodule.exports))"
-			],
-			laf: [
-				"var __WEBPACK_AMD_DEFINE_ARRAY__, XXX;",
-				"!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, XXX = (#.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)))"
-			],
-			lao: [
-				"var XXX;",
-				"!(#, XXX = #)"
-			],
-			laof: [
-				"var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_FACTORY__, XXX;",
-				`!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, __WEBPACK_AMD_DEFINE_FACTORY__ = (#),
-				XXX = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
-				(__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__))`
-			]
-		};
-	}
-
-	apply(dependency, source) {
-		const branch = this.branch(dependency);
-		const defAndText = this.definitions[branch];
-		const definitions = defAndText[0];
-		const text = defAndText[1];
-		this.replace(dependency, source, definitions, text);
-	}
-
-	localModuleVar(dependency) {
-		return dependency.localModule && dependency.localModule.used && dependency.localModule.variableName();
-	}
-
-	branch(dependency) {
-		const localModuleVar = this.localModuleVar(dependency) ? "l" : "";
-		const arrayRange = dependency.arrayRange ? "a" : "";
-		const objectRange = dependency.objectRange ? "o" : "";
-		const functionRange = dependency.functionRange ? "f" : "";
-		return localModuleVar + arrayRange + objectRange + functionRange;
-	}
-
-	replace(dependency, source, definition, text) {
-		const localModuleVar = this.localModuleVar(dependency);
-		if(localModuleVar) {
-			text = text.replace(/XXX/g, localModuleVar.replace(/\$/g, "$$$$"));
-			definition = definition.replace(/XXX/g, localModuleVar.replace(/\$/g, "$$$$"));
-		}
-
-		if(dependency.namedModule) {
-			text = text.replace(/YYY/g, JSON.stringify(dependency.namedModule));
-		}
-
-		const texts = text.split("#");
-
-		if(definition) source.insert(0, definition);
-
-		let current = dependency.range[0];
-		if(dependency.arrayRange) {
-			source.replace(current, dependency.arrayRange[0] - 1, texts.shift());
-			current = dependency.arrayRange[1];
-		}
-
-		if(dependency.objectRange) {
-			source.replace(current, dependency.objectRange[0] - 1, texts.shift());
-			current = dependency.objectRange[1];
-		} else if(dependency.functionRange) {
-			source.replace(current, dependency.functionRange[0] - 1, texts.shift());
-			current = dependency.functionRange[1];
-		}
-		source.replace(current, dependency.range[1] - 1, texts.shift());
-		if(texts.length > 0)
-			throw new Error("Implementation error");
-	}
-};
-
-module.exports = AMDDefineDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const NullDependency = require("./NullDependency");
+
+class AMDDefineDependency extends NullDependency {
+	constructor(range, arrayRange, functionRange, objectRange, namedModule) {
+		super();
+		this.range = range;
+		this.arrayRange = arrayRange;
+		this.functionRange = functionRange;
+		this.objectRange = objectRange;
+		this.namedModule = namedModule;
+	}
+
+	get type() {
+		return "amd define";
+	}
+}
+
+AMDDefineDependency.Template = class AMDDefineDependencyTemplate {
+	get definitions() {
+		return {
+			f: [
+				"var __WEBPACK_AMD_DEFINE_RESULT__;",
+				`!(__WEBPACK_AMD_DEFINE_RESULT__ = #.call(exports, __webpack_require__, exports, module),
+				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`
+			],
+			o: [
+				"",
+				"!(module.exports = #)"
+			],
+			of: [
+				"var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;",
+				`!(__WEBPACK_AMD_DEFINE_FACTORY__ = (#),
+				__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
+				(__WEBPACK_AMD_DEFINE_FACTORY__.call(exports, __webpack_require__, exports, module)) :
+				__WEBPACK_AMD_DEFINE_FACTORY__),
+				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`
+			],
+			af: [
+				"var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;",
+				`!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, __WEBPACK_AMD_DEFINE_RESULT__ = #.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__),
+				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`
+			],
+			ao: [
+				"",
+				"!(#, module.exports = #)"
+			],
+			aof: [
+				"var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;",
+				`!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, __WEBPACK_AMD_DEFINE_FACTORY__ = (#),
+				__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
+				(__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__),
+				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`
+			],
+			lf: [
+				"var XXX, XXXmodule;",
+				"!(XXXmodule = { id: YYY, exports: {}, loaded: false }, XXX = #.call(XXXmodule.exports, __webpack_require__, XXXmodule.exports, XXXmodule), XXXmodule.loaded = true, XXX === undefined && (XXX = XXXmodule.exports))"
+			],
+			lo: [
+				"var XXX;",
+				"!(XXX = #)"
+			],
+			lof: [
+				"var XXX, XXXfactory, XXXmodule;",
+				"!(XXXfactory = (#), (XXXmodule = { id: YYY, exports: {}, loaded: false }), XXX = (typeof XXXfactory === 'function' ? (XXXfactory.call(XXXmodule.exports, __webpack_require__, XXXmodule.exports, XXXmodule)) : XXXfactory), (XXXmodule.loaded = true), XXX === undefined && (XXX = XXXmodule.exports))"
+			],
+			laf: [
+				"var __WEBPACK_AMD_DEFINE_ARRAY__, XXX;",
+				"!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, XXX = (#.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)))"
+			],
+			lao: [
+				"var XXX;",
+				"!(#, XXX = #)"
+			],
+			laof: [
+				"var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_FACTORY__, XXX;",
+				`!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, __WEBPACK_AMD_DEFINE_FACTORY__ = (#),
+				XXX = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
+				(__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__))`
+			]
+		};
+	}
+
+	apply(dependency, source) {
+		const branch = this.branch(dependency);
+		const defAndText = this.definitions[branch];
+		const definitions = defAndText[0];
+		const text = defAndText[1];
+		this.replace(dependency, source, definitions, text);
+	}
+
+	localModuleVar(dependency) {
+		return dependency.localModule && dependency.localModule.used && dependency.localModule.variableName();
+	}
+
+	branch(dependency) {
+		const localModuleVar = this.localModuleVar(dependency) ? "l" : "";
+		const arrayRange = dependency.arrayRange ? "a" : "";
+		const objectRange = dependency.objectRange ? "o" : "";
+		const functionRange = dependency.functionRange ? "f" : "";
+		return localModuleVar + arrayRange + objectRange + functionRange;
+	}
+
+	replace(dependency, source, definition, text) {
+		const localModuleVar = this.localModuleVar(dependency);
+		if(localModuleVar) {
+			text = text.replace(/XXX/g, localModuleVar.replace(/\$/g, "$$$$"));
+			definition = definition.replace(/XXX/g, localModuleVar.replace(/\$/g, "$$$$"));
+		}
+
+		if(dependency.namedModule) {
+			text = text.replace(/YYY/g, JSON.stringify(dependency.namedModule));
+		}
+
+		const texts = text.split("#");
+
+		if(definition) source.insert(0, definition);
+
+		let current = dependency.range[0];
+		if(dependency.arrayRange) {
+			source.replace(current, dependency.arrayRange[0] - 1, texts.shift());
+			current = dependency.arrayRange[1];
+		}
+
+		if(dependency.objectRange) {
+			source.replace(current, dependency.objectRange[0] - 1, texts.shift());
+			current = dependency.objectRange[1];
+		} else if(dependency.functionRange) {
+			source.replace(current, dependency.functionRange[0] - 1, texts.shift());
+			current = dependency.functionRange[1];
+		}
+		source.replace(current, dependency.range[1] - 1, texts.shift());
+		if(texts.length > 0)
+			throw new Error("Implementation error");
+	}
+};
+
+module.exports = AMDDefineDependency;

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -28,6 +28,10 @@ class AMDDefineDependencyParserPlugin {
 		this.options = options;
 	}
 
+	newDefineDependency(range, arrayRange, functionRange, objectRange, namedModule) {
+		return new AMDDefineDependency(range, arrayRange, functionRange, objectRange, namedModule);
+	}
+
 	apply(parser) {
 		const options = this.options;
 		parser.plugin("call define", (expr) => {
@@ -156,7 +160,7 @@ class AMDDefineDependencyParserPlugin {
 				parser.walkExpression(fn || obj);
 			}
 
-			const dep = new AMDDefineDependency(
+			const dep = this.newDefineDependency(
 				expr.range,
 				array ? array.range : null,
 				fn ? fn.range : null,

package/lib/dependencies/AMDPlugin.js

@@ -1,119 +1,119 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const path = require("path");
-const AMDRequireDependency = require("./AMDRequireDependency");
-const AMDRequireItemDependency = require("./AMDRequireItemDependency");
-const AMDRequireArrayDependency = require("./AMDRequireArrayDependency");
-const AMDRequireContextDependency = require("./AMDRequireContextDependency");
-const AMDDefineDependency = require("./AMDDefineDependency");
-const UnsupportedDependency = require("./UnsupportedDependency");
-const LocalModuleDependency = require("./LocalModuleDependency");
-
-const NullFactory = require("../NullFactory");
-
-const AMDRequireDependenciesBlockParserPlugin = require("./AMDRequireDependenciesBlockParserPlugin");
-const AMDDefineDependencyParserPlugin = require("./AMDDefineDependencyParserPlugin");
-
-const AliasPlugin = require("enhanced-resolve/lib/AliasPlugin");
-
-const ParserHelpers = require("../ParserHelpers");
-
-class AMDPlugin {
-	constructor(options, amdOptions) {
-		this.amdOptions = amdOptions;
-		this.options = options;
-	}
-
-	apply(compiler) {
-		const options = this.options;
-		const amdOptions = this.amdOptions;
-		compiler.plugin("compilation", (compilation, params) => {
-			const normalModuleFactory = params.normalModuleFactory;
-			const contextModuleFactory = params.contextModuleFactory;
-
-			compilation.dependencyFactories.set(AMDRequireDependency, new NullFactory());
-			compilation.dependencyTemplates.set(AMDRequireDependency, new AMDRequireDependency.Template());
-
-			compilation.dependencyFactories.set(AMDRequireItemDependency, normalModuleFactory);
-			compilation.dependencyTemplates.set(AMDRequireItemDependency, new AMDRequireItemDependency.Template());
-
-			compilation.dependencyFactories.set(AMDRequireArrayDependency, new NullFactory());
-			compilation.dependencyTemplates.set(AMDRequireArrayDependency, new AMDRequireArrayDependency.Template());
-
-			compilation.dependencyFactories.set(AMDRequireContextDependency, contextModuleFactory);
-			compilation.dependencyTemplates.set(AMDRequireContextDependency, new AMDRequireContextDependency.Template());
-
-			compilation.dependencyFactories.set(AMDDefineDependency, new NullFactory());
-			compilation.dependencyTemplates.set(AMDDefineDependency, new AMDDefineDependency.Template());
-
-			compilation.dependencyFactories.set(UnsupportedDependency, new NullFactory());
-			compilation.dependencyTemplates.set(UnsupportedDependency, new UnsupportedDependency.Template());
-
-			compilation.dependencyFactories.set(LocalModuleDependency, new NullFactory());
-			compilation.dependencyTemplates.set(LocalModuleDependency, new LocalModuleDependency.Template());
-
-			params.normalModuleFactory.plugin("parser", (parser, parserOptions) => {
-
-				if(typeof parserOptions.amd !== "undefined" && !parserOptions.amd)
-					return;
-
-				function setExpressionToModule(outerExpr, module) {
-					parser.plugin("expression " + outerExpr, (expr) => {
-						const dep = new AMDRequireItemDependency(module, expr.range);
-						dep.userRequest = outerExpr;
-						dep.loc = expr.loc;
-						parser.state.current.addDependency(dep);
-						return true;
-					});
-				}
-
-				parser.apply(
-					new AMDRequireDependenciesBlockParserPlugin(options),
-					new AMDDefineDependencyParserPlugin(options)
-				);
-				setExpressionToModule("require.amd", "!!webpack amd options");
-				setExpressionToModule("define.amd", "!!webpack amd options");
-				setExpressionToModule("define", "!!webpack amd define");
-				parser.plugin("expression __webpack_amd_options__", () =>
-					parser.state.current.addVariable("__webpack_amd_options__", JSON.stringify(amdOptions)));
-				parser.plugin("evaluate typeof define.amd", ParserHelpers.evaluateToString(typeof amdOptions));
-				parser.plugin("evaluate typeof require.amd", ParserHelpers.evaluateToString(typeof amdOptions));
-				parser.plugin("evaluate Identifier define.amd", ParserHelpers.evaluateToIdentifier("define.amd", true));
-				parser.plugin("evaluate Identifier require.amd", ParserHelpers.evaluateToIdentifier("require.amd", true));
-				parser.plugin("typeof define", ParserHelpers.toConstantDependency(JSON.stringify("function")));
-				parser.plugin("evaluate typeof define", ParserHelpers.evaluateToString("function"));
-				parser.plugin("can-rename define", ParserHelpers.approve);
-				parser.plugin("rename define", (expr) => {
-					const dep = new AMDRequireItemDependency("!!webpack amd define", expr.range);
-					dep.userRequest = "define";
-					dep.loc = expr.loc;
-					parser.state.current.addDependency(dep);
-					return false;
-				});
-				parser.plugin("typeof require", ParserHelpers.toConstantDependency(JSON.stringify("function")));
-				parser.plugin("evaluate typeof require", ParserHelpers.evaluateToString("function"));
-			});
-		});
-		compiler.plugin("after-resolvers", () => {
-			compiler.resolvers.normal.apply(
-				new AliasPlugin("described-resolve", {
-					name: "amdefine",
-					alias: path.join(__dirname, "..", "..", "buildin", "amd-define.js")
-				}, "resolve"),
-				new AliasPlugin("described-resolve", {
-					name: "webpack amd options",
-					alias: path.join(__dirname, "..", "..", "buildin", "amd-options.js")
-				}, "resolve"),
-				new AliasPlugin("described-resolve", {
-					name: "webpack amd define",
-					alias: path.join(__dirname, "..", "..", "buildin", "amd-define.js")
-				}, "resolve")
-			);
-		});
-	}
-}
-module.exports = AMDPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const path = require("path");
+const AMDRequireDependency = require("./AMDRequireDependency");
+const AMDRequireItemDependency = require("./AMDRequireItemDependency");
+const AMDRequireArrayDependency = require("./AMDRequireArrayDependency");
+const AMDRequireContextDependency = require("./AMDRequireContextDependency");
+const AMDDefineDependency = require("./AMDDefineDependency");
+const UnsupportedDependency = require("./UnsupportedDependency");
+const LocalModuleDependency = require("./LocalModuleDependency");
+
+const NullFactory = require("../NullFactory");
+
+const AMDRequireDependenciesBlockParserPlugin = require("./AMDRequireDependenciesBlockParserPlugin");
+const AMDDefineDependencyParserPlugin = require("./AMDDefineDependencyParserPlugin");
+
+const AliasPlugin = require("enhanced-resolve/lib/AliasPlugin");
+
+const ParserHelpers = require("../ParserHelpers");
+
+class AMDPlugin {
+	constructor(options, amdOptions) {
+		this.amdOptions = amdOptions;
+		this.options = options;
+	}
+
+	apply(compiler) {
+		const options = this.options;
+		const amdOptions = this.amdOptions;
+		compiler.plugin("compilation", (compilation, params) => {
+			const normalModuleFactory = params.normalModuleFactory;
+			const contextModuleFactory = params.contextModuleFactory;
+
+			compilation.dependencyFactories.set(AMDRequireDependency, new NullFactory());
+			compilation.dependencyTemplates.set(AMDRequireDependency, new AMDRequireDependency.Template());
+
+			compilation.dependencyFactories.set(AMDRequireItemDependency, normalModuleFactory);
+			compilation.dependencyTemplates.set(AMDRequireItemDependency, new AMDRequireItemDependency.Template());
+
+			compilation.dependencyFactories.set(AMDRequireArrayDependency, new NullFactory());
+			compilation.dependencyTemplates.set(AMDRequireArrayDependency, new AMDRequireArrayDependency.Template());
+
+			compilation.dependencyFactories.set(AMDRequireContextDependency, contextModuleFactory);
+			compilation.dependencyTemplates.set(AMDRequireContextDependency, new AMDRequireContextDependency.Template());
+
+			compilation.dependencyFactories.set(AMDDefineDependency, new NullFactory());
+			compilation.dependencyTemplates.set(AMDDefineDependency, new AMDDefineDependency.Template());
+
+			compilation.dependencyFactories.set(UnsupportedDependency, new NullFactory());
+			compilation.dependencyTemplates.set(UnsupportedDependency, new UnsupportedDependency.Template());
+
+			compilation.dependencyFactories.set(LocalModuleDependency, new NullFactory());
+			compilation.dependencyTemplates.set(LocalModuleDependency, new LocalModuleDependency.Template());
+
+			params.normalModuleFactory.plugin("parser", (parser, parserOptions) => {
+
+				if(typeof parserOptions.amd !== "undefined" && !parserOptions.amd)
+					return;
+
+				function setExpressionToModule(outerExpr, module) {
+					parser.plugin("expression " + outerExpr, (expr) => {
+						const dep = new AMDRequireItemDependency(module, expr.range);
+						dep.userRequest = outerExpr;
+						dep.loc = expr.loc;
+						parser.state.current.addDependency(dep);
+						return true;
+					});
+				}
+
+				parser.apply(
+					new AMDRequireDependenciesBlockParserPlugin(options),
+					new AMDDefineDependencyParserPlugin(options)
+				);
+				setExpressionToModule("require.amd", "!!webpack amd options");
+				setExpressionToModule("define.amd", "!!webpack amd options");
+				setExpressionToModule("define", "!!webpack amd define");
+				parser.plugin("expression __webpack_amd_options__", () =>
+					parser.state.current.addVariable("__webpack_amd_options__", JSON.stringify(amdOptions)));
+				parser.plugin("evaluate typeof define.amd", ParserHelpers.evaluateToString(typeof amdOptions));
+				parser.plugin("evaluate typeof require.amd", ParserHelpers.evaluateToString(typeof amdOptions));
+				parser.plugin("evaluate Identifier define.amd", ParserHelpers.evaluateToIdentifier("define.amd", true));
+				parser.plugin("evaluate Identifier require.amd", ParserHelpers.evaluateToIdentifier("require.amd", true));
+				parser.plugin("typeof define", ParserHelpers.toConstantDependency(JSON.stringify("function")));
+				parser.plugin("evaluate typeof define", ParserHelpers.evaluateToString("function"));
+				parser.plugin("can-rename define", ParserHelpers.approve);
+				parser.plugin("rename define", (expr) => {
+					const dep = new AMDRequireItemDependency("!!webpack amd define", expr.range);
+					dep.userRequest = "define";
+					dep.loc = expr.loc;
+					parser.state.current.addDependency(dep);
+					return false;
+				});
+				parser.plugin("typeof require", ParserHelpers.toConstantDependency(JSON.stringify("function")));
+				parser.plugin("evaluate typeof require", ParserHelpers.evaluateToString("function"));
+			});
+		});
+		compiler.plugin("after-resolvers", () => {
+			compiler.resolvers.normal.apply(
+				new AliasPlugin("described-resolve", {
+					name: "amdefine",
+					alias: path.join(__dirname, "..", "..", "buildin", "amd-define.js")
+				}, "resolve"),
+				new AliasPlugin("described-resolve", {
+					name: "webpack amd options",
+					alias: path.join(__dirname, "..", "..", "buildin", "amd-options.js")
+				}, "resolve"),
+				new AliasPlugin("described-resolve", {
+					name: "webpack amd define",
+					alias: path.join(__dirname, "..", "..", "buildin", "amd-define.js")
+				}, "resolve")
+			);
+		});
+	}
+}
+module.exports = AMDPlugin;

package/lib/dependencies/AMDRequireArrayDependency.js

@@ -47,6 +47,8 @@ AMDRequireArrayDependency.Template = class AMDRequireArrayDependencyTemplate {
 		if(dep.module) {
 			const stringifiedId = JSON.stringify(dep.module.id);
 			return `__webpack_require__(${comment}${stringifiedId})`;
+		} else if(dep.localModule) {
+			return dep.localModule.variableName();
 		}
 
 		return webpackMissingModuleModule(dep.request);

package/lib/dependencies/AMDRequireContextDependency.js

@@ -5,7 +5,6 @@
 "use strict";
 
 const ContextDependency = require("./ContextDependency");
-const CriticalDependencyWarning = require("./CriticalDependencyWarning");
 class AMDRequireContextDependency extends ContextDependency {
 	constructor(request, recursive, regExp, range, valueRange) {
 		super(request, recursive, regExp);
@@ -16,14 +15,6 @@ class AMDRequireContextDependency extends ContextDependency {
 	get type() {
 		return "amd require context";
 	}
-
-	getWarnings() {
-		if(this.critical) {
-			return [
-				new CriticalDependencyWarning(this.critical)
-			];
-		}
-	}
 }
 AMDRequireContextDependency.Template = require("./ContextDependencyTemplateAsRequireCall");
 module.exports = AMDRequireContextDependency;