Skip to content

fix unit tests w/ webpack2, fixes #69 #70

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

Merged
merged 1 commit into from
Jan 31, 2017
Merged

fix unit tests w/ webpack2, fixes #69 #70

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
6 changes: 3 additions & 3 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
};

Expand Down Expand Up @@ -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}},
Expand Down Expand Up @@ -139,7 +139,7 @@ module.exports = function makeWebpackConfig() {
/node_modules/,
/\.spec\.js$/
],
loader: 'istanbul-instrumenter',
loader: 'istanbul-instrumenter-loader',
query: {
esModules: true
}
Expand Down