Merge pull request webpack#2306 from beauroberts/issue-2299-webpack-1

sokra · sokra · commit 07f95c7c7eb6 · 2016-04-10T22:25:07.000+02:00
Fixes issue webpack#2299 for 1.x
diff --git a/lib/dependencies/LoaderPlugin.js b/lib/dependencies/LoaderPlugin.js
@@ -23,9 +23,8 @@ LoaderPlugin.prototype.apply = function(compiler) {
 				], true, "lm", false, function(err) {
 					if(err) return callback(err);
 
-					module = dep.module;
-					if(!module) return callback(new Error("Cannot load the module"));
-					if(module.building) module.building.push(next);
+					if(!dep.module) return callback(new Error("Cannot load the module"));
+					if(dep.module.building) dep.module.building.push(next);
 					else next();
 
 					function next(err) {
diff --git a/test/cases/loaders/issue-2299/a.json b/test/cases/loaders/issue-2299/a.json
@@ -0,0 +1,7 @@
+{
+    "imports": [
+        "./subdir_1/b.json",
+        "./subdir_2/c.json"
+    ],
+    "a": true
+}
diff --git a/test/cases/loaders/issue-2299/index.js b/test/cases/loaders/issue-2299/index.js
@@ -0,0 +1,3 @@
+it("should be able to use loadModule multiple times within a loader, on files in different directories", function() {
+	require('!./loader/index.js!./a.json').should.have.properties(['a', 'b', 'c']);
+});
diff --git a/test/cases/loaders/issue-2299/loader/index.js b/test/cases/loaders/issue-2299/loader/index.js
@@ -0,0 +1,31 @@
+var path = require('path');
+var async = require('async');
+module.exports = function(content) {
+	var cb = this.async();
+	var json = JSON.parse(content);
+	async.mapSeries(
+		json.imports,
+		function(url, callback) {
+			this.loadModule(url, function(err, source, map, module) {
+				if (err) {
+					return callback(err);
+				}
+				callback(null, this.exec(source, url));
+			}.bind(this))
+		}.bind(this),
+		function(err, results) {
+			if (err) {
+				return cb(err);
+			}
+			// Combine all the results into one object and return it
+			cb(null, 'module.exports = ' + JSON.stringify(results.reduce(function(prev, result) {
+				for (var key in result) {
+					if (result.hasOwnProperty(key)) {
+						prev[key] = result[key];
+					}
+				}
+				return prev;
+			}, json)));
+		}
+	);
+}
diff --git a/test/cases/loaders/issue-2299/subdir_1/b.json b/test/cases/loaders/issue-2299/subdir_1/b.json
@@ -0,0 +1,3 @@
+{
+    "b": true
+}
diff --git a/test/cases/loaders/issue-2299/subdir_2/c.json b/test/cases/loaders/issue-2299/subdir_2/c.json
@@ -0,0 +1,3 @@
+{
+    "c": true
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+it("should be able to use loadModule multiple times within a loader, on files in different directories", function() {`
	`2`	`+ require('!./loader/index.js!./a.json').should.have.properties(['a', 'b', 'c']);`
	`3`	`+});`