starred/floccus

Fork 0

mirror of https://github.com/floccusaddon/floccus.git synced 2026-04-25 06:06:05 +03:00

[PR #740] [CLOSED] Bump webpack-merge from 4.2.2 to 5.5.0 #1734

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/740
Author: @dependabot-preview[bot]
Created: 12/11/2020
Status: ❌ Closed

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

📝 Commits (1)

6d6e6f4 Bump webpack-merge from 4.2.2 to 5.5.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.5.0.

Changelog

Sourced from webpack-merge's changelog.

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

Fix - Drop <reference types="webpack-dev-server" /> from index.d.ts #143

5.1.0 / 2020-08-03

Feature - Expose merge as default for backwards-compatibility with TypeScript. Now import merge from "webpack-merge"; works there. In CommonJS, the default alias is exposed through default property due to technical constraints.

5.0.9 / 2020-07-09

Fix - Don't crash on merge() and merge([]). Now {} is returned in these corner cases.

5.0.8 / 2020-07-07

Commits

f3f8fe7 5.5.0
b89bc27 chore: Update changelog
c2e79a0 feat - Add a syntax for adjusting merge behavior without matching (#152)
105007e 5.4.1
f311804 chore: Update changelog
28d6b98 chore: Add @trombka to contributors
927e049 unique merge array customisation fix (#162)
57ec295 chore: Apply prettier 2
33c3768 5.4.0
106f586 chore: Update change log
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/740 **Author:** [@dependabot-preview[bot]](https://github.com/apps/dependabot-preview) **Created:** 12/11/2020 **Status:** ❌ Closed **Base:** `develop` ← **Head:** `dependabot/npm_and_yarn/webpack-merge-5.5.0` --- ### 📝 Commits (1) - [`6d6e6f4`](https://github.com/floccusaddon/floccus/commit/6d6e6f4bdf88f1c0278f6cf097e322cea7acc546) Bump webpack-merge from 4.2.2 to 5.5.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.5.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.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> <ul> <li>Fix - Drop <code><reference types="webpack-dev-server" /></code> from <strong>index.d.ts</strong> <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/143">#143</a></li> </ul> <h2>5.1.0 / 2020-08-03</h2> <ul> <li>Feature - Expose <code>merge</code> as <code>default</code> for backwards-compatibility with TypeScript. Now <code>import merge from "webpack-merge";</code> works there. In CommonJS, the default alias is exposed through <code>default</code> property due to technical constraints.</li> </ul> <h2>5.0.9 / 2020-07-09</h2> <ul> <li>Fix - Don't crash on <code>merge()</code> and <code>merge([])</code>. Now <code>{}</code> is returned in these corner cases.</li> </ul> <h2>5.0.8 / 2020-07-07</h2>  </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/survivejs/webpack-merge/commit/f3f8fe720df698e5b1f00f437be19b04c9d700c5"><code>f3f8fe7</code></a> 5.5.0</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/b89bc278ca3fe75aa40b22d201abab3465a3d133"><code>b89bc27</code></a> chore: Update changelog</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/c2e79a08833276bc29ef1b7f8a100a0ede12d8c8"><code>c2e79a0</code></a> feat - Add a syntax for adjusting merge behavior without matching (<a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/152">#152</a>)</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/105007e7731626c23867efd3b7363fe77ecff0a8"><code>105007e</code></a> 5.4.1</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/f311804334c84899033de6d73ac9a942ad647149"><code>f311804</code></a> chore: Update changelog</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/28d6b98c85ff7132a0e49ad4e7b20534d9804905"><code>28d6b98</code></a> chore: Add <a href="https://github.com/trombka">@trombka</a> to contributors</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/927e049a54cb9cc537cf8ed4de9893825e8122f8"><code>927e049</code></a> unique merge array customisation fix (<a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/162">#162</a>)</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/57ec2957ecfab174a9dad07c41cfcf476d64baa2"><code>57ec295</code></a> chore: Apply prettier 2</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/33c37681a06b6730b4874abc3e15669373e0b31c"><code>33c3768</code></a> 5.4.0</li> <li><a href="https://github.com/survivejs/webpack-merge/commit/106f58669ac23a2a77621294380d186b1f31baff"><code>106f586</code></a> chore: Update change log</li> <li>Additional commits viewable in <a href="https://github.com/survivejs/webpack-merge/compare/v4.2.2...v5.5.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.5.0)](https://dependabot.com/compatibility-score/?dependency-name=webpack-merge&package-manager=npm_and_yarn&previous-version=4.2.2&new-version=5.5.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#1734

No description provided.

Rows
Columns