Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(karma-webpack): Do not unify "colors" property if webpack "stats" is a string #376

Merged
merged 1 commit into from
Nov 30, 2018
Merged

fix(karma-webpack): Do not unify "colors" property if webpack "stats" is a string #376

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/karma-webpack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ let isBlocked = false;
const normalize = (file) => file.replace(/\\/g, '/');

const getOutputPath = (outputPath) => {
for (var i = 0; i < outputPath.length; i++) {
for (let i = 0; i < outputPath.length; i++) {
if (
outputPath[i].indexOf(".js") !== -1 &&
outputPath[i].indexOf(".js.map") === -1
outputPath[i].indexOf('.js') !== -1 &&
outputPath[i].indexOf('.js.map') === -1
) {
return outputPath[i];
}
}
return null;
}
};

const escapeRegExp = function(str) {
// See details here https://stackoverflow.com/questions/3446170/escape-string-for-use-in-javascript-regex
Expand Down Expand Up @@ -181,7 +181,7 @@ function Plugin(
if (this.entries.has(entry)) {
const entryPath = this.entries.get(entry);
let outputPath = stats.assetsByChunkName[entry];

if (Array.isArray(outputPath)) {
outputPath = getOutputPath(outputPath);
}
Expand Down Expand Up @@ -229,8 +229,11 @@ function Plugin(
webpackMiddlewareOptions.publicPath = '/_karma_webpack_/';

// Set webpack's color config to value specified in Karma's config for consistency
webpackMiddlewareOptions.stats = webpackMiddlewareOptions.stats || {};
webpackMiddlewareOptions.stats.colors = colors;
if (typeof webpackMiddlewareOptions.stats !== 'string') {
// stats can be either a string or an object
webpackMiddlewareOptions.stats = webpackMiddlewareOptions.stats || {};
webpackMiddlewareOptions.stats.colors = colors;
}

const middleware = new WebpackDevMiddleware(
compiler,
Expand Down