Skip to content

Commit

Permalink
Merge pull request #7059 from bastimeyer/bugfix/loaderplugin-recursive
Browse files Browse the repository at this point in the history
Fix LoaderPlugin not resolving recursively
  • Loading branch information
sokra committed Apr 17, 2018
2 parents e54af0d + e1930c2 commit babc8a4
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 1 deletion.
2 changes: 1 addition & 1 deletion lib/dependencies/LoaderPlugin.js
Expand Up @@ -47,7 +47,7 @@ class LoaderPlugin {
],
true,
"lm",
false,
true,
err => {
compilation.semaphore.acquire(() => {
if (err) return callback(err);
Expand Down
1 change: 1 addition & 0 deletions test/cases/loaders/issue-4959/a.js
@@ -0,0 +1 @@
module.exports = "a";
1 change: 1 addition & 0 deletions test/cases/loaders/issue-4959/b.js
@@ -0,0 +1 @@
module.exports = require("c");
1 change: 1 addition & 0 deletions test/cases/loaders/issue-4959/c.js
@@ -0,0 +1 @@
module.exports = "c";
3 changes: 3 additions & 0 deletions test/cases/loaders/issue-4959/index.js
@@ -0,0 +1,3 @@
it("should resolve module dependencies recursively", function() {
require("!./loaders/index!a").should.be.eql("c");
});
9 changes: 9 additions & 0 deletions test/cases/loaders/issue-4959/loaders/index.js
@@ -0,0 +1,9 @@
module.exports = function() {
var callback = this.async();
this.loadModule("b", function(error) {
if (error) {
return callback(error);
}
callback(null, "module.exports = require('b');");
});
};
7 changes: 7 additions & 0 deletions test/cases/loaders/issue-4959/package.json
@@ -0,0 +1,7 @@
{
"browser": {
"a": "./a.js",
"b": "./b.js",
"c": "./c.js"
}
}

0 comments on commit babc8a4

Please sign in to comment.