Skip to content

Commit 7875114

Browse files
committed
fixes webpack#73
1 parent 16156c5 commit 7875114

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

bin/convert-argv.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var path = require("path");
22
var fs = require("fs");
3+
fs.existsSync = fs.existsSync || path.existsSync;
34
var resolve = require("enhanced-resolve");
45

56
module.exports = function(optimist, argv, convertOptions) {
@@ -266,8 +267,11 @@ module.exports = function(optimist, argv, convertOptions) {
266267
argv._.forEach(function(content) {
267268
var i = content.indexOf("=");
268269
var j = content.indexOf("?");
269-
if(i < 0 || (j >= 0 && j < i)) addTo("main", content);
270-
else addTo(content.substr(0, i), content.substr(i+1))
270+
if(i < 0 || (j >= 0 && j < i)) {
271+
var resolved = path.resolve(content);
272+
if(fs.existsSync(resolved)) addTo("main", resolved);
273+
else addTo("main", content);
274+
} else addTo(content.substr(0, i), content.substr(i+1))
271275
});
272276
}
273277

test/browsertest/build.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ console.log("compile scripts...");
2828
var extraArgsNoWatch = extraArgs.slice(0);
2929
var watchIndex = extraArgsNoWatch.indexOf("--watch");
3030
if(watchIndex != -1) extraArgsNoWatch.splice(watchIndex, 1);
31-
// node ../../bin/webpack --output-pathinfo --colors --optimize-max-chunks 1 --output-library library1 library1 js/library1
31+
// node ../../bin/webpack --output-pathinfo --colors --optimize-max-chunks 1 --output-library library1 node_modules/library1 js/library1
3232
var library1 = cp.spawn("node", join(["../../bin/webpack.js", "--output-pathinfo", "--colors", "--optimize-max-chunks", "1", "--output-library", "library1",
33-
"library1", "js/library1.js"], extraArgsNoWatch));
33+
"node_modules/library1", "js/library1.js"], extraArgsNoWatch));
3434
bindOutput(library1);
3535
library1.on("exit", function(code) {
3636
if(code === 0) {

0 commit comments

Comments
 (0)