reorganized function

sokra · sokra · commit 1c9fd4883984 · 2014-11-02T12:17:05.000+01:00
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -553,19 +553,29 @@ Compilation.prototype.addChunk = function addChunk(name, module, loc) {
 };
 
 Compilation.prototype.processDependenciesBlockForChunk = function processDependenciesBlockForChunk(block, chunk) {
-	block.blocks.forEach(function(b) {
-		var c;
-		if(!b.chunk) {
-			c = this.addChunk(b.chunkName, b.module, b.loc);
-			b.chunk = c;
-			c.addBlock(b);
-		} else {
-			c = b.chunk;
-		}
-		chunk.addChunk(c);
-		c.addParent(chunk);
-		this.processDependenciesBlockForChunk(b, c);
-	}, this);
+	if(block.blocks) {
+		block.blocks.forEach(function(b) {
+			var c;
+			if(!b.chunk) {
+				c = this.addChunk(b.chunkName, b.module, b.loc);
+				b.chunk = c;
+				c.addBlock(b);
+			} else {
+				c = b.chunk;
+			}
+			chunk.addChunk(c);
+			c.addParent(chunk);
+			this.processDependenciesBlockForChunk(b, c);
+		}, this);
+	}
+	if(block.dependencies) {
+		block.dependencies.forEach(iteratorDependency, this);
+	}
+	if(block.variables) {
+		block.variables.forEach(function(v) {
+			v.dependencies.forEach(iteratorDependency, this);
+		}, this);
+	}
 	function iteratorDependency(d) {
 		if(!d.module || d.weak) {
 			return;
@@ -579,10 +589,6 @@ Compilation.prototype.processDependenciesBlockForChunk = function processDepende
 			this.processDependenciesBlockForChunk(d.module, chunk);
 		}
 	}
-	block.dependencies.forEach(iteratorDependency, this);
-	block.variables.forEach(function(v) {
-		v.dependencies.forEach(iteratorDependency, this);
-	}, this);
 };
 
 Compilation.prototype.removeChunkFromDependencies = function removeChunkFromDependencies(block, chunk) {
