Skip to content

Commit

Permalink
Merge pull request #70 from phra/fix/webpack2-unit-tests
Browse files Browse the repository at this point in the history
fix unit tests w/ webpack2, fixes #69
phra authored Jan 31, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 84c979d + 29c56a7 commit 89b0043
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ module.exports = function makeWebpackConfig() {
* Should be an empty object if it's generating a test build
* Karma will set this when it's a test build
*/
config.entry = isTest ? {} : {
config.entry = isTest ? void 0 : {
app: './src/app/app.js'
};

@@ -102,7 +102,7 @@ module.exports = function makeWebpackConfig() {
// Reference: https://github.com/webpack/style-loader
// Use style-loader in development.

loader: isTest ? 'null' : ExtractTextPlugin.extract({
loader: isTest ? 'null-loader' : ExtractTextPlugin.extract({
fallbackLoader: 'style-loader',
loader: [
{loader: 'css-loader', query: {sourceMap: true}},
@@ -139,7 +139,7 @@ module.exports = function makeWebpackConfig() {
/node_modules/,
/\.spec\.js$/
],
loader: 'istanbul-instrumenter',
loader: 'istanbul-instrumenter-loader',
query: {
esModules: true
}

0 comments on commit 89b0043

Please sign in to comment.