chore(dep): upgrade webpack-merge

packages/components/src/Packages/Deprecated/org.standardnotes.bold-editor/package.json

@@ -39,7 +39,7 @@
     "webpack": "*",
     "webpack-cli": "*",
     "webpack-dev-server": "*",
-    "webpack-merge": "^5.7.3",
+    "webpack-merge": "^5.8.0",
     "webpack-merge-and-include-globally": "^2.3.4"
   }
 }

packages/components/src/Packages/Editors/org.standardnotes.advanced-markdown-editor/package.json

@@ -40,6 +40,6 @@
     "webpack": "*",
     "webpack-cli": "*",
     "webpack-dev-server": "*",
-    "webpack-merge": "^5.7.3"
+    "webpack-merge": "^5.8.0"
   }
 }

packages/components/src/Packages/Editors/org.standardnotes.code-editor/package.json

@@ -30,6 +30,6 @@
     "sn-stylekit": "^2.1.1",
     "webpack": "*",
     "webpack-cli": "*",
-    "webpack-merge": "^5.7.3"
+    "webpack-merge": "^5.8.0"
   }
 }

packages/components/src/Packages/Editors/org.standardnotes.plus-editor/package.json

@@ -36,7 +36,7 @@
     "webpack": "*",
     "webpack-cli": "*",
     "webpack-dev-server": "*",
-    "webpack-merge": "^5.7.3",
+    "webpack-merge": "^5.8.0",
     "webpack-merge-and-include-globally": "^2.3.3"
   }
 }

packages/components/src/Packages/Editors/org.standardnotes.simple-task-editor/package.json

@@ -43,6 +43,6 @@
     "webpack": "*",
     "webpack-cli": "*",
     "webpack-dev-server": "*",
-    "webpack-merge": "5.7.3"
+    "webpack-merge": "^5.8.0"
   }
 }

packages/components/src/Packages/Editors/org.standardnotes.standard-sheets/package.json

@@ -39,6 +39,6 @@
     "webpack": "*",
     "webpack-cli": "*",
     "webpack-dev-server": "*",
-    "webpack-merge": "*"
+    "webpack-merge": "^5.8.0"
   }
 }

packages/components/src/Packages/Editors/org.standardnotes.token-vault/package.json

@@ -58,6 +58,6 @@
     "webpack": "*",
     "webpack-cli": "*",
     "webpack-dev-server": "*",
-    "webpack-merge": "*"
+    "webpack-merge": "^5.8.0"
   }
 }

packages/desktop/package.json

@@ -79,7 +79,7 @@
     "ts-node": "^10.7.0",
     "typescript": "*",
     "webpack": "*",
-    "webpack-merge": "*"
+    "webpack-merge": "^5.8.0"
   },
   "build": {
     "electronVersion": "17.4.2",

packages/snjs/package.json

@@ -63,7 +63,7 @@
     "uuid": "^8.3.2",
     "webpack": "*",
     "webpack-cli": "*",
-    "webpack-merge": "*"
+    "webpack-merge": "^5.8.0"
   },
   "dependencies": {
     "@standardnotes/api": "workspace:*",

packages/web/package.json

@@ -60,7 +60,7 @@
     "typescript": "*",
     "webpack": "*",
     "webpack-dev-server": "*",
-    "webpack-merge": "*"
+    "webpack-merge": "^5.8.0"
   },
   "dependencies": {
     "@reach/alert": "^0.16.0",

yarn.lock

@@ -6285,7 +6285,7 @@ __metadata:
     webpack: "*"
     webpack-cli: "*"
     webpack-dev-server: "*"
-    webpack-merge: "*"
+    webpack-merge: ^5.8.0
   languageName: unknown
   linkType: soft
 
@@ -6326,7 +6326,7 @@ __metadata:
     webpack: "*"
     webpack-cli: "*"
     webpack-dev-server: "*"
-    webpack-merge: ^5.7.3
+    webpack-merge: ^5.8.0
     webpack-merge-and-include-globally: ^2.3.4
   languageName: unknown
   linkType: soft
@@ -6350,7 +6350,7 @@ __metadata:
     sn-stylekit: ^2.1.1
     webpack: "*"
     webpack-cli: "*"
-    webpack-merge: ^5.7.3
+    webpack-merge: ^5.8.0
   languageName: unknown
   linkType: soft
 
@@ -6456,7 +6456,7 @@ __metadata:
     ts-node: ^10.7.0
     typescript: "*"
     webpack: "*"
-    webpack-merge: "*"
+    webpack-merge: ^5.8.0
   languageName: unknown
   linkType: soft
 
@@ -6799,7 +6799,7 @@ __metadata:
     webpack: "*"
     webpack-cli: "*"
     webpack-dev-server: "*"
-    webpack-merge: ^5.7.3
+    webpack-merge: ^5.8.0
   languageName: unknown
   linkType: soft
 
@@ -7122,7 +7122,7 @@ __metadata:
     webpack: "*"
     webpack-cli: "*"
     webpack-dev-server: "*"
-    webpack-merge: ^5.7.3
+    webpack-merge: ^5.8.0
     webpack-merge-and-include-globally: ^2.3.3
   languageName: unknown
   linkType: soft
@@ -7211,7 +7211,7 @@ __metadata:
     webpack: "*"
     webpack-cli: "*"
     webpack-dev-server: "*"
-    webpack-merge: 5.7.3
+    webpack-merge: ^5.8.0
   languageName: unknown
   linkType: soft
 
@@ -7309,7 +7309,7 @@ __metadata:
     uuid: ^8.3.2
     webpack: "*"
     webpack-cli: "*"
-    webpack-merge: "*"
+    webpack-merge: ^5.8.0
   languageName: unknown
   linkType: soft
 
@@ -7349,7 +7349,7 @@ __metadata:
     webpack: "*"
     webpack-cli: "*"
     webpack-dev-server: "*"
-    webpack-merge: "*"
+    webpack-merge: ^5.8.0
   languageName: unknown
   linkType: soft
 
@@ -7526,7 +7526,7 @@ __metadata:
     typescript: "*"
     webpack: "*"
     webpack-dev-server: "*"
-    webpack-merge: "*"
+    webpack-merge: ^5.8.0
   languageName: unknown
   linkType: soft
 
@@ -39176,26 +39176,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-merge@npm:*, webpack-merge@npm:^5.7.3, webpack-merge@npm:^5.8.0":
-  version: 5.8.0
-  resolution: "webpack-merge@npm:5.8.0"
-  dependencies:
-    clone-deep: ^4.0.1
-    wildcard: ^2.0.0
-  checksum: 88786ab91013f1bd2a683834ff381be81c245a4b0f63304a5103e90f6653f44dab496a0768287f8531761f8ad957d1f9f3ccb2cb55df0de1bd9ee343e079da26
-  languageName: node
-  linkType: hard
-
-"webpack-merge@npm:5.7.3":
-  version: 5.7.3
-  resolution: "webpack-merge@npm:5.7.3"
-  dependencies:
-    clone-deep: ^4.0.1
-    wildcard: ^2.0.0
-  checksum: 09608c3a4928246e9c1c09c22b5f867c38d0ab0fb027ebcc3b15d42659f06a10cfa7f7e2cf2a0ace6f2d571c1cd744ec23e7b2069d34a70378e163e8e035c290
-  languageName: node
-  linkType: hard
-
 "webpack-merge@npm:^4.2.2":
   version: 4.2.2
   resolution: "webpack-merge@npm:4.2.2"
@@ -39205,6 +39185,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"webpack-merge@npm:^5.7.3, webpack-merge@npm:^5.8.0":
+  version: 5.8.0
+  resolution: "webpack-merge@npm:5.8.0"
+  dependencies:
+    clone-deep: ^4.0.1
+    wildcard: ^2.0.0
+  checksum: 88786ab91013f1bd2a683834ff381be81c245a4b0f63304a5103e90f6653f44dab496a0768287f8531761f8ad957d1f9f3ccb2cb55df0de1bd9ee343e079da26
+  languageName: node
+  linkType: hard
+
 "webpack-remove-empty-scripts@npm:^0.8.0":
   version: 0.8.1
   resolution: "webpack-remove-empty-scripts@npm:0.8.1"