Skip to content

Commit

Permalink
More merge fun
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielReid committed Jan 25, 2021
1 parent 672cf86 commit bb0a482
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion webpack.local.dev.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const merge = require('webpack-merge');
const {merge} = require('webpack-merge');
const common = require('./webpack.common.js');
const HtmlWebpackPlugin = require('html-webpack-plugin');
let fs = require('fs');
Expand Down
4 changes: 2 additions & 2 deletions webpack.local.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
'use strict';
const merge = require('webpack-merge');
const {merge} = require('webpack-merge');
const prod = require('./webpack.prod');
const HtmlWebpackPlugin = require('html-webpack-plugin');

let fs = require('fs');

module.exports = merge.smart(prod, {
module.exports = merge(prod, {
plugins: [
new HtmlWebpackPlugin({
filename: 'signin.html',
Expand Down

0 comments on commit bb0a482

Please sign in to comment.