opensourcemirror
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixes #73

This commit is contained in:
Tobias Koppers 2013-03-11 12:16:10 +01:00
parent 16156c5be5
commit 78751149c7
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/convert-argv.js
View File

@ -1,5 +1,6 @@
var path = require("path");
var fs = require("fs");
fs.existsSync = fs.existsSync || path.existsSync;
var resolve = require("enhanced-resolve");
module.exports = function(optimist, argv, convertOptions) {
@ -266,8 +267,11 @@ module.exports = function(optimist, argv, convertOptions) {
argv._.forEach(function(content) {
var i = content.indexOf("=");
var j = content.indexOf("?");
if(i < 0 || (j >= 0 && j < i)) addTo("main", content);
else addTo(content.substr(0, i), content.substr(i+1))
if(i < 0 || (j >= 0 && j < i)) {
var resolved = path.resolve(content);
if(fs.existsSync(resolved)) addTo("main", resolved);
else addTo("main", content);
} else addTo(content.substr(0, i), content.substr(i+1))
});
}

4
test/browsertest/build.js
View File

@ -28,9 +28,9 @@ console.log("compile scripts...");
var extraArgsNoWatch = extraArgs.slice(0);
var watchIndex = extraArgsNoWatch.indexOf("--watch");
if(watchIndex != -1) extraArgsNoWatch.splice(watchIndex, 1);
// node ../../bin/webpack --output-pathinfo --colors --optimize-max-chunks 1 --output-library library1 library1 js/library1
// node ../../bin/webpack --output-pathinfo --colors --optimize-max-chunks 1 --output-library library1 node_modules/library1 js/library1
var library1 = cp.spawn("node", join(["../../bin/webpack.js", "--output-pathinfo", "--colors", "--optimize-max-chunks", "1", "--output-library", "library1",
"library1", "js/library1.js"], extraArgsNoWatch));
"node_modules/library1", "js/library1.js"], extraArgsNoWatch));
bindOutput(library1);
library1.on("exit", function(code) {
if(code === 0) {