Skip to content

Commit

Permalink
Merge branch 'merge-upstream' into 'master'
Browse files Browse the repository at this point in the history
Merge upstream

See merge request obsidian/starter!4
  • Loading branch information
Eole211 committed May 20, 2019
2 parents e652291 + 7008eea commit 8e1d302
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions config/webpack.config.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const merge = require("webpack-merge");
const path = require("path");

const FriendlyErrorsWebpackPlugin = require("friendly-errors-webpack-plugin");
const HardSourceWebpackPlugin = require("hard-source-webpack-plugin");
//const HardSourceWebpackPlugin = require("hard-source-webpack-plugin");

const common = require("./webpack.common.js");

Expand All @@ -26,6 +26,8 @@ module.exports = merge(common, {
],
},
}),
new HardSourceWebpackPlugin(),
//new HardSourceWebpackPlugin(),
// No hardsource plugin because of errors with last Webpack version :
// https://github.com/webpack/webpack/issues/8052
],
});

0 comments on commit 8e1d302

Please sign in to comment.