⬆️ Bump webpack-merge from 4.2.2 to 5.8.0 (#8)

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.2.2 to 5.8.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.8.0 / 2021-06-07</h2>
<ul>
<li>Docs - Update <code>env</code> example to be webpack 5 compatible. <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/177">#177</a>, <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/180">#180</a></li>
<li>Feat - Support strings as rules for TypeScript, not just enums. <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/179">#179</a>, <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/185">#185</a></li>
</ul>
<h2>5.7.3 / 2020-12-22</h2>
<ul>
<li>Fix - Don't merge strings with objects in <code>mergeWithRules</code>. <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/172">#172</a></li>
</ul>
<h2>5.7.2 / 2020-12-16</h2>
<ul>
<li>Fix - If there's no match when using <code>merge</code> operation with <code>mergeWithRules</code>, use default merge behavior as a fallback. <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/167">#167</a></li>
</ul>
<h2>5.7.1 / 2020-12-16</h2>
<ul>
<li>Fix - Fix a merge failure for <code>mergeWithRules</code> when non-array matches are merged. <a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/166">#166</a></li>
</ul>
<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>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/survivejs/webpack-merge/commit/7a99833bd9faecd30bbcaeec8a9a10f6bab1d300"><code>7a99833</code></a> 5.8.0</li>
<li><a href="https://github.com/survivejs/webpack-merge/commit/df2b5cf6b28cc8f184dc53ec7a5622a44a7a8080"><code>df2b5cf</code></a> chore: Update changelog</li>
<li><a href="https://github.com/survivejs/webpack-merge/commit/5cb501e60481fb74f38595479c246f7d99d115c2"><code>5cb501e</code></a> feat: Support rules as strings (<a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/185">#185</a>)</li>
<li><a href="https://github.com/survivejs/webpack-merge/commit/72b52ced453ed642cd90de445bcfc4d8e338a412"><code>72b52ce</code></a> chore: Update changelog</li>
<li><a href="https://github.com/survivejs/webpack-merge/commit/afe55817106a61af03c9a25d03e06fab2de7c231"><code>afe5581</code></a> docs: update  example code of Limitations (<a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/180">#180</a>)</li>
<li><a href="https://github.com/survivejs/webpack-merge/commit/1062b06cfbbc2c9f5e7f9f21ab9d2cf0c6851296"><code>1062b06</code></a> chore: Update dependencies</li>
<li><a href="https://github.com/survivejs/webpack-merge/commit/3da07b210cda525ed0b124153d6472c23c88b2f2"><code>3da07b2</code></a> chore(deps): bump y18n from 4.0.0 to 4.0.1 (<a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/178">#178</a>)</li>
<li><a href="https://github.com/survivejs/webpack-merge/commit/53bac19aebff060116fd3b16a581e4bf06c7ac1e"><code>53bac19</code></a> chore(deps): bump lodash from 4.17.20 to 4.17.21 (<a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/181">#181</a>)</li>
<li><a href="https://github.com/survivejs/webpack-merge/commit/936ed0321bee2a2239abfe62f05d201dd46267b0"><code>936ed03</code></a> chore(deps): bump hosted-git-info from 2.8.8 to 2.8.9 (<a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/182">#182</a>)</li>
<li><a href="https://github.com/survivejs/webpack-merge/commit/d70de5320c94037ae2892bf9d76e5bafbfcf49bc"><code>d70de53</code></a> chore(deps): bump browserslist from 4.14.5 to 4.16.6 (<a href="https://github-redirect.dependabot.com/survivejs/webpack-merge/issues/183">#183</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/survivejs/webpack-merge/compare/v4.2.2...v5.8.0">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=webpack-merge&package-manager=npm_and_yarn&previous-version=4.2.2&new-version=5.8.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

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)


</details>

Co-authored-by: shejinxin <[email protected]>

Author: dependabot[bot]

package.json

@@ -148,7 +148,7 @@
     "webpack-bundle-analyzer": "^3.6.0",
     "webpack-cli": "^4.7.2",
     "webpack-dev-server": "^3.9.0",
-    "webpack-merge": "^4.2.2"
+    "webpack-merge": "^5.8.0"
   },
   "build": {
     "appId": "io.github.xcodebuild.iproxy",

webpack/webpack.main.config.js

@@ -7,7 +7,7 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 
 const baseConfig = require('./webpack.base.config');
 
-module.exports = merge.smart(baseConfig, {
+module.exports = merge.merge(baseConfig, {
     target: 'electron-main',
     entry: {
         main: './src/main/index.ts',

webpack/webpack.main.prod.config.js

@@ -2,6 +2,6 @@ const merge = require('webpack-merge');
 
 const baseConfig = require('./webpack.main.config');
 
-module.exports = merge.smart(baseConfig, {
+module.exports = merge.merge(baseConfig, {
     mode: 'production',
 });

webpack/webpack.renderer.config.js

@@ -9,7 +9,7 @@ const baseConfig = require('./webpack.base.config');
 const pkg = require('../package.json');
 const devMode = process.env.NODE_ENV !== 'production';
 
-module.exports = merge.smart(baseConfig, {
+module.exports = merge.merge(baseConfig, {
     target: 'electron-renderer',
     entry: {
         app: ['@babel/polyfill', './src/renderer/index.tsx'],

webpack/webpack.renderer.dev.config.js

@@ -4,7 +4,7 @@ const spawn = require('child_process').spawn;
 
 const baseConfig = require('./webpack.renderer.config');
 
-module.exports = merge.smart(baseConfig, {
+module.exports = merge.merge(baseConfig, {
     resolve: {
         alias: {
             'react-dom': '@hot-loader/react-dom',

webpack/webpack.renderer.prod.config.js

@@ -7,6 +7,6 @@ if (process.env.BUNDLE_ANALYZER) {
     baseConfig.plugins.push(new BundleAnalyzerPlugin());
 }
 
-module.exports = merge.smart(baseConfig, {
+module.exports = merge.merge(baseConfig, {
     mode: 'production',
 });