From 1997f244145b153f95ad765c0513ee6b9a0024d5 Mon Sep 17 00:00:00 2001 From: renovate <29139614+renovate@users.noreply.github.com> Date: Tue, 2 Jul 2024 08:32:26 +0000 Subject: [PATCH] chore: bump up webpack-merge version to v6 (#7407) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [webpack-merge](https://togithub.com/survivejs/webpack-merge) | [`^5.10.0` -> `^6.0.0`](https://renovatebot.com/diffs/npm/webpack-merge/5.10.0/6.0.1) | [![age](https://developer.mend.io/api/mc/badges/age/npm/webpack-merge/6.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/webpack-merge/6.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/webpack-merge/5.10.0/6.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/webpack-merge/5.10.0/6.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
survivejs/webpack-merge (webpack-merge) ### [`v6.0.1`](https://togithub.com/survivejs/webpack-merge/blob/HEAD/CHANGELOG.md#601--2024-07-02) [Compare Source](https://togithub.com/survivejs/webpack-merge/compare/v6.0.0...2f610b9c2da066cc5d035ee83db84e22b7d42fb3) - Fix - Restore usage of `clone-deep` as there was a corner case where `structuredClone` did not work as expected. [#​214](https://togithub.com/survivejs/webpack-merge/issues/214) ### [`v6.0.0`](https://togithub.com/survivejs/webpack-merge/blob/HEAD/CHANGELOG.md#600--xxxx-xx-xx) [Compare Source](https://togithub.com/survivejs/webpack-merge/compare/v5.10.0...v6.0.0) - Chore - Update internal dependencies. As a result, the package needs at least Node 18 to run. - Chore - Use `structuredClone` over `clone-deep` dependency since it is included to Node 18 or above. [#​214](https://togithub.com/survivejs/webpack-merge/issues/214)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/toeverything/AFFiNE). --- tools/cli/package.json | 2 +- yarn.lock | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/tools/cli/package.json b/tools/cli/package.json index 151fe34dc5..2452cc28fc 100644 --- a/tools/cli/package.json +++ b/tools/cli/package.json @@ -39,7 +39,7 @@ "webpack": "^5.91.0", "webpack-cli": "^5.1.4", "webpack-dev-server": "^5.0.4", - "webpack-merge": "^5.10.0" + "webpack-merge": "^6.0.0" }, "scripts": { "build": "node --loader ts-node/esm/transpile-only.mjs ./src/bin/build.ts", diff --git a/yarn.lock b/yarn.lock index 6be4e7a88b..fdf35bfb75 100644 --- a/yarn.lock +++ b/yarn.lock @@ -259,7 +259,7 @@ __metadata: webpack: "npm:^5.91.0" webpack-cli: "npm:^5.1.4" webpack-dev-server: "npm:^5.0.4" - webpack-merge: "npm:^5.10.0" + webpack-merge: "npm:^6.0.0" languageName: unknown linkType: soft @@ -39133,7 +39133,7 @@ __metadata: languageName: node linkType: hard -"webpack-merge@npm:^5.10.0, webpack-merge@npm:^5.7.3": +"webpack-merge@npm:^5.7.3": version: 5.10.0 resolution: "webpack-merge@npm:5.10.0" dependencies: @@ -39144,6 +39144,17 @@ __metadata: languageName: node linkType: hard +"webpack-merge@npm:^6.0.0": + version: 6.0.1 + resolution: "webpack-merge@npm:6.0.1" + dependencies: + clone-deep: "npm:^4.0.1" + flat: "npm:^5.0.2" + wildcard: "npm:^2.0.1" + checksum: 10/39ab911c26237922295d9b3d0617c8ea0c438c35a3b21b05506616a10423f5ece1962bccbedec932c5db61af57999b6d055d56d1f1755c63e2701bd4a55c3887 + languageName: node + linkType: hard + "webpack-sources@npm:^3.2.3": version: 3.2.3 resolution: "webpack-sources@npm:3.2.3" @@ -39330,7 +39341,7 @@ __metadata: languageName: node linkType: hard -"wildcard@npm:^2.0.0": +"wildcard@npm:^2.0.0, wildcard@npm:^2.0.1": version: 2.0.1 resolution: "wildcard@npm:2.0.1" checksum: 10/e0c60a12a219e4b12065d1199802d81c27b841ed6ad6d9d28240980c73ceec6f856771d575af367cbec2982d9ae7838759168b551776577f155044f5a5ba843c