Skip to content

Commit 89b0043

Browse files
authored
Merge pull request preboot#70 from phra/fix/webpack2-unit-tests
fix unit tests w/ webpack2, fixes preboot#69
2 parents 84c979d + 29c56a7 commit 89b0043

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

webpack.config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module.exports = function makeWebpackConfig() {
2929
* Should be an empty object if it's generating a test build
3030
* Karma will set this when it's a test build
3131
*/
32-
config.entry = isTest ? {} : {
32+
config.entry = isTest ? void 0 : {
3333
app: './src/app/app.js'
3434
};
3535

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

105-
loader: isTest ? 'null' : ExtractTextPlugin.extract({
105+
loader: isTest ? 'null-loader' : ExtractTextPlugin.extract({
106106
fallbackLoader: 'style-loader',
107107
loader: [
108108
{loader: 'css-loader', query: {sourceMap: true}},
@@ -139,7 +139,7 @@ module.exports = function makeWebpackConfig() {
139139
/node_modules/,
140140
/\.spec\.js$/
141141
],
142-
loader: 'istanbul-instrumenter',
142+
loader: 'istanbul-instrumenter-loader',
143143
query: {
144144
esModules: true
145145
}

0 commit comments

Comments
 (0)