From 43b2b9c7918ddee8508d405dd27d74a51bfda2cf Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Thu, 1 Dec 2022 17:53:47 +0100 Subject: [PATCH 01/36] cli: removed unused @sucrase/jest-plugin dependency Signed-off-by: Patrik Oldsberg --- .changeset/eleven-jeans-train.md | 5 +++++ packages/cli/config/jestSucraseTransform.js | 4 ---- packages/cli/package.json | 1 - yarn.lock | 12 +----------- 4 files changed, 6 insertions(+), 16 deletions(-) create mode 100644 .changeset/eleven-jeans-train.md diff --git a/.changeset/eleven-jeans-train.md b/.changeset/eleven-jeans-train.md new file mode 100644 index 0000000000..7039c85900 --- /dev/null +++ b/.changeset/eleven-jeans-train.md @@ -0,0 +1,5 @@ +--- +'@backstage/cli': patch +--- + +Removed the unused dependency on `@sucrase/jest-plugin`. diff --git a/packages/cli/config/jestSucraseTransform.js b/packages/cli/config/jestSucraseTransform.js index 99ebc04877..64e7307cab 100644 --- a/packages/cli/config/jestSucraseTransform.js +++ b/packages/cli/config/jestSucraseTransform.js @@ -17,7 +17,6 @@ const { createHash } = require('crypto'); const { transform } = require('sucrase'); const sucrasePkg = require('sucrase/package.json'); -const sucrasePluginPkg = require('@sucrase/jest-plugin/package.json'); const ESM_REGEX = /\b(?:import|export)\b/; @@ -70,15 +69,12 @@ function createTransformer(config) { return { code: source }; }; - // TODO: contribute something like this to @sucrase/jest-plugin const getCacheKey = sourceText => { return createHash('md5') .update(sourceText) .update(Buffer.alloc(1)) .update(sucrasePkg.version) .update(Buffer.alloc(1)) - .update(sucrasePluginPkg.version) - .update(Buffer.alloc(1)) .update(JSON.stringify(config)) .update(Buffer.alloc(1)) .update('1') // increment whenever the transform logic in this file changes diff --git a/packages/cli/package.json b/packages/cli/package.json index eef838d8ca..eef1b80ca5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -46,7 +46,6 @@ "@spotify/eslint-config-base": "^14.0.0", "@spotify/eslint-config-react": "^14.0.0", "@spotify/eslint-config-typescript": "^14.0.0", - "@sucrase/jest-plugin": "^2.1.1", "@sucrase/webpack-loader": "^2.0.0", "@svgr/plugin-jsx": "6.5.x", "@svgr/plugin-svgo": "6.5.x", diff --git a/yarn.lock b/yarn.lock index f2775cff03..d1f117427e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3617,7 +3617,6 @@ __metadata: "@spotify/eslint-config-base": ^14.0.0 "@spotify/eslint-config-react": ^14.0.0 "@spotify/eslint-config-typescript": ^14.0.0 - "@sucrase/jest-plugin": ^2.1.1 "@sucrase/webpack-loader": ^2.0.0 "@svgr/plugin-jsx": 6.5.x "@svgr/plugin-svgo": 6.5.x @@ -12928,15 +12927,6 @@ __metadata: languageName: node linkType: hard -"@sucrase/jest-plugin@npm:^2.1.1": - version: 2.2.1 - resolution: "@sucrase/jest-plugin@npm:2.2.1" - dependencies: - sucrase: ^3.18.0 - checksum: 818627b40392875107722530af1a58f195d7166a5c5149db425db8ac3ff741b39d1c722a09dfbe7b686c87002616da7ef3c861dbe6f6f5390f3ca8f08c2a975a - languageName: node - linkType: hard - "@sucrase/webpack-loader@npm:^2.0.0": version: 2.0.0 resolution: "@sucrase/webpack-loader@npm:2.0.0" @@ -35766,7 +35756,7 @@ __metadata: languageName: node linkType: hard -"sucrase@npm:^3.18.0, sucrase@npm:^3.20.2": +"sucrase@npm:^3.20.2": version: 3.29.0 resolution: "sucrase@npm:3.29.0" dependencies: From dc879a3902d80f118b1c59c0421cc54c2bc91d1a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 10:15:33 +0000 Subject: [PATCH 02/36] Update dependency @types/cors to v2.8.13 Signed-off-by: Renovate Bot --- yarn.lock | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 48fffeed0d..8dbfdeed9c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13790,13 +13790,22 @@ __metadata: languageName: node linkType: hard -"@types/cors@npm:2.8.12, @types/cors@npm:^2.8.6": +"@types/cors@npm:2.8.12": version: 2.8.12 resolution: "@types/cors@npm:2.8.12" checksum: 8c45f112c7d1d2d831b4b266f2e6ed33a1887a35dcbfe2a18b28370751fababb7cd045e745ef84a523c33a25932678097bf79afaa367c6cb3fa0daa7a6438257 languageName: node linkType: hard +"@types/cors@npm:^2.8.6": + version: 2.8.13 + resolution: "@types/cors@npm:2.8.13" + dependencies: + "@types/node": "*" + checksum: 7ef197ea19d2e5bf1313b8416baa6f3fd6dd887fd70191da1f804f557395357dafd8bc8bed0ac60686923406489262a7c8a525b55748f7b2b8afa686700de907 + languageName: node + linkType: hard + "@types/cron@npm:^2.0.0": version: 2.0.0 resolution: "@types/cron@npm:2.0.0" From 5a9b490d698187a2017984b434f878206387b2bc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 05:17:22 +0000 Subject: [PATCH 03/36] Update dependency json-schema-library to v7.4.1 Signed-off-by: Renovate Bot --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2885799d7f..50c2920a83 100644 --- a/yarn.lock +++ b/yarn.lock @@ -26535,15 +26535,15 @@ __metadata: linkType: hard "json-schema-library@npm:^7.3.9": - version: 7.3.9 - resolution: "json-schema-library@npm:7.3.9" + version: 7.4.1 + resolution: "json-schema-library@npm:7.4.1" dependencies: "@sagold/json-pointer": ^5.0.0 "@sagold/json-query": ^6.0.0 deepmerge: ^4.2.2 fast-deep-equal: ^3.1.3 valid-url: ^1.0.9 - checksum: de40dd4d5f1ce438fa45703402716f2cf543b8e89d4ffc3618045f771f6f749928984905db761e9cf7e8602d213f4578c3e983a40e0d49013c0fea1488d397a8 + checksum: 5d64cc325d43b0d661b8a841e06345eda6bcfb11f0af703bcc39475ea9389d22fbfcbd1d70e5b5cf5cdec76dd2edcb52e45dddb131aed6ffc97544ef5660d847 languageName: node linkType: hard From 1018dcdd4a8490ac90c92b5b37aa84a62cffd6ad Mon Sep 17 00:00:00 2001 From: Dawit Ameneshewa Date: Tue, 6 Dec 2022 10:11:45 +0300 Subject: [PATCH 04/36] Make `StorageApi` notify its subscribers when localStorage values change in other tabs/windows Signed-off-by: Dawit Ameneshewa --- .../src/apis/implementations/StorageApi/WebStorage.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts b/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts index b0cbfbd883..c17cc56494 100644 --- a/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts +++ b/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts @@ -89,9 +89,19 @@ export class WebStorage implements StorageApi { observe$( key: string, ): Observable> { + this.addStorageEventListener(); return this.observable.filter(({ key: messageKey }) => messageKey === key); } + private addStorageEventListener() { + window.addEventListener('storage', event => { + if (event.key?.includes(this.namespace)) { + const key = event.key.replace(`${this.namespace}/`, ''); + this.notifyChanges(key); + } + }); + } + private getKeyName(key: string) { return `${this.namespace}/${encodeURIComponent(key)}`; } From 653d7912acf8a0c29179f2fc4b1d227e9fed3065 Mon Sep 17 00:00:00 2001 From: Dawit Ameneshewa Date: Tue, 6 Dec 2022 10:29:37 +0300 Subject: [PATCH 05/36] Add changeset Signed-off-by: Dawit Ameneshewa --- .changeset/wild-pears-enjoy.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/wild-pears-enjoy.md diff --git a/.changeset/wild-pears-enjoy.md b/.changeset/wild-pears-enjoy.md new file mode 100644 index 0000000000..5b987e49dd --- /dev/null +++ b/.changeset/wild-pears-enjoy.md @@ -0,0 +1,5 @@ +--- +'@backstage/core-app-api': patch +--- + +Made `StorageApi` notify its subscribers when localStorage values change in other tabs/windows From 4640d6e286de2572a9b42aa691e21cafae4aaf8f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 10:01:58 +0000 Subject: [PATCH 06/36] Update dependency @types/object-hash to v3 Signed-off-by: Renovate Bot --- .changeset/renovate-1354b20.md | 5 +++++ plugins/airbrake/package.json | 2 +- yarn.lock | 10 +++++----- 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 .changeset/renovate-1354b20.md diff --git a/.changeset/renovate-1354b20.md b/.changeset/renovate-1354b20.md new file mode 100644 index 0000000000..961213caad --- /dev/null +++ b/.changeset/renovate-1354b20.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-airbrake': patch +--- + +Updated dependency `@types/object-hash` to `^3.0.0`. diff --git a/plugins/airbrake/package.json b/plugins/airbrake/package.json index 8be500e662..04a89338d9 100644 --- a/plugins/airbrake/package.json +++ b/plugins/airbrake/package.json @@ -48,7 +48,7 @@ "@testing-library/react": "^12.1.3", "@testing-library/user-event": "^14.0.0", "@types/node": "^16.11.26", - "@types/object-hash": "^2.2.1", + "@types/object-hash": "^3.0.0", "cross-fetch": "^3.1.5", "msw": "^0.49.0" }, diff --git a/yarn.lock b/yarn.lock index 2885799d7f..42362d5ed9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4329,7 +4329,7 @@ __metadata: "@testing-library/react": ^12.1.3 "@testing-library/user-event": ^14.0.0 "@types/node": ^16.11.26 - "@types/object-hash": ^2.2.1 + "@types/object-hash": ^3.0.0 cross-fetch: ^3.1.5 msw: ^0.49.0 object-hash: ^3.0.0 @@ -14642,10 +14642,10 @@ __metadata: languageName: node linkType: hard -"@types/object-hash@npm:^2.2.1": - version: 2.2.1 - resolution: "@types/object-hash@npm:2.2.1" - checksum: bbcbf076903e11fa6d61dd5cc365bce2b080b18502ef52672a427443262e465d7b46b8f2821e8cea0307de66aee2eb92ad6e2bed2346acd7c8de118d4123fe3a +"@types/object-hash@npm:^3.0.0": + version: 3.0.1 + resolution: "@types/object-hash@npm:3.0.1" + checksum: 24853a95fdb7ab40ae170b5d8e6437d436289d41fdf3c480a71e8324257ffaae5954d10885998fa4b080d74a04866cc421d0e36a0cf6006d4a8fce003ee4d61c languageName: node linkType: hard From e2aaa67f62f93a948baca763dffd7f3ff989afb9 Mon Sep 17 00:00:00 2001 From: Dawit Ameneshewa Date: Tue, 6 Dec 2022 13:24:38 +0300 Subject: [PATCH 07/36] Fix failing docs quality check Signed-off-by: Dawit Ameneshewa --- .changeset/wild-pears-enjoy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/wild-pears-enjoy.md b/.changeset/wild-pears-enjoy.md index 5b987e49dd..8cee4daa54 100644 --- a/.changeset/wild-pears-enjoy.md +++ b/.changeset/wild-pears-enjoy.md @@ -2,4 +2,4 @@ '@backstage/core-app-api': patch --- -Made `StorageApi` notify its subscribers when localStorage values change in other tabs/windows +Made `StorageApi` notify its subscribers when `localStorage` values change in other tabs/windows From 07f5ea45dab90b4cd87d2d99f4a5ed66df51151e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 10:44:31 +0000 Subject: [PATCH 08/36] Update dependency @keyv/redis to v2.5.4 Signed-off-by: Renovate Bot --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6311ccc002..572ab39fae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10903,11 +10903,11 @@ __metadata: linkType: hard "@keyv/redis@npm:^2.5.3": - version: 2.5.3 - resolution: "@keyv/redis@npm:2.5.3" + version: 2.5.4 + resolution: "@keyv/redis@npm:2.5.4" dependencies: ioredis: ^5.2.4 - checksum: db6be54624320f5d03856985fee5151601fa278d63ef98feac12f89188fbf86b972e7f5ca3ece0d6137c81038b1eb3c42805beaf51c4c963cca35c2b7d68be92 + checksum: 02f557e0bc0343aea44b8dd4b6ff273da5833b935236c4036fa89e90b1d92d9688dafa064d5318d26744a6c72497cd4c41dcac825cb8d5919271e3a25a3cadbb languageName: node linkType: hard From 151c0e147723e147773de3835f0d2813dba59339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Tue, 6 Dec 2022 12:07:23 +0100 Subject: [PATCH 09/36] remove it instead MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- .changeset/renovate-1354b20.md | 5 ----- .changeset/spicy-pianos-train.md | 5 +++++ plugins/airbrake/package.json | 2 -- .../EntityAirbrakeWidget.tsx | 16 ++++++++-------- yarn.lock | 9 --------- 5 files changed, 13 insertions(+), 24 deletions(-) delete mode 100644 .changeset/renovate-1354b20.md create mode 100644 .changeset/spicy-pianos-train.md diff --git a/.changeset/renovate-1354b20.md b/.changeset/renovate-1354b20.md deleted file mode 100644 index 961213caad..0000000000 --- a/.changeset/renovate-1354b20.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-airbrake': patch ---- - -Updated dependency `@types/object-hash` to `^3.0.0`. diff --git a/.changeset/spicy-pianos-train.md b/.changeset/spicy-pianos-train.md new file mode 100644 index 0000000000..9a93edb3ce --- /dev/null +++ b/.changeset/spicy-pianos-train.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-airbrake': patch +--- + +Remove the `object-hash` dependency diff --git a/plugins/airbrake/package.json b/plugins/airbrake/package.json index 04a89338d9..d85e8f735b 100644 --- a/plugins/airbrake/package.json +++ b/plugins/airbrake/package.json @@ -32,7 +32,6 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", - "object-hash": "^3.0.0", "react-use": "^17.2.4" }, "peerDependencies": { @@ -48,7 +47,6 @@ "@testing-library/react": "^12.1.3", "@testing-library/user-event": "^14.0.0", "@types/node": "^16.11.26", - "@types/object-hash": "^3.0.0", "cross-fetch": "^3.1.5", "msw": "^0.49.0" }, diff --git a/plugins/airbrake/src/components/EntityAirbrakeWidget/EntityAirbrakeWidget.tsx b/plugins/airbrake/src/components/EntityAirbrakeWidget/EntityAirbrakeWidget.tsx index 6c2e4b8686..6780b80dbc 100644 --- a/plugins/airbrake/src/components/EntityAirbrakeWidget/EntityAirbrakeWidget.tsx +++ b/plugins/airbrake/src/components/EntityAirbrakeWidget/EntityAirbrakeWidget.tsx @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + import { Entity } from '@backstage/catalog-model'; -import React from 'react'; -import { Grid, Typography } from '@material-ui/core'; import { EmptyState, ErrorPanel, @@ -23,12 +22,13 @@ import { MissingAnnotationEmptyState, Progress, } from '@backstage/core-components'; -import hash from 'object-hash'; -import { makeStyles } from '@material-ui/core/styles'; -import { BackstageTheme } from '@backstage/theme'; import { useApi } from '@backstage/core-plugin-api'; -import { airbrakeApiRef } from '../../api'; +import { BackstageTheme } from '@backstage/theme'; +import { Grid, Typography } from '@material-ui/core'; +import { makeStyles } from '@material-ui/core/styles'; +import React from 'react'; import useAsync from 'react-use/lib/useAsync'; +import { airbrakeApiRef } from '../../api'; import { AIRBRAKE_PROJECT_ID_ANNOTATION, useProjectId } from '../useProjectId'; const useStyles = makeStyles(() => ({ @@ -64,8 +64,8 @@ export const EntityAirbrakeWidget = ({ entity }: { entity: Entity }) => { {value.groups?.map(group => ( - {group.errors?.map(groupError => ( - + {group.errors?.map((groupError, i) => ( + {groupError.message} diff --git a/yarn.lock b/yarn.lock index 42362d5ed9..049c3c998d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4329,10 +4329,8 @@ __metadata: "@testing-library/react": ^12.1.3 "@testing-library/user-event": ^14.0.0 "@types/node": ^16.11.26 - "@types/object-hash": ^3.0.0 cross-fetch: ^3.1.5 msw: ^0.49.0 - object-hash: ^3.0.0 react-use: ^17.2.4 peerDependencies: react: ^16.13.1 || ^17.0.0 @@ -14642,13 +14640,6 @@ __metadata: languageName: node linkType: hard -"@types/object-hash@npm:^3.0.0": - version: 3.0.1 - resolution: "@types/object-hash@npm:3.0.1" - checksum: 24853a95fdb7ab40ae170b5d8e6437d436289d41fdf3c480a71e8324257ffaae5954d10885998fa4b080d74a04866cc421d0e36a0cf6006d4a8fce003ee4d61c - languageName: node - linkType: hard - "@types/parse-json@npm:^4.0.0": version: 4.0.0 resolution: "@types/parse-json@npm:4.0.0" From 1458b430406743f902a60f5f8e2083814179a663 Mon Sep 17 00:00:00 2001 From: Johan Haals Date: Tue, 6 Dec 2022 14:30:20 +0100 Subject: [PATCH 10/36] chore: simplify catalogService tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Fredrik Adelöw Signed-off-by: Johan Haals --- plugins/catalog-node/src/catalogService.test.ts | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/plugins/catalog-node/src/catalogService.test.ts b/plugins/catalog-node/src/catalogService.test.ts index 593f5bd59c..230af79a88 100644 --- a/plugins/catalog-node/src/catalogService.test.ts +++ b/plugins/catalog-node/src/catalogService.test.ts @@ -17,7 +17,6 @@ import { PluginEndpointDiscovery } from '@backstage/backend-common'; import { createBackendModule, - createServiceFactory, coreServices, } from '@backstage/backend-plugin-api'; import { startTestBackend } from '@backstage/backend-test-utils'; @@ -27,15 +26,6 @@ import { catalogServiceRef } from './catalogService'; describe('catalogServiceRef', () => { it('should return a catalogClient', async () => { expect.assertions(1); - - const mockDiscoveryFactory = createServiceFactory({ - service: coreServices.discovery, - deps: {}, - factory: async ({}) => { - return async () => jest.fn() as unknown as PluginEndpointDiscovery; - }, - }); - const testModule = createBackendModule({ moduleId: 'test', pluginId: 'test', @@ -52,7 +42,9 @@ describe('catalogServiceRef', () => { }); await startTestBackend({ - services: [mockDiscoveryFactory], + services: [ + [coreServices.discovery, {} as unknown as PluginEndpointDiscovery], + ], features: [testModule()], }); }); From e5dec1b3864e108e7eaca8f6131c16c85290de0e Mon Sep 17 00:00:00 2001 From: Dawit Ameneshewa Date: Tue, 6 Dec 2022 17:53:26 +0300 Subject: [PATCH 11/36] Add only one, global storage event listener for all buckets Signed-off-by: Dawit Ameneshewa --- .../implementations/StorageApi/WebStorage.ts | 20 +++++++++++-------- .../src/apis/definitions/StorageApi.ts | 8 ++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts b/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts index c17cc56494..0f56a608c1 100644 --- a/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts +++ b/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts @@ -24,6 +24,14 @@ import ObservableImpl from 'zen-observable'; const buckets = new Map(); +window.addEventListener('storage', event => { + for (const [bucketPath, webStorage] of buckets.entries()) { + if (event.key?.startsWith(bucketPath)) { + webStorage.handleStorageChange(event.key); + } + } +}); + /** * An implementation of the storage API, that uses the browser's local storage. * @@ -89,17 +97,13 @@ export class WebStorage implements StorageApi { observe$( key: string, ): Observable> { - this.addStorageEventListener(); return this.observable.filter(({ key: messageKey }) => messageKey === key); } - private addStorageEventListener() { - window.addEventListener('storage', event => { - if (event.key?.includes(this.namespace)) { - const key = event.key.replace(`${this.namespace}/`, ''); - this.notifyChanges(key); - } - }); + handleStorageChange(eventKey: StorageEvent['key']) { + if (!eventKey?.startsWith(this.namespace)) return; + const key = eventKey?.replace(`${this.namespace}/`, ''); + this.notifyChanges(key); } private getKeyName(key: string) { diff --git a/packages/core-plugin-api/src/apis/definitions/StorageApi.ts b/packages/core-plugin-api/src/apis/definitions/StorageApi.ts index 1506e5f143..f8c0948ec6 100644 --- a/packages/core-plugin-api/src/apis/definitions/StorageApi.ts +++ b/packages/core-plugin-api/src/apis/definitions/StorageApi.ts @@ -85,6 +85,14 @@ export interface StorageApi { key: string, ): Observable>; + /** + * Synchronizes stored data across multiple tabs or windows by using the + * browser's StorageEvent API. + * + * @param eventKey - The key of a storage event object + */ + handleStorageChange(eventKey: StorageEvent['key']): void; + /** * Returns an immediate snapshot value for the given key, if possible. * From 5cdd1a916bde75bb7f20787f3ba3d29ada5a3771 Mon Sep 17 00:00:00 2001 From: Paulo Eduardo Peixoto Date: Tue, 6 Dec 2022 16:03:07 -0300 Subject: [PATCH 12/36] docs(plugins/dynatrace): update doc with install processing. Signed-off-by: Paulo Eduardo Peixoto --- plugins/dynatrace/README.md | 39 +++++++++++++++++++++++++++- plugins/dynatrace/assets/plugin.png | Bin 0 -> 42898 bytes 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 plugins/dynatrace/assets/plugin.png diff --git a/plugins/dynatrace/README.md b/plugins/dynatrace/README.md index e5684b2017..8ea66e4c15 100644 --- a/plugins/dynatrace/README.md +++ b/plugins/dynatrace/README.md @@ -2,13 +2,17 @@ Welcome to the Dynatrace plugin! +![](./assets/plugin.png) + ## Getting started This plugin uses the Backstage proxy to communicate with Dynatrace's REST APIs. ### Setup -#### Dynatrace API Key +#### Requirements + +##### Dynatrace API Key The Dynatrace plugin will require the following information, to be used in the configuration options detailed below: @@ -17,6 +21,39 @@ The Dynatrace plugin will require the following information, to be used in the c - `entities.read` - `problems.read` +#### Install + +1. Install the plugin on your frontend: + +``` +yarn add --cwd packages/app @backstage/plugin-dynatrace +``` + +2. We created in our catalog the interface for using the integration with Dynatrace. + +```diff +# packages/app/src/components/catalog/EntityPage.tsx + +[...] ++ import { DynatraceTab, isDynatraceAvailable } from '@backstage/plugin-dynatrace' + +[...] + +const serviceEntityPage = ( + + [...] + + + + +) + +``` + #### Plugin Configuration This plugin requires a proxy endpoint for Dynatrace configured in `app-config.yaml` like so: diff --git a/plugins/dynatrace/assets/plugin.png b/plugins/dynatrace/assets/plugin.png new file mode 100644 index 0000000000000000000000000000000000000000..b1b9b0c7a76dd44281a3f8a9ab546e36cc1cb066 GIT binary patch literal 42898 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 Date: Tue, 6 Dec 2022 16:55:43 -0300 Subject: [PATCH 13/36] docs(plugins/dynatrace): update doc and package.json. Signed-off-by: Paulo Eduardo Peixoto --- plugins/dynatrace/README.md | 2 +- plugins/dynatrace/package.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/dynatrace/README.md b/plugins/dynatrace/README.md index 8ea66e4c15..e1b7bea406 100644 --- a/plugins/dynatrace/README.md +++ b/plugins/dynatrace/README.md @@ -2,7 +2,7 @@ Welcome to the Dynatrace plugin! -![](./assets/plugin.png) +![Example of the Dynatrace plugin](./assets/plugin.png) ## Getting started diff --git a/plugins/dynatrace/package.json b/plugins/dynatrace/package.json index a6117c67d5..2dc6e80b31 100644 --- a/plugins/dynatrace/package.json +++ b/plugins/dynatrace/package.json @@ -12,6 +12,11 @@ "backstage": { "role": "frontend-plugin" }, + "repository": { + "type": "git", + "url": "https://github.com/backstage/backstage", + "directory": "plugins/dynatrace" + }, "scripts": { "start": "backstage-cli package start", "build": "backstage-cli package build", From 7b89dba556f0a8a40dee08f3d885b5ad158ca2ff Mon Sep 17 00:00:00 2001 From: Paulo Eduardo Peixoto Date: Tue, 6 Dec 2022 17:12:44 -0300 Subject: [PATCH 14/36] docs(plugins/dynatrace/README.md): fix at example implements. Signed-off-by: Paulo Eduardo Peixoto --- plugins/dynatrace/README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/dynatrace/README.md b/plugins/dynatrace/README.md index e1b7bea406..df6bb75f10 100644 --- a/plugins/dynatrace/README.md +++ b/plugins/dynatrace/README.md @@ -42,13 +42,13 @@ yarn add --cwd packages/app @backstage/plugin-dynatrace const serviceEntityPage = ( [...] - - - ++ ++ ++ ) From c4788dbb58b03758f2fec548996deb35222d7586 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Tue, 6 Dec 2022 21:59:08 +0100 Subject: [PATCH 15/36] create-app: add order Signed-off-by: Patrik Oldsberg --- .changeset/chilly-tables-crash.md | 5 +++++ packages/create-app/templates/default-app/package.json.hbs | 4 ++-- .../templates/default-app/packages/app/package.json.hbs | 2 +- .../templates/default-app/packages/backend/package.json.hbs | 6 +++--- 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 .changeset/chilly-tables-crash.md diff --git a/.changeset/chilly-tables-crash.md b/.changeset/chilly-tables-crash.md new file mode 100644 index 0000000000..5c6510fb65 --- /dev/null +++ b/.changeset/chilly-tables-crash.md @@ -0,0 +1,5 @@ +--- +'@backstage/create-app': patch +--- + +Fix dependency ordering in templated packages. diff --git a/packages/create-app/templates/default-app/package.json.hbs b/packages/create-app/templates/default-app/package.json.hbs index 070cb871bc..05c2436933 100644 --- a/packages/create-app/templates/default-app/package.json.hbs +++ b/packages/create-app/templates/default-app/package.json.hbs @@ -34,9 +34,9 @@ "@spotify/prettier-config": "^12.0.0", "concurrently": "^6.0.0", "lerna": "^4.0.0", + "node-gyp": "^9.0.0", "prettier": "^2.3.2", - "typescript": "~4.6.4", - "node-gyp": "^9.0.0" + "typescript": "~4.6.4" }, "resolutions": { "@types/react": "^17", diff --git a/packages/create-app/templates/default-app/packages/app/package.json.hbs b/packages/create-app/templates/default-app/packages/app/package.json.hbs index c060cb330c..ebd8a9ee15 100644 --- a/packages/create-app/templates/default-app/packages/app/package.json.hbs +++ b/packages/create-app/templates/default-app/packages/app/package.json.hbs @@ -39,8 +39,8 @@ "@backstage/plugin-search-react": "^{{version '@backstage/plugin-search-react'}}", "@backstage/plugin-tech-radar": "^{{version '@backstage/plugin-tech-radar'}}", "@backstage/plugin-techdocs": "^{{version '@backstage/plugin-techdocs'}}", - "@backstage/plugin-techdocs-react": "^{{version '@backstage/plugin-techdocs-react'}}", "@backstage/plugin-techdocs-module-addons-contrib": "^{{version '@backstage/plugin-techdocs-module-addons-contrib'}}", + "@backstage/plugin-techdocs-react": "^{{version '@backstage/plugin-techdocs-react'}}", "@backstage/plugin-user-settings": "^{{version '@backstage/plugin-user-settings'}}", "@backstage/theme": "^{{version '@backstage/theme'}}", "@material-ui/core": "^4.12.2", diff --git a/packages/create-app/templates/default-app/packages/backend/package.json.hbs b/packages/create-app/templates/default-app/packages/backend/package.json.hbs index 1b9b79b683..ca644265b8 100644 --- a/packages/create-app/templates/default-app/packages/backend/package.json.hbs +++ b/packages/create-app/templates/default-app/packages/backend/package.json.hbs @@ -16,11 +16,10 @@ "build-image": "docker build ../.. -f Dockerfile --tag backstage" }, "dependencies": { - "app": "link:../app", "@backstage/backend-common": "^{{version '@backstage/backend-common'}}", "@backstage/backend-tasks": "^{{version '@backstage/backend-tasks'}}", - "@backstage/catalog-model": "^{{version '@backstage/catalog-model'}}", "@backstage/catalog-client": "^{{version '@backstage/catalog-client'}}", + "@backstage/catalog-model": "^{{version '@backstage/catalog-model'}}", "@backstage/config": "^{{version '@backstage/config'}}", "@backstage/plugin-app-backend": "^{{version '@backstage/plugin-app-backend'}}", "@backstage/plugin-auth-backend": "^{{version '@backstage/plugin-auth-backend'}}", @@ -34,6 +33,7 @@ "@backstage/plugin-search-backend-module-pg": "^{{version '@backstage/plugin-search-backend-module-pg'}}", "@backstage/plugin-search-backend-node": "^{{version '@backstage/plugin-search-backend-node'}}", "@backstage/plugin-techdocs-backend": "^{{version '@backstage/plugin-techdocs-backend'}}", + "app": "link:../app", "better-sqlite3": "^7.5.0", "dockerode": "^3.3.1", "express": "^4.17.1", @@ -44,8 +44,8 @@ "devDependencies": { "@backstage/cli": "^{{version '@backstage/cli'}}", "@types/dockerode": "^3.3.0", - "@types/express-serve-static-core": "^4.17.5", "@types/express": "^4.17.6", + "@types/express-serve-static-core": "^4.17.5", "@types/luxon": "^2.0.4" }, "files": [ From b3ac0d637d807d7bb43c4c987e06e3712f5f174b Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Tue, 6 Dec 2022 22:27:35 +0100 Subject: [PATCH 16/36] e2e-test: update to use backstage-cli new Signed-off-by: Patrik Oldsberg --- packages/e2e-test/src/commands/run.ts | 51 +++++++++++++-------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/packages/e2e-test/src/commands/run.ts b/packages/e2e-test/src/commands/run.ts index fe4d87bea4..3eedb90b21 100644 --- a/packages/e2e-test/src/commands/run.ts +++ b/packages/e2e-test/src/commands/run.ts @@ -57,13 +57,14 @@ export async function run() { const appDir = await createApp('test-app', workspaceDir, rootDir); print('Creating a Backstage Plugin'); - const pluginName = await createPlugin('test-plugin', appDir); + const pluginId = 'test'; + await createPlugin({ appDir, pluginId, select: 'plugin' }); print('Creating a Backstage Backend Plugin'); - await createPlugin('test-plugin', appDir, ['--backend']); + await createPlugin({ appDir, pluginId, select: 'backend-plugin' }); print('Starting the app'); - await testAppServe(pluginName, appDir); + await testAppServe(pluginId, appDir); if (Boolean(process.env.POSTGRES_USER)) { print('Testing the PostgreSQL backend startup'); @@ -328,14 +329,18 @@ async function overrideModuleResolutions(appDir: string, workspaceDir: string) { /** * Uses create-plugin command to create a new plugin in the app */ -async function createPlugin( - pluginName: string, - appDir: string, - options: string[] = [], -) { - const child = spawnPiped(['yarn', 'create-plugin', ...options], { - cwd: appDir, - }); +async function createPlugin(options: { + appDir: string; + pluginId: string; + select: string; +}) { + const { appDir, pluginId, select } = options; + const child = spawnPiped( + ['yarn', 'new', '--select', select, '--option', `id=${pluginId}`], + { + cwd: appDir, + }, + ); try { let stdout = ''; @@ -343,20 +348,14 @@ async function createPlugin( stdout = stdout + data.toString('utf8'); }); - await waitFor(() => stdout.includes('Enter an ID for the plugin')); - child.stdin?.write(`${pluginName}\n`); - - // await waitFor(() => stdout.includes('Enter the owner(s) of the plugin')); - // child.stdin.write('@someuser\n'); - print('Waiting for plugin create script to be done'); await waitForExit(child); - const canonicalName = options.includes('--backend') - ? `${pluginName}-backend` - : pluginName; - - const pluginDir = resolvePath(appDir, 'plugins', canonicalName); + const pluginDir = resolvePath( + appDir, + 'plugins', + select === 'backend-plugin' ? `${pluginId}-backend` : pluginId, + ); print(`Running 'yarn tsc' in root for newly created plugin`); await runPlain(['yarn', 'tsc'], { cwd: appDir }); @@ -365,8 +364,6 @@ async function createPlugin( print(`Running 'yarn ${cmd.join(' ')}' in newly created plugin`); await runPlain(['yarn', ...cmd], { cwd: pluginDir }); } - - return canonicalName; } finally { child.kill(); } @@ -375,7 +372,7 @@ async function createPlugin( /** * Start serving the newly created app and make sure that the create plugin is rendering correctly */ -async function testAppServe(pluginName: string, appDir: string) { +async function testAppServe(pluginId: string, appDir: string) { const startApp = spawnPiped(['yarn', 'start'], { cwd: appDir, env: { @@ -398,8 +395,8 @@ async function testAppServe(pluginName: string, appDir: string) { await waitForPageWithText(page, '/', 'My Company Catalog'); await waitForPageWithText( page, - `/${pluginName}`, - `Welcome to ${pluginName}!`, + `/${pluginId}`, + `Welcome to ${pluginId}!`, ); print('Both App and Plugin loaded correctly'); From dbec8a6922a742217d9bfa9105f056e7469a9fb5 Mon Sep 17 00:00:00 2001 From: GTB3NW Date: Tue, 6 Dec 2022 22:48:25 +0000 Subject: [PATCH 17/36] fix: add default Signed-off-by: GTB3NW --- packages/create-app/src/createApp.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/create-app/src/createApp.ts b/packages/create-app/src/createApp.ts index 6267081c8b..3e66b9801d 100644 --- a/packages/create-app/src/createApp.ts +++ b/packages/create-app/src/createApp.ts @@ -42,6 +42,7 @@ export default async (opts: OptionValues): Promise => { { type: 'input', name: 'name', + default: 'backstage', message: chalk.blue('Enter a name for the app [required]'), validate: (value: any) => { if (!value) { From af1358bb07adcf3c442f6e45d466f79ba2676652 Mon Sep 17 00:00:00 2001 From: GTB3NW Date: Tue, 6 Dec 2022 23:06:43 +0000 Subject: [PATCH 18/36] add changeset Signed-off-by: GTB3NW --- .changeset/cyan-donkeys-arrive.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/cyan-donkeys-arrive.md diff --git a/.changeset/cyan-donkeys-arrive.md b/.changeset/cyan-donkeys-arrive.md new file mode 100644 index 0000000000..f226bc29b5 --- /dev/null +++ b/.changeset/cyan-donkeys-arrive.md @@ -0,0 +1,5 @@ +--- +'@backstage/create-app': minor +--- + +added default project name for CI job compatibility From 733fd1631af458eb83a9dbdc5ef7f59e1ff7c7f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 00:31:20 +0000 Subject: [PATCH 19/36] build(deps): bump express from 4.17.1 to 4.18.2 in /microsite Bumps [express](https://github.com/expressjs/express) from 4.17.1 to 4.18.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.17.1...4.18.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] --- microsite/yarn.lock | 339 ++++++++++++++++++++++++-------------------- 1 file changed, 189 insertions(+), 150 deletions(-) diff --git a/microsite/yarn.lock b/microsite/yarn.lock index 0a26cf8ef6..5bb7b398c9 100644 --- a/microsite/yarn.lock +++ b/microsite/yarn.lock @@ -1360,13 +1360,13 @@ __metadata: languageName: node linkType: hard -"accepts@npm:~1.3.7": - version: 1.3.7 - resolution: "accepts@npm:1.3.7" +"accepts@npm:~1.3.8": + version: 1.3.8 + resolution: "accepts@npm:1.3.8" dependencies: - mime-types: ~2.1.24 - negotiator: 0.6.2 - checksum: 27fc8060ffc69481ff6719cd3ee06387d2b88381cb0ce626f087781bbd02201a645a9febc8e7e7333558354b33b1d2f922ad13560be4ec1b7ba9e76fc1c1241d + mime-types: ~2.1.34 + negotiator: 0.6.3 + checksum: 50c43d32e7b50285ebe84b613ee4a3aa426715a7d131b65b786e2ead0fd76b6b60091b9916d3478a75f11f162628a2139991b6c03ab3f1d9ab7c86075dc8eab4 languageName: node linkType: hard @@ -1906,21 +1906,23 @@ __metadata: languageName: node linkType: hard -"body-parser@npm:1.19.0": - version: 1.19.0 - resolution: "body-parser@npm:1.19.0" +"body-parser@npm:1.20.1": + version: 1.20.1 + resolution: "body-parser@npm:1.20.1" dependencies: - bytes: 3.1.0 + bytes: 3.1.2 content-type: ~1.0.4 debug: 2.6.9 - depd: ~1.1.2 - http-errors: 1.7.2 + depd: 2.0.0 + destroy: 1.2.0 + http-errors: 2.0.0 iconv-lite: 0.4.24 - on-finished: ~2.3.0 - qs: 6.7.0 - raw-body: 2.4.0 - type-is: ~1.6.17 - checksum: 490231b4c89bbd43112762f7ba8e5342c174a6c9f64284a3b0fcabf63277e332f8316765596f1e5b15e4f3a6cf0422e005f4bb3149ed3a224bb025b7a36b9ac1 + on-finished: 2.4.1 + qs: 6.11.0 + raw-body: 2.5.1 + type-is: ~1.6.18 + unpipe: 1.0.0 + checksum: f1050dbac3bede6a78f0b87947a8d548ce43f91ccc718a50dd774f3c81f2d8b04693e52acf62659fad23101827dd318da1fb1363444ff9a8482b886a3e4a5266 languageName: node linkType: hard @@ -2063,10 +2065,10 @@ __metadata: languageName: node linkType: hard -"bytes@npm:3.1.0": - version: 3.1.0 - resolution: "bytes@npm:3.1.0" - checksum: 7c3b21c5d9d44ed455460d5d36a31abc6fa2ce3807964ba60a4b03fd44454c8cf07bb0585af83bfde1c5cc2ea4bbe5897bc3d18cd15e0acf25a3615a35aba2df +"bytes@npm:3.1.2": + version: 3.1.2 + resolution: "bytes@npm:3.1.2" + checksum: e4bcd3948d289c5127591fbedf10c0b639ccbf00243504e4e127374a15c3bc8eed0d28d4aaab08ff6f1cf2abc0cce6ba3085ed32f4f90e82a5683ce0014e1b6e languageName: node linkType: hard @@ -2566,7 +2568,16 @@ __metadata: languageName: node linkType: hard -"content-disposition@npm:0.5.3, content-disposition@npm:^0.5.2": +"content-disposition@npm:0.5.4": + version: 0.5.4 + resolution: "content-disposition@npm:0.5.4" + dependencies: + safe-buffer: 5.2.1 + checksum: afb9d545e296a5171d7574fcad634b2fdf698875f4006a9dd04a3e1333880c5c0c98d47b560d01216fb6505a54a2ba6a843ee3a02ec86d7e911e8315255f56c3 + languageName: node + linkType: hard + +"content-disposition@npm:^0.5.2": version: 0.5.3 resolution: "content-disposition@npm:0.5.3" dependencies: @@ -2605,10 +2616,10 @@ __metadata: languageName: node linkType: hard -"cookie@npm:0.4.0": - version: 0.4.0 - resolution: "cookie@npm:0.4.0" - checksum: 760384ba0aef329c52523747e36a452b5e51bc49b34160363a6934e7b7df3f93fcc88b35e33450361535d40a92a96412da870e1816aba9aa6cc556a9fedd8492 +"cookie@npm:0.5.0": + version: 0.5.0 + resolution: "cookie@npm:0.5.0" + checksum: 1f4bd2ca5765f8c9689a7e8954183f5332139eb72b6ff783d8947032ec1fdf43109852c178e21a953a30c0dd42257828185be01b49d1eb1a67fd054ca588a180 languageName: node linkType: hard @@ -3076,17 +3087,24 @@ __metadata: languageName: node linkType: hard -"depd@npm:^1.1.2, depd@npm:~1.1.2": +"depd@npm:2.0.0": + version: 2.0.0 + resolution: "depd@npm:2.0.0" + checksum: abbe19c768c97ee2eed6282d8ce3031126662252c58d711f646921c9623f9052e3e1906443066beec1095832f534e57c523b7333f8e7e0d93051ab6baef5ab3a + languageName: node + linkType: hard + +"depd@npm:^1.1.2": version: 1.1.2 resolution: "depd@npm:1.1.2" checksum: 6b406620d269619852885ce15965272b829df6f409724415e0002c8632ab6a8c0a08ec1f0bd2add05dc7bd7507606f7e2cc034fa24224ab829580040b835ecd9 languageName: node linkType: hard -"destroy@npm:~1.0.4": - version: 1.0.4 - resolution: "destroy@npm:1.0.4" - checksum: da9ab4961dc61677c709da0c25ef01733042614453924d65636a7db37308fef8a24cd1e07172e61173d471ca175371295fbc984b0af5b2b4ff47cd57bd784c03 +"destroy@npm:1.2.0": + version: 1.2.0 + resolution: "destroy@npm:1.2.0" + checksum: 0acb300b7478a08b92d810ab229d5afe0d2f4399272045ab22affa0d99dbaf12637659411530a6fcd597a9bdac718fc94373a61a95b4651bbc7b83684a565e38 languageName: node linkType: hard @@ -3611,40 +3629,41 @@ __metadata: linkType: hard "express@npm:^4.17.1": - version: 4.17.1 - resolution: "express@npm:4.17.1" + version: 4.18.2 + resolution: "express@npm:4.18.2" dependencies: - accepts: ~1.3.7 + accepts: ~1.3.8 array-flatten: 1.1.1 - body-parser: 1.19.0 - content-disposition: 0.5.3 + body-parser: 1.20.1 + content-disposition: 0.5.4 content-type: ~1.0.4 - cookie: 0.4.0 + cookie: 0.5.0 cookie-signature: 1.0.6 debug: 2.6.9 - depd: ~1.1.2 + depd: 2.0.0 encodeurl: ~1.0.2 escape-html: ~1.0.3 etag: ~1.8.1 - finalhandler: ~1.1.2 + finalhandler: 1.2.0 fresh: 0.5.2 + http-errors: 2.0.0 merge-descriptors: 1.0.1 methods: ~1.1.2 - on-finished: ~2.3.0 + on-finished: 2.4.1 parseurl: ~1.3.3 path-to-regexp: 0.1.7 - proxy-addr: ~2.0.5 - qs: 6.7.0 + proxy-addr: ~2.0.7 + qs: 6.11.0 range-parser: ~1.2.1 - safe-buffer: 5.1.2 - send: 0.17.1 - serve-static: 1.14.1 - setprototypeof: 1.1.1 - statuses: ~1.5.0 + safe-buffer: 5.2.1 + send: 0.18.0 + serve-static: 1.15.0 + setprototypeof: 1.2.0 + statuses: 2.0.1 type-is: ~1.6.18 utils-merge: 1.0.1 vary: ~1.1.2 - checksum: d964e9e17af331ea6fa2f84999b063bc47189dd71b4a735df83f9126d3bb2b92e830f1cb1d7c2742530eb625e2689d7a9a9c71f0c3cc4dd6015c3cd32a01abd5 + checksum: 3c4b9b076879442f6b968fe53d85d9f1eeacbb4f4c41e5f16cc36d77ce39a2b0d81b3f250514982110d815b2f7173f5561367f9110fcc541f9371948e8c8b037 languageName: node linkType: hard @@ -3916,18 +3935,18 @@ __metadata: languageName: node linkType: hard -"finalhandler@npm:~1.1.2": - version: 1.1.2 - resolution: "finalhandler@npm:1.1.2" +"finalhandler@npm:1.2.0": + version: 1.2.0 + resolution: "finalhandler@npm:1.2.0" dependencies: debug: 2.6.9 encodeurl: ~1.0.2 escape-html: ~1.0.3 - on-finished: ~2.3.0 + on-finished: 2.4.1 parseurl: ~1.3.3 - statuses: ~1.5.0 + statuses: 2.0.1 unpipe: ~1.0.0 - checksum: 617880460c5138dd7ccfd555cb5dde4d8f170f4b31b8bd51e4b646bb2946c30f7db716428a1f2882d730d2b72afb47d1f67cc487b874cb15426f95753a88965e + checksum: 92effbfd32e22a7dff2994acedbd9bcc3aa646a3e919ea6a53238090e87097f8ef07cced90aa2cc421abdf993aefbdd5b00104d55c7c5479a8d00ed105b45716 languageName: node linkType: hard @@ -4020,10 +4039,10 @@ __metadata: languageName: node linkType: hard -"forwarded@npm:~0.1.2": - version: 0.1.2 - resolution: "forwarded@npm:0.1.2" - checksum: 54695c574292f9bc6bfa52111844337bc2e61cfcc5ec82f16b816d721a67a0c76b4849a34b57e38e51d64ddbb81aef974f393579f610ed1b990470e75abad2e0 +"forwarded@npm:0.2.0": + version: 0.2.0 + resolution: "forwarded@npm:0.2.0" + checksum: fd27e2394d8887ebd16a66ffc889dc983fbbd797d5d3f01087c020283c0f019a7d05ee85669383d8e0d216b116d720fc0cef2f6e9b7eb9f4c90c6e0bc7fd28e6 languageName: node linkType: hard @@ -4159,6 +4178,17 @@ __metadata: languageName: node linkType: hard +"get-intrinsic@npm:^1.0.2": + version: 1.1.3 + resolution: "get-intrinsic@npm:1.1.3" + dependencies: + function-bind: ^1.1.1 + has: ^1.0.3 + has-symbols: ^1.0.3 + checksum: 152d79e87251d536cf880ba75cfc3d6c6c50e12b3a64e1ea960e73a3752b47c69f46034456eae1b0894359ce3bc64c55c186f2811f8a788b75b638b06fab228a + languageName: node + linkType: hard + "get-proxy@npm:^2.0.0": version: 2.1.0 resolution: "get-proxy@npm:2.1.0" @@ -4493,6 +4523,13 @@ __metadata: languageName: node linkType: hard +"has-symbols@npm:^1.0.3": + version: 1.0.3 + resolution: "has-symbols@npm:1.0.3" + checksum: a054c40c631c0d5741a8285010a0777ea0c068f99ed43e5d6eb12972da223f8af553a455132fdb0801bdcfa0e0f443c0c03a68d8555aa529b3144b446c3f2410 + languageName: node + linkType: hard + "has-to-string-tag-x@npm:^1.2.0": version: 1.4.1 resolution: "has-to-string-tag-x@npm:1.4.1" @@ -4627,29 +4664,16 @@ __metadata: languageName: node linkType: hard -"http-errors@npm:1.7.2": - version: 1.7.2 - resolution: "http-errors@npm:1.7.2" +"http-errors@npm:2.0.0": + version: 2.0.0 + resolution: "http-errors@npm:2.0.0" dependencies: - depd: ~1.1.2 - inherits: 2.0.3 - setprototypeof: 1.1.1 - statuses: ">= 1.5.0 < 2" - toidentifier: 1.0.0 - checksum: 5534b0ae08e77f5a45a2380f500e781f6580c4ff75b816cb1f09f99a290b57e78a518be6d866db1b48cca6b052c09da2c75fc91fb16a2fe3da3c44d9acbb9972 - languageName: node - linkType: hard - -"http-errors@npm:~1.7.2": - version: 1.7.3 - resolution: "http-errors@npm:1.7.3" - dependencies: - depd: ~1.1.2 + depd: 2.0.0 inherits: 2.0.4 - setprototypeof: 1.1.1 - statuses: ">= 1.5.0 < 2" - toidentifier: 1.0.0 - checksum: a59f359473f4b3ea78305beee90d186268d6075432622a46fb7483059068a2dd4c854a20ac8cd438883127e06afb78c1309168bde6cdfeed1e3700eb42487d99 + setprototypeof: 1.2.0 + statuses: 2.0.1 + toidentifier: 1.0.1 + checksum: 9b0a3782665c52ce9dc658a0d1560bcb0214ba5699e4ea15aefb2a496e2ca83db03ebc42e1cce4ac1f413e4e0d2d736a3fd755772c556a9a06853ba2a0b7d920 languageName: node linkType: hard @@ -4868,13 +4892,6 @@ __metadata: languageName: node linkType: hard -"inherits@npm:2.0.3": - version: 2.0.3 - resolution: "inherits@npm:2.0.3" - checksum: 78cb8d7d850d20a5e9a7f3620db31483aa00ad5f722ce03a55b110e5a723539b3716a3b463e2b96ce3fe286f33afc7c131fa2f91407528ba80cea98a7545d4c0 - languageName: node - linkType: hard - "ini@npm:^1.3.4, ini@npm:^1.3.5": version: 1.3.8 resolution: "ini@npm:1.3.8" @@ -6116,6 +6133,13 @@ __metadata: languageName: node linkType: hard +"mime-db@npm:1.52.0": + version: 1.52.0 + resolution: "mime-db@npm:1.52.0" + checksum: 0d99a03585f8b39d68182803b12ac601d9c01abfa28ec56204fa330bc9f3d1c5e14beb049bafadb3dbdf646dfb94b87e24d4ec7b31b7279ef906a8ea9b6a513f + languageName: node + linkType: hard + "mime-types@npm:^2.1.12, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24": version: 2.1.28 resolution: "mime-types@npm:2.1.28" @@ -6125,6 +6149,15 @@ __metadata: languageName: node linkType: hard +"mime-types@npm:~2.1.34": + version: 2.1.35 + resolution: "mime-types@npm:2.1.35" + dependencies: + mime-db: 1.52.0 + checksum: 89a5b7f1def9f3af5dad6496c5ed50191ae4331cc5389d7c521c8ad28d5fdad2d06fd81baf38fed813dc4e46bb55c8145bb0ff406330818c9cf712fb2e9b3836 + languageName: node + linkType: hard + "mime@npm:1.6.0": version: 1.6.0 resolution: "mime@npm:1.6.0" @@ -6289,13 +6322,6 @@ __metadata: languageName: node linkType: hard -"ms@npm:2.1.1": - version: 2.1.1 - resolution: "ms@npm:2.1.1" - checksum: 0078a23cd916a9a7435c413caa14c57d4b4f6e2470e0ab554b6964163c8a4436448ac7ae020e883685475da6b6796cc396b670f579cb275db288a21e3e57721e - languageName: node - linkType: hard - "ms@npm:2.1.2": version: 2.1.2 resolution: "ms@npm:2.1.2" @@ -6303,7 +6329,7 @@ __metadata: languageName: node linkType: hard -"ms@npm:^2.0.0, ms@npm:^2.1.1": +"ms@npm:2.1.3, ms@npm:^2.0.0, ms@npm:^2.1.1": version: 2.1.3 resolution: "ms@npm:2.1.3" checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d @@ -6345,14 +6371,7 @@ __metadata: languageName: node linkType: hard -"negotiator@npm:0.6.2": - version: 0.6.2 - resolution: "negotiator@npm:0.6.2" - checksum: dfddaff6c06792f1c4c3809e29a427b8daef8cd437c83b08dd51d7ee11bbd1c29d9512d66b801144d6c98e910ffd8723f2432e0cbf8b18d41d2a09599c975ab3 - languageName: node - linkType: hard - -"negotiator@npm:^0.6.3": +"negotiator@npm:0.6.3, negotiator@npm:^0.6.3": version: 0.6.3 resolution: "negotiator@npm:0.6.3" checksum: b8ffeb1e262eff7968fc90a2b6767b04cfd9842582a9d0ece0af7049537266e7b2506dfb1d107a32f06dd849ab2aea834d5830f7f4d0e5cb7d36e1ae55d021d9 @@ -6543,6 +6562,13 @@ __metadata: languageName: node linkType: hard +"object-inspect@npm:^1.9.0": + version: 1.12.2 + resolution: "object-inspect@npm:1.12.2" + checksum: a534fc1b8534284ed71f25ce3a496013b7ea030f3d1b77118f6b7b1713829262be9e6243acbcb3ef8c626e2b64186112cb7f6db74e37b2789b9c789ca23048b2 + languageName: node + linkType: hard + "object-keys@npm:^1.0.12, object-keys@npm:^1.1.1": version: 1.1.1 resolution: "object-keys@npm:1.1.1" @@ -6603,12 +6629,12 @@ __metadata: languageName: node linkType: hard -"on-finished@npm:~2.3.0": - version: 2.3.0 - resolution: "on-finished@npm:2.3.0" +"on-finished@npm:2.4.1": + version: 2.4.1 + resolution: "on-finished@npm:2.4.1" dependencies: ee-first: 1.1.1 - checksum: 1db595bd963b0124d6fa261d18320422407b8f01dc65863840f3ddaaf7bcad5b28ff6847286703ca53f4ec19595bd67a2f1253db79fc4094911ec6aa8df1671b + checksum: d20929a25e7f0bb62f937a425b5edeb4e4cde0540d77ba146ec9357f00b0d497cdb3b9b05b9c8e46222407d1548d08166bff69cc56dfa55ba0e4469228920ff0 languageName: node linkType: hard @@ -7450,13 +7476,13 @@ __metadata: languageName: node linkType: hard -"proxy-addr@npm:~2.0.5": - version: 2.0.6 - resolution: "proxy-addr@npm:2.0.6" +"proxy-addr@npm:~2.0.7": + version: 2.0.7 + resolution: "proxy-addr@npm:2.0.7" dependencies: - forwarded: ~0.1.2 + forwarded: 0.2.0 ipaddr.js: 1.9.1 - checksum: 2bad9b7a56b847faf606a19328aaaf5fca3e561ebb4e933969a580d94a20f77e74fb21196028a6e417851b3d9d95a0c704732a3362e3ef515d45d96859ac7eb9 + checksum: 29c6990ce9364648255454842f06f8c46fcd124d3e6d7c5066df44662de63cdc0bad032e9bf5a3d653ff72141cc7b6019873d685708ac8210c30458ad99f2b74 languageName: node linkType: hard @@ -7498,10 +7524,12 @@ __metadata: languageName: node linkType: hard -"qs@npm:6.7.0": - version: 6.7.0 - resolution: "qs@npm:6.7.0" - checksum: dfd5f6adef50e36e908cfa70a6233871b5afe66fbaca37ecc1da352ba29eb2151a3797991948f158bb37fccde51bd57845cb619a8035287bfc24e4591172c347 +"qs@npm:6.11.0": + version: 6.11.0 + resolution: "qs@npm:6.11.0" + dependencies: + side-channel: ^1.0.4 + checksum: 6e1f29dd5385f7488ec74ac7b6c92f4d09a90408882d0c208414a34dd33badc1a621019d4c799a3df15ab9b1d0292f97c1dd71dc7c045e69f81a8064e5af7297 languageName: node linkType: hard @@ -7555,15 +7583,15 @@ __metadata: languageName: node linkType: hard -"raw-body@npm:2.4.0": - version: 2.4.0 - resolution: "raw-body@npm:2.4.0" +"raw-body@npm:2.5.1": + version: 2.5.1 + resolution: "raw-body@npm:2.5.1" dependencies: - bytes: 3.1.0 - http-errors: 1.7.2 + bytes: 3.1.2 + http-errors: 2.0.0 iconv-lite: 0.4.24 unpipe: 1.0.0 - checksum: 6343906939e018c6e633a34a938a5d6d1e93ffcfa48646e00207d53b418e941953b521473950c079347220944dc75ba10e7b3c08bf97e3ac72c7624882db09bb + checksum: 5362adff1575d691bb3f75998803a0ffed8c64eabeaa06e54b4ada25a0cd1b2ae7f4f5ec46565d1bec337e08b5ac90c76eaa0758de6f72a633f025d754dec29e languageName: node linkType: hard @@ -8037,7 +8065,7 @@ __metadata: languageName: node linkType: hard -"safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:~5.2.0": +"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491 @@ -8141,36 +8169,36 @@ __metadata: languageName: node linkType: hard -"send@npm:0.17.1": - version: 0.17.1 - resolution: "send@npm:0.17.1" +"send@npm:0.18.0": + version: 0.18.0 + resolution: "send@npm:0.18.0" dependencies: debug: 2.6.9 - depd: ~1.1.2 - destroy: ~1.0.4 + depd: 2.0.0 + destroy: 1.2.0 encodeurl: ~1.0.2 escape-html: ~1.0.3 etag: ~1.8.1 fresh: 0.5.2 - http-errors: ~1.7.2 + http-errors: 2.0.0 mime: 1.6.0 - ms: 2.1.1 - on-finished: ~2.3.0 + ms: 2.1.3 + on-finished: 2.4.1 range-parser: ~1.2.1 - statuses: ~1.5.0 - checksum: d214c2fa42e7fae3f8fc1aa3931eeb3e6b78c2cf141574e09dbe159915c1e3a337269fc6b7512e7dfddcd7d6ff5974cb62f7c3637ba86a55bde20a92c18bdca0 + statuses: 2.0.1 + checksum: 74fc07ebb58566b87b078ec63e5a3e41ecd987e4272ba67b7467e86c6ad51bc6b0b0154133b6d8b08a2ddda360464f71382f7ef864700f34844a76c8027817a8 languageName: node linkType: hard -"serve-static@npm:1.14.1": - version: 1.14.1 - resolution: "serve-static@npm:1.14.1" +"serve-static@npm:1.15.0": + version: 1.15.0 + resolution: "serve-static@npm:1.15.0" dependencies: encodeurl: ~1.0.2 escape-html: ~1.0.3 parseurl: ~1.3.3 - send: 0.17.1 - checksum: c6b268e8486d39ecd54b86c7f2d0ee4a38cd7514ddd9c92c8d5793bb005afde5e908b12395898ae206782306ccc848193d93daa15b86afb3cbe5a8414806abe8 + send: 0.18.0 + checksum: af57fc13be40d90a12562e98c0b7855cf6e8bd4c107fe9a45c212bf023058d54a1871b1c89511c3958f70626fff47faeb795f5d83f8cf88514dbaeb2b724464d languageName: node linkType: hard @@ -8202,10 +8230,10 @@ __metadata: languageName: node linkType: hard -"setprototypeof@npm:1.1.1": - version: 1.1.1 - resolution: "setprototypeof@npm:1.1.1" - checksum: a8bee29c1c64c245d460ce53f7460af8cbd0aceac68d66e5215153992cc8b3a7a123416353e0c642060e85cc5fd4241c92d1190eec97eda0dcb97436e8fcca3b +"setprototypeof@npm:1.2.0": + version: 1.2.0 + resolution: "setprototypeof@npm:1.2.0" + checksum: be18cbbf70e7d8097c97f713a2e76edf84e87299b40d085c6bf8b65314e994cc15e2e317727342fa6996e38e1f52c59720b53fe621e2eb593a6847bf0356db89 languageName: node linkType: hard @@ -8245,6 +8273,17 @@ __metadata: languageName: node linkType: hard +"side-channel@npm:^1.0.4": + version: 1.0.4 + resolution: "side-channel@npm:1.0.4" + dependencies: + call-bind: ^1.0.0 + get-intrinsic: ^1.0.2 + object-inspect: ^1.9.0 + checksum: 351e41b947079c10bd0858364f32bb3a7379514c399edb64ab3dce683933483fc63fb5e4efe0a15a2e8a7e3c436b6a91736ddb8d8c6591b0460a24bb4a1ee245 + languageName: node + linkType: hard + "signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.7": version: 3.0.7 resolution: "signal-exit@npm:3.0.7" @@ -8537,10 +8576,10 @@ __metadata: languageName: node linkType: hard -"statuses@npm:>= 1.5.0 < 2, statuses@npm:~1.5.0": - version: 1.5.0 - resolution: "statuses@npm:1.5.0" - checksum: c469b9519de16a4bb19600205cffb39ee471a5f17b82589757ca7bd40a8d92ebb6ed9f98b5a540c5d302ccbc78f15dc03cc0280dd6e00df1335568a5d5758a5c +"statuses@npm:2.0.1": + version: 2.0.1 + resolution: "statuses@npm:2.0.1" + checksum: 18c7623fdb8f646fb213ca4051be4df7efb3484d4ab662937ca6fbef7ced9b9e12842709872eb3020cc3504b93bde88935c9f6417489627a7786f24f8031cbcb languageName: node linkType: hard @@ -8947,10 +8986,10 @@ __metadata: languageName: node linkType: hard -"toidentifier@npm:1.0.0": - version: 1.0.0 - resolution: "toidentifier@npm:1.0.0" - checksum: 199e6bfca1531d49b3506cff02353d53ec987c9ee10ee272ca6484ed97f1fc10fb77c6c009079ca16d5c5be4a10378178c3cacdb41ce9ec954c3297c74c6053e +"toidentifier@npm:1.0.1": + version: 1.0.1 + resolution: "toidentifier@npm:1.0.1" + checksum: 952c29e2a85d7123239b5cfdd889a0dde47ab0497f0913d70588f19c53f7e0b5327c95f4651e413c74b785147f9637b17410ac8c846d5d4a20a5a33eb6dc3a45 languageName: node linkType: hard @@ -9041,7 +9080,7 @@ __metadata: languageName: node linkType: hard -"type-is@npm:~1.6.17, type-is@npm:~1.6.18": +"type-is@npm:~1.6.18": version: 1.6.18 resolution: "type-is@npm:1.6.18" dependencies: From bfae4fbddce5146585be28221338a2706c437bc2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 00:33:32 +0000 Subject: [PATCH 20/36] Update dependency @oriflame/backstage-plugin-score-card to v0.5.7 Signed-off-by: Renovate Bot --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1e4f3d4d8b..8fab444d5b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12226,8 +12226,8 @@ __metadata: linkType: hard "@oriflame/backstage-plugin-score-card@npm:^0.5.1": - version: 0.5.4 - resolution: "@oriflame/backstage-plugin-score-card@npm:0.5.4" + version: 0.5.7 + resolution: "@oriflame/backstage-plugin-score-card@npm:0.5.7" dependencies: "@backstage/catalog-model": ^1.1.2 "@backstage/config": ^1.0.3 @@ -12245,7 +12245,7 @@ __metadata: peerDependencies: react: ^16.13.1 || ^17.0.0 react-dom: ^16.13.1 || ^17.0.0 - checksum: 1c9e08ec4bac5487941d2823ccd923c474ec18a99d62b97047d4bd0cdd1c33660339cfba1085dc8e756675a3f03cfff9e33cb395afa8fb74cacd11ab1251547c + checksum: 9a3e933dfd212ba8b1a786d13bca9859b23d7ab333745afbe358f8ca084f09a92e724326c5d0d00ed320e01f73fbbb265625c8c9af872aaadc01c945e56e0863 languageName: node linkType: hard From deff7d8d10ee58654215f6cd647e91d663997e01 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 01:05:32 +0000 Subject: [PATCH 21/36] Update dependency mini-css-extract-plugin to v2.7.2 Signed-off-by: Renovate Bot --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index c1f35f4062..04c8fdf45e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -28830,13 +28830,13 @@ __metadata: linkType: hard "mini-css-extract-plugin@npm:^2.4.2": - version: 2.7.1 - resolution: "mini-css-extract-plugin@npm:2.7.1" + version: 2.7.2 + resolution: "mini-css-extract-plugin@npm:2.7.2" dependencies: schema-utils: ^4.0.0 peerDependencies: webpack: ^5.0.0 - checksum: 0da0db7befa4da5df2293440e540d9414b23b99768bbec4b8dab40c1c961ad31532239635be06c6ca9a6d4cfcb0caeb6dbd19d5e31d3271d734e0a39c3245c23 + checksum: cd65611d6dc452f230c6ebba8a47bc5f5146b813b13b0b402c6f4a69f6451242eeea781152bebd31cad8ca7c7e95dac91e7e464087f18fb65b2d1097b58cf4ae languageName: node linkType: hard From a4903aedba35e0d11c39a853cbff1e50499f297c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 02:06:20 +0000 Subject: [PATCH 22/36] Update aws-sdk-js-v3 monorepo to v3.224.0 Signed-off-by: Renovate Bot --- yarn.lock | 1210 ++++++++++++++++++++++++++--------------------------- 1 file changed, 605 insertions(+), 605 deletions(-) diff --git a/yarn.lock b/yarn.lock index c7c6664453..84aaed0d0c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -379,13 +379,13 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/abort-controller@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/abort-controller@npm:3.222.0" +"@aws-sdk/abort-controller@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/abort-controller@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 06528afdab15ed4f088b313e3e42c4ed9b46f4887a2f6f75aabe98830027510e5541965cefa3af1a9f0315ae4b37bdc16b6a9c80b7fca65719b47c8909aad260 + checksum: 6d272d21e7cc0aa020f44f97c002b13dd2ad164fe96d6c6caa73b96e429101cb867188b50c452462e8f0092e680fe87f3d033beacda1366c632b5cf41f5b7207 languageName: node linkType: hard @@ -408,476 +408,476 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/client-cognito-identity@npm:3.223.0": - version: 3.223.0 - resolution: "@aws-sdk/client-cognito-identity@npm:3.223.0" +"@aws-sdk/client-cognito-identity@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/client-cognito-identity@npm:3.224.0" dependencies: "@aws-crypto/sha256-browser": 2.0.0 "@aws-crypto/sha256-js": 2.0.0 - "@aws-sdk/client-sts": 3.223.0 - "@aws-sdk/config-resolver": 3.222.0 - "@aws-sdk/credential-provider-node": 3.223.0 - "@aws-sdk/fetch-http-handler": 3.222.0 - "@aws-sdk/hash-node": 3.222.0 - "@aws-sdk/invalid-dependency": 3.222.0 - "@aws-sdk/middleware-content-length": 3.222.0 - "@aws-sdk/middleware-endpoint": 3.222.0 - "@aws-sdk/middleware-host-header": 3.222.0 - "@aws-sdk/middleware-logger": 3.222.0 - "@aws-sdk/middleware-recursion-detection": 3.222.0 - "@aws-sdk/middleware-retry": 3.222.0 - "@aws-sdk/middleware-serde": 3.222.0 - "@aws-sdk/middleware-signing": 3.222.0 - "@aws-sdk/middleware-stack": 3.222.0 - "@aws-sdk/middleware-user-agent": 3.222.0 - "@aws-sdk/node-config-provider": 3.222.0 - "@aws-sdk/node-http-handler": 3.222.0 - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/smithy-client": 3.222.0 - "@aws-sdk/types": 3.222.0 - "@aws-sdk/url-parser": 3.222.0 + "@aws-sdk/client-sts": 3.224.0 + "@aws-sdk/config-resolver": 3.224.0 + "@aws-sdk/credential-provider-node": 3.224.0 + "@aws-sdk/fetch-http-handler": 3.224.0 + "@aws-sdk/hash-node": 3.224.0 + "@aws-sdk/invalid-dependency": 3.224.0 + "@aws-sdk/middleware-content-length": 3.224.0 + "@aws-sdk/middleware-endpoint": 3.224.0 + "@aws-sdk/middleware-host-header": 3.224.0 + "@aws-sdk/middleware-logger": 3.224.0 + "@aws-sdk/middleware-recursion-detection": 3.224.0 + "@aws-sdk/middleware-retry": 3.224.0 + "@aws-sdk/middleware-serde": 3.224.0 + "@aws-sdk/middleware-signing": 3.224.0 + "@aws-sdk/middleware-stack": 3.224.0 + "@aws-sdk/middleware-user-agent": 3.224.0 + "@aws-sdk/node-config-provider": 3.224.0 + "@aws-sdk/node-http-handler": 3.224.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/smithy-client": 3.224.0 + "@aws-sdk/types": 3.224.0 + "@aws-sdk/url-parser": 3.224.0 "@aws-sdk/util-base64": 3.208.0 "@aws-sdk/util-body-length-browser": 3.188.0 "@aws-sdk/util-body-length-node": 3.208.0 - "@aws-sdk/util-defaults-mode-browser": 3.222.0 - "@aws-sdk/util-defaults-mode-node": 3.222.0 - "@aws-sdk/util-endpoints": 3.222.0 - "@aws-sdk/util-user-agent-browser": 3.222.0 - "@aws-sdk/util-user-agent-node": 3.222.0 + "@aws-sdk/util-defaults-mode-browser": 3.224.0 + "@aws-sdk/util-defaults-mode-node": 3.224.0 + "@aws-sdk/util-endpoints": 3.224.0 + "@aws-sdk/util-user-agent-browser": 3.224.0 + "@aws-sdk/util-user-agent-node": 3.224.0 "@aws-sdk/util-utf8-browser": 3.188.0 "@aws-sdk/util-utf8-node": 3.208.0 tslib: ^2.3.1 - checksum: ada894c3fbe943044617d719dc947af51546dbfea72e5b63f23c6230677c39dc0355248ed1ba119a29f2d4b7bc64e28400880b580a263bcd45d05fdf45007ad7 + checksum: 0534ed2da499ede416e65a4b92e5f33b9e1c5376ad947447f69bf54fd790b02f141eb054265ed40d694f1bab10e0b2c3ddfe7e7ca62f8c3ce5c86f835d8ab4e6 languageName: node linkType: hard "@aws-sdk/client-s3@npm:^3.208.0": - version: 3.223.0 - resolution: "@aws-sdk/client-s3@npm:3.223.0" + version: 3.224.0 + resolution: "@aws-sdk/client-s3@npm:3.224.0" dependencies: "@aws-crypto/sha1-browser": 2.0.0 "@aws-crypto/sha256-browser": 2.0.0 "@aws-crypto/sha256-js": 2.0.0 - "@aws-sdk/client-sts": 3.223.0 - "@aws-sdk/config-resolver": 3.222.0 - "@aws-sdk/credential-provider-node": 3.223.0 - "@aws-sdk/eventstream-serde-browser": 3.222.0 - "@aws-sdk/eventstream-serde-config-resolver": 3.222.0 - "@aws-sdk/eventstream-serde-node": 3.222.0 - "@aws-sdk/fetch-http-handler": 3.222.0 - "@aws-sdk/hash-blob-browser": 3.222.0 - "@aws-sdk/hash-node": 3.222.0 - "@aws-sdk/hash-stream-node": 3.222.0 - "@aws-sdk/invalid-dependency": 3.222.0 - "@aws-sdk/md5-js": 3.222.0 - "@aws-sdk/middleware-bucket-endpoint": 3.222.0 - "@aws-sdk/middleware-content-length": 3.222.0 - "@aws-sdk/middleware-endpoint": 3.222.0 - "@aws-sdk/middleware-expect-continue": 3.222.0 - "@aws-sdk/middleware-flexible-checksums": 3.222.0 - "@aws-sdk/middleware-host-header": 3.222.0 - "@aws-sdk/middleware-location-constraint": 3.222.0 - "@aws-sdk/middleware-logger": 3.222.0 - "@aws-sdk/middleware-recursion-detection": 3.222.0 - "@aws-sdk/middleware-retry": 3.222.0 - "@aws-sdk/middleware-sdk-s3": 3.222.0 - "@aws-sdk/middleware-serde": 3.222.0 - "@aws-sdk/middleware-signing": 3.222.0 - "@aws-sdk/middleware-ssec": 3.222.0 - "@aws-sdk/middleware-stack": 3.222.0 - "@aws-sdk/middleware-user-agent": 3.222.0 - "@aws-sdk/node-config-provider": 3.222.0 - "@aws-sdk/node-http-handler": 3.222.0 - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/signature-v4-multi-region": 3.222.0 - "@aws-sdk/smithy-client": 3.222.0 - "@aws-sdk/types": 3.222.0 - "@aws-sdk/url-parser": 3.222.0 + "@aws-sdk/client-sts": 3.224.0 + "@aws-sdk/config-resolver": 3.224.0 + "@aws-sdk/credential-provider-node": 3.224.0 + "@aws-sdk/eventstream-serde-browser": 3.224.0 + "@aws-sdk/eventstream-serde-config-resolver": 3.224.0 + "@aws-sdk/eventstream-serde-node": 3.224.0 + "@aws-sdk/fetch-http-handler": 3.224.0 + "@aws-sdk/hash-blob-browser": 3.224.0 + "@aws-sdk/hash-node": 3.224.0 + "@aws-sdk/hash-stream-node": 3.224.0 + "@aws-sdk/invalid-dependency": 3.224.0 + "@aws-sdk/md5-js": 3.224.0 + "@aws-sdk/middleware-bucket-endpoint": 3.224.0 + "@aws-sdk/middleware-content-length": 3.224.0 + "@aws-sdk/middleware-endpoint": 3.224.0 + "@aws-sdk/middleware-expect-continue": 3.224.0 + "@aws-sdk/middleware-flexible-checksums": 3.224.0 + "@aws-sdk/middleware-host-header": 3.224.0 + "@aws-sdk/middleware-location-constraint": 3.224.0 + "@aws-sdk/middleware-logger": 3.224.0 + "@aws-sdk/middleware-recursion-detection": 3.224.0 + "@aws-sdk/middleware-retry": 3.224.0 + "@aws-sdk/middleware-sdk-s3": 3.224.0 + "@aws-sdk/middleware-serde": 3.224.0 + "@aws-sdk/middleware-signing": 3.224.0 + "@aws-sdk/middleware-ssec": 3.224.0 + "@aws-sdk/middleware-stack": 3.224.0 + "@aws-sdk/middleware-user-agent": 3.224.0 + "@aws-sdk/node-config-provider": 3.224.0 + "@aws-sdk/node-http-handler": 3.224.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/signature-v4-multi-region": 3.224.0 + "@aws-sdk/smithy-client": 3.224.0 + "@aws-sdk/types": 3.224.0 + "@aws-sdk/url-parser": 3.224.0 "@aws-sdk/util-base64": 3.208.0 "@aws-sdk/util-body-length-browser": 3.188.0 "@aws-sdk/util-body-length-node": 3.208.0 - "@aws-sdk/util-defaults-mode-browser": 3.222.0 - "@aws-sdk/util-defaults-mode-node": 3.222.0 - "@aws-sdk/util-endpoints": 3.222.0 - "@aws-sdk/util-stream-browser": 3.222.0 - "@aws-sdk/util-stream-node": 3.222.0 - "@aws-sdk/util-user-agent-browser": 3.222.0 - "@aws-sdk/util-user-agent-node": 3.222.0 + "@aws-sdk/util-defaults-mode-browser": 3.224.0 + "@aws-sdk/util-defaults-mode-node": 3.224.0 + "@aws-sdk/util-endpoints": 3.224.0 + "@aws-sdk/util-stream-browser": 3.224.0 + "@aws-sdk/util-stream-node": 3.224.0 + "@aws-sdk/util-user-agent-browser": 3.224.0 + "@aws-sdk/util-user-agent-node": 3.224.0 "@aws-sdk/util-utf8-browser": 3.188.0 "@aws-sdk/util-utf8-node": 3.208.0 - "@aws-sdk/util-waiter": 3.222.0 + "@aws-sdk/util-waiter": 3.224.0 "@aws-sdk/xml-builder": 3.201.0 fast-xml-parser: 4.0.11 tslib: ^2.3.1 - checksum: 52f5fe06c0740db4ccfbe61010654e02ecc0e994cdd6feb8b95a49e507a2813fe2889bb7cf12977febfe3d96333a962c16e8d26a77df80a9bd23a635dcc0f505 + checksum: 975e4b8d237b1169a429960d5bfe911339980f5722b858ccc5d9f168abccaeac953a5d68ea21e55ba48e4e8000154280da5170bb6d252adf5847df84b3b1bcf1 languageName: node linkType: hard "@aws-sdk/client-sqs@npm:^3.208.0": - version: 3.223.0 - resolution: "@aws-sdk/client-sqs@npm:3.223.0" + version: 3.224.0 + resolution: "@aws-sdk/client-sqs@npm:3.224.0" dependencies: "@aws-crypto/sha256-browser": 2.0.0 "@aws-crypto/sha256-js": 2.0.0 - "@aws-sdk/client-sts": 3.223.0 - "@aws-sdk/config-resolver": 3.222.0 - "@aws-sdk/credential-provider-node": 3.223.0 - "@aws-sdk/fetch-http-handler": 3.222.0 - "@aws-sdk/hash-node": 3.222.0 - "@aws-sdk/invalid-dependency": 3.222.0 - "@aws-sdk/md5-js": 3.222.0 - "@aws-sdk/middleware-content-length": 3.222.0 - "@aws-sdk/middleware-endpoint": 3.222.0 - "@aws-sdk/middleware-host-header": 3.222.0 - "@aws-sdk/middleware-logger": 3.222.0 - "@aws-sdk/middleware-recursion-detection": 3.222.0 - "@aws-sdk/middleware-retry": 3.222.0 - "@aws-sdk/middleware-sdk-sqs": 3.222.0 - "@aws-sdk/middleware-serde": 3.222.0 - "@aws-sdk/middleware-signing": 3.222.0 - "@aws-sdk/middleware-stack": 3.222.0 - "@aws-sdk/middleware-user-agent": 3.222.0 - "@aws-sdk/node-config-provider": 3.222.0 - "@aws-sdk/node-http-handler": 3.222.0 - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/smithy-client": 3.222.0 - "@aws-sdk/types": 3.222.0 - "@aws-sdk/url-parser": 3.222.0 + "@aws-sdk/client-sts": 3.224.0 + "@aws-sdk/config-resolver": 3.224.0 + "@aws-sdk/credential-provider-node": 3.224.0 + "@aws-sdk/fetch-http-handler": 3.224.0 + "@aws-sdk/hash-node": 3.224.0 + "@aws-sdk/invalid-dependency": 3.224.0 + "@aws-sdk/md5-js": 3.224.0 + "@aws-sdk/middleware-content-length": 3.224.0 + "@aws-sdk/middleware-endpoint": 3.224.0 + "@aws-sdk/middleware-host-header": 3.224.0 + "@aws-sdk/middleware-logger": 3.224.0 + "@aws-sdk/middleware-recursion-detection": 3.224.0 + "@aws-sdk/middleware-retry": 3.224.0 + "@aws-sdk/middleware-sdk-sqs": 3.224.0 + "@aws-sdk/middleware-serde": 3.224.0 + "@aws-sdk/middleware-signing": 3.224.0 + "@aws-sdk/middleware-stack": 3.224.0 + "@aws-sdk/middleware-user-agent": 3.224.0 + "@aws-sdk/node-config-provider": 3.224.0 + "@aws-sdk/node-http-handler": 3.224.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/smithy-client": 3.224.0 + "@aws-sdk/types": 3.224.0 + "@aws-sdk/url-parser": 3.224.0 "@aws-sdk/util-base64": 3.208.0 "@aws-sdk/util-body-length-browser": 3.188.0 "@aws-sdk/util-body-length-node": 3.208.0 - "@aws-sdk/util-defaults-mode-browser": 3.222.0 - "@aws-sdk/util-defaults-mode-node": 3.222.0 - "@aws-sdk/util-endpoints": 3.222.0 - "@aws-sdk/util-user-agent-browser": 3.222.0 - "@aws-sdk/util-user-agent-node": 3.222.0 + "@aws-sdk/util-defaults-mode-browser": 3.224.0 + "@aws-sdk/util-defaults-mode-node": 3.224.0 + "@aws-sdk/util-endpoints": 3.224.0 + "@aws-sdk/util-user-agent-browser": 3.224.0 + "@aws-sdk/util-user-agent-node": 3.224.0 "@aws-sdk/util-utf8-browser": 3.188.0 "@aws-sdk/util-utf8-node": 3.208.0 fast-xml-parser: 4.0.11 tslib: ^2.3.1 - checksum: 3f5e5052e02c33590199dcdc37df66692b5330e15afaaa5868b55ccb8a085f2a839dce5bda54270e75fe660b0be6fac3071722922ddb12922dd1f162912fe77e + checksum: 71141166e3445627dd2bc9d194f6a4c87a4652e91ed79a2521297d1e72badba39495bb5c316050ac8a310c9422e063201d4d59c027b770995e8d6de8fa38d188 languageName: node linkType: hard -"@aws-sdk/client-sso-oidc@npm:3.223.0": - version: 3.223.0 - resolution: "@aws-sdk/client-sso-oidc@npm:3.223.0" +"@aws-sdk/client-sso-oidc@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/client-sso-oidc@npm:3.224.0" dependencies: "@aws-crypto/sha256-browser": 2.0.0 "@aws-crypto/sha256-js": 2.0.0 - "@aws-sdk/config-resolver": 3.222.0 - "@aws-sdk/fetch-http-handler": 3.222.0 - "@aws-sdk/hash-node": 3.222.0 - "@aws-sdk/invalid-dependency": 3.222.0 - "@aws-sdk/middleware-content-length": 3.222.0 - "@aws-sdk/middleware-endpoint": 3.222.0 - "@aws-sdk/middleware-host-header": 3.222.0 - "@aws-sdk/middleware-logger": 3.222.0 - "@aws-sdk/middleware-recursion-detection": 3.222.0 - "@aws-sdk/middleware-retry": 3.222.0 - "@aws-sdk/middleware-serde": 3.222.0 - "@aws-sdk/middleware-stack": 3.222.0 - "@aws-sdk/middleware-user-agent": 3.222.0 - "@aws-sdk/node-config-provider": 3.222.0 - "@aws-sdk/node-http-handler": 3.222.0 - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/smithy-client": 3.222.0 - "@aws-sdk/types": 3.222.0 - "@aws-sdk/url-parser": 3.222.0 + "@aws-sdk/config-resolver": 3.224.0 + "@aws-sdk/fetch-http-handler": 3.224.0 + "@aws-sdk/hash-node": 3.224.0 + "@aws-sdk/invalid-dependency": 3.224.0 + "@aws-sdk/middleware-content-length": 3.224.0 + "@aws-sdk/middleware-endpoint": 3.224.0 + "@aws-sdk/middleware-host-header": 3.224.0 + "@aws-sdk/middleware-logger": 3.224.0 + "@aws-sdk/middleware-recursion-detection": 3.224.0 + "@aws-sdk/middleware-retry": 3.224.0 + "@aws-sdk/middleware-serde": 3.224.0 + "@aws-sdk/middleware-stack": 3.224.0 + "@aws-sdk/middleware-user-agent": 3.224.0 + "@aws-sdk/node-config-provider": 3.224.0 + "@aws-sdk/node-http-handler": 3.224.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/smithy-client": 3.224.0 + "@aws-sdk/types": 3.224.0 + "@aws-sdk/url-parser": 3.224.0 "@aws-sdk/util-base64": 3.208.0 "@aws-sdk/util-body-length-browser": 3.188.0 "@aws-sdk/util-body-length-node": 3.208.0 - "@aws-sdk/util-defaults-mode-browser": 3.222.0 - "@aws-sdk/util-defaults-mode-node": 3.222.0 - "@aws-sdk/util-endpoints": 3.222.0 - "@aws-sdk/util-user-agent-browser": 3.222.0 - "@aws-sdk/util-user-agent-node": 3.222.0 + "@aws-sdk/util-defaults-mode-browser": 3.224.0 + "@aws-sdk/util-defaults-mode-node": 3.224.0 + "@aws-sdk/util-endpoints": 3.224.0 + "@aws-sdk/util-user-agent-browser": 3.224.0 + "@aws-sdk/util-user-agent-node": 3.224.0 "@aws-sdk/util-utf8-browser": 3.188.0 "@aws-sdk/util-utf8-node": 3.208.0 tslib: ^2.3.1 - checksum: ab5b6142d897ec48a3bb246577c23d1b6e26ee228c7ce264f826d10f88caa83e03f0dac9d88e361c70b778ceef45f0ebd9712cd03ca5b60ab240a3d4382ecb7c + checksum: 465f65014e007f85d331148607a5b51aa3bbbbb7a95705ed9daf5f562047ee190821e7cf6e84c6f4ae68ef8abe0ab2e84000b77a54757073210992d503fbe786 languageName: node linkType: hard -"@aws-sdk/client-sso@npm:3.223.0": - version: 3.223.0 - resolution: "@aws-sdk/client-sso@npm:3.223.0" +"@aws-sdk/client-sso@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/client-sso@npm:3.224.0" dependencies: "@aws-crypto/sha256-browser": 2.0.0 "@aws-crypto/sha256-js": 2.0.0 - "@aws-sdk/config-resolver": 3.222.0 - "@aws-sdk/fetch-http-handler": 3.222.0 - "@aws-sdk/hash-node": 3.222.0 - "@aws-sdk/invalid-dependency": 3.222.0 - "@aws-sdk/middleware-content-length": 3.222.0 - "@aws-sdk/middleware-endpoint": 3.222.0 - "@aws-sdk/middleware-host-header": 3.222.0 - "@aws-sdk/middleware-logger": 3.222.0 - "@aws-sdk/middleware-recursion-detection": 3.222.0 - "@aws-sdk/middleware-retry": 3.222.0 - "@aws-sdk/middleware-serde": 3.222.0 - "@aws-sdk/middleware-stack": 3.222.0 - "@aws-sdk/middleware-user-agent": 3.222.0 - "@aws-sdk/node-config-provider": 3.222.0 - "@aws-sdk/node-http-handler": 3.222.0 - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/smithy-client": 3.222.0 - "@aws-sdk/types": 3.222.0 - "@aws-sdk/url-parser": 3.222.0 + "@aws-sdk/config-resolver": 3.224.0 + "@aws-sdk/fetch-http-handler": 3.224.0 + "@aws-sdk/hash-node": 3.224.0 + "@aws-sdk/invalid-dependency": 3.224.0 + "@aws-sdk/middleware-content-length": 3.224.0 + "@aws-sdk/middleware-endpoint": 3.224.0 + "@aws-sdk/middleware-host-header": 3.224.0 + "@aws-sdk/middleware-logger": 3.224.0 + "@aws-sdk/middleware-recursion-detection": 3.224.0 + "@aws-sdk/middleware-retry": 3.224.0 + "@aws-sdk/middleware-serde": 3.224.0 + "@aws-sdk/middleware-stack": 3.224.0 + "@aws-sdk/middleware-user-agent": 3.224.0 + "@aws-sdk/node-config-provider": 3.224.0 + "@aws-sdk/node-http-handler": 3.224.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/smithy-client": 3.224.0 + "@aws-sdk/types": 3.224.0 + "@aws-sdk/url-parser": 3.224.0 "@aws-sdk/util-base64": 3.208.0 "@aws-sdk/util-body-length-browser": 3.188.0 "@aws-sdk/util-body-length-node": 3.208.0 - "@aws-sdk/util-defaults-mode-browser": 3.222.0 - "@aws-sdk/util-defaults-mode-node": 3.222.0 - "@aws-sdk/util-endpoints": 3.222.0 - "@aws-sdk/util-user-agent-browser": 3.222.0 - "@aws-sdk/util-user-agent-node": 3.222.0 + "@aws-sdk/util-defaults-mode-browser": 3.224.0 + "@aws-sdk/util-defaults-mode-node": 3.224.0 + "@aws-sdk/util-endpoints": 3.224.0 + "@aws-sdk/util-user-agent-browser": 3.224.0 + "@aws-sdk/util-user-agent-node": 3.224.0 "@aws-sdk/util-utf8-browser": 3.188.0 "@aws-sdk/util-utf8-node": 3.208.0 tslib: ^2.3.1 - checksum: 856e3745182906d274dc894baa7d853966b0074f89ea892f29132e1cefdf49f267f1d0fffaa2de3de352d19ff3963d59290602057bd4510731e0156199bed664 + checksum: dec6e779b6aef5a7bb1fec4ae8690c87a186c6dbb5401b557f885356f6f0298047ae89dd22115d0678ef4fbcb534636c895115c9fc1776d05683715d5328e595 languageName: node linkType: hard -"@aws-sdk/client-sts@npm:3.223.0": - version: 3.223.0 - resolution: "@aws-sdk/client-sts@npm:3.223.0" +"@aws-sdk/client-sts@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/client-sts@npm:3.224.0" dependencies: "@aws-crypto/sha256-browser": 2.0.0 "@aws-crypto/sha256-js": 2.0.0 - "@aws-sdk/config-resolver": 3.222.0 - "@aws-sdk/credential-provider-node": 3.223.0 - "@aws-sdk/fetch-http-handler": 3.222.0 - "@aws-sdk/hash-node": 3.222.0 - "@aws-sdk/invalid-dependency": 3.222.0 - "@aws-sdk/middleware-content-length": 3.222.0 - "@aws-sdk/middleware-endpoint": 3.222.0 - "@aws-sdk/middleware-host-header": 3.222.0 - "@aws-sdk/middleware-logger": 3.222.0 - "@aws-sdk/middleware-recursion-detection": 3.222.0 - "@aws-sdk/middleware-retry": 3.222.0 - "@aws-sdk/middleware-sdk-sts": 3.222.0 - "@aws-sdk/middleware-serde": 3.222.0 - "@aws-sdk/middleware-signing": 3.222.0 - "@aws-sdk/middleware-stack": 3.222.0 - "@aws-sdk/middleware-user-agent": 3.222.0 - "@aws-sdk/node-config-provider": 3.222.0 - "@aws-sdk/node-http-handler": 3.222.0 - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/smithy-client": 3.222.0 - "@aws-sdk/types": 3.222.0 - "@aws-sdk/url-parser": 3.222.0 + "@aws-sdk/config-resolver": 3.224.0 + "@aws-sdk/credential-provider-node": 3.224.0 + "@aws-sdk/fetch-http-handler": 3.224.0 + "@aws-sdk/hash-node": 3.224.0 + "@aws-sdk/invalid-dependency": 3.224.0 + "@aws-sdk/middleware-content-length": 3.224.0 + "@aws-sdk/middleware-endpoint": 3.224.0 + "@aws-sdk/middleware-host-header": 3.224.0 + "@aws-sdk/middleware-logger": 3.224.0 + "@aws-sdk/middleware-recursion-detection": 3.224.0 + "@aws-sdk/middleware-retry": 3.224.0 + "@aws-sdk/middleware-sdk-sts": 3.224.0 + "@aws-sdk/middleware-serde": 3.224.0 + "@aws-sdk/middleware-signing": 3.224.0 + "@aws-sdk/middleware-stack": 3.224.0 + "@aws-sdk/middleware-user-agent": 3.224.0 + "@aws-sdk/node-config-provider": 3.224.0 + "@aws-sdk/node-http-handler": 3.224.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/smithy-client": 3.224.0 + "@aws-sdk/types": 3.224.0 + "@aws-sdk/url-parser": 3.224.0 "@aws-sdk/util-base64": 3.208.0 "@aws-sdk/util-body-length-browser": 3.188.0 "@aws-sdk/util-body-length-node": 3.208.0 - "@aws-sdk/util-defaults-mode-browser": 3.222.0 - "@aws-sdk/util-defaults-mode-node": 3.222.0 - "@aws-sdk/util-endpoints": 3.222.0 - "@aws-sdk/util-user-agent-browser": 3.222.0 - "@aws-sdk/util-user-agent-node": 3.222.0 + "@aws-sdk/util-defaults-mode-browser": 3.224.0 + "@aws-sdk/util-defaults-mode-node": 3.224.0 + "@aws-sdk/util-endpoints": 3.224.0 + "@aws-sdk/util-user-agent-browser": 3.224.0 + "@aws-sdk/util-user-agent-node": 3.224.0 "@aws-sdk/util-utf8-browser": 3.188.0 "@aws-sdk/util-utf8-node": 3.208.0 fast-xml-parser: 4.0.11 tslib: ^2.3.1 - checksum: 6976345f839b0028a0e83f6d11e3323da68cef103ae5381299c6d75df25a1ef336b83023c79896242fbc4b7d2a27f3deebb1b1922e815e6cc7780f3eee302210 + checksum: 7515beb79d882711fed63b175a4095bb2b331c834ab5814d741358abe0b67e429d1faf8dfa86082527e673171db46b7596e99fa6eaeb4934eb3d3adc7d59e53d languageName: node linkType: hard -"@aws-sdk/config-resolver@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/config-resolver@npm:3.222.0" +"@aws-sdk/config-resolver@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/config-resolver@npm:3.224.0" dependencies: - "@aws-sdk/signature-v4": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/signature-v4": 3.224.0 + "@aws-sdk/types": 3.224.0 "@aws-sdk/util-config-provider": 3.208.0 - "@aws-sdk/util-middleware": 3.222.0 + "@aws-sdk/util-middleware": 3.224.0 tslib: ^2.3.1 - checksum: 8a2524cf1e8bd9d7acf82a039a1da7de9a7f9017d7a0dd913024e74d126509bdaa0e2b2bfc0b9ba5a9aee83af4022e2573f59d675997cc81b726d8300afd22d5 + checksum: a36c7963a81c45651a89a7a6da90bd189b0c784cc4a60a149908bb5e9aac23da47235ef03ce9288240400a917392c69380dc61eb50934f9cf9dffa877ad821c1 languageName: node linkType: hard -"@aws-sdk/credential-provider-cognito-identity@npm:3.223.0": - version: 3.223.0 - resolution: "@aws-sdk/credential-provider-cognito-identity@npm:3.223.0" +"@aws-sdk/credential-provider-cognito-identity@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/credential-provider-cognito-identity@npm:3.224.0" dependencies: - "@aws-sdk/client-cognito-identity": 3.223.0 - "@aws-sdk/property-provider": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/client-cognito-identity": 3.224.0 + "@aws-sdk/property-provider": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: e0f03110b120699ef9c458edd5b1a248f5e3f360931b2e8be7ebb7fc33da51ac1c3fdf96bb05a755a2d303c00c7effee7a582706da2333b4ee43c0040ff551a5 + checksum: fb7d6217073e3795133dbf1130e7029037895b7387e2c3784991e009579e6af3a2e7d11f6ea6d0bf5d0ef1aab7753123125dfacc40be59922afb245d6ab60a0f languageName: node linkType: hard -"@aws-sdk/credential-provider-env@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/credential-provider-env@npm:3.222.0" +"@aws-sdk/credential-provider-env@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/credential-provider-env@npm:3.224.0" dependencies: - "@aws-sdk/property-provider": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/property-provider": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: ae524102f47c8ac471231d990b63d3a3272826f94efd9a37d6a5ccc1c42db1edc86a69c67743eeba16fbead5b6800578de1a43831b99005e6d5b974acdc553d0 + checksum: 56e78345184467d56fc2689cacc57631d63b67381a7cf6a25f349d1ea7de7aa850166dc1bf91bc290c6709ec0e2a72b8baa16a9fb59450c168f9520265b3eb9d languageName: node linkType: hard -"@aws-sdk/credential-provider-imds@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/credential-provider-imds@npm:3.222.0" +"@aws-sdk/credential-provider-imds@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/credential-provider-imds@npm:3.224.0" dependencies: - "@aws-sdk/node-config-provider": 3.222.0 - "@aws-sdk/property-provider": 3.222.0 - "@aws-sdk/types": 3.222.0 - "@aws-sdk/url-parser": 3.222.0 + "@aws-sdk/node-config-provider": 3.224.0 + "@aws-sdk/property-provider": 3.224.0 + "@aws-sdk/types": 3.224.0 + "@aws-sdk/url-parser": 3.224.0 tslib: ^2.3.1 - checksum: 41e5ee3819896063fdd3054d9a21d954b6904eaf66b4fc1385407de18dab7417704f2c2ebfad27330692fda629cc8878a0d7291a67f84ab4880a1c1a4a4d3c22 + checksum: b33c6dc901aa74c4105df4d6c8e20f8f27c0c8e6875c4a1b3a70719a844beb7a3b280b11652cc746cc89090238645ec67a4e336c59d1fc753e95621bca166b0b languageName: node linkType: hard -"@aws-sdk/credential-provider-ini@npm:3.223.0": - version: 3.223.0 - resolution: "@aws-sdk/credential-provider-ini@npm:3.223.0" +"@aws-sdk/credential-provider-ini@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/credential-provider-ini@npm:3.224.0" dependencies: - "@aws-sdk/credential-provider-env": 3.222.0 - "@aws-sdk/credential-provider-imds": 3.222.0 - "@aws-sdk/credential-provider-sso": 3.223.0 - "@aws-sdk/credential-provider-web-identity": 3.222.0 - "@aws-sdk/property-provider": 3.222.0 - "@aws-sdk/shared-ini-file-loader": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/credential-provider-env": 3.224.0 + "@aws-sdk/credential-provider-imds": 3.224.0 + "@aws-sdk/credential-provider-sso": 3.224.0 + "@aws-sdk/credential-provider-web-identity": 3.224.0 + "@aws-sdk/property-provider": 3.224.0 + "@aws-sdk/shared-ini-file-loader": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: f407fe591999f1da1d5580b182af261ceeb4455da9a53d18ae871c9cf244e6e72fa10ef28036419790e2b5787d64c5de5b4daf4c7f69acb866894410baa880d0 + checksum: 7f3f0bfe4fddbfd65a9ea694b640437dea15afd9f6449206a79dad51876c7d3fc9e93b8a822bdfec7c91390ebf100aee8ec69da68260ff95ae5ac0a7ad94e334 languageName: node linkType: hard -"@aws-sdk/credential-provider-node@npm:3.223.0": - version: 3.223.0 - resolution: "@aws-sdk/credential-provider-node@npm:3.223.0" +"@aws-sdk/credential-provider-node@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/credential-provider-node@npm:3.224.0" dependencies: - "@aws-sdk/credential-provider-env": 3.222.0 - "@aws-sdk/credential-provider-imds": 3.222.0 - "@aws-sdk/credential-provider-ini": 3.223.0 - "@aws-sdk/credential-provider-process": 3.222.0 - "@aws-sdk/credential-provider-sso": 3.223.0 - "@aws-sdk/credential-provider-web-identity": 3.222.0 - "@aws-sdk/property-provider": 3.222.0 - "@aws-sdk/shared-ini-file-loader": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/credential-provider-env": 3.224.0 + "@aws-sdk/credential-provider-imds": 3.224.0 + "@aws-sdk/credential-provider-ini": 3.224.0 + "@aws-sdk/credential-provider-process": 3.224.0 + "@aws-sdk/credential-provider-sso": 3.224.0 + "@aws-sdk/credential-provider-web-identity": 3.224.0 + "@aws-sdk/property-provider": 3.224.0 + "@aws-sdk/shared-ini-file-loader": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 6ce5f88f75a6e879344ea76fa2b390c779d74f1b3657fa15367b15797b09d9713ef0d2f14c95421254a6bc0b8bde1acd2634978a6549e02a74c33160ae6130fd + checksum: b9a8112e8c9bd9ab6db0600119380deda6cf7b90accd29be8ad8e37a6a54feb65a69be5e2211f698d2fd5006df09e3c6124b70203402c5c297736dc4856d4298 languageName: node linkType: hard -"@aws-sdk/credential-provider-process@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/credential-provider-process@npm:3.222.0" +"@aws-sdk/credential-provider-process@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/credential-provider-process@npm:3.224.0" dependencies: - "@aws-sdk/property-provider": 3.222.0 - "@aws-sdk/shared-ini-file-loader": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/property-provider": 3.224.0 + "@aws-sdk/shared-ini-file-loader": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 9f51373b68be65f4ec1a1412796070c4c8570729ad1b2e6882c802b152d6ac54c2877df8049e7e483fe85af94fdd19bda6145ebe9130e7a6502f851ae8db1855 + checksum: ca2ed6dcea75cdbcd625e374b52d8801be551f460babe6eea7f9137cef6dc576621715fdf92b344689c087dfd0922ae1a6f821a49284bf84435fcf5fd4503022 languageName: node linkType: hard -"@aws-sdk/credential-provider-sso@npm:3.223.0": - version: 3.223.0 - resolution: "@aws-sdk/credential-provider-sso@npm:3.223.0" +"@aws-sdk/credential-provider-sso@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/credential-provider-sso@npm:3.224.0" dependencies: - "@aws-sdk/client-sso": 3.223.0 - "@aws-sdk/property-provider": 3.222.0 - "@aws-sdk/shared-ini-file-loader": 3.222.0 - "@aws-sdk/token-providers": 3.223.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/client-sso": 3.224.0 + "@aws-sdk/property-provider": 3.224.0 + "@aws-sdk/shared-ini-file-loader": 3.224.0 + "@aws-sdk/token-providers": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 4593a94dc86ef7218517061cf875285c2c6087f1d4a1199442055e6165701f11f9921612a04ab3c1b3f29b3132d46a8ce8cd26070fad132509e20eca1b89f217 + checksum: b683443ddc87581a61a0605e2cf656105c17df22ee8d9d7980c8e82cf3b91f5fb146962d6339f2c979b53a20442daeec210387b0f836cd4fc8ab1e789605d242 languageName: node linkType: hard -"@aws-sdk/credential-provider-web-identity@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/credential-provider-web-identity@npm:3.222.0" +"@aws-sdk/credential-provider-web-identity@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/credential-provider-web-identity@npm:3.224.0" dependencies: - "@aws-sdk/property-provider": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/property-provider": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 4cae5d24b048decc17e44cef846635d7dfc3e2941b26391b144677a355f2ed4b3b798e87e14cc04959283c4f4914267edaaf8d92e58cd61a4a529551e61459ae + checksum: bbb4617981743074b50e99c73861a6f2ef89725cdfaa2f6dece73317d0d8baa007edf5ce001d6efdf5707da97b90fb39c9049a25f4fc57547329d1d0388ccc8d languageName: node linkType: hard "@aws-sdk/credential-providers@npm:^3.208.0": - version: 3.223.0 - resolution: "@aws-sdk/credential-providers@npm:3.223.0" + version: 3.224.0 + resolution: "@aws-sdk/credential-providers@npm:3.224.0" dependencies: - "@aws-sdk/client-cognito-identity": 3.223.0 - "@aws-sdk/client-sso": 3.223.0 - "@aws-sdk/client-sts": 3.223.0 - "@aws-sdk/credential-provider-cognito-identity": 3.223.0 - "@aws-sdk/credential-provider-env": 3.222.0 - "@aws-sdk/credential-provider-imds": 3.222.0 - "@aws-sdk/credential-provider-ini": 3.223.0 - "@aws-sdk/credential-provider-node": 3.223.0 - "@aws-sdk/credential-provider-process": 3.222.0 - "@aws-sdk/credential-provider-sso": 3.223.0 - "@aws-sdk/credential-provider-web-identity": 3.222.0 - "@aws-sdk/property-provider": 3.222.0 - "@aws-sdk/shared-ini-file-loader": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/client-cognito-identity": 3.224.0 + "@aws-sdk/client-sso": 3.224.0 + "@aws-sdk/client-sts": 3.224.0 + "@aws-sdk/credential-provider-cognito-identity": 3.224.0 + "@aws-sdk/credential-provider-env": 3.224.0 + "@aws-sdk/credential-provider-imds": 3.224.0 + "@aws-sdk/credential-provider-ini": 3.224.0 + "@aws-sdk/credential-provider-node": 3.224.0 + "@aws-sdk/credential-provider-process": 3.224.0 + "@aws-sdk/credential-provider-sso": 3.224.0 + "@aws-sdk/credential-provider-web-identity": 3.224.0 + "@aws-sdk/property-provider": 3.224.0 + "@aws-sdk/shared-ini-file-loader": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 289d043f41460751e90c3adc323f3a56e517f67c0a7f8889249e0969b3302f19d093eef4a10d3528bdf34f1043f95fa41555ed5c91af4d2ca636cded1775c81c + checksum: 584dedd2d444c7d16923df3ded5e94fa2c74732cb1f70f32aa967696b941810df55941c3e9e792bf885b8980fea45763c77470ab97736ecb02c30da90e98a819 languageName: node linkType: hard -"@aws-sdk/eventstream-codec@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/eventstream-codec@npm:3.222.0" +"@aws-sdk/eventstream-codec@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/eventstream-codec@npm:3.224.0" dependencies: "@aws-crypto/crc32": 2.0.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 "@aws-sdk/util-hex-encoding": 3.201.0 tslib: ^2.3.1 - checksum: e41eebf3117623b26a825de7faebe3ce7e0f8aeaf01044902393581d36887879bdd5e73f20a708ef4031a6cdf0de2b845442cd83ac1b0f02ae9c056778c93113 + checksum: 622758cc6968e04a37017be40a28a2febe75444752e84c4f67568fe5ca7f7272f831b3231d3bb8be7af5d81825999270ccb02c77ced47bcfbcbf2e18c5af8381 languageName: node linkType: hard -"@aws-sdk/eventstream-serde-browser@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/eventstream-serde-browser@npm:3.222.0" +"@aws-sdk/eventstream-serde-browser@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/eventstream-serde-browser@npm:3.224.0" dependencies: - "@aws-sdk/eventstream-serde-universal": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/eventstream-serde-universal": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 7bddf8d48b99615e3e03f051eee4dbb92cd84a23e688c83a7a2d4b8383ece4b59864c2d337d581d3eeaa62f692f912be20091c6b0bb82631d4681fb83d3898b9 + checksum: 68dc85dad5d2447b7f3f9ff900917ff27b471ce8598c624e0e9b5f571b0cc708bffae5b634431d990c4c079069a94371611003849bfda01660fdb87b0a84e2e0 languageName: node linkType: hard -"@aws-sdk/eventstream-serde-config-resolver@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/eventstream-serde-config-resolver@npm:3.222.0" +"@aws-sdk/eventstream-serde-config-resolver@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/eventstream-serde-config-resolver@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 77f133dea7ae542cdcd8c2e4533ab862ddf7167a328c19d61ed360733ed3f9f3b4dfd66a52431300dfd87babafc0db8241e27f66178cb90973778b4ac06c2e0a + checksum: 6fff16c3cb290131c35e933024e51d58d9e3a5c8ec02e5fde00e9c798755cffc97fe88ea3606cc4879b03acb9b639446fa036ba5b65f1a644226891635ae7f90 languageName: node linkType: hard -"@aws-sdk/eventstream-serde-node@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/eventstream-serde-node@npm:3.222.0" +"@aws-sdk/eventstream-serde-node@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/eventstream-serde-node@npm:3.224.0" dependencies: - "@aws-sdk/eventstream-serde-universal": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/eventstream-serde-universal": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: f18b1254ffffaee8acd7f5f1104969ca29248f797e8a9b018aaf4945e5a6b3bd1d6f46078a878232b1e99133e963e9ad8d840389d3fc9e8b0edc00e767c69d9f + checksum: de4f0859d29271c18ca9c971f61e1e2997b26171537ce39dab0fd7588c96fc1bf8e1e7ba21c47643a2e22aaba0558172cfa4fea32e9ad9c83c29c52f33a8711a languageName: node linkType: hard -"@aws-sdk/eventstream-serde-universal@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/eventstream-serde-universal@npm:3.222.0" +"@aws-sdk/eventstream-serde-universal@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/eventstream-serde-universal@npm:3.224.0" dependencies: - "@aws-sdk/eventstream-codec": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/eventstream-codec": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: e3a02b2edc0245fce5137adfaf945c969a2285e5f681752ef257c837f578ece4872af3d7ce3ea2b6776761d70d77151034e843d98f9bbed9523cf3e533f49994 + checksum: f59d9b5a032ea5c7d5d44dedae49b7a2082b230cf9c959c691cddecf49e526a8c30ac3dcab0caa51e92cbc4bf733401c50f8883ea477f8c4549f02a4be457464 languageName: node linkType: hard @@ -894,59 +894,59 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/fetch-http-handler@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/fetch-http-handler@npm:3.222.0" +"@aws-sdk/fetch-http-handler@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/fetch-http-handler@npm:3.224.0" dependencies: - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/querystring-builder": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/querystring-builder": 3.224.0 + "@aws-sdk/types": 3.224.0 "@aws-sdk/util-base64": 3.208.0 tslib: ^2.3.1 - checksum: b6fa1a03e8e7fa4aea13f9aa154968b93ce1c6eca8f2f3fd58961bad167a720dc999cc62270bdf707d21e2136d22171f1099b4b326ccbcff52bea59a5a278630 + checksum: 9f259ff8f43cc2489e3e56680ff6ebe83a73dff68c516041c950652435a3f04ecf188c916b0fd707519d58f5ddb6bdc6d1ba08defc480fd824a2da4853f69efd languageName: node linkType: hard -"@aws-sdk/hash-blob-browser@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/hash-blob-browser@npm:3.222.0" +"@aws-sdk/hash-blob-browser@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/hash-blob-browser@npm:3.224.0" dependencies: "@aws-sdk/chunked-blob-reader": 3.188.0 "@aws-sdk/chunked-blob-reader-native": 3.208.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: c70be9c57ebfb3c549be807af61a77242952f39696eca2c38c77b6cde9afe8f83f92c8467cde9224f4da97e97635a3987759cd3996fd07ee23a1cf67dafc0d92 + checksum: 095ce6321cce2543315191b9add1e4d80c5d0ff0acdf33eebb286dbfbb66253611ddeddfb7d24eaba80279a6a946360bdee7e9f09189d786fd9684991f3aec7d languageName: node linkType: hard -"@aws-sdk/hash-node@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/hash-node@npm:3.222.0" +"@aws-sdk/hash-node@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/hash-node@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 "@aws-sdk/util-buffer-from": 3.208.0 tslib: ^2.3.1 - checksum: 25ad5a33eb74d7a6a43f1d9d668a268e1ac9d1e5f394395784fc6011d10448630f79ea1f5c5dfbed249556cd4dec2f091d0913eca82700bdea1f64564c6512ae + checksum: 4bc0887de1572a482b90047e8abe3ef82381535702dc59679c976cb31ae6cd3b784458475618ea701e7b19876708c9fe41356229aed38355123672fcdc1050fa languageName: node linkType: hard -"@aws-sdk/hash-stream-node@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/hash-stream-node@npm:3.222.0" +"@aws-sdk/hash-stream-node@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/hash-stream-node@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 6c58512030bb6e10601dda4de1efa0b61b2d6d9828018682c751a5a10a2d52e7931181818b51d8bf9cdf8ec0ef3fc2d93f0ef71ede51e91abc3b4f04a777ac4f + checksum: db411e1ff7aca6dae01abe9400e95ad6f6fd5108deeb28c29d5f619f0bda19e25851ad511b8e0d35a304f24b61cee597d18b949cc17776402386bf784b4f264a languageName: node linkType: hard -"@aws-sdk/invalid-dependency@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/invalid-dependency@npm:3.222.0" +"@aws-sdk/invalid-dependency@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/invalid-dependency@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 1b6f3c2330f57506d8431cd7d295ab483e739a8be21556b5495cf3b0501776e0b286ddb5f049acd8814f46d44380a3c4ec0790c3226cbe8dcea03998c4bc1fd7 + checksum: b356eac51b083580d9337be21132c276e08c7b86304619af5bb84c7aa893dee8928b76d730ce854314527e97d4140c99c3bf96960c721d2f5d4c716fa8475a39 languageName: node linkType: hard @@ -960,11 +960,11 @@ __metadata: linkType: hard "@aws-sdk/lib-storage@npm:^3.208.0": - version: 3.223.0 - resolution: "@aws-sdk/lib-storage@npm:3.223.0" + version: 3.224.0 + resolution: "@aws-sdk/lib-storage@npm:3.224.0" dependencies: - "@aws-sdk/middleware-endpoint": 3.222.0 - "@aws-sdk/smithy-client": 3.222.0 + "@aws-sdk/middleware-endpoint": 3.224.0 + "@aws-sdk/smithy-client": 3.224.0 buffer: 5.6.0 events: 3.3.0 stream-browserify: 3.0.0 @@ -972,267 +972,267 @@ __metadata: peerDependencies: "@aws-sdk/abort-controller": ^3.0.0 "@aws-sdk/client-s3": ^3.0.0 - checksum: 85dccc0148b404cb822156eafca32e918835f2beb6f218fd6062cce3ea93f80cf7229dd58f2a1c06959880958cb893a2b3e6e05526e080cd76c9b3971689602f + checksum: fe23a8adce2df28cc46b941010c7a426d86f3c6993def09d3c4a2d1e14400f0f511b8e15caaa10cb64cb1863413cc6dd026750cc4195b246ee3b6976b3df9a18 languageName: node linkType: hard -"@aws-sdk/md5-js@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/md5-js@npm:3.222.0" +"@aws-sdk/md5-js@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/md5-js@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 "@aws-sdk/util-utf8-browser": 3.188.0 "@aws-sdk/util-utf8-node": 3.208.0 tslib: ^2.3.1 - checksum: 1fce491eef05bbf11242472e65a8ac379fd8061c3afc23e1e320fe86ddcb2babaa4696e1ebb452e69fcacf4f812d92490e25b7c928edb44d667db6718e1310cd + checksum: 6c886d29a47da9af5e71b637e7adbc28f4e09cbb69d31ec2f69f2d9cdb74288fa82bb24e46bceeee49c0bb4d855b2cf2f35951a7920ac507a0776a49907ad5e4 languageName: node linkType: hard -"@aws-sdk/middleware-bucket-endpoint@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-bucket-endpoint@npm:3.222.0" +"@aws-sdk/middleware-bucket-endpoint@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-bucket-endpoint@npm:3.224.0" dependencies: - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/types": 3.224.0 "@aws-sdk/util-arn-parser": 3.208.0 "@aws-sdk/util-config-provider": 3.208.0 tslib: ^2.3.1 - checksum: 2f1d0da868788b8716a39e79e885cad3fa481701f6965eade6acd9d60c39fa95a257ca3c3d70b84936cead854232c17ddd6d2d4ce414735959af567e518aeb6e + checksum: 6653f5746286103e2b14278f204aac47336a924e410506cff7f51ce7450bd725f52414bd55c7f0bd201469ee520583c0d2091df3234cc05dc71d31ef54b71810 languageName: node linkType: hard -"@aws-sdk/middleware-content-length@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-content-length@npm:3.222.0" +"@aws-sdk/middleware-content-length@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-content-length@npm:3.224.0" dependencies: - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: c21d04fa94ad3b20f507ad41f65cd010e84ce6ef9a4b9ae9c8d66ea8ca60b8b4c1436a9a1c19805de79b95b6f885f18dfda50ba19f6546023a71f36577797f66 + checksum: 509fc34b438d2bc9a1fa0c987b41cfcff57b151e23b1d74b9b4d8c8533b99b9cd76b15cae845b8749e9eb33fb41e7f15813c4e9328a563acf2f7427ecb17d3b6 languageName: node linkType: hard -"@aws-sdk/middleware-endpoint@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-endpoint@npm:3.222.0" +"@aws-sdk/middleware-endpoint@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-endpoint@npm:3.224.0" dependencies: - "@aws-sdk/middleware-serde": 3.222.0 - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/signature-v4": 3.222.0 - "@aws-sdk/types": 3.222.0 - "@aws-sdk/url-parser": 3.222.0 + "@aws-sdk/middleware-serde": 3.224.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/signature-v4": 3.224.0 + "@aws-sdk/types": 3.224.0 + "@aws-sdk/url-parser": 3.224.0 "@aws-sdk/util-config-provider": 3.208.0 - "@aws-sdk/util-middleware": 3.222.0 + "@aws-sdk/util-middleware": 3.224.0 tslib: ^2.3.1 - checksum: 3a1240f66457d1de73a9c9f5f8baaf628f307d46840ef323492ac68ede5504dee6b1a9299195212e2b12e039ac7d6eafefa72cc1502799bcae6fd77c5d84da93 + checksum: ec64a4cd3fe5f8008a6783c26a41c31ddc8fc100c399d87e1fd3e9c13a8916debdc0d698ecb53fdee853a877bd026df4b40106e74b431510d392e619143d8dae languageName: node linkType: hard -"@aws-sdk/middleware-expect-continue@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-expect-continue@npm:3.222.0" +"@aws-sdk/middleware-expect-continue@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-expect-continue@npm:3.224.0" dependencies: - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 285ed55ab00f9a46af98003a34af9398e2ab044f0892f51b4f498ec1bfc7b83065bf4d6680da9bc2a581fcab438eac76a385b1038e3683aec8c9056285ef9a2f + checksum: b1ea74285d5b25538971a6fdf2c8836f6c0324b5f0fbf8863df7e8faf3d786612671a3e6694369ed4777256fc4bf920087706bf7916650128657be22224c4dc4 languageName: node linkType: hard -"@aws-sdk/middleware-flexible-checksums@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-flexible-checksums@npm:3.222.0" +"@aws-sdk/middleware-flexible-checksums@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-flexible-checksums@npm:3.224.0" dependencies: "@aws-crypto/crc32": 2.0.0 "@aws-crypto/crc32c": 2.0.0 "@aws-sdk/is-array-buffer": 3.201.0 - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: b55f9f45b4fd3c9aeed2f80c030b19fb1e2602e1062c692b4f7c5c9d87e7b7c036e7ebdac066dbfe6a3cde275a9091235ff2793a657630a330aaa652c6e53b50 + checksum: cd8a7a9bedfe957e0167e812ce0b3b1410571272d955d272493baae64ac81166fd62ce8d72affa6d5e989728919515221e8c7733a32e53e1be6e61dbaa896597 languageName: node linkType: hard -"@aws-sdk/middleware-host-header@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-host-header@npm:3.222.0" +"@aws-sdk/middleware-host-header@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-host-header@npm:3.224.0" dependencies: - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 0806ce2b235d8ec6328caa1cacdbdbee82196f82b7dc96e1ce6d8413390a35c73475df3a102391a99cd5996ef806054969ea00338064889997bd15428a064c73 + checksum: 33c7e89226e07068413503b89d5f79adb677e3f80f55b5613089a35b7a9be5506d5bead56eacffd9bb658d2303d1224acd6037e8c563c794e45d2653664044e9 languageName: node linkType: hard -"@aws-sdk/middleware-location-constraint@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-location-constraint@npm:3.222.0" +"@aws-sdk/middleware-location-constraint@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-location-constraint@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 54d77c68746e836ec9317f4062152beb09fccee15266f52b7e4ee6a19d5d40b8c4bb720a867170acdf8c77d8ef7b08701cf1a76b202dc3c191488a10507c1bdc + checksum: f8389db2f32fe8f30142e30a7eb0668a29a9825f009d031bd1b66c1360025594ffa785eb610c3a7f456809a77a67663654c5d3ebe6ed1563347b8ff9a0dcb618 languageName: node linkType: hard -"@aws-sdk/middleware-logger@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-logger@npm:3.222.0" +"@aws-sdk/middleware-logger@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-logger@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: c0fef1f56ba710a2e5784515f96d8c8408b3e882288d1bc8e6201bf8128d921de4b2dbaaeca1fee48334539587bf514cb77796cc0fab989173c4d785fc220db5 + checksum: 0b859bcbcce1a5fb449d2be7180a08b27d45d634fe71f9ac7e999bfa7fca8e9d26cf47bfdadb02b499b7a7e65d8d83ba0e2d58b2fdd970266220f54fa7efc3a4 languageName: node linkType: hard -"@aws-sdk/middleware-recursion-detection@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-recursion-detection@npm:3.222.0" +"@aws-sdk/middleware-recursion-detection@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-recursion-detection@npm:3.224.0" dependencies: - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 6a3b31de18a32585a86948f312aefd98ec7a9a9ff5b8044f7f11dc8d7737e5fdb5d867f2971ffcf645db118892a28518fdb9689cc8fb64e947717281cca32031 + checksum: 27649af44cc8b97a75e70796e816b467931316cc7c5d197cb66a75d61e59941bfc23508a480f796da537ca083fe977b000446327e4d2acd5d85810be70a997c5 languageName: node linkType: hard -"@aws-sdk/middleware-retry@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-retry@npm:3.222.0" +"@aws-sdk/middleware-retry@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-retry@npm:3.224.0" dependencies: - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/service-error-classification": 3.222.0 - "@aws-sdk/types": 3.222.0 - "@aws-sdk/util-middleware": 3.222.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/service-error-classification": 3.224.0 + "@aws-sdk/types": 3.224.0 + "@aws-sdk/util-middleware": 3.224.0 tslib: ^2.3.1 uuid: ^8.3.2 - checksum: 764a56b92ba0178166cb188db20e521360a625d763a94e9470eeda83ad1d6d240186b5eeec41592896aa09f7c1370e604513419bf30683cbcbd5e5ae625b3a98 + checksum: a5d3b0db4a8734a3b693b2176a196c4f16101d911d8d2bd393b11f184f5335102cc9b5fec7ea4470784de12d2ef3e7c53be7e4b55c545483385fe7c6e33dd6c0 languageName: node linkType: hard -"@aws-sdk/middleware-sdk-s3@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-sdk-s3@npm:3.222.0" +"@aws-sdk/middleware-sdk-s3@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-sdk-s3@npm:3.224.0" dependencies: - "@aws-sdk/middleware-bucket-endpoint": 3.222.0 - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/middleware-bucket-endpoint": 3.224.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/types": 3.224.0 "@aws-sdk/util-arn-parser": 3.208.0 tslib: ^2.3.1 - checksum: a09aead012e6aae12467ba45b1740255b60da4f5cd816043abc8af0fd4905133063454c755d08ab3dcbf11096d42d0f92ab20b51d08c7d4daaa55f0586e99558 + checksum: 872b249cb6c37d05da8352380ddbbe7cf841f7f7eebc46a7de69990dc124ce2ebab1221d9120f4a4870c74791817f14388e89f76a3817273c0750e2e41ea71dc languageName: node linkType: hard -"@aws-sdk/middleware-sdk-sqs@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-sdk-sqs@npm:3.222.0" +"@aws-sdk/middleware-sdk-sqs@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-sdk-sqs@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 "@aws-sdk/util-hex-encoding": 3.201.0 tslib: ^2.3.1 - checksum: b882f5e83fa65f8e2f1dceaa96a0995d2058fee84dbd16048198b9f45d1f6763215363fbdb99b8f137a580b8cdac820992e776a562378327d7d86b6cca4e8d87 + checksum: 1c616b94b36b2f3cedf6c7b781785314bd8f59abbb9cb16596bea66b6448f65a5023a21121cf40889507227e892be1628adf9b290d24c0b1e5bd0718ff1993cf languageName: node linkType: hard -"@aws-sdk/middleware-sdk-sts@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-sdk-sts@npm:3.222.0" +"@aws-sdk/middleware-sdk-sts@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-sdk-sts@npm:3.224.0" dependencies: - "@aws-sdk/middleware-signing": 3.222.0 - "@aws-sdk/property-provider": 3.222.0 - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/signature-v4": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/middleware-signing": 3.224.0 + "@aws-sdk/property-provider": 3.224.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/signature-v4": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 0ad309d6490586686643602199b8a4389818568b6a7f6c41c97ff0b85e91651c9bed05da31c3eddf1ad329af926ac7efa5b8ee353c52a540ef1a529d6346350f + checksum: a79b9522fbda47da0908e1e0d233205a8cb3ca917cc3d93e7a51ae4631a53178e923eac3d68cc025fa1aea66637f4b29f5437ad83b954ef94d1c03e9d3c41e60 languageName: node linkType: hard -"@aws-sdk/middleware-serde@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-serde@npm:3.222.0" +"@aws-sdk/middleware-serde@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-serde@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 28dfe6d9c8d662d449ec4df9c30aa0eb18103f8cff8f3fa5325fc41a4e94b16e054d97d1325fe68b2ef497abfeabfc96b4ad63e485fb71693a488869fe732c33 + checksum: 87d78fdc57003022844cf4aa9ba94ba0a9329e9aef927a1fedf5291e894f21f070815d7480aafdcf8fb393f419899fc9c7c41f17550ea5c02ec725f46b17e0ba languageName: node linkType: hard -"@aws-sdk/middleware-signing@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-signing@npm:3.222.0" +"@aws-sdk/middleware-signing@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-signing@npm:3.224.0" dependencies: - "@aws-sdk/property-provider": 3.222.0 - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/signature-v4": 3.222.0 - "@aws-sdk/types": 3.222.0 - "@aws-sdk/util-middleware": 3.222.0 + "@aws-sdk/property-provider": 3.224.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/signature-v4": 3.224.0 + "@aws-sdk/types": 3.224.0 + "@aws-sdk/util-middleware": 3.224.0 tslib: ^2.3.1 - checksum: 0e43183ba97d40162d2be2d8f0965c532691ebbb9bcb6216cb9b43f6fa2ed81118f3c06f991e5d01b3dc5b8d3cc692344b53996a8e13085fb9c658683da5e791 + checksum: 2730138c34e1bb3b1fc303b8056803060632dec90e5e9e036189b26555c2139f6de5a5a1c9ae5289de3da6a65f0de4f1e8661703a9c752f794b3d42b554d090a languageName: node linkType: hard -"@aws-sdk/middleware-ssec@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-ssec@npm:3.222.0" +"@aws-sdk/middleware-ssec@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-ssec@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: fec3cf9a4495c1d2bdcd1ca3d577a077df9427a8fb1afbf53eede63347e1d0181b031e7c4625736079a726bf9c90ae5140aed2655c2282b8dcfc2957ca2641af + checksum: d8f96f4b7dcc74f7871e646e3b6808b305e6f4b61401523045188e7b0c23781d28f4d0cace8bcbaf5e38f9c118f4cd7fe67304c1f80b57cab5b3833f5b20a53a languageName: node linkType: hard -"@aws-sdk/middleware-stack@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-stack@npm:3.222.0" +"@aws-sdk/middleware-stack@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-stack@npm:3.224.0" dependencies: tslib: ^2.3.1 - checksum: 5f143c1a964016a7296798e8ca457b7a364bc8e816eb1829be5c3b5c0f7430dbad2df3725d96bee4f4ad9ac4937083e7b2bf7c72093775c5b9fa85f697304361 + checksum: 144e2b7e5aca6d1ad562bd9d1cba0cf6f12bf63a52dfef04ff38f32e76a76d2e4180fee6a81cc8c65ca2cef4c2617cabd74f360336f72e07068af9205536ebc4 languageName: node linkType: hard -"@aws-sdk/middleware-user-agent@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/middleware-user-agent@npm:3.222.0" +"@aws-sdk/middleware-user-agent@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/middleware-user-agent@npm:3.224.0" dependencies: - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 3521fc61597faa8e53ee2290a4e1342ad0a22591362757c57985add5e3a85978f9e8fc83e993670740eae532937886c61ca85a8c534327ff4ef1ed721883e7a9 + checksum: b12568290e2e4c367e387f3736eab1b442e7d16690ccc27044f25078dd27db4c1cc5635d3b76d5445545164d1184a4c38875f76f4461e0ea629b76df3f9ee03d languageName: node linkType: hard -"@aws-sdk/node-config-provider@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/node-config-provider@npm:3.222.0" +"@aws-sdk/node-config-provider@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/node-config-provider@npm:3.224.0" dependencies: - "@aws-sdk/property-provider": 3.222.0 - "@aws-sdk/shared-ini-file-loader": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/property-provider": 3.224.0 + "@aws-sdk/shared-ini-file-loader": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 53c2e7d7c1ac5c54a0fbf5b5fdf963c89cc659f51189a6086f939d5adc0d9c3500e3205b159285f447df3bbf39ac32e67e1c313bbc368ad1c1ae8d26f771a3f4 + checksum: 26a970b6851d222b0cf7dcd5903c6b8a62c1092ae9ac414828891f47e12d32c84cf2a9f8677717d2c0126c4e3b4dbac2c834971de26d548e5c04b5b66b291cb9 languageName: node linkType: hard -"@aws-sdk/node-http-handler@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/node-http-handler@npm:3.222.0" +"@aws-sdk/node-http-handler@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/node-http-handler@npm:3.224.0" dependencies: - "@aws-sdk/abort-controller": 3.222.0 - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/querystring-builder": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/abort-controller": 3.224.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/querystring-builder": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 06a66d1e54e0fd856c6172f2cfd97daefab8d5b996eecfb83b05cb29f4830ff00af1a5deb2726ec88b306a585be214e3fc7b3ead3ea9b70776a70a768424a70d + checksum: 14ea9f596919cd6b577e9dac59131aea5ec3651ed3ad45a4010ac46ec240a3b608116b0da0fe5d2c945bfb4015630592bb1ccea1736513d4af070c6225f357be languageName: node linkType: hard -"@aws-sdk/property-provider@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/property-provider@npm:3.222.0" +"@aws-sdk/property-provider@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/property-provider@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 924965232eeef1870c7ed108b7ab1b6d23da3032f0741b129a883eab472c17c9811b95f79e3e84299cd0a44512b3aedfafa05ab0b232a0b17782ed327a4a1965 + checksum: 314c35b9e2b721f996a3098464fd3af306fe41c68730c7ae22e50f16896ec5b680540567a2efa4c94fa0601d521a4070ae61e1781d7e9210cd0cf934f281fe60 languageName: node linkType: hard @@ -1246,13 +1246,13 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/protocol-http@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/protocol-http@npm:3.222.0" +"@aws-sdk/protocol-http@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/protocol-http@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 11650667a4072246e6a12269c95e2c5a746d32032d0a54e3c8d062c711fef07b0c6fc2ad2a23c9ef82a97d305bf9a9222ccbcc3adb2835355b8b0199d3839f75 + checksum: 148d8884566823a7bec10b2bf85c123891ddd23b9e1a544e60a9f55902e390a469699964ddfe19810883ca8a72170918a0a57415e8dfe1da0ed26162d8dedb05 languageName: node linkType: hard @@ -1267,51 +1267,51 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/querystring-builder@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/querystring-builder@npm:3.222.0" +"@aws-sdk/querystring-builder@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/querystring-builder@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 "@aws-sdk/util-uri-escape": 3.201.0 tslib: ^2.3.1 - checksum: 418bc648f3597e1b96765784acb6964dc3aaca6853582d7e91aaaaf793d9ee1fe8170da31cddff72b36b95456fc5566589120c94988711726dc80ddf345e9839 + checksum: 6435f62feb5bfa478a4f40b7bf4525de8cf021a69b05dd73951eb03c6bea610477942b5c79beca5c4f9c0544948a105c4ef38eb0470b8266cec9c2d656047c68 languageName: node linkType: hard -"@aws-sdk/querystring-parser@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/querystring-parser@npm:3.222.0" +"@aws-sdk/querystring-parser@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/querystring-parser@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: d209807dc727c6eebf885d1e7a440e0fdb9c68e27f7f6e48a326f97eab8da9172dba91a35015656dffd10d7a2b484237e49705d332948cfed747ae04f08de9ab + checksum: d95aadf9c7af1b06ea3aeab3e734674ae744b6c674cbc4e9ce1f58177d930b56590c8a41b5e7eb1c9fa1c11afcad175813718d6de5b249cea36c8f0dfc81c041 languageName: node linkType: hard -"@aws-sdk/service-error-classification@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/service-error-classification@npm:3.222.0" - checksum: 7277ef3831a91821ce3306eda993d4d646ae15de9c638a4a8804d8db330a267cb6e3a20e3eb886d9cac634a77b0e1f3eb0706ce7c38bc42f4b67a1fac6f6d76a +"@aws-sdk/service-error-classification@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/service-error-classification@npm:3.224.0" + checksum: e9942b92125170f0690ceb68819cfb72cfe0e6d040bc1452c14938eeb1b69c5c1b1bc4dadd85d5580447e51d21a92965203556e6893b02ad2a339f62a64090ad languageName: node linkType: hard -"@aws-sdk/shared-ini-file-loader@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/shared-ini-file-loader@npm:3.222.0" +"@aws-sdk/shared-ini-file-loader@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/shared-ini-file-loader@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 2efc2618e65058bd549a6acd2cd68c1e8d2a5079a5447328908eb952651714d616fdb1a95622c63b4718f03ac251eb6d5598a666e1c01f1ea223b2071ee74371 + checksum: 3b03aa70a9396095152f0bb7e698bf00e572d9dc9ba166bb6eca73c0ad9694af9439beb40da2959711e4c44c6fdd12283a7c910e576bb4568429d1c207e9f823 languageName: node linkType: hard -"@aws-sdk/signature-v4-multi-region@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/signature-v4-multi-region@npm:3.222.0" +"@aws-sdk/signature-v4-multi-region@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/signature-v4-multi-region@npm:3.224.0" dependencies: - "@aws-sdk/protocol-http": 3.222.0 - "@aws-sdk/signature-v4": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/protocol-http": 3.224.0 + "@aws-sdk/signature-v4": 3.224.0 + "@aws-sdk/types": 3.224.0 "@aws-sdk/util-arn-parser": 3.208.0 tslib: ^2.3.1 peerDependencies: @@ -1319,45 +1319,45 @@ __metadata: peerDependenciesMeta: "@aws-sdk/signature-v4-crt": optional: true - checksum: 6ab68c8001c85c79974f5bd272e6caeebe486d40665be1658aba4bce11e518873fc3bc72c9731fbfa399fa5d09b980f878aaa1c01330ebc0b026520c8d3f3fed + checksum: 28eed25747a1e52a1bae5fe3909c0e0aba243a4d76908746f9e3a6418b4fc1ac5f14db5108334969231d2086d739fea9f7bc3c5c79daa08761d95406dd02a5b3 languageName: node linkType: hard -"@aws-sdk/signature-v4@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/signature-v4@npm:3.222.0" +"@aws-sdk/signature-v4@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/signature-v4@npm:3.224.0" dependencies: "@aws-sdk/is-array-buffer": 3.201.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 "@aws-sdk/util-hex-encoding": 3.201.0 - "@aws-sdk/util-middleware": 3.222.0 + "@aws-sdk/util-middleware": 3.224.0 "@aws-sdk/util-uri-escape": 3.201.0 tslib: ^2.3.1 - checksum: 66f9f0f8170cdede19d4194a5bb56fc914c9013bf9dbc60d84aa4340d15d4f5ed73a477484fac943de08f57d924423eaa01f913bd3055ee0b7b3c5b119f9e348 + checksum: d25d5058ca95e602dee993405e2b3766c866d5f1e1084dac3140f32e390e8dddb50aae716e415571eec73691ec1c3134f2377c4742c8310c11a4eaea1911a4cc languageName: node linkType: hard -"@aws-sdk/smithy-client@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/smithy-client@npm:3.222.0" +"@aws-sdk/smithy-client@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/smithy-client@npm:3.224.0" dependencies: - "@aws-sdk/middleware-stack": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/middleware-stack": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 0bfbd061a001054a99234a819e9313a2bfd9131e013cdd46674f3dc06faa3e416245d8e3a86e05fad942da5ec6ef34988e686e29d5940ad738452116a4e70173 + checksum: fa42228e506b4114e97ee3de1b1c1980d65ada4248eb9637e5a1e4b132b7ce25adc7581628a3e4638de9344e9ab8994b8560c172349a3024626f599e430e125e languageName: node linkType: hard -"@aws-sdk/token-providers@npm:3.223.0": - version: 3.223.0 - resolution: "@aws-sdk/token-providers@npm:3.223.0" +"@aws-sdk/token-providers@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/token-providers@npm:3.224.0" dependencies: - "@aws-sdk/client-sso-oidc": 3.223.0 - "@aws-sdk/property-provider": 3.222.0 - "@aws-sdk/shared-ini-file-loader": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/client-sso-oidc": 3.224.0 + "@aws-sdk/property-provider": 3.224.0 + "@aws-sdk/shared-ini-file-loader": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 08d724bc685b90761159b449413c9dddb581cc61cd982ee9a189e8682d1a703acc70663beec2ae31d1ebf6fe9a86480b63fb65da531e35b2e8772a2c3906969f + checksum: 88f930b3f58cd3e31786b06083aef40fdc572139523745ab361935986552625f0ddff5fd08f18046d992a43931887968aab278f16bc7ea93c0b611f8bade24c2 languageName: node linkType: hard @@ -1368,21 +1368,21 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/types@npm:3.222.0, @aws-sdk/types@npm:^3.1.0, @aws-sdk/types@npm:^3.110.0, @aws-sdk/types@npm:^3.208.0": - version: 3.222.0 - resolution: "@aws-sdk/types@npm:3.222.0" - checksum: 41d70038c69b1e9b9dbf0489a8aa416da1c96c4ff84e8d5db01ea4877efceb4c0fdd0ce27bdeea8c67afc4d168151dc63938302a3f945922143f37472c4fd9da +"@aws-sdk/types@npm:3.224.0, @aws-sdk/types@npm:^3.1.0, @aws-sdk/types@npm:^3.110.0, @aws-sdk/types@npm:^3.208.0": + version: 3.224.0 + resolution: "@aws-sdk/types@npm:3.224.0" + checksum: fa6682baf21dbd50b54e8ccde97ce26c69f18c60a6a7a8e4099526d89b46159d77534b1756db8d3e7ca408b9283b8e5685d329572c85ea9686a49f2e42b9c822 languageName: node linkType: hard -"@aws-sdk/url-parser@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/url-parser@npm:3.222.0" +"@aws-sdk/url-parser@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/url-parser@npm:3.224.0" dependencies: - "@aws-sdk/querystring-parser": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/querystring-parser": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: ef878c49c61efc2bd6a94ffebfbacade2bdd19e390785e48a8c5c151db86d099c391c30304ba6ade1cdd94c1c41d87ce160d6570cd4f76058e1cbbe0063829f4 + checksum: ac7007c3ce03610ded32e7d77f211733434b08b28be0f94e1ee9e6e228463d95e69b4abe4f977e2f0c3836c3a4350a5041fa787b4363e822ec888c41b32da754 languageName: node linkType: hard @@ -1442,39 +1442,39 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/util-defaults-mode-browser@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/util-defaults-mode-browser@npm:3.222.0" +"@aws-sdk/util-defaults-mode-browser@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/util-defaults-mode-browser@npm:3.224.0" dependencies: - "@aws-sdk/property-provider": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/property-provider": 3.224.0 + "@aws-sdk/types": 3.224.0 bowser: ^2.11.0 tslib: ^2.3.1 - checksum: 3e936e38976a9edac22ff32990c55ca01a9f3bb058ebf1f933a1f5240bb6c26394224284db521b9011e88bdb6d567b7aa7584e0a594ae962ad9f0e3740801712 + checksum: 02a90d352a80bab1ddd4799dc74c4fb11d786e33088bf08d52ff9514cbad481480995bf4ad5353579eb8bc30e98e8bf059e5213a3be383db0008996188ff366a languageName: node linkType: hard -"@aws-sdk/util-defaults-mode-node@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/util-defaults-mode-node@npm:3.222.0" +"@aws-sdk/util-defaults-mode-node@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/util-defaults-mode-node@npm:3.224.0" dependencies: - "@aws-sdk/config-resolver": 3.222.0 - "@aws-sdk/credential-provider-imds": 3.222.0 - "@aws-sdk/node-config-provider": 3.222.0 - "@aws-sdk/property-provider": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/config-resolver": 3.224.0 + "@aws-sdk/credential-provider-imds": 3.224.0 + "@aws-sdk/node-config-provider": 3.224.0 + "@aws-sdk/property-provider": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 37718633f793e9880f4a93e6d56cb72b1cfc4e45d3177d2065e5179788941cf0f43fb45c740763debbe33fc8a62d1d09c3fe87809c71c039a5dd071cec3a0306 + checksum: 26b6e76e75a3a658cdcfb1dcecddd28e732fd9dd69e288872d44631283322f70cd85a6da00bcc8d491ecf7c29a6eb2cddd06c8813a4844b7dac04467404ce7bf languageName: node linkType: hard -"@aws-sdk/util-endpoints@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/util-endpoints@npm:3.222.0" +"@aws-sdk/util-endpoints@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/util-endpoints@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 3e71a50994363b978ab35bc1fee7ab21c157731e0c7364f064d40244058c96188c238b27d2f9097becc548b86e0abaca886cea03e89b8b219fb0d0a7fea6a249 + checksum: ffc030b7cd991364b4c89e0ed5b91a886c214bfbfbca7ef8a8aa8006e443a17d0c47a21b0f80b8a22878299bd31ae2153a8e4ee309372a13c678900e52949f00 languageName: node linkType: hard @@ -1496,38 +1496,38 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/util-middleware@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/util-middleware@npm:3.222.0" +"@aws-sdk/util-middleware@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/util-middleware@npm:3.224.0" dependencies: tslib: ^2.3.1 - checksum: 807dd36731c7aa59658e4eea5747d6d363b5e5715d0d2c5554c265df6729735f31e790e8e6130d5d56b4923e29080a656e19978631a7ff667f969bfdae8c6320 + checksum: 8e84a4ca626e5eeb087817685f28a064dc969225df1f295ac6152ab9613c8b6ef13c70ae181fe23b35dcdcdbfd1359f0d0ffb0dbf841c403359227f6fd44db6a languageName: node linkType: hard -"@aws-sdk/util-stream-browser@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/util-stream-browser@npm:3.222.0" +"@aws-sdk/util-stream-browser@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/util-stream-browser@npm:3.224.0" dependencies: - "@aws-sdk/fetch-http-handler": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/fetch-http-handler": 3.224.0 + "@aws-sdk/types": 3.224.0 "@aws-sdk/util-base64": 3.208.0 "@aws-sdk/util-hex-encoding": 3.201.0 "@aws-sdk/util-utf8-browser": 3.188.0 tslib: ^2.3.1 - checksum: 08428921f9a49824ea5b335c4bdacb6216346b8c0fd2e6914a45982c96d440eabc4a05a91e217ff7a5696d802c2fb1ab458546c34ef66edf5e52f41e3ee98dda + checksum: 904b2cbf307786e80900a35db85a807299a0a5cb87e1466069173d5f262d96955d6c0c2e4fed13099726ccb5b5f738a86ea1b8430bb41a8bbf0f45a3d4667802 languageName: node linkType: hard -"@aws-sdk/util-stream-node@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/util-stream-node@npm:3.222.0" +"@aws-sdk/util-stream-node@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/util-stream-node@npm:3.224.0" dependencies: - "@aws-sdk/node-http-handler": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/node-http-handler": 3.224.0 + "@aws-sdk/types": 3.224.0 "@aws-sdk/util-buffer-from": 3.208.0 tslib: ^2.3.1 - checksum: 04d875a572d45604dc71c1e20b90136f5b8a20820f53ad5ab4e76ee86fa3e043e015c40d041d81822703305c9530baccc595534f6674903b7f830ea9649c050b + checksum: e97fc82dd5071d1c4b84a644730505b43e8a039d8515913e3d1bd00c475eca6fdfb3550b281af939ebb14da79bef2f7f50e8f2459ff0b05732827b25c7b20b65 languageName: node linkType: hard @@ -1545,30 +1545,30 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/util-user-agent-browser@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/util-user-agent-browser@npm:3.222.0" +"@aws-sdk/util-user-agent-browser@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/util-user-agent-browser@npm:3.224.0" dependencies: - "@aws-sdk/types": 3.222.0 + "@aws-sdk/types": 3.224.0 bowser: ^2.11.0 tslib: ^2.3.1 - checksum: 14a878c88948fed8c6e19324a6f28088cbb964580e74c97ec319c8afb426f17b35cfbcbc40bb43b977b3a5a9b05aaa254dfc23a028d29802058148f28507f7f1 + checksum: 49866dc6c000d60b4ab387de732458b41bb534bc9d51fbd28ac57c166bf37bbe88c8652121fefc23740de909aa550b98f4e9cb39f4e27c4b37999df7d5d5f9dc languageName: node linkType: hard -"@aws-sdk/util-user-agent-node@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/util-user-agent-node@npm:3.222.0" +"@aws-sdk/util-user-agent-node@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/util-user-agent-node@npm:3.224.0" dependencies: - "@aws-sdk/node-config-provider": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/node-config-provider": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 peerDependencies: aws-crt: ">=1.0.0" peerDependenciesMeta: aws-crt: optional: true - checksum: 36a9cf397196ef6c188d307f6202b10d98629dfe7583dc903e22870b553cca7624e2732f16e9511e690433665966e5adce7472299081eda1acf8d33b4c977ea4 + checksum: b9b240ee2776776e2d44dfc198424a23b26b3a2bb3cdd107fb9d3fb2179476f93f93399991e1c447fe13c98d793676876c50c8d70a47eb3c34e98dfa0318da95 languageName: node linkType: hard @@ -1591,14 +1591,14 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/util-waiter@npm:3.222.0": - version: 3.222.0 - resolution: "@aws-sdk/util-waiter@npm:3.222.0" +"@aws-sdk/util-waiter@npm:3.224.0": + version: 3.224.0 + resolution: "@aws-sdk/util-waiter@npm:3.224.0" dependencies: - "@aws-sdk/abort-controller": 3.222.0 - "@aws-sdk/types": 3.222.0 + "@aws-sdk/abort-controller": 3.224.0 + "@aws-sdk/types": 3.224.0 tslib: ^2.3.1 - checksum: 840d57ff2250d6a9fd917ed80db5d8ecea38b056453aaab78c7b19c9858f6e837ffd06f430e5682d0fbd4f3d47ac1a79fcf9f1ed9af7da2e446e3a19239777ec + checksum: 7360833ecad2d0b2b6add1e36f09900f98227243ba44312e3a1363bfb180e987b3a35de64aee41edc15f9dc2c6b85e83d8fb11fa8fc46ef855cb83c08542b42a languageName: node linkType: hard From bc2f9ad271d9591e4b0368ef89f32225f4a8cb46 Mon Sep 17 00:00:00 2001 From: Dawit Ameneshewa Date: Wed, 7 Dec 2022 09:44:15 +0300 Subject: [PATCH 23/36] Add documentation for an optional `handleStorageChange` method in `StorageApi` Signed-off-by: Dawit Ameneshewa --- packages/core-app-api/api-report.md | 2 ++ packages/core-plugin-api/api-report.md | 1 + packages/core-plugin-api/src/apis/definitions/StorageApi.ts | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/core-app-api/api-report.md b/packages/core-app-api/api-report.md index 70312a54a5..54aa700472 100644 --- a/packages/core-app-api/api-report.md +++ b/packages/core-app-api/api-report.md @@ -558,6 +558,8 @@ export class WebStorage implements StorageApi { // (undocumented) get(key: string): T | undefined; // (undocumented) + handleStorageChange(eventKey: StorageEvent['key']): void; + // (undocumented) observe$( key: string, ): Observable>; diff --git a/packages/core-plugin-api/api-report.md b/packages/core-plugin-api/api-report.md index cebf09e908..ed40792c6a 100644 --- a/packages/core-plugin-api/api-report.md +++ b/packages/core-plugin-api/api-report.md @@ -697,6 +697,7 @@ export type SignInPageProps = { // @public export interface StorageApi { forBucket(name: string): StorageApi; + handleStorageChange?(eventKey: StorageEvent['key']): void; observe$( key: string, ): Observable>; diff --git a/packages/core-plugin-api/src/apis/definitions/StorageApi.ts b/packages/core-plugin-api/src/apis/definitions/StorageApi.ts index f8c0948ec6..5ecf251e2d 100644 --- a/packages/core-plugin-api/src/apis/definitions/StorageApi.ts +++ b/packages/core-plugin-api/src/apis/definitions/StorageApi.ts @@ -91,7 +91,7 @@ export interface StorageApi { * * @param eventKey - The key of a storage event object */ - handleStorageChange(eventKey: StorageEvent['key']): void; + handleStorageChange?(eventKey: StorageEvent['key']): void; /** * Returns an immediate snapshot value for the given key, if possible. From 95b98d700963f56ba675979d352b79855f722eb8 Mon Sep 17 00:00:00 2001 From: Maximilian Vorbrodt Date: Wed, 7 Dec 2022 10:10:51 +0100 Subject: [PATCH 24/36] clean up some deprecations Signed-off-by: Maximilian Vorbrodt --- .../ProxiedSignInIdentity.test.ts | 24 ++++++++++--------- .../ProxiedSignInIdentity.ts | 2 +- .../layout/SignInPage/LegacyUserIdentity.ts | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInIdentity.test.ts b/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInIdentity.test.ts index a3f6c185f8..3a40f5bb4b 100644 --- a/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInIdentity.test.ts +++ b/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInIdentity.test.ts @@ -48,7 +48,7 @@ describe('ProxiedSignInIdentity', () => { it('handles a token that has no exp', async () => { const [a, _b, c] = validBackstageToken.split('.'); - const botched = `${a}.${btoa(JSON.stringify({}))}.${c}`; + const botched = `${a}.${window.btoa(JSON.stringify({}))}.${c}`; expect(tokenToExpiry(botched)).toEqual( new Date(new Date(Date.now() + DEFAULTS.defaultTokenExpiryMillis)), ); @@ -81,16 +81,18 @@ describe('ProxiedSignInIdentity', () => { backstageIdentity: { token: [ 'eyJhbGciOiJFUzI1NiIsImtpZCI6ImMxNTMzNDRiLWZjYzktNGIwOS1iN2ZhLTU3ZmM5MDhjMjBiNiJ9', - btoa( - JSON.stringify({ - iss: 'http://localhost:7007/api/auth', - sub: 'user:default/freben', - aud: 'backstage', - iat, - exp, - ent: ['group:default/my-team'], - }), - ).replace(/=/g, ''), + window + .btoa( + JSON.stringify({ + iss: 'http://localhost:7007/api/auth', + sub: 'user:default/freben', + aud: 'backstage', + iat, + exp, + ent: ['group:default/my-team'], + }), + ) + .replace(/=/g, ''), '4nOTmPHPwhzaKTzikgUsHcszfcP-JamcojMnRfyfsKhyHCCEywe6uLFlvvmK5NbaX5Z7IIji-kg7bxKU58kwoQ', ].join('.'), identity: { diff --git a/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInIdentity.ts b/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInIdentity.ts index 2247d17d82..7633fc43c3 100644 --- a/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInIdentity.ts +++ b/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInIdentity.ts @@ -40,7 +40,7 @@ export function tokenToExpiry(jwtToken: string | undefined): Date { } const [_header, rawPayload, _signature] = jwtToken.split('.'); - const payload = JSON.parse(atob(rawPayload)); + const payload = JSON.parse(window.atob(rawPayload)); if (typeof payload.exp !== 'number') { return fallback; } diff --git a/packages/core-components/src/layout/SignInPage/LegacyUserIdentity.ts b/packages/core-components/src/layout/SignInPage/LegacyUserIdentity.ts index cc51d2b9a8..3c1e4de7d8 100644 --- a/packages/core-components/src/layout/SignInPage/LegacyUserIdentity.ts +++ b/packages/core-components/src/layout/SignInPage/LegacyUserIdentity.ts @@ -22,7 +22,7 @@ import { function parseJwtPayload(token: string) { const [_header, payload, _signature] = token.split('.'); - return JSON.parse(atob(payload)); + return JSON.parse(window.atob(payload)); } type LegacySignInResult = { From 91bba69ef816c144c6335089440f5c295407716c Mon Sep 17 00:00:00 2001 From: Maximilian Vorbrodt Date: Wed, 7 Dec 2022 10:12:45 +0100 Subject: [PATCH 25/36] add changeset Signed-off-by: Maximilian Vorbrodt --- .changeset/wicked-impalas-relate.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/wicked-impalas-relate.md diff --git a/.changeset/wicked-impalas-relate.md b/.changeset/wicked-impalas-relate.md new file mode 100644 index 0000000000..5d8b16d062 --- /dev/null +++ b/.changeset/wicked-impalas-relate.md @@ -0,0 +1,5 @@ +--- +'@backstage/core-components': patch +--- + +Internal refactor to remove deprecated symbols. From cd10d9e4699c1cf523f0fb419e52a81d4b7881fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Wed, 7 Dec 2022 12:21:57 +0100 Subject: [PATCH 26/36] fixup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- microsite/yarn.lock | 85 ++++++++------------------------------------- 1 file changed, 14 insertions(+), 71 deletions(-) diff --git a/microsite/yarn.lock b/microsite/yarn.lock index 5bb7b398c9..d559b81510 100644 --- a/microsite/yarn.lock +++ b/microsite/yarn.lock @@ -2568,7 +2568,7 @@ __metadata: languageName: node linkType: hard -"content-disposition@npm:0.5.4": +"content-disposition@npm:0.5.4, content-disposition@npm:^0.5.2": version: 0.5.4 resolution: "content-disposition@npm:0.5.4" dependencies: @@ -2577,15 +2577,6 @@ __metadata: languageName: node linkType: hard -"content-disposition@npm:^0.5.2": - version: 0.5.3 - resolution: "content-disposition@npm:0.5.3" - dependencies: - safe-buffer: 5.1.2 - checksum: 95bf164c0b0b8199d3f44b7631e51b37f683c6a90b9baa4315bd3d405a6d1bc81b7346f0981046aa004331fb3d7a28b629514d01fc209a5251573fc7e4d33380 - languageName: node - linkType: hard - "content-type@npm:~1.0.4": version: 1.0.4 resolution: "content-type@npm:1.0.4" @@ -4167,18 +4158,7 @@ __metadata: languageName: node linkType: hard -"get-intrinsic@npm:^1.0.0": - version: 1.0.2 - resolution: "get-intrinsic@npm:1.0.2" - dependencies: - function-bind: ^1.1.1 - has: ^1.0.3 - has-symbols: ^1.0.1 - checksum: bed41c7426212d79982c23e9dddb7de2b6b05ca35e94e653edfed06188381ed4eae0e04adf7f4d3ea1f47f1c345b255405e8c44b1167185537a506eff5c519c8 - languageName: node - linkType: hard - -"get-intrinsic@npm:^1.0.2": +"get-intrinsic@npm:^1.0.0, get-intrinsic@npm:^1.0.2": version: 1.1.3 resolution: "get-intrinsic@npm:1.1.3" dependencies: @@ -4516,14 +4496,7 @@ __metadata: languageName: node linkType: hard -"has-symbols@npm:^1.0.1": - version: 1.0.1 - resolution: "has-symbols@npm:1.0.1" - checksum: 4f09be6682f9fc29855ded1101ad2a0f5d559d7d9ed68f7b68be1ea213c23991216d08d6585bf3ff6fded6f526cc506bda528d276f083602b55d232f132cfa27 - languageName: node - linkType: hard - -"has-symbols@npm:^1.0.3": +"has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.3": version: 1.0.3 resolution: "has-symbols@npm:1.0.3" checksum: a054c40c631c0d5741a8285010a0777ea0c068f99ed43e5d6eb12972da223f8af553a455132fdb0801bdcfa0e0f443c0c03a68d8555aa529b3144b446c3f2410 @@ -6126,30 +6099,14 @@ __metadata: languageName: node linkType: hard -"mime-db@npm:1.45.0, mime-db@npm:^1.28.0": - version: 1.45.0 - resolution: "mime-db@npm:1.45.0" - checksum: 00aa67af7a2014c12380bec57b3efe988e45c51979acca792633e2ba4d45c601b4160ceaf9666e2b8fa6822f5cb81e12206f9921d1bc3d78226aee813d4244fd - languageName: node - linkType: hard - -"mime-db@npm:1.52.0": +"mime-db@npm:1.52.0, mime-db@npm:^1.28.0": version: 1.52.0 resolution: "mime-db@npm:1.52.0" checksum: 0d99a03585f8b39d68182803b12ac601d9c01abfa28ec56204fa330bc9f3d1c5e14beb049bafadb3dbdf646dfb94b87e24d4ec7b31b7279ef906a8ea9b6a513f languageName: node linkType: hard -"mime-types@npm:^2.1.12, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24": - version: 2.1.28 - resolution: "mime-types@npm:2.1.28" - dependencies: - mime-db: 1.45.0 - checksum: ea59cb885b5234cd7fcc2c8de1eff8543cf057be7daaf804a1b9b2cc6930c8dbcdc5e86b9732827a794d5282baa6f45ef93bc50eaba93839b9174cc6d36c9702 - languageName: node - linkType: hard - -"mime-types@npm:~2.1.34": +"mime-types@npm:^2.1.12, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34": version: 2.1.35 resolution: "mime-types@npm:2.1.35" dependencies: @@ -6555,14 +6512,7 @@ __metadata: languageName: node linkType: hard -"object-inspect@npm:^1.8.0": - version: 1.9.0 - resolution: "object-inspect@npm:1.9.0" - checksum: 715d2ef5beebfecd5c6d5b29dd370b11bb37d46284d4c1e38463c1ab5dd182cb9d1b543b3f0ea682c84a1883863ea2fe6e6b7599a65a6ab043545189b06e8800 - languageName: node - linkType: hard - -"object-inspect@npm:^1.9.0": +"object-inspect@npm:^1.8.0, object-inspect@npm:^1.9.0": version: 1.12.2 resolution: "object-inspect@npm:1.12.2" checksum: a534fc1b8534284ed71f25ce3a496013b7ea030f3d1b77118f6b7b1713829262be9e6243acbcb3ef8c626e2b64186112cb7f6db74e37b2789b9c789ca23048b2 @@ -7524,7 +7474,7 @@ __metadata: languageName: node linkType: hard -"qs@npm:6.11.0": +"qs@npm:6.11.0, qs@npm:^6.4.0": version: 6.11.0 resolution: "qs@npm:6.11.0" dependencies: @@ -7533,13 +7483,6 @@ __metadata: languageName: node linkType: hard -"qs@npm:^6.4.0": - version: 6.9.4 - resolution: "qs@npm:6.9.4" - checksum: 5ac0bd145f32d346d20c2fdcf19c8e548c5916458851e32527efb25be0c2cff8a3a81140c145c98a1184779b5b625c91bc7c50e147073bffb978fb7f4a9c8c8a - languageName: node - linkType: hard - "qs@npm:~6.5.2": version: 6.5.2 resolution: "qs@npm:6.5.2" @@ -8058,13 +8001,6 @@ __metadata: languageName: node linkType: hard -"safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1": - version: 5.1.2 - resolution: "safe-buffer@npm:5.1.2" - checksum: f2f1f7943ca44a594893a852894055cf619c1fbcb611237fc39e461ae751187e7baf4dc391a72125e0ac4fb2d8c5c0b3c71529622e6a58f46b960211e704903c - languageName: node - linkType: hard - "safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" @@ -8072,6 +8008,13 @@ __metadata: languageName: node linkType: hard +"safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1": + version: 5.1.2 + resolution: "safe-buffer@npm:5.1.2" + checksum: f2f1f7943ca44a594893a852894055cf619c1fbcb611237fc39e461ae751187e7baf4dc391a72125e0ac4fb2d8c5c0b3c71529622e6a58f46b960211e704903c + languageName: node + linkType: hard + "safe-json-parse@npm:~1.0.1": version: 1.0.1 resolution: "safe-json-parse@npm:1.0.1" From 5aa0dc604f772d3b825d057b3917f498b6965405 Mon Sep 17 00:00:00 2001 From: Dawit Ameneshewa Date: Wed, 7 Dec 2022 14:29:53 +0300 Subject: [PATCH 27/36] Add storage event listener only when there is at least one `WebStorage` API subscriber Signed-off-by: Dawit Ameneshewa --- .../implementations/StorageApi/WebStorage.ts | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts b/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts index 0f56a608c1..224327298f 100644 --- a/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts +++ b/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts @@ -24,14 +24,6 @@ import ObservableImpl from 'zen-observable'; const buckets = new Map(); -window.addEventListener('storage', event => { - for (const [bucketPath, webStorage] of buckets.entries()) { - if (event.key?.startsWith(bucketPath)) { - webStorage.handleStorageChange(event.key); - } - } -}); - /** * An implementation of the storage API, that uses the browser's local storage. * @@ -43,6 +35,8 @@ export class WebStorage implements StorageApi { private readonly errorApi: ErrorApi, ) {} + private static hasSubscribers = false; + static create(options: { errorApi: ErrorApi; namespace?: string; @@ -50,6 +44,16 @@ export class WebStorage implements StorageApi { return new WebStorage(options.namespace ?? '', options.errorApi); } + private static addStorageEventListener() { + window.addEventListener('storage', event => { + for (const [bucketPath, webStorage] of buckets.entries()) { + if (event.key?.startsWith(bucketPath)) { + webStorage.handleStorageChange(event.key); + } + } + }); + } + get(key: string): T | undefined { return this.snapshot(key).value as T | undefined; } @@ -97,6 +101,10 @@ export class WebStorage implements StorageApi { observe$( key: string, ): Observable> { + if (!WebStorage.hasSubscribers) { + WebStorage.addStorageEventListener(); + WebStorage.hasSubscribers = true; + } return this.observable.filter(({ key: messageKey }) => messageKey === key); } From 52f34199696d6c6cebf3d778ee0549eda51b05a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Wed, 7 Dec 2022 13:44:52 +0100 Subject: [PATCH 28/36] get rid of the vulnerable qs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- yarn.lock | 67 +++++++++++++++++++++++++------------------------------ 1 file changed, 30 insertions(+), 37 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1c605f4e51..b6252cd8a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17365,9 +17365,9 @@ __metadata: languageName: node linkType: hard -"body-parser@npm:1.20.0, body-parser@npm:^1.19.0": - version: 1.20.0 - resolution: "body-parser@npm:1.20.0" +"body-parser@npm:1.20.1, body-parser@npm:^1.19.0": + version: 1.20.1 + resolution: "body-parser@npm:1.20.1" dependencies: bytes: 3.1.2 content-type: ~1.0.4 @@ -17377,11 +17377,11 @@ __metadata: http-errors: 2.0.0 iconv-lite: 0.4.24 on-finished: 2.4.1 - qs: 6.10.3 + qs: 6.11.0 raw-body: 2.5.1 type-is: ~1.6.18 unpipe: 1.0.0 - checksum: 12fffdeac82fe20dddcab7074215d5156e7d02a69ae90cbe9fee1ca3efa2f28ef52097cbea76685ee0a1509c71d85abd0056a08e612c09077cad6277a644cf88 + checksum: f1050dbac3bede6a78f0b87947a8d548ce43f91ccc718a50dd774f3c81f2d8b04693e52acf62659fad23101827dd318da1fb1363444ff9a8482b886a3e4a5266 languageName: node linkType: hard @@ -20318,13 +20318,13 @@ __metadata: languageName: node linkType: hard -"dezalgo@npm:1.0.3, dezalgo@npm:^1.0.0": - version: 1.0.3 - resolution: "dezalgo@npm:1.0.3" +"dezalgo@npm:^1.0.0, dezalgo@npm:^1.0.4": + version: 1.0.4 + resolution: "dezalgo@npm:1.0.4" dependencies: asap: ^2.0.0 wrappy: 1 - checksum: 8b26238db91423b2702a7a6d9629d0019c37c415e7b6e75d4b3e8d27e9464e21cac3618dd145f4d4ee96c70cc6ff034227b5b8a0e9c09015a8bdbe6dace3cfb9 + checksum: 895389c6aead740d2ab5da4d3466d20fa30f738010a4d3f4dcccc9fc645ca31c9d10b7e1804ae489b1eb02c7986f9f1f34ba132d409b043082a86d9a4e745624 languageName: node linkType: hard @@ -22189,12 +22189,12 @@ __metadata: linkType: hard "express@npm:^4.17.1, express@npm:^4.17.3, express@npm:^4.18.1": - version: 4.18.1 - resolution: "express@npm:4.18.1" + version: 4.18.2 + resolution: "express@npm:4.18.2" dependencies: accepts: ~1.3.8 array-flatten: 1.1.1 - body-parser: 1.20.0 + body-parser: 1.20.1 content-disposition: 0.5.4 content-type: ~1.0.4 cookie: 0.5.0 @@ -22213,7 +22213,7 @@ __metadata: parseurl: ~1.3.3 path-to-regexp: 0.1.7 proxy-addr: ~2.0.7 - qs: 6.10.3 + qs: 6.11.0 range-parser: ~1.2.1 safe-buffer: 5.2.1 send: 0.18.0 @@ -22223,7 +22223,7 @@ __metadata: type-is: ~1.6.18 utils-merge: 1.0.1 vary: ~1.1.2 - checksum: c3d44c92e48226ef32ec978becfedb0ecf0ca21316bfd33674b3c5d20459840584f2325726a4f17f33d9c99f769636f728982d1c5433a5b6fe6eb95b8cf0c854 + checksum: 3c4b9b076879442f6b968fe53d85d9f1eeacbb4f4c41e5f16cc36d77ce39a2b0d81b3f250514982110d815b2f7173f5561367f9110fcc541f9371948e8c8b037 languageName: node linkType: hard @@ -22886,14 +22886,14 @@ __metadata: linkType: hard "formidable@npm:^2.0.1": - version: 2.0.1 - resolution: "formidable@npm:2.0.1" + version: 2.1.2 + resolution: "formidable@npm:2.1.2" dependencies: - dezalgo: 1.0.3 - hexoid: 1.0.0 - once: 1.4.0 - qs: 6.9.3 - checksum: b35445444e7b6f6f3cacbadd5e6fadd6b5b2e83162e7c41fa22586df584cc515bbd1ee0dc2b701ce031fcb000d71769bc77bd0958db8a89a0ceb8b2227bdc695 + dezalgo: ^1.0.4 + hexoid: ^1.0.0 + once: ^1.4.0 + qs: ^6.11.0 + checksum: 81c8e5d89f5eb873e992893468f0de22c01678ca3d315db62be0560f9de1c77d4faefc9b1f4575098eb2263b3c81ba1024833a9fc3206297ddbac88a4f69b7a8 languageName: node linkType: hard @@ -23983,7 +23983,7 @@ __metadata: languageName: node linkType: hard -"hexoid@npm:1.0.0": +"hexoid@npm:^1.0.0": version: 1.0.0 resolution: "hexoid@npm:1.0.0" checksum: 27a148ca76a2358287f40445870116baaff4a0ed0acc99900bf167f0f708ffd82e044ff55e9949c71963852b580fc024146d3ac6d5d76b508b78d927fa48ae2d @@ -30035,7 +30035,7 @@ __metadata: languageName: node linkType: hard -"once@npm:1.4.0, once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0": +"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0": version: 1.4.0 resolution: "once@npm:1.4.0" dependencies: @@ -32251,26 +32251,19 @@ __metadata: languageName: node linkType: hard -"qs@npm:6.10.3, qs@npm:^6.10.1, qs@npm:^6.10.2, qs@npm:^6.10.3, qs@npm:^6.9.1, qs@npm:^6.9.4, qs@npm:^6.9.6": - version: 6.10.3 - resolution: "qs@npm:6.10.3" +"qs@npm:6.11.0, qs@npm:^6.10.1, qs@npm:^6.10.2, qs@npm:^6.10.3, qs@npm:^6.11.0, qs@npm:^6.9.1, qs@npm:^6.9.4, qs@npm:^6.9.6": + version: 6.11.0 + resolution: "qs@npm:6.11.0" dependencies: side-channel: ^1.0.4 - checksum: 0fac5e6c7191d0295a96d0e83c851aeb015df7e990e4d3b093897d3ac6c94e555dbd0a599739c84d7fa46d7fee282d94ba76943983935cf33bba6769539b8019 - languageName: node - linkType: hard - -"qs@npm:6.9.3": - version: 6.9.3 - resolution: "qs@npm:6.9.3" - checksum: 89cd1b5e521c19a7e0a7a056ddc261c5c30889664608cf9ce6085f9f25606fc48568cf6a6249e641b4b5c04dac7889e3b82133142523abf397228eb4f488fc38 + checksum: 6e1f29dd5385f7488ec74ac7b6c92f4d09a90408882d0c208414a34dd33badc1a621019d4c799a3df15ab9b1d0292f97c1dd71dc7c045e69f81a8064e5af7297 languageName: node linkType: hard "qs@npm:~6.5.2": - version: 6.5.2 - resolution: "qs@npm:6.5.2" - checksum: 24af7b9928ba2141233fba2912876ff100403dba1b08b20c3b490da9ea6c636760445ea2211a079e7dfa882a5cf8f738337b3748c8bdd0f93358fa8881d2db8f + version: 6.5.3 + resolution: "qs@npm:6.5.3" + checksum: 6f20bf08cabd90c458e50855559539a28d00b2f2e7dddcb66082b16a43188418cb3cb77cbd09268bcef6022935650f0534357b8af9eeb29bf0f27ccb17655692 languageName: node linkType: hard From 1dec14de936bf550d5252b34055f5020c500fb29 Mon Sep 17 00:00:00 2001 From: Dawit Ameneshewa Date: Wed, 7 Dec 2022 16:45:32 +0300 Subject: [PATCH 29/36] Make `handleStorageChange` method in `WebStorage` class private Signed-off-by: Dawit Ameneshewa --- .changeset/wild-pears-enjoy.md | 2 +- packages/core-app-api/api-report.md | 2 -- .../src/apis/implementations/StorageApi/WebStorage.ts | 8 ++++---- packages/core-plugin-api/api-report.md | 1 - .../core-plugin-api/src/apis/definitions/StorageApi.ts | 8 -------- 5 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.changeset/wild-pears-enjoy.md b/.changeset/wild-pears-enjoy.md index 8cee4daa54..01a8b8a4a1 100644 --- a/.changeset/wild-pears-enjoy.md +++ b/.changeset/wild-pears-enjoy.md @@ -2,4 +2,4 @@ '@backstage/core-app-api': patch --- -Made `StorageApi` notify its subscribers when `localStorage` values change in other tabs/windows +Made `WebStorage` notify its subscribers when `localStorage` values change in other tabs/windows diff --git a/packages/core-app-api/api-report.md b/packages/core-app-api/api-report.md index 54aa700472..70312a54a5 100644 --- a/packages/core-app-api/api-report.md +++ b/packages/core-app-api/api-report.md @@ -558,8 +558,6 @@ export class WebStorage implements StorageApi { // (undocumented) get(key: string): T | undefined; // (undocumented) - handleStorageChange(eventKey: StorageEvent['key']): void; - // (undocumented) observe$( key: string, ): Observable>; diff --git a/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts b/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts index 224327298f..3477853241 100644 --- a/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts +++ b/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts @@ -35,7 +35,7 @@ export class WebStorage implements StorageApi { private readonly errorApi: ErrorApi, ) {} - private static hasSubscribers = false; + private static hasSubscribed = false; static create(options: { errorApi: ErrorApi; @@ -101,14 +101,14 @@ export class WebStorage implements StorageApi { observe$( key: string, ): Observable> { - if (!WebStorage.hasSubscribers) { + if (!WebStorage.hasSubscribed) { WebStorage.addStorageEventListener(); - WebStorage.hasSubscribers = true; + WebStorage.hasSubscribed = true; } return this.observable.filter(({ key: messageKey }) => messageKey === key); } - handleStorageChange(eventKey: StorageEvent['key']) { + private handleStorageChange(eventKey: StorageEvent['key']) { if (!eventKey?.startsWith(this.namespace)) return; const key = eventKey?.replace(`${this.namespace}/`, ''); this.notifyChanges(key); diff --git a/packages/core-plugin-api/api-report.md b/packages/core-plugin-api/api-report.md index ed40792c6a..cebf09e908 100644 --- a/packages/core-plugin-api/api-report.md +++ b/packages/core-plugin-api/api-report.md @@ -697,7 +697,6 @@ export type SignInPageProps = { // @public export interface StorageApi { forBucket(name: string): StorageApi; - handleStorageChange?(eventKey: StorageEvent['key']): void; observe$( key: string, ): Observable>; diff --git a/packages/core-plugin-api/src/apis/definitions/StorageApi.ts b/packages/core-plugin-api/src/apis/definitions/StorageApi.ts index 5ecf251e2d..1506e5f143 100644 --- a/packages/core-plugin-api/src/apis/definitions/StorageApi.ts +++ b/packages/core-plugin-api/src/apis/definitions/StorageApi.ts @@ -85,14 +85,6 @@ export interface StorageApi { key: string, ): Observable>; - /** - * Synchronizes stored data across multiple tabs or windows by using the - * browser's StorageEvent API. - * - * @param eventKey - The key of a storage event object - */ - handleStorageChange?(eventKey: StorageEvent['key']): void; - /** * Returns an immediate snapshot value for the given key, if possible. * From a59b58d089e5e0a46eecfd20c546a1038299d1e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 13:49:42 +0000 Subject: [PATCH 30/36] build(deps): bump qs from 6.5.2 to 6.5.3 in /microsite Bumps [qs](https://github.com/ljharb/qs) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/ljharb/qs/releases) - [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md) - [Commits](https://github.com/ljharb/qs/compare/v6.5.2...v6.5.3) --- updated-dependencies: - dependency-name: qs dependency-type: indirect ... Signed-off-by: dependabot[bot] --- microsite/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/microsite/yarn.lock b/microsite/yarn.lock index d559b81510..66552b5587 100644 --- a/microsite/yarn.lock +++ b/microsite/yarn.lock @@ -7484,9 +7484,9 @@ __metadata: linkType: hard "qs@npm:~6.5.2": - version: 6.5.2 - resolution: "qs@npm:6.5.2" - checksum: 24af7b9928ba2141233fba2912876ff100403dba1b08b20c3b490da9ea6c636760445ea2211a079e7dfa882a5cf8f738337b3748c8bdd0f93358fa8881d2db8f + version: 6.5.3 + resolution: "qs@npm:6.5.3" + checksum: 6f20bf08cabd90c458e50855559539a28d00b2f2e7dddcb66082b16a43188418cb3cb77cbd09268bcef6022935650f0534357b8af9eeb29bf0f27ccb17655692 languageName: node linkType: hard From 6870b43dd1ed4b7f70e1eee82aab13a10ac3f478 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Wed, 7 Dec 2022 14:51:34 +0100 Subject: [PATCH 31/36] core-app-api: fix base url rewriting Signed-off-by: Patrik Oldsberg --- .changeset/green-deers-turn.md | 5 +++++ .../core-app-api/src/app/AppManager.test.tsx | 19 ++++++++----------- packages/core-app-api/src/app/AppManager.tsx | 16 +++++++++------- 3 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 .changeset/green-deers-turn.md diff --git a/.changeset/green-deers-turn.md b/.changeset/green-deers-turn.md new file mode 100644 index 0000000000..394b89b8e3 --- /dev/null +++ b/.changeset/green-deers-turn.md @@ -0,0 +1,5 @@ +--- +'@backstage/core-app-api': patch +--- + +Fix for the automatic rewriting of base URLs. diff --git a/packages/core-app-api/src/app/AppManager.test.tsx b/packages/core-app-api/src/app/AppManager.test.tsx index 03bd34eba1..1b2ac9471a 100644 --- a/packages/core-app-api/src/app/AppManager.test.tsx +++ b/packages/core-app-api/src/app/AppManager.test.tsx @@ -624,21 +624,18 @@ describe('Integration Test', () => { describe('relative url resolvers', () => { it.each([ [ - [document.location.href, document.location.href], + ['http://localhost', 'http://localhost'], { backend: { - baseUrl: 'http://localhost:8008/', + baseUrl: 'http://localhost:8008', }, app: { - baseUrl: 'http://localhost:8008/', + baseUrl: 'http://localhost:8008', }, }, ], [ - [ - `${document.location.origin}/backstage`, - `${document.location.origin}/backstage`, - ], + ['http://localhost/backstage', 'http://localhost/backstage'], { backend: { baseUrl: 'http://test.com/backstage', @@ -650,8 +647,8 @@ describe('Integration Test', () => { ], [ [ - `${document.location.origin}/backstage/instance`, - `${document.location.origin}/backstage/instance`, + 'http://localhost/backstage/instance', + 'http://localhost/backstage/instance', ], { backend: { @@ -664,8 +661,8 @@ describe('Integration Test', () => { ], [ [ - `${document.location.origin}/backstage/instance`, - `http://test.com/backstage/instance`, + 'http://localhost/backstage/instance', + 'http://test.com/backstage/instance', ], { backend: { diff --git a/packages/core-app-api/src/app/AppManager.tsx b/packages/core-app-api/src/app/AppManager.tsx index 155ff6ad3b..f4fa2d8442 100644 --- a/packages/core-app-api/src/app/AppManager.tsx +++ b/packages/core-app-api/src/app/AppManager.tsx @@ -179,7 +179,7 @@ function useConfigLoader( return new URL( fullUrl.replace(getOrigin(fullUrl), ''), document.location.origin, - ).href; + ).href.replace(/\/$/, ''); }; /** @@ -199,15 +199,17 @@ function useConfigLoader( const backendOrigin = getOrigin(backendBaseUrl); if (appOrigin === backendOrigin) { - relativeResolverConfig.data.backend = { - baseUrl: overrideOrigin(backendBaseUrl), - }; + const newBackendBaseUrl = overrideOrigin(backendBaseUrl); + if (backendBaseUrl !== newBackendBaseUrl) { + relativeResolverConfig.data.backend = { baseUrl: newBackendBaseUrl }; + } } } if (appBaseUrl) { - relativeResolverConfig.data.app = { - baseUrl: overrideOrigin(appBaseUrl), - }; + const newAppBaseUrl = overrideOrigin(appBaseUrl); + if (appBaseUrl !== newAppBaseUrl) { + relativeResolverConfig.data.app = { baseUrl: newAppBaseUrl }; + } } /** * Only add the relative config if there is actually data to add. From 0659c6f8694eb0523c43a065c9a541e4ab30f68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Wed, 7 Dec 2022 15:04:30 +0100 Subject: [PATCH 32/36] bump decode-uri-component MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index acaed46b03..69a6583a98 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20062,9 +20062,9 @@ __metadata: linkType: hard "decode-uri-component@npm:^0.2.0": - version: 0.2.0 - resolution: "decode-uri-component@npm:0.2.0" - checksum: f3749344ab9305ffcfe4bfe300e2dbb61fc6359e2b736812100a3b1b6db0a5668cba31a05e4b45d4d63dbf1a18dfa354cd3ca5bb3ededddabb8cd293f4404f94 + version: 0.2.2 + resolution: "decode-uri-component@npm:0.2.2" + checksum: 95476a7d28f267292ce745eac3524a9079058bbb35767b76e3ee87d42e34cd0275d2eb19d9d08c3e167f97556e8a2872747f5e65cbebcac8b0c98d83e285f139 languageName: node linkType: hard From f5da4f0334166f8ca49841912d740d9eed4fe64b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Wed, 7 Dec 2022 15:07:22 +0100 Subject: [PATCH 33/36] bump socket.io MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- yarn.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 69a6583a98..cee75879bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20850,9 +20850,9 @@ __metadata: languageName: node linkType: hard -"engine.io@npm:~3.5.0": - version: 3.5.0 - resolution: "engine.io@npm:3.5.0" +"engine.io@npm:~3.6.0": + version: 3.6.1 + resolution: "engine.io@npm:3.6.1" dependencies: accepts: ~1.3.4 base64id: 2.0.0 @@ -20860,7 +20860,7 @@ __metadata: debug: ~4.1.0 engine.io-parser: ~2.2.0 ws: ~7.4.2 - checksum: 8d7eb107428301084502c65c8ae48e350587fa57edae734a88f7345debd386ed1d8a25ece7e82ba3ff1ad65300fb0123def1446a1a13127929ee5eac378af8b2 + checksum: 7dd9eddc79aedf61a63141e6208ee89936c659445378f965bff6d5eb3e9cb4815aff735f2b1886487e2be51116a343e89d972ae5790bf2ac9fdcb2572baf8935 languageName: node linkType: hard @@ -34795,9 +34795,9 @@ __metadata: languageName: node linkType: hard -"socket.io-client@npm:2.4.0, socket.io-client@npm:^2.2.0": - version: 2.4.0 - resolution: "socket.io-client@npm:2.4.0" +"socket.io-client@npm:2.5.0, socket.io-client@npm:^2.2.0": + version: 2.5.0 + resolution: "socket.io-client@npm:2.5.0" dependencies: backo2: 1.0.2 component-bind: 1.0.0 @@ -34810,7 +34810,7 @@ __metadata: parseuri: 0.0.6 socket.io-parser: ~3.3.0 to-array: 0.1.4 - checksum: d5f16c6d836f6672f89896e785dccdb15ea4a78719daf9bc7954b5943e6ecbae97a56f4a8a33e22418ab0ce38e05a54770d2080bbf6c6d5c0c3a72b60a895800 + checksum: a33accaf02c4a4c47ac9b09018fa4b9fa67a648a0cc92602e520ec884520050796786eb0df78fc1a9bf51e7b3d7b50ba4ffd3bda6e44df2c253a77100124669c languageName: node linkType: hard @@ -34837,16 +34837,16 @@ __metadata: linkType: hard "socket.io@npm:^2.2.0": - version: 2.4.1 - resolution: "socket.io@npm:2.4.1" + version: 2.5.0 + resolution: "socket.io@npm:2.5.0" dependencies: debug: ~4.1.0 - engine.io: ~3.5.0 + engine.io: ~3.6.0 has-binary2: ~1.0.2 socket.io-adapter: ~1.1.0 - socket.io-client: 2.4.0 + socket.io-client: 2.5.0 socket.io-parser: ~3.4.0 - checksum: 290e4e8dae5c38628c5164cae12fc8154165233a46ecc241768a44f0add8f1243a0b13239385573fbbe9e4fb6424c199381461b577d504dc47529f5e1e7b6e4d + checksum: 6f20a413352cb0a8bb13063249fe425c81fb54beca1bdd71221262305cf21232e6a37fdd4a232b5695dbd4d3204281a9313829c9c373c5ba01c5bd7218edd094 languageName: node linkType: hard From b2a448c610c020e6dec0bdc3c7fcb3f65a79ee66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Wed, 7 Dec 2022 15:10:28 +0100 Subject: [PATCH 34/36] bump xmldom MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index cee75879bf..9d38c63468 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15797,9 +15797,9 @@ __metadata: linkType: hard "@xmldom/xmldom@npm:^0.7.0, @xmldom/xmldom@npm:^0.7.5, @xmldom/xmldom@npm:^0.7.6": - version: 0.7.6 - resolution: "@xmldom/xmldom@npm:0.7.6" - checksum: 3c31dcd909aaefd65090033bd45e0aca42d636a9ae43c7313f4be87de570d046abba28362810d63c0718d6f08a9ce5f8da27b87437afc24d2290b6d4e75a6eee + version: 0.7.9 + resolution: "@xmldom/xmldom@npm:0.7.9" + checksum: 66e37b7800132f891b885b2eceeeebc53f60b69789da10276f1584256b963d79a28c7ae2071bc53a9cd842d9b03554c761b2701fe8036d6052f26bcd0ae8f2bb languageName: node linkType: hard From cbcde64a173b4f8ac617d3263512d1a884158e44 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 14:19:33 +0000 Subject: [PATCH 35/36] Update dependency @graphql-tools/schema to v9.0.11 Signed-off-by: Renovate Bot --- yarn.lock | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/yarn.lock b/yarn.lock index acaed46b03..4f96a2ee2d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9638,15 +9638,15 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/merge@npm:8.3.12, @graphql-tools/merge@npm:^8.2.6": - version: 8.3.12 - resolution: "@graphql-tools/merge@npm:8.3.12" +"@graphql-tools/merge@npm:8.3.13, @graphql-tools/merge@npm:^8.2.6": + version: 8.3.13 + resolution: "@graphql-tools/merge@npm:8.3.13" dependencies: - "@graphql-tools/utils": 9.1.1 + "@graphql-tools/utils": 9.1.2 tslib: ^2.4.0 peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: aab6f6edbaa2f63c7f44e4a1832d8028570d09ea85bb4a9525016879fad2ea2f8ea260c0b78ab1f6b7a418d92a3debfbbedecb3f5a36a5590edd0b2ac1cd2012 + checksum: 3f0fcc006775e819624dc873e51e37f4be6a1dd5301246992fe2e1ca4fe669d4fa039298365e28e06508ce0e2d70e0f8f5fbb87b73511cbdd5c67fb3dbbfc359 languageName: node linkType: hard @@ -9772,16 +9772,16 @@ __metadata: linkType: hard "@graphql-tools/schema@npm:^9.0.0": - version: 9.0.10 - resolution: "@graphql-tools/schema@npm:9.0.10" + version: 9.0.11 + resolution: "@graphql-tools/schema@npm:9.0.11" dependencies: - "@graphql-tools/merge": 8.3.12 - "@graphql-tools/utils": 9.1.1 + "@graphql-tools/merge": 8.3.13 + "@graphql-tools/utils": 9.1.2 tslib: ^2.4.0 value-or-promise: 1.0.11 peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 4c1c7fc1c84a2faf2310a110ed72125b511371f1ea2869442fd55b5bcdb2c431dd60235ff77f32860235ee99dd12746e23dace35a18a8ffd339fad4f51004321 + checksum: 959bb7af704d399dea7291fb278438131ac26c1653ee2de33fb24787d19c337e371c3f29a015fcb719a9c9f7a05120832f789ef8a466304c71ab4781c82c93df languageName: node linkType: hard @@ -9854,7 +9854,7 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/utils@npm:9.1.1, @graphql-tools/utils@npm:^9.1.1": +"@graphql-tools/utils@npm:9.1.1": version: 9.1.1 resolution: "@graphql-tools/utils@npm:9.1.1" dependencies: @@ -9865,6 +9865,17 @@ __metadata: languageName: node linkType: hard +"@graphql-tools/utils@npm:9.1.2, @graphql-tools/utils@npm:^9.1.1": + version: 9.1.2 + resolution: "@graphql-tools/utils@npm:9.1.2" + dependencies: + tslib: ^2.4.0 + peerDependencies: + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 + checksum: 42074c6766b88bc39ed3cce93a213f8b8f42c0d9cb781bbf6b81aa6b0bf7d29a6553e14e8e4b2807f357619e058d26caca77bad6aa01a3ade1f3d86b96e73f56 + languageName: node + linkType: hard + "@graphql-tools/wrap@npm:8.5.1, @graphql-tools/wrap@npm:^8.3.1": version: 8.5.1 resolution: "@graphql-tools/wrap@npm:8.5.1" From 512a3b800b4513684dfb9aa267750ffc8363713d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Wed, 7 Dec 2022 15:42:34 +0100 Subject: [PATCH 36/36] turn down create-app changeset to patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- .changeset/cyan-donkeys-arrive.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/cyan-donkeys-arrive.md b/.changeset/cyan-donkeys-arrive.md index f226bc29b5..9358197d1c 100644 --- a/.changeset/cyan-donkeys-arrive.md +++ b/.changeset/cyan-donkeys-arrive.md @@ -1,5 +1,5 @@ --- -'@backstage/create-app': minor +'@backstage/create-app': patch --- added default project name for CI job compatibility