1. webpack source definitions are now one-liners

2. Pass module id from dependency to generated source code

Author: zastavnitskiy

lib/dependencies/AMDDefineDependency.js

@@ -6,12 +6,13 @@
 const NullDependency = require("./NullDependency");
 
 class AMDDefineDependency extends NullDependency {
-	constructor(range, arrayRange, functionRange, objectRange) {
+	constructor(range, arrayRange, functionRange, objectRange, namedModule) {
 		super();
 		this.range = range;
 		this.arrayRange = arrayRange;
 		this.functionRange = functionRange;
 		this.objectRange = objectRange;
+		this.namedModule = namedModule;
 	}
 
 	get type() {
@@ -56,29 +57,16 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate {
 				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`
 			],
 			lf: [
-				`var XXX,
-				 XXXmodule;
-				`,
-				`!(XXXmodule = { id: 1, exports: {}, loaded: false },
-					XXX = #.call(XXXmodule.exports, __webpack_require__, XXXmodule.exports, XXXmodule),
-					XXXmodule.loaded = true,
-					XXX === undefined && (XXX = XXXmodule.exports))`
+				"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: 1, 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))`
+				"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;",
@@ -124,6 +112,10 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate {
 			definition = definition.replace(/XXX/g, localModuleVar.replace(/\$/g, "$$$$"));
 		}
 
+		if(dependency.namedModule) {
+			text = text.replace(/YYY/g, dependency.namedModule);
+		}
+
 		const texts = text.split("#");
 
 		if(definition) source.insert(0, definition);

lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -155,7 +155,14 @@ class AMDDefineDependencyParserPlugin {
 			} else if(fn || obj) {
 				parser.walkExpression(fn || obj);
 			}
-			const dep = new AMDDefineDependency(expr.range, array ? array.range : null, fn ? fn.range : null, obj ? obj.range : null);
+
+			const dep = new AMDDefineDependency(
+				expr.range,
+				array ? array.range : null,
+				fn ? fn.range : null,
+				obj ? obj.range : null,
+				namedModule ? namedModule : null
+			);
 			dep.loc = expr.loc;
 			if(namedModule) {
 				dep.localModule = LocalModulesHelpers.addLocalModule(parser.state, namedModule);