webpack — local dependecies. Work in progress

zastavnitskiy · sokra · commit c0c116321bc6 · 2017-04-03T11:35:18.000+02:00
Fix Duplicated __WEBPACK_AMD_DEFINE_FACTORY__ by renaming it to __WEBPACK_LOCAL_MODULE_[n]__factory.
Don't pass global module to define factory.
diff --git a/lib/dependencies/AMDDefineDependency.js b/lib/dependencies/AMDDefineDependency.js
@@ -56,17 +56,29 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate {
 				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`
 			],
 			lf: [
-				"var XXX;",
-				"!(XXX = #.call(exports, __webpack_require__, exports, module)); XXX === undefined && (XXX = module.exports)"
+				`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))`
 			],
 			lo: [
 				"var XXX;",
 				"!(XXX = #)"
 			],
 			lof: [
-				"var __WEBPACK_AMD_DEFINE_FACTORY__, XXX;",
-				`!(__WEBPACK_AMD_DEFINE_FACTORY__ = (#), XXX = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
-				(__WEBPACK_AMD_DEFINE_FACTORY__.call(exports, __webpack_require__, exports, module)) : __WEBPACK_AMD_DEFINE_FACTORY__))`
+				`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))`
 			],
 			laf: [
 				"var __WEBPACK_AMD_DEFINE_ARRAY__, XXX;",
