Skip to content

Commit

Permalink
Bump webpack-merge from 4.2.2 to 6.0.1 (#348)
Browse files Browse the repository at this point in the history
* Bump webpack-merge from 4.2.2 to 6.0.1

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.2.2 to 6.0.1.
- [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md)
- [Commits](survivejs/webpack-merge@v4.2.2...v6.0.1)

---
updated-dependencies:
- dependency-name: webpack-merge
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Change the webpack-merge import

* Replace merge.smart with merge

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: sirknightj <[email protected]>
  • Loading branch information
dependabot[bot] and sirknightj authored Dec 17, 2024
1 parent b68f7d7 commit d43e60d
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 12 deletions.
24 changes: 19 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"webpack": "^5.0.0",
"webpack-cli": "^4.7.0",
"webpack-dev-server": "^4.0.0",
"webpack-merge": "^4.2.2"
"webpack-merge": "^6.0.1"
},
"dependencies": {
"isomorphic-webcrypto": "^2.3.6",
Expand Down
4 changes: 2 additions & 2 deletions webpack.debug.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const path = require('path');
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');

module.exports = merge.smart(require('./webpack.config'), {
module.exports = merge(require('./webpack.config'), {
mode: 'development',

output: {
Expand Down
4 changes: 2 additions & 2 deletions webpack.dev.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const path = require('path');
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');

module.exports = merge.smart(require('./webpack.config'), {
module.exports = merge(require('./webpack.config'), {
mode: 'development',

output: {
Expand Down
4 changes: 2 additions & 2 deletions webpack.dist.config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
const path = require('path');
const TerserPlugin = require('terser-webpack-plugin');
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');

// Define maximum asset size before gzipping
const MAX_ASSET_SIZE_KB = 23.6;
const MAX_ASSET_SIZE_BYTES = MAX_ASSET_SIZE_KB * 1024;

module.exports = merge.smart(require('./webpack.config'), {
module.exports = merge(require('./webpack.config'), {
mode: 'production',

output: {
Expand Down

0 comments on commit d43e60d

Please sign in to comment.