starred/floccus

Fork 0

mirror of https://github.com/floccusaddon/floccus.git synced 2026-04-25 14:16:12 +03:00

[PR #743] [CLOSED] Bump webpack-merge from 4.2.2 to 5.7.0 #1731

New issue

Closed

opened 2026-02-25 23:30:40 +03:00 by kerem · 0 comments

kerem commented

2026-02-25 23:30:40 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/floccusaddon/floccus/pull/743
Author: @dependabot-preview[bot]
Created: 12/14/2020
Status: ❌ Closed

Base: develop ← Head: dependabot/npm_and_yarn/webpack-merge-5.7.0

📝 Commits (1)

0910d24 Bump webpack-merge from 4.2.2 to 5.7.0

📊 Changes

2 files changed (+34 additions, -5 deletions)

View changed files

📝 package-lock.json (+33 -4)
📝 package.json (+1 -1)

📄 Description

Bumps webpack-merge from 4.2.2 to 5.7.0.

Changelog

Sourced from webpack-merge's changelog.

5.7.0 / 2020-12-12

Feat - Throw a TypeError if trying to use mergeWithRules with invalid configuration types for append/prepend/merge operations.

5.6.1 / 2020-12-11

Fix - Drop extraneous logging.

5.6.0 / 2020-12-11

Feat - Support merge (CustomizeRule.Merge) for objects at mergeWithRules. This is useful for merging loader options for example. #163

5.5.0 / 2020-12-10

Feat - Allow mergeWithRules to merge based on rules without a match. #151 #159

5.4.1 / 2020-12-08

Fix - Allow mergeUnique to work with arbitrary order. #161

5.4.0 / 2020-10-30

Fix - Fall back correctly in mergeWithRules for cases that aren't matched. #157 #158

Fix - Don't throw if using mergeWithRules without a rule #151

Feat - Throw if undefined is passed to merge as a structure to merge

5.3.0 / 2020-10-30

Fix - Expose Configuration type through a generic to TypeScript to support both webpack 4 and 5 #141 #154

In case you use webpack 4, please change your typing as instructed in the readme as the default type is loose but non-breaking.

5.2.0 / 2020-10-07

Feature - Support advanced merging cases through mergeWithRules #146 #149

5.1.4 / 2020-09-09

Fix - Expose CustomizeRule for TypeScript users #147

5.1.3 / 2020-08-30

Fix - Allow merging a RegExp to itself #145

5.1.2 / 2020-08-18

Fix - Allow overriding an object field with null #144

5.1.1 / 2020-08-04

Commits

88d9bc1 5.7.0
d840d1f chore: Update changelog
aa9fd96 feat: Throw if trying to append/prepend non-arrays
157b9a0 feat: Throw if trying to merge non-objects
8a7d155 docs: Use consistent formatting + fix typo
7231d6c test: Assert that multi-level match works
6d8f6a4 fix: Drop it.only
dda6430 Update .travis.yml (#164)
3649212 5.6.1
6e84282 fix: Drop extraneous logging
Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

@dependabot rebase will rebase this PR
@dependabot recreate will recreate this PR, overwriting any edits that have been made to it
@dependabot merge will merge this PR after your CI passes on it
@dependabot squash and merge will squash and merge this PR after your CI passes on it
@dependabot cancel merge will cancel a previously requested merge and block automerging
@dependabot reopen will reopen this PR if it is closed
@dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
@dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
@dependabot use these labels will set the current labels as the default for future PRs for this repo and language
@dependabot use these reviewers will set the current reviewers as the default for future PRs for this repo and language
@dependabot use these assignees will set the current assignees as the default for future PRs for this repo and language
@dependabot use this milestone will set the current milestone as the default for future PRs for this repo and language
@dependabot badge me will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot dashboard:

Update frequency (including time of day and day of week)
Pull request limits (per update run and/or open at any time)
Out-of-range updates (receive only lockfile updates, if desired)
Security updates (receive only security updates, if desired)

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/floccusaddon/floccus/pull/743 **Author:** [@dependabot-preview[bot]](https://github.com/apps/dependabot-preview) **Created:** 12/14/2020 **Status:** ❌ Closed **Base:** `develop` ← **Head:** `dependabot/npm_and_yarn/webpack-merge-5.7.0` --- ### 📝 Commits (1) - [`0910d24`](https://github.com/floccusaddon/floccus/commit/0910d2410fa49ce1baf18b8d76f9a94aac9b42ff) Bump webpack-merge from 4.2.2 to 5.7.0 ### 📊 Changes **2 files changed** (+34 additions, -5 deletions) <details> <summary>View changed files</summary> 📝 `package-lock.json` (+33 -4) 📝 `package.json` (+1 -1) </details> ### 📄 Description Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.2.2 to 5.7.0. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md">webpack-merge's changelog</a>.</em></p> <blockquote> <h2>5.7.0 / 2020-12-12</h2> <ul> <li>Feat - Throw a <code>TypeError</code> if trying to use <code>mergeWithRules</code> with invalid configuration types for <code>append</code>/<code>prepend</code>/<code>merge</code> operations.</li> </ul> <h2>5.6.1 / 2020-12-11</h2> <ul> <li>Fix - Drop extraneous logging.</li> </ul> <h2>5.6.0 / 2020-12-11</h2> <ul> <li>Feat - Support <code>merge</code> (<code>CustomizeRule.Merge</code>) for objects at <code>mergeWithRules</code>. This is useful for merging loader options for example. <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/163">#163</a></li> </ul> <h2>5.5.0 / 2020-12-10</h2> <ul> <li>Feat - Allow <code>mergeWithRules</code> to merge based on rules without a match. <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/151">#151</a> <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/159">#159</a></li> </ul> <h2>5.4.1 / 2020-12-08</h2> <ul> <li>Fix - Allow <code>mergeUnique</code> to work with arbitrary order. <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/161">#161</a></li> </ul> <h2>5.4.0 / 2020-10-30</h2> <ul> <li>Fix - Fall back correctly in <code>mergeWithRules</code> for cases that aren't matched. <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/157">#157</a> <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/158">#158</a></li> <li>Fix - Don't throw if using <code>mergeWithRules</code> without a rule <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/151">#151</a></li> <li>Feat - Throw if <code>undefined</code> is passed to <code>merge</code> as a structure to merge</li> </ul> <h2>5.3.0 / 2020-10-30</h2> <ul> <li>Fix - Expose <code>Configuration</code> type through a generic to TypeScript to support both webpack 4 and 5 <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/141">#141</a> <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/154">#154</a></li> </ul> <p>In case you use webpack 4, please change your typing as instructed in the readme as the default type is loose but non-breaking.</p> <h2>5.2.0 / 2020-10-07</h2> <ul> <li>Feature - Support advanced merging cases through <code>mergeWithRules</code> <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/146">#146</a> <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/149">#149</a></li> </ul> <h2>5.1.4 / 2020-09-09</h2> <ul> <li>Fix - Expose <code>CustomizeRule</code> for TypeScript users <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/147">#147</a></li> </ul> <h2>5.1.3 / 2020-08-30</h2> <ul> <li>Fix - Allow merging a <code>RegExp</code> to itself <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/145">#145</a></li> </ul> <h2>5.1.2 / 2020-08-18</h2> <ul> <li>Fix - Allow overriding an object field with <code>null</code> <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/144">#144</a></li> </ul> <h2>5.1.1 / 2020-08-04</h2>  </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/survivejs/webpack-merge/commit/88d9bc1a703108ab5a6211d9cb8c611bc991c7c7"><code>88d9bc1</code></a> 5.7.0</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/d840d1f27f78cc3b8a388113cce13461a6f8a302"><code>d840d1f</code></a> chore: Update changelog</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/aa9fd9688870164ebf912cc32203940c94bb286f"><code>aa9fd96</code></a> feat: Throw if trying to append/prepend non-arrays</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/157b9a0ecf50af3b5d540cc2c20c583cb4fc3545"><code>157b9a0</code></a> feat: Throw if trying to merge non-objects</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/8a7d1553df03f8f68ec93aeaf3489a0d5da65a79"><code>8a7d155</code></a> docs: Use consistent formatting + fix typo</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/7231d6c47c8546027a8cdf8297eaabb5d5e60e7a"><code>7231d6c</code></a> test: Assert that multi-level match works</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/6d8f6a4136a67198c97e39eb2080246a9c25bb0e"><code>6d8f6a4</code></a> fix: Drop it.only</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/dda6430d1a6475fc13f4bf14889e4af60d08f9eb"><code>dda6430</code></a> Update .travis.yml (<a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/164">#164</a>)</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/3649212bcf03e3e015e0fdc2e1ec431afeb7242f"><code>3649212</code></a> 5.6.1</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/6e842825e97e38906b3de8d9f9bd5b80ef687b7b"><code>6e84282</code></a> fix: Drop extraneous logging</li> <li>Additional commits viewable in <a href="https://github.com/survivejs/webpack-merge/compare/v4.2.2...v5.7.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=webpack-merge&package-manager=npm_and_yarn&previous-version=4.2.2&new-version=5.7.0)](https://dependabot.com/compatibility-score/?dependency-name=webpack-merge&package-manager=npm_and_yarn&previous-version=4.2.2&new-version=5.7.0) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com): - Update frequency (including time of day and day of week) - Pull request limits (per update run and/or open at any time) - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

kerem

2026-02-25 23:30:40 +03:00

closed this issue
added the
pull-request
label

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

starred/floccus#1731

No description provided.

Rows
Columns