mirror of https://github.com/webpack/webpack.git
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:
commit
2206ee0e55
|
|
@ -537,7 +537,7 @@ module.exports = function(yargs, argv, convertOptions) {
|
||||||
if(i < 0 || (j >= 0 && j < i)) {
|
if(i < 0 || (j >= 0 && j < i)) {
|
||||||
var resolved = path.resolve(content);
|
var resolved = path.resolve(content);
|
||||||
if(fs.existsSync(resolved)) {
|
if(fs.existsSync(resolved)) {
|
||||||
addTo("main", resolved);
|
addTo("main", `${resolved}${fs.statSync(resolved).isDirectory() ? path.sep : ""}`);
|
||||||
} else {
|
} else {
|
||||||
addTo("main", content);
|
addTo("main", content);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
module.exports = "fileA";
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
|
||||||
|
|
@ -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();
|
||||||
|
};
|
||||||
|
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
a
|
||||||
|
bundle.js
|
||||||
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
module.exports = {};
|
||||||
Loading…
Reference in New Issue