Skip to content
This repository has been archived by the owner on Nov 28, 2022. It is now read-only.

Commit

Permalink
chore(deps-dev): bump webpack-merge from 4.2.2 to 5.1.3 (#908)
Browse files Browse the repository at this point in the history
* chore(deps-dev): bump webpack-merge from 4.2.2 to 5.1.3

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.2.2 to 5.1.3.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md)
- [Commits](survivejs/webpack-merge@v4.2.2...v5.1.3)

Signed-off-by: dependabot[bot] <support@github.com>

* fix: updating our usage of webpack-merge so it works again

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jon Ursenbach <jon@ursenba.ch>
  • Loading branch information
dependabot[bot] and erunion authored Sep 9, 2020
1 parent 8a92a55 commit 9b4ce8e
Show file tree
Hide file tree
Showing 10 changed files with 112 additions and 19 deletions.
15 changes: 11 additions & 4 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 @@ -58,7 +58,7 @@
"webpack": "^4.41.0",
"webpack-cli": "^3.3.9",
"webpack-dev-server": "^3.8.2",
"webpack-merge": "^4.2.2"
"webpack-merge": "^5.1.3"
},
"dependencies": {
"@apidevtools/swagger-parser": "^10.0.1",
Expand Down
51 changes: 47 additions & 4 deletions packages/api-explorer/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 packages/api-explorer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"terser-webpack-plugin": "^4.1.0",
"webpack": "^4.41.0",
"webpack-cli": "^3.3.9",
"webpack-merge": "^4.2.2"
"webpack-merge": "^5.1.3"
},
"prettier": "@readme/eslint-config/prettier"
}
2 changes: 1 addition & 1 deletion packages/api-explorer/webpack.prod.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint import/no-extraneous-dependencies: ["error", {"devDependencies": true }] */
const webpack = require('webpack');
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const TerserPlugin = require('terser-webpack-plugin');

const common = require('./webpack.config');
Expand Down
51 changes: 47 additions & 4 deletions packages/api-logs/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 packages/api-logs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"prettier": "^2.0.1",
"terser-webpack-plugin": "^4.1.0",
"webpack": "^4.41.0",
"webpack-merge": "^4.2.2"
"webpack-merge": "^5.1.3"
},
"prettier": "@readme/eslint-config/prettier"
}
2 changes: 1 addition & 1 deletion packages/api-logs/webpack.prod.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint import/no-extraneous-dependencies: ["error", {"devDependencies": true }] */
const webpack = require('webpack');
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const TerserPlugin = require('terser-webpack-plugin');

const common = require('./webpack.config');
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
const webpack = require('webpack');
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const common = require('./webpack.common');
const log = require('./example/fixtures/requestmodel.json');

Expand Down
2 changes: 1 addition & 1 deletion webpack.prod.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint import/no-extraneous-dependencies: ["error", {"devDependencies": true }] */
const path = require('path');
const webpack = require('webpack');
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const TerserPlugin = require('terser-webpack-plugin');

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

0 comments on commit 9b4ce8e

Please sign in to comment.