move weak into getReference

sokra · sokra · commit 4c81b9a0170f · 2017-08-08T09:43:33.000+02:00
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -857,17 +857,22 @@ class Compilation extends Tapable {
 		};
 
 		const iteratorDependency = d => {
-			if(!d.module) {
+			const ref = d.getReference();
+			if(!ref) {
+				return;
+			}
+			const refModule = ref.module;
+			if(!refModule) {
 				return;
 			}
 			if(d.weak) {
 				return;
 			}
-			if(chunk.addModule(d.module)) {
-				d.module.addChunk(chunk);
+			if(chunk.addModule(refModule)) {
+				refModule.addChunk(chunk);
 				queue.push({
-					block: d.module,
-					module: d.module,
+					block: refModule,
+					module: refModule,
 					chunk
 				});
 			}
diff --git a/lib/Dependency.js b/lib/Dependency.js
@@ -8,6 +8,7 @@ const compareLocations = require("./compareLocations");
 class Dependency {
 	constructor() {
 		this.module = null;
+		this.weak = false;
 	}
 
 	isEqualResource() {
@@ -19,6 +20,7 @@ class Dependency {
 		if(!this.module) return null;
 		return {
 			module: this.module,
+			weak: this.weak,
 			importedNames: true, // true: full object, false: only sideeffects/no export, array of strings: the exports with this names
 		};
 	}
diff --git a/lib/FlagInitialModulesAsUsedPlugin.js b/lib/FlagInitialModulesAsUsedPlugin.js
@@ -13,6 +13,7 @@ class FlagInitialModulesAsUsedPlugin {
 						return;
 					}
 					chunk.forEachModule((module) => {
+						module.used = true;
 						module.usedExports = true;
 					});
 				});
diff --git a/test/RequireJsStuffPlugin.test.js b/test/RequireJsStuffPlugin.test.js
@@ -113,7 +113,7 @@ describe("RequireJsStuffPlugin", () => {
 									const addDependencySpy = parserEventContext.state.current.addDependency;
 									const addedDependency = JSON.stringify(addDependencySpy.getCall(0).args[0]);
 									addDependencySpy.callCount.should.be.exactly(1);
-									addedDependency.should.be.exactly('{"module":null,"expression":"undefined","range":10,"loc":5}');
+									addedDependency.should.be.exactly('{"module":null,"weak":false,"expression":"undefined","range":10,"loc":5}');
 								});
 							});
 						});
@@ -132,7 +132,7 @@ describe("RequireJsStuffPlugin", () => {
 									const addDependencySpy = parserEventContext.state.current.addDependency;
 									const addedDependency = JSON.stringify(addDependencySpy.getCall(0).args[0]);
 									addDependencySpy.callCount.should.be.exactly(1);
-									addedDependency.should.be.exactly('{"module":null,"expression":"undefined","range":10,"loc":5}');
+									addedDependency.should.be.exactly('{"module":null,"weak":false,"expression":"undefined","range":10,"loc":5}');
 								});
 							});
 						});
@@ -151,7 +151,7 @@ describe("RequireJsStuffPlugin", () => {
 									const addDependencySpy = parserEventContext.state.current.addDependency;
 									const addedDependency = JSON.stringify(addDependencySpy.getCall(0).args[0]);
 									addDependencySpy.callCount.should.be.exactly(1);
-									addedDependency.should.be.exactly('{"module":null,"expression":"\\"0.0.0\\"","range":10,"loc":5}');
+									addedDependency.should.be.exactly('{"module":null,"weak":false,"expression":"\\"0.0.0\\"","range":10,"loc":5}');
 								});
 							});
 						});
@@ -170,7 +170,7 @@ describe("RequireJsStuffPlugin", () => {
 									const addDependencySpy = parserEventContext.state.current.addDependency;
 									const addedDependency = JSON.stringify(addDependencySpy.getCall(0).args[0]);
 									addDependencySpy.callCount.should.be.exactly(1);
-									addedDependency.should.be.exactly('{"module":null,"expression":"__webpack_require__.oe","range":10,"loc":5}');
+									addedDependency.should.be.exactly('{"module":null,"weak":false,"expression":"__webpack_require__.oe","range":10,"loc":5}');
 								});
 							});
 						});

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ const compareLocations = require("./compareLocations");`
`8`	`8`	`class Dependency {`
`9`	`9`	`constructor() {`
`10`	`10`	`this.module = null;`
	`11`	`+ this.weak = false;`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`isEqualResource() {`
`@@ -19,6 +20,7 @@ class Dependency {`
`19`	`20`	`if(!this.module) return null;`
`20`	`21`	`return {`
`21`	`22`	`module: this.module,`
	`23`	`+ weak: this.weak,`
`22`	`24`	`importedNames: true, // true: full object, false: only sideeffects/no export, array of strings: the exports with this names`
`23`	`25`	`};`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ class FlagInitialModulesAsUsedPlugin {`
`13`	`13`	`return;`
`14`	`14`	`}`
`15`	`15`	`chunk.forEachModule((module) => {`
	`16`	`+ module.used = true;`
`16`	`17`	`module.usedExports = true;`
`17`	`18`	`});`
`18`	`19`	`});`