mirror of https://github.com/webpack/webpack.git
fixed some issues
This commit is contained in:
parent
3247725ba3
commit
a8c7dc26d9
|
|
@ -302,7 +302,7 @@ Stats.jsonToString = function jsonToString(obj, useColors) {
|
||||||
var l = value.length;
|
var l = value.length;
|
||||||
if(align[col] == "l")
|
if(align[col] == "l")
|
||||||
format(value);
|
format(value);
|
||||||
for(; l < colSizes[col]; l++)
|
for(; l < colSizes[col] && col !== cols-1; l++)
|
||||||
normal(" ");
|
normal(" ");
|
||||||
if(align[col] == "r")
|
if(align[col] == "r")
|
||||||
format(value);
|
format(value);
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,10 @@ describe("Examples", function() {
|
||||||
examples.forEach(function(examplePath) {
|
examples.forEach(function(examplePath) {
|
||||||
it("should compile " + path.basename(examplePath), function(done) {
|
it("should compile " + path.basename(examplePath), function(done) {
|
||||||
var options = {};
|
var options = {};
|
||||||
if(fs.existsSync(path.join(examplePath, "webpack.config.js")))
|
var webpackConfigPath = path.join(examplePath, "webpack.config.js");
|
||||||
options = require(path.join(examplePath, "webpack.config.js"));
|
webpackConfigPath = webpackConfigPath.substr(0, 1).toUpperCase() + webpackConfigPath.substr(1);
|
||||||
|
if(fs.existsSync(webpackConfigPath))
|
||||||
|
options = require(webpackConfigPath);
|
||||||
options.context = examplePath;
|
options.context = examplePath;
|
||||||
options.optimize = options.optimize || {};
|
options.optimize = options.optimize || {};
|
||||||
options.output = options.output || {};
|
options.output = options.output || {};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue