From f125ad3cf1fa0f6c1bf946008cb27a6648dbda6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Wed, 13 Jul 2022 10:10:57 +0200 Subject: [PATCH] chore(dep): upgrade webpack-merge --- ...-merge-npm-5.7.3-f596ce4401-09608c3a49.zip | Bin 22588 -> 0 bytes .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/desktop/package.json | 2 +- packages/snjs/package.json | 2 +- packages/web/package.json | 2 +- yarn.lock | 50 +++++++----------- 12 files changed, 30 insertions(+), 40 deletions(-) delete mode 100644 .yarn/cache/webpack-merge-npm-5.7.3-f596ce4401-09608c3a49.zip diff --git a/.yarn/cache/webpack-merge-npm-5.7.3-f596ce4401-09608c3a49.zip b/.yarn/cache/webpack-merge-npm-5.7.3-f596ce4401-09608c3a49.zip deleted file mode 100644 index bb2a9ee620b67767b054da8abdf03626255411bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22588 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 diff --git a/packages/components/src/Packages/Deprecated/org.standardnotes.bold-editor/package.json b/packages/components/src/Packages/Deprecated/org.standardnotes.bold-editor/package.json index ab5c4c9dc..d45fd61f1 100644 --- a/packages/components/src/Packages/Deprecated/org.standardnotes.bold-editor/package.json +++ b/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" } } diff --git a/packages/components/src/Packages/Editors/org.standardnotes.advanced-markdown-editor/package.json b/packages/components/src/Packages/Editors/org.standardnotes.advanced-markdown-editor/package.json index b9bd136ff..3e2eebff4 100644 --- a/packages/components/src/Packages/Editors/org.standardnotes.advanced-markdown-editor/package.json +++ b/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" } } diff --git a/packages/components/src/Packages/Editors/org.standardnotes.code-editor/package.json b/packages/components/src/Packages/Editors/org.standardnotes.code-editor/package.json index f289b3c60..fc647e061 100644 --- a/packages/components/src/Packages/Editors/org.standardnotes.code-editor/package.json +++ b/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" } } diff --git a/packages/components/src/Packages/Editors/org.standardnotes.plus-editor/package.json b/packages/components/src/Packages/Editors/org.standardnotes.plus-editor/package.json index 3354352ab..e65d890c5 100644 --- a/packages/components/src/Packages/Editors/org.standardnotes.plus-editor/package.json +++ b/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" } } diff --git a/packages/components/src/Packages/Editors/org.standardnotes.simple-task-editor/package.json b/packages/components/src/Packages/Editors/org.standardnotes.simple-task-editor/package.json index 18e9c40f3..d82c4aa2d 100644 --- a/packages/components/src/Packages/Editors/org.standardnotes.simple-task-editor/package.json +++ b/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" } } diff --git a/packages/components/src/Packages/Editors/org.standardnotes.standard-sheets/package.json b/packages/components/src/Packages/Editors/org.standardnotes.standard-sheets/package.json index 2d7164916..ccf7d3dd4 100644 --- a/packages/components/src/Packages/Editors/org.standardnotes.standard-sheets/package.json +++ b/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" } } diff --git a/packages/components/src/Packages/Editors/org.standardnotes.token-vault/package.json b/packages/components/src/Packages/Editors/org.standardnotes.token-vault/package.json index 15ffe55fe..8a43ae80a 100644 --- a/packages/components/src/Packages/Editors/org.standardnotes.token-vault/package.json +++ b/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" } } diff --git a/packages/desktop/package.json b/packages/desktop/package.json index d766c31b1..f4c904a59 100644 --- a/packages/desktop/package.json +++ b/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", diff --git a/packages/snjs/package.json b/packages/snjs/package.json index f68329bd1..a09262971 100644 --- a/packages/snjs/package.json +++ b/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:*", diff --git a/packages/web/package.json b/packages/web/package.json index 008f5459c..beaff9f1c 100644 --- a/packages/web/package.json +++ b/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", diff --git a/yarn.lock b/yarn.lock index 3591c94ea..c8bc2b450 100644 --- a/yarn.lock +++ b/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"