From 1bfe3a4eaab4f9ca657e45072311035e9a595e05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 11:14:41 +0200 Subject: [PATCH 01/18] Bump minimist from 1.2.5 to 1.2.6 (#51) Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index d35aa4c..abf1483 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2544,9 +2544,9 @@ } }, "node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "node_modules/mkdirp": { @@ -2588,14 +2588,6 @@ "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=" }, - "node_modules/mz/node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/mz/node_modules/thenify": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz", @@ -2679,7 +2671,6 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -5704,9 +5695,9 @@ } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "mkdirp": { @@ -5745,11 +5736,6 @@ "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=" }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - }, "thenify": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz", @@ -5826,8 +5812,7 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "object-inspect": { "version": "1.8.0", From 8621c47884c4fb5fc91f7146b68226de5d3ba432 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 11:22:29 +0200 Subject: [PATCH 02/18] Bump ansi-regex from 3.0.0 to 3.0.1 (#52) Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/chalk/ansi-regex/releases) - [Commits](https://github.com/chalk/ansi-regex/compare/v3.0.0...v3.0.1) --- updated-dependencies: - dependency-name: ansi-regex dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 48 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index abf1483..7b6333b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -399,9 +399,9 @@ } }, "node_modules/ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", + "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", "dev": true, "engines": { "node": ">=4" @@ -1016,9 +1016,9 @@ } }, "node_modules/cspell/node_modules/ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, "engines": { "node": ">=8" @@ -1949,9 +1949,9 @@ } }, "node_modules/inquirer/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true, "engines": { "node": ">=6" @@ -3402,9 +3402,9 @@ } }, "node_modules/table/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true, "engines": { "node": ">=6" @@ -4025,9 +4025,9 @@ "dev": true }, "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", + "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", "dev": true }, "ansi-styles": { @@ -4442,9 +4442,9 @@ }, "dependencies": { "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "get-stdin": { @@ -5243,9 +5243,9 @@ }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true }, "chalk": { @@ -6367,9 +6367,9 @@ }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true }, "string-width": { From 4187c0541e546bdf9ca520ec9ae3fe9cf497f428 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 11:24:00 +0200 Subject: [PATCH 03/18] Bump follow-redirects from 1.14.1 to 1.14.9 (#53) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.1 to 1.14.9. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.1...v1.14.9) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7b6333b..7e093c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1652,9 +1652,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz", - "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==", + "version": "1.14.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", "funding": [ { "type": "individual", @@ -5018,9 +5018,9 @@ "dev": true }, "follow-redirects": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz", - "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==" + "version": "1.14.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==" }, "form-data": { "version": "4.0.0", From 453f5de10687a682fc7e5107423ca573fd6850ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 08:18:03 +0100 Subject: [PATCH 04/18] Bump json5 from 1.0.1 to 1.0.2 (#56) Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7e093c0..b665c78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2188,9 +2188,9 @@ "dev": true }, "node_modules/json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "dev": true, "dependencies": { "minimist": "^1.2.0" @@ -5412,9 +5412,9 @@ "dev": true }, "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "dev": true, "requires": { "minimist": "^1.2.0" From ec90e1ebb4752a3d29c533a58c02b120e5b7f66d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 08:24:55 +0100 Subject: [PATCH 05/18] Bump thenify from 3.3.0 to 3.3.1 (#54) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [thenify](https://github.com/thenables/thenify) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/thenables/thenify/releases) - [Changelog](https://github.com/thenables/thenify/blob/master/History.md) - [Commits](https://github.com/thenables/thenify/compare/3.3.0...3.3.1) --- updated-dependencies: - dependency-name: thenify dependency-type: indirect ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sven Münnich --- package-lock.json | 52 +++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index b665c78..a0bcebe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -419,6 +419,11 @@ "node": ">=4" } }, + "node_modules/any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==" + }, "node_modules/argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -2583,19 +2588,6 @@ "thenify-all": "^1.0.0" } }, - "node_modules/mz/node_modules/any-promise": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=" - }, - "node_modules/mz/node_modules/thenify": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz", - "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=", - "dependencies": { - "any-promise": "^1.0.0" - } - }, "node_modules/mz/node_modules/thenify-all": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", @@ -3442,6 +3434,14 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, + "node_modules/thenify": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", + "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "dependencies": { + "any-promise": "^1.0.0" + } + }, "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -4039,6 +4039,11 @@ "color-convert": "^1.9.0" } }, + "any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==" + }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -5731,19 +5736,6 @@ "thenify-all": "^1.0.0" }, "dependencies": { - "any-promise": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=" - }, - "thenify": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz", - "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=", - "requires": { - "any-promise": "^1.0.0" - } - }, "thenify-all": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", @@ -6400,6 +6392,14 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, + "thenify": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", + "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "requires": { + "any-promise": "^1.0.0" + } + }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", From 08e85edcec7aca322fe2ac159e20b42eeec4d68f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 08:30:21 +0100 Subject: [PATCH 06/18] Bump minimatch from 3.0.4 to 3.1.2 (#57) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sven Münnich --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index a0bcebe..0849413 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2537,9 +2537,9 @@ } }, "node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "dependencies": { "brace-expansion": "^1.1.7" @@ -5691,9 +5691,9 @@ "dev": true }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "requires": { "brace-expansion": "^1.1.7" From 4876b8da75eeff748868a40de6e8f81e78b6299d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sven=20M=C3=BCnnich?= Date: Tue, 7 May 2024 16:19:05 +0200 Subject: [PATCH 07/18] Fix `upload` command (#62) Fixes #61 --- lib/commands/upload.js | 103 +++++++++++++++++-------------- lib/shopwareStoreCommander.js | 111 ++++++++++++++++++++++++++++------ 2 files changed, 150 insertions(+), 64 deletions(-) diff --git a/lib/commands/upload.js b/lib/commands/upload.js index af0e55c..957428c 100755 --- a/lib/commands/upload.js +++ b/lib/commands/upload.js @@ -36,7 +36,7 @@ Program .option('-R, --no-release', 'Set this option to not submit the uploaded binary for review.') .option( '--store-ioncube-encode ', - 'Whether the Store should automatically ionCube-encode the released binary (default is \'auto\', which retains previous release\'s setting)', + 'Deprecated: Shopware no longer supports ionCube encryption.', parseOnOffAutoOption, 'auto', ) @@ -64,6 +64,9 @@ if (typeof Program.opts().username === 'undefined') { async function main() { const pluginZipFilePath = path.resolve(process.cwd(), Program.args[0]); + if (Program.opts().storeIoncubeEncode !== undefined) { + console.error(Chalk.yellow.bold('Warning: Option \'--store-ioncube-encode\' is deprecated because Shopware no longer supports ionCube encryption. Ignoring.')); + } try { const password = await getPassword(Program); const commander = new ShopwareStoreCommander(Program.opts().username, password); @@ -100,15 +103,6 @@ async function main() { ); const latestReleasedBinary = (releasedBinaries.length > 0) ? releasedBinaries[0] : null; - if (Program.opts().storeIoncubeEncode === 'auto') { - // Set the option based on the latest released binary, if possible - if (latestReleasedBinary) { - Program.opts().storeIoncubeEncode = latestReleasedBinary.ionCubeEncrypted; - } else { - Program.opts().storeIoncubeEncode = false; - console.error(Chalk.yellow.bold('Warning: Cannot automatically determine value for option \'--store-ioncube-encode\', because no valid, released binary exists which it could have been derived from. Using \'false\' instead.')); - } - } if (Program.opts().licenseCheckRequired === 'auto') { // Set the option based on the latest released binary, if possible if (latestReleasedBinary) { @@ -119,31 +113,15 @@ async function main() { } } - // Make sure that the version of the passed binary does not exist yet - const conflictingBinary = remotePlugin.binaries.find( - binary => binary.version.length > 0 && binary.version === localPlugin.version, - ); - if (conflictingBinary) { - if (Program.opts().force) { - remotePlugin = await commander.updatePluginBinary(remotePlugin, conflictingBinary, pluginZipFilePath); - } else { - throw new Error(`The binary version ${conflictingBinary.version} you're trying to upload already exists for plugin ${remotePlugin.name}`); - } - } else { - // Upload the binary - remotePlugin = await commander.uploadPluginBinary(remotePlugin, pluginZipFilePath); - } - - // Update the uploaded binary using the plugin info - console.error(`Set version to ${(localPlugin.version)}`); - remotePlugin.latestBinary.version = localPlugin.version; - remotePlugin.latestBinary.changelogs.forEach((changelog) => { - const lang = changelog.locale.name.split('_').shift(); - console.error(`Set changelog for language '${lang}'`); + console.error(`Setting version to ${(localPlugin.version)}...`); + const { supportedLocales } = await commander.getAccountData(); + const changelogs = supportedLocales.map((locale) => { + const language = locale.split('_').shift(); + console.error(`Preparing changelog for language '${language}'...`); // Try to find a changelog let changelogText = ''; try { - changelogText = localPlugin.releaseNotes[lang].toHtml(); + changelogText = localPlugin.releaseNotes[language].toHtml(); } catch (e) { console.error(Chalk.yellow.bold(`\u{26A0} ${e.message}`)); } @@ -154,25 +132,58 @@ async function main() { changelogText += '\u{0020}'; } - changelog.text = changelogText; + return { + locale, + text: changelogText, + }; }); - const shopwareVersions = commander.statics.softwareVersions; - remotePlugin.latestBinary.compatibleSoftwareVersions = shopwareVersions.filter( - version => version.selectable && localPlugin.isCompatibleWithShopwareVersion(version.name), - ); - const compatibleVersionStrings = remotePlugin.latestBinary.compatibleSoftwareVersions.map(version => version.name); - if (compatibleVersionStrings.length > 0) { - console.error(`Set shopware version compatibility: ${compatibleVersionStrings.join(', ')}`); + const compatibleShopwareVersions = commander.statics.softwareVersions + .filter(version => version.selectable && localPlugin.isCompatibleWithShopwareVersion(version.name)) + .map(version => version.name); + if (compatibleShopwareVersions.length > 0) { + console.error(`Setting shopware version compatibility: ${compatibleShopwareVersions.join(', ')}`); } else { console.error( Chalk.yellow.bold('\u{26A0} Warning: The plugin\'s compatibility constraints don\'t match any available shopware versions!'), ); } - remotePlugin.latestBinary.ionCubeEncrypted = Program.opts().storeIoncubeEncode; - remotePlugin.latestBinary.licenseCheckRequired = Program.opts().licenseCheckRequired; - remotePlugin = await commander.savePluginBinary(remotePlugin, remotePlugin.latestBinary); - const uploadSuccessMessage = `New version ${remotePlugin.latestBinary.version} of plugin ${remotePlugin.name} uploaded! \u{2705}`; + // Make sure that the version of the passed binary does not exist yet + const conflictingBinary = remotePlugin.binaries.find( + binary => binary.version.length > 0 && binary.version === localPlugin.version, + ); + let existingBinary; + if (!conflictingBinary) { + await commander.validatePluginBinaryFile(remotePlugin, pluginZipFilePath); + existingBinary = await commander.createPluginBinary( + remotePlugin, + localPlugin.version, + changelogs, + compatibleShopwareVersions, + ); + } else if (Program.opts().force) { + existingBinary = conflictingBinary; + } else { + throw new Error(`The binary version ${conflictingBinary.version} you're trying to upload already exists for plugin ${remotePlugin.name}`); + } + + let updatedBinary = await commander.uploadPluginBinaryFile( + remotePlugin, + existingBinary, + pluginZipFilePath, + ); + + // Always update the binary after uploading to set the licenseCheckRequired flag because it is not settable + // during creation + updatedBinary = await commander.updatePluginBinary( + remotePlugin, + updatedBinary, + changelogs, + compatibleShopwareVersions, + Program.opts().licenseCheckRequired, + ); + + const uploadSuccessMessage = `New version ${updatedBinary.version} of plugin ${remotePlugin.name} uploaded! \u{2705}`; console.error(Chalk.green.bold(uploadSuccessMessage)); if (!Program.opts().release) { util.showGrowlIfEnabled(uploadSuccessMessage); @@ -186,10 +197,10 @@ async function main() { // Check review status const review = remotePlugin.reviews[remotePlugin.reviews.length - 1]; if (review.status.name !== 'approved') { - throw new Error(`The review of ${remotePlugin.name} v${remotePlugin.latestBinary.version} finished with status '${review.status.name}':\n\n${review.comment}`); + throw new Error(`The review of ${remotePlugin.name} v${updatedBinary.version} finished with status '${review.status.name}':\n\n${review.comment}`); } - const successMessage = `Review succeeded! Version ${remotePlugin.latestBinary.version} of plugin ${remotePlugin.name} is now available in the store. \u{1F389}`; + const successMessage = `Review succeeded! Version ${updatedBinary.version} of plugin ${remotePlugin.name} is now available in the store. \u{1F389}`; util.showGrowlIfEnabled(successMessage); console.error(Chalk.green.bold(successMessage)); diff --git a/lib/shopwareStoreCommander.js b/lib/shopwareStoreCommander.js index aa9c1a6..cc9234d 100644 --- a/lib/shopwareStoreCommander.js +++ b/lib/shopwareStoreCommander.js @@ -59,6 +59,7 @@ module.exports = class ShopwareStoreCommander { // Save producer ID (required to load e.g. plugins) this.accountData = { producerId: producers.data[0].id, + supportedLocales: producers.data[0].supportedLanguages.map(language => language.name), }; const plugins = await this.client.get('plugins', { @@ -126,21 +127,82 @@ module.exports = class ShopwareStoreCommander { /** * @param {Object} plugin - * @param {String} filePath + * @param {String} version + * @param {Array} changelogs + * @param {Array} compatibleShopwareVersions * @return {Object} */ - async uploadPluginBinary(plugin, filePath) { - const binaryName = filePath.split(/(\\|\/)/g).pop(); - this.logEmitter.emit('info', `Uploading binary ${binaryName} for plugin ${plugin.name}...`); + async createPluginBinary(plugin, version, changelogs, compatibleShopwareVersions) { + this.logEmitter.emit('info', `Creating binary version ${version} of plugin ${plugin.name}...`); - const { data, headers } = await getPostDataFromFile(filePath); - const res = await this.client.post(`plugins/${plugin.id}/binaries`, data, { headers }); + const accountData = await this.getAccountData(); + const { data: newBinary } = await this.client.post( + `producers/${accountData.producerId}/plugins/${plugin.id}/binaries`, + { + version, + changelogs, + softwareVersions: compatibleShopwareVersions, + }, + ); - // Add the binary info to the plugin - plugin.binaries = res.data; + const matchingBinaryIndex = plugin.binaries.findIndex(existingBinary => existingBinary.id === newBinary.id); + if (matchingBinaryIndex === -1) { + plugin.binaries.push(newBinary); + } else { + plugin.binaries[matchingBinaryIndex] = newBinary; + } plugin.latestBinary = plugin.binaries[plugin.binaries.length - 1]; - return plugin; + return newBinary; + } + + /** + * @param {Object} plugin + * @param {Object} binary + * @param {Array} changelogs + * @param {Array} compatibleShopwareVersions + * @param {Boolean} licenseCheckRequired + * @return {Object} + */ + async updatePluginBinary(plugin, binary, changelogs, compatibleShopwareVersions, licenseCheckRequired) { + this.logEmitter.emit('info', `Updating binary version ${binary.version} of plugin ${plugin.name}...`); + + const accountData = await this.getAccountData(); + const { data: updatedBinary } = await this.client.put( + `producers/${accountData.producerId}/plugins/${plugin.id}/binaries/${binary.id}`, + { + changelogs, + softwareVersions: compatibleShopwareVersions, + licenseCheckRequired, + // ionCube encryption is no longer supported + ionCubeEncrypted: false, + }, + ); + + const matchingBinaryIndex = plugin.binaries.findIndex(existingBinary => existingBinary.id === binary.id); + if (matchingBinaryIndex !== -1) { + plugin.binaries[matchingBinaryIndex] = updatedBinary; + plugin.latestBinary = plugin.binaries[plugin.binaries.length - 1]; + } + + return updatedBinary; + } + + /** + * @param {Object} plugin + * @param {String} filePath + */ + async validatePluginBinaryFile(plugin, filePath) { + const binaryName = filePath.split(/(\\|\/)/g).pop(); + this.logEmitter.emit('info', `Validating binary ${binaryName} for plugin ${plugin.name}...`); + + const { data, headers } = await getPostDataFromFile(filePath); + const accountData = await this.getAccountData(); + await this.client.post( + `producers/${accountData.producerId}/plugins/${plugin.id}/binaries/validate`, + data, + { headers }, + ); } /** @@ -149,18 +211,25 @@ module.exports = class ShopwareStoreCommander { * @param {String} filePath * @return {Object} */ - async updatePluginBinary(plugin, binary, filePath) { + async uploadPluginBinaryFile(plugin, binary, filePath) { const binaryName = filePath.split(/(\\|\/)/g).pop(); - this.logEmitter.emit('info', `Uploading updated binary ${binaryName} for plugin ${plugin.name}...`); + this.logEmitter.emit('info', `Uploading binary ${binaryName} for plugin ${plugin.name}...`); const { data, headers } = await getPostDataFromFile(filePath); - const res = await this.client.post(`plugins/${plugin.id}/binaries/${binary.id}/file`, data, { headers }); + const accountData = await this.getAccountData(); + const { data: updatedBinary } = await this.client.post( + `producers/${accountData.producerId}/plugins/${plugin.id}/binaries/${binary.id}/file`, + data, + { headers }, + ); - // Add the binary info to the plugin - plugin.binaries = res.data; - plugin.latestBinary = plugin.binaries[plugin.binaries.length - 1]; + const matchingBinaryIndex = plugin.binaries.findIndex(existingBinary => existingBinary.id === binary.id); + if (matchingBinaryIndex !== -1) { + plugin.binaries[matchingBinaryIndex] = updatedBinary; + plugin.latestBinary = plugin.binaries[plugin.binaries.length - 1]; + } - return plugin; + return updatedBinary; } /** @@ -171,7 +240,11 @@ module.exports = class ShopwareStoreCommander { async savePluginBinary(plugin, binary) { this.logEmitter.emit('info', `Saving binary version ${binary.version} of plugin ${plugin.name}...`); - const res = await this.client.put(`plugins/${plugin.id}/binaries/${binary.id}`, binary); + const accountData = await this.getAccountData(); + const res = await this.client.put( + `producers/${accountData.producerId}/plugins/${plugin.id}/binaries/${binary.id}`, + binary, + ); // Save the updated data locally binary.changelogs = res.data.changelogs; binary.compatibleSoftwareVersions = res.data.compatibleSoftwareVersions; @@ -274,8 +347,10 @@ module.exports = class ShopwareStoreCommander { async loadExtraPluginFields(plugin, fields) { plugin.scsLoadedExtraFields = plugin.scsLoadedExtraFields || []; // Load all extra fields + const accountData = await this.getAccountData(); const extraFieldPromises = fields.map(async (field) => { - const res = await this.client.get(`plugins/${plugin.id}/${field}`); + const path = (field === 'binaries') ? `producers/${accountData.producerId}/plugins/${plugin.id}/${field}` : `plugins/${plugin.id}/${field}`; + const res = await this.client.get(path); plugin[field] = res.data; // Mark the extra field as loaded if (plugin.scsLoadedExtraFields.indexOf(field) === -1) { From 84f300d58d591b3c1709ccfed7968130ec385829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sven=20Mu=CC=88nnich?= Date: Tue, 7 May 2024 17:12:30 +0200 Subject: [PATCH 08/18] Update `actions/checkout` and `actions/setup-node` --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 904a039..dd02701 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,8 +6,8 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: '16' - run: npm ci @@ -19,8 +19,8 @@ jobs: if: startsWith(github.ref, 'refs/tags/') runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: '16' - uses: JS-DevTools/npm-publish@v1 From 7e1046743c79b1328f227ef553a004575f119bbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sven=20Mu=CC=88nnich?= Date: Tue, 7 May 2024 21:44:50 +0200 Subject: [PATCH 09/18] Require at least node v18 --- .github/workflows/ci.yml | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd02701..87e49cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: '16' + node-version-file: 'package.json' - run: npm ci - run: npm run eslint - run: npm run cspell @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: '16' + node-version-file: 'package.json' - uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_ACCESS_TOKEN }} diff --git a/package.json b/package.json index 9bdb6e9..00fc8e7 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "viison-style-guide": "git+https://github.com/pickware/style-guide.git" }, "engines": { - "node": ">=14.0.0" + "node": ">=18.0.0" }, "preferGlobal": true } From 4af5d517d94586adfbd5e5e95594ea9421ee4b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sven=20Mu=CC=88nnich?= Date: Tue, 7 May 2024 17:14:41 +0200 Subject: [PATCH 10/18] Refactor publishing of package to npm registry --- .github/workflows/ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87e49cd..39f1041 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,8 @@ jobs: - uses: actions/setup-node@v4 with: node-version-file: 'package.json' - - uses: JS-DevTools/npm-publish@v1 - with: - token: ${{ secrets.NPM_ACCESS_TOKEN }} + registry-url: 'https://registry.npmjs.org' + - run: npm ci + - run: npm publish --access public + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }} From f0cfe7eefc5fff259d3183d90b10f6d3d99d34f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sven=20Mu=CC=88nnich?= Date: Tue, 7 May 2024 17:22:32 +0200 Subject: [PATCH 11/18] Enable dependency caching in GitHub Actions workflow `CI` --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39f1041..27609ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,6 +10,8 @@ jobs: - uses: actions/setup-node@v4 with: node-version-file: 'package.json' + cache: 'npm' + cache-dependency-path: 'package-lock.json' - run: npm ci - run: npm run eslint - run: npm run cspell @@ -23,6 +25,8 @@ jobs: - uses: actions/setup-node@v4 with: node-version-file: 'package.json' + cache: 'npm' + cache-dependency-path: 'package-lock.json' registry-url: 'https://registry.npmjs.org' - run: npm ci - run: npm publish --access public From f0321b90c32da3c30a4656aaf1a32e8455527f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sven=20Mu=CC=88nnich?= Date: Tue, 7 May 2024 17:23:51 +0200 Subject: [PATCH 12/18] Automatically cancel previous CI runs of the same git ref --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 27609ff..573c5b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,11 @@ name: CI on: [push] +# Automatically cancel previous runs for the same ref (i.e. branch) +concurrency: + group: ${{ github.ref }}-${{ github.event_name }} + cancel-in-progress: true + jobs: lint: runs-on: ubuntu-latest From 7e8a32f0e64769ea8a730b2039cdb726202bcf53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sven=20Mu=CC=88nnich?= Date: Tue, 7 May 2024 17:40:45 +0200 Subject: [PATCH 13/18] Prepare release of v4.0.0 --- CHANGELOG.md | 10 ++++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a531247..8c4d651 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## 4.0.0 + +### Breaking changes + +* Drops support of Node.js < v18. + +### Bug fixes + +* Fixes `upload` command. + ## 3.1.0 * Enables support for Node.js > v14. diff --git a/package-lock.json b/package-lock.json index 0849413..54d95fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "scs-commander", - "version": "3.1.0", + "version": "4.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "scs-commander", - "version": "3.1.0", + "version": "4.0.0", "license": "MIT", "dependencies": { "axios": "^0.21.1", diff --git a/package.json b/package.json index 00fc8e7..368fb1d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "scs-commander", - "version": "3.1.0", + "version": "4.0.0", "description": "A CLI tool for interacting with the Shopware Community Store.", "keywords": [ "shopware", From 7329fd41b306820f172b75ea33ecdf81fa7d93ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 21:54:44 +0200 Subject: [PATCH 14/18] Bump jszip from 3.7.0 to 3.8.0 (#58) Bumps [jszip](https://github.com/Stuk/jszip) from 3.7.0 to 3.8.0. - [Release notes](https://github.com/Stuk/jszip/releases) - [Changelog](https://github.com/Stuk/jszip/blob/main/CHANGES.md) - [Commits](https://github.com/Stuk/jszip/compare/v3.7.0...v3.8.0) --- updated-dependencies: - dependency-name: jszip dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 54d95fd..13d7a3e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "viison-style-guide": "git+https://github.com/pickware/style-guide.git" }, "engines": { - "node": ">=14.0.0" + "node": ">=18.0.0" } }, "node_modules/@babel/code-frame": { @@ -2217,9 +2217,9 @@ } }, "node_modules/jszip": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.0.tgz", - "integrity": "sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.8.0.tgz", + "integrity": "sha512-cnpQrXvFSLdsR9KR5/x7zdf6c3m8IhZfZzSblFEHSqBaVwD2nvJ4CuCKLyvKvwBgZm08CgfSoiTBQLm5WW9hGw==", "dependencies": { "lie": "~3.3.0", "pako": "~1.0.2", @@ -5436,9 +5436,9 @@ } }, "jszip": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.0.tgz", - "integrity": "sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.8.0.tgz", + "integrity": "sha512-cnpQrXvFSLdsR9KR5/x7zdf6c3m8IhZfZzSblFEHSqBaVwD2nvJ4CuCKLyvKvwBgZm08CgfSoiTBQLm5WW9hGw==", "requires": { "lie": "~3.3.0", "pako": "~1.0.2", From 95c67f7c44b9e3e413d5ccd2fa7d282dbbb2a7a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 21:56:26 +0200 Subject: [PATCH 15/18] Bump semver from 7.3.5 to 7.5.2 (#65) Bumps [semver](https://github.com/npm/node-semver) from 7.3.5 to 7.5.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v7.3.5...v7.5.2) --- updated-dependencies: - dependency-name: semver dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 13d7a3e..6d2b5e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3169,9 +3169,9 @@ "dev": true }, "node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz", + "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -6182,9 +6182,9 @@ "dev": true }, "semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz", + "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==", "requires": { "lru-cache": "^6.0.0" } From df4b2681a5090d7ad9bb7fedfd4919df70198c3f Mon Sep 17 00:00:00 2001 From: Hannes Wernery Date: Mon, 13 May 2024 11:39:10 +0200 Subject: [PATCH 16/18] Fix typo in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4553b41..ba7e71b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,7 +38,7 @@ ## 2.2.0 -* Adds compatibility with Showpare's 4-digit version numbers. +* Adds compatibility with Shopware's 4-digit version numbers. ## 2.1.0 From afc84c6c6221b9faa4eec8c3a697ea7e4f22a201 Mon Sep 17 00:00:00 2001 From: Hannes Wernery Date: Mon, 13 May 2024 11:40:24 +0200 Subject: [PATCH 17/18] npm install --- package-lock.json | 201 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 190 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index f6d0c9b..aaa1f66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,7 @@ "": { "name": "scs-commander", "version": "4.0.0", + "hasInstallScript": true, "license": "MIT", "dependencies": { "axios": "^0.21.1", @@ -19,6 +20,7 @@ "concat-stream": "^2.0.0", "diff": "^5.0.0", "dotenv": "^9.0.1", + "execa": "^4.0.3", "exponential-backoff": "^3.1.0", "form-data": "^4.0.0", "jszip": "^3.6.0", @@ -1156,6 +1158,14 @@ "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", "dev": true }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dependencies": { + "once": "^1.4.0" + } + }, "node_modules/error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -1551,6 +1561,104 @@ "node": ">=0.10.0" } }, + "node_modules/execa": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", + "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", + "dependencies": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/execa/node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/execa/node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/execa/node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/execa/node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "engines": { + "node": ">=8" + } + }, + "node_modules/execa/node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/execa/node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "engines": { + "node": ">=8" + } + }, + "node_modules/execa/node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/exponential-backoff": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.0.tgz", @@ -1745,6 +1853,20 @@ "node": ">=0.10.0" } }, + "node_modules/get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -1848,6 +1970,14 @@ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", "dev": true }, + "node_modules/human-signals": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", + "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", + "engines": { + "node": ">=8.12.0" + } + }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -2086,6 +2216,17 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-string": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", @@ -2495,6 +2636,11 @@ "node": ">=0.10.0" } }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + }, "node_modules/micromatch": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", @@ -2659,6 +2805,25 @@ "semver": "bin/semver" } }, + "node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/npm-run-path/node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "engines": { + "node": ">=8" + } + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -2736,7 +2901,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "dependencies": { "wrappy": "1" } @@ -2969,6 +3133,15 @@ "node": ">=0.4.0" } }, + "node_modules/pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, "node_modules/punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", @@ -3219,8 +3392,7 @@ "node_modules/signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "dev": true + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, "node_modules/slice-ansi": { "version": "2.1.0", @@ -3342,6 +3514,14 @@ "node": ">=4" } }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "engines": { + "node": ">=6" + } + }, "node_modules/strip-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", @@ -3638,8 +3818,7 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "node_modules/write": { "version": "1.0.3", @@ -4944,9 +5123,9 @@ "dev": true }, "execa": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz", - "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", + "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", "requires": { "cross-spawn": "^7.0.0", "get-stream": "^5.0.0", @@ -5420,9 +5599,9 @@ } }, "is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" }, "is-string": { "version": "1.0.5", From 788e4482a57bc6b67d4b3a55f6a63005cd7e3ffe Mon Sep 17 00:00:00 2001 From: Hannes Wernery Date: Mon, 13 May 2024 11:46:16 +0200 Subject: [PATCH 18/18] Add "execa" to cspell.json --- .cspell.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.cspell.json b/.cspell.json index 5d58462..214593f 100644 --- a/.cspell.json +++ b/.cspell.json @@ -2,6 +2,7 @@ "allowCompoundWords": true, "words": [ "Changelogs", + "execa", "jsdiff", "jszip", "promisify",