Skip to content

Commit

Permalink
Updated imports of webpack-merge
Browse files Browse the repository at this point in the history
### Why?

The import structure changed in the latest version.

```
[webpack-cli] Failed to load '/home/leigh/code/touch-pricker/config/webpack.config.dev.js' config
[webpack-cli] TypeError: merge is not a function
```

This should have been changed in 3980f60
  • Loading branch information
simpleigh committed Aug 7, 2023
1 parent 621fb13 commit 0bded82
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion config/webpack.config.dev.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const { CleanWebpackPlugin } = require('clean-webpack-plugin');
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');

const paths = require('./paths');
const banner = require('./webpack.banner');
Expand Down
2 changes: 1 addition & 1 deletion config/webpack.config.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const { CleanWebpackPlugin } = require('clean-webpack-plugin');
const CopyPlugin = require('copy-webpack-plugin');
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');

const paths = require('./paths');
const banner = require('./webpack.banner');
Expand Down
2 changes: 1 addition & 1 deletion config/webpack.config.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/* eslint-disable sort-keys */

const merge = require('webpack-merge');
const { merge } = require('webpack-merge');

const paths = require('./paths');
const banner = require('./webpack.banner');
Expand Down

0 comments on commit 0bded82

Please sign in to comment.