root
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5625 from gyandeeps/issue5576 

Fix: Add path separator to avoid file and folder name mixup(fixes #5576)
This commit is contained in:
Tobias Koppers 2017-09-07 00:07:29 +02:00 committed by GitHub
parent 92d5c20943 4f5e78bc0f
commit 2206ee0e55
6 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/convert-argv.js
View File

@ -537,7 +537,7 @@ module.exports = function(yargs, argv, convertOptions) {
if(i < 0 || (j >= 0 && j < i)) {
var resolved = path.resolve(content);
if(fs.existsSync(resolved)) {
addTo("main", resolved);
addTo("main", `${resolved}${fs.statSync(resolved).isDirectory() ? path.sep : ""}`);
} else {
addTo("main", content);
}

1
test/binCases/errors/issue-5576/a.js Normal file
View File

@ -0,0 +1 @@
module.exports = "fileA";

1
test/binCases/errors/issue-5576/a/.keep Normal file
View File

@ -0,0 +1 @@

13
test/binCases/errors/issue-5576/test.js Normal file
View File

@ -0,0 +1,13 @@
"use strict";
module.exports = function testAssertions(code, stdout, stderr) {
code.should.be.eql(2);
stdout[0].should.containEql("Hash: ");
stdout[1].should.containEql("Version: ");
stdout[2].should.containEql("Time: ");
stdout[4].should.containEql("ERROR in Entry module not found: Error: Can't resolve");
stderr.should.be.empty();
};

3
test/binCases/errors/issue-5576/test.opts Normal file
View File

@ -0,0 +1,3 @@
a
bundle.js

1
test/binCases/errors/issue-5576/webpack.config.js Normal file
View File

@ -0,0 +1 @@
module.exports = {};