From 581add03a3bfe5af2b4de11d9bb3addda7bb4cce Mon Sep 17 00:00:00 2001 From: Peter Vaiciulis Date: Tue, 29 Oct 2024 16:38:03 -0700 Subject: [PATCH 1/8] chore: update schema generation --- package-lock.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0156b885e1..ed76c4d3aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31455,7 +31455,7 @@ }, "packages/ai-constructs": { "name": "@aws-amplify/ai-constructs", - "version": "0.6.2", + "version": "0.7.0", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-schemas": "^1.4.0", @@ -31495,12 +31495,12 @@ }, "packages/backend": { "name": "@aws-amplify/backend", - "version": "1.5.1", + "version": "1.5.2", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-auth": "^1.2.0", "@aws-amplify/backend-data": "^1.1.5", - "@aws-amplify/backend-function": "^1.7.1", + "@aws-amplify/backend-function": "^1.7.2", "@aws-amplify/backend-output-schemas": "^1.4.0", "@aws-amplify/backend-output-storage": "^1.1.2", "@aws-amplify/backend-secret": "^1.1.4", @@ -31524,10 +31524,10 @@ }, "packages/backend-ai": { "name": "@aws-amplify/backend-ai", - "version": "0.3.3", + "version": "0.3.4", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/ai-constructs": "^0.6.2", + "@aws-amplify/ai-constructs": "^0.7.0", "@aws-amplify/backend-output-schemas": "^1.4.0", "@aws-amplify/backend-output-storage": "^1.0.2", "@aws-amplify/data-schema-types": "^1.2.0", @@ -31595,7 +31595,7 @@ }, "packages/backend-function": { "name": "@aws-amplify/backend-function", - "version": "1.7.1", + "version": "1.7.2", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-schemas": "^1.4.0", @@ -32039,10 +32039,10 @@ "license": "Apache-2.0", "devDependencies": { "@apollo/client": "^3.10.1", - "@aws-amplify/ai-constructs": "^0.6.0", + "@aws-amplify/ai-constructs": "^0.7.0", "@aws-amplify/auth-construct": "^1.3.1", - "@aws-amplify/backend": "^1.5.0", - "@aws-amplify/backend-ai": "^0.3.2", + "@aws-amplify/backend": "^1.5.2", + "@aws-amplify/backend-ai": "^0.3.4", "@aws-amplify/backend-secret": "^1.1.4", "@aws-amplify/client-config": "^1.4.0", "@aws-amplify/data-schema": "^1.0.0", From c5e6f92146e865bcbf147a6f167a9bd1978357f9 Mon Sep 17 00:00:00 2001 From: Peter Vaiciulis Date: Wed, 30 Oct 2024 11:38:48 -0700 Subject: [PATCH 2/8] chore: update schema generator package --- .changeset/thirty-cheetahs-clap.md | 2 ++ packages/schema-generator/package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .changeset/thirty-cheetahs-clap.md diff --git a/.changeset/thirty-cheetahs-clap.md b/.changeset/thirty-cheetahs-clap.md new file mode 100644 index 0000000000..a845151cc8 --- /dev/null +++ b/.changeset/thirty-cheetahs-clap.md @@ -0,0 +1,2 @@ +--- +--- diff --git a/packages/schema-generator/package.json b/packages/schema-generator/package.json index 7ee91355ad..a6b924d9a8 100644 --- a/packages/schema-generator/package.json +++ b/packages/schema-generator/package.json @@ -18,7 +18,7 @@ "update:api": "api-extractor run --local" }, "dependencies": { - "@aws-amplify/graphql-schema-generator": "^0.9.4", + "@aws-amplify/graphql-schema-generator": "^0.11.0", "@aws-amplify/platform-core": "^1.0.5" }, "license": "Apache-2.0" From 8d00a47fb800d7d2d064442253b63d421cbab1e8 Mon Sep 17 00:00:00 2001 From: Peter Vaiciulis Date: Wed, 30 Oct 2024 12:09:39 -0700 Subject: [PATCH 3/8] add changeset --- .changeset/orange-nails-cross.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/orange-nails-cross.md diff --git a/.changeset/orange-nails-cross.md b/.changeset/orange-nails-cross.md new file mode 100644 index 0000000000..abae0c0d0b --- /dev/null +++ b/.changeset/orange-nails-cross.md @@ -0,0 +1,5 @@ +--- +'@aws-amplify/schema-generator': patch +--- + +Upgrade @aws-amplify/graphql-schema-generator to v0.11.0 From 5b0a18f22abdf7af899bb3feb7632306d31d0f0c Mon Sep 17 00:00:00 2001 From: Peter Vaiciulis Date: Wed, 30 Oct 2024 12:25:48 -0700 Subject: [PATCH 4/8] update schema-generator at root --- package-lock.json | 80 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 61 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index ed76c4d3aa..17003c3ee0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5070,13 +5070,13 @@ "license": "0BSD" }, "node_modules/@aws-amplify/graphql-schema-generator": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-schema-generator/-/graphql-schema-generator-0.9.4.tgz", - "integrity": "sha512-GXoPOes5Sj93p7RWunJlMdxPQyoh+dBaJq3qpQUOSYQU1UxUqAstnD+gqAWEG58opiupHby7jTIi1ljK1e9CrQ==", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-schema-generator/-/graphql-schema-generator-0.11.0.tgz", + "integrity": "sha512-c5pDuoh8UWD0qQ2N4HjR3ZC/JO6ai8DrsK40oQKwQhG2V/VkxUGdqsg0B9nYiKepxiTw0gXabLq8JfwW4o8uBg==", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-transformer-core": "2.9.3", - "@aws-amplify/graphql-transformer-interfaces": "3.10.1", + "@aws-amplify/graphql-transformer-core": "3.2.2", + "@aws-amplify/graphql-transformer-interfaces": "4.1.2", "@aws-sdk/client-ec2": "3.624.0", "@aws-sdk/client-iam": "3.624.0", "@aws-sdk/client-lambda": "3.624.0", @@ -5084,7 +5084,7 @@ "csv-parse": "^5.5.2", "fs-extra": "11.1.1", "graphql": "^15.5.0", - "graphql-transformer-common": "4.31.1", + "graphql-transformer-common": "5.1.0", "knex": "~2.4.0", "mysql2": "~3.9.7", "ora": "^4.0.3", @@ -5712,6 +5712,24 @@ "node": ">=14.14" } }, + "node_modules/@aws-amplify/graphql-schema-generator/node_modules/graphql-mapping-template": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/graphql-mapping-template/-/graphql-mapping-template-5.0.1.tgz", + "integrity": "sha512-hgFkXUS6Q35zE/uyPGIZYof2kutwTZmVqwJfnQofiCYWRRQS0zjzUdyqmOcCBkbJB4Zi7G7mXcl3fSIs5I5vgA==", + "license": "Apache-2.0" + }, + "node_modules/@aws-amplify/graphql-schema-generator/node_modules/graphql-transformer-common": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/graphql-transformer-common/-/graphql-transformer-common-5.1.0.tgz", + "integrity": "sha512-i1Ja0bjlsrSNT5TzjGOrPyxYGJPTutDOLTJENcGC47+KYzMfQS80KpVpUZlIVlcCbDYeSZbv8HaMtJlJpmjbmw==", + "license": "Apache-2.0", + "dependencies": { + "graphql": "^15.5.0", + "graphql-mapping-template": "5.0.1", + "md5": "^2.2.1", + "pluralize": "8.0.0" + } + }, "node_modules/@aws-amplify/graphql-schema-generator/node_modules/typescript": { "version": "4.9.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", @@ -5726,17 +5744,17 @@ } }, "node_modules/@aws-amplify/graphql-transformer-core": { - "version": "2.9.3", - "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-transformer-core/-/graphql-transformer-core-2.9.3.tgz", - "integrity": "sha512-gz9PbNTqsyQQn6W5d4HPN/pafvFH7spwd6R/hImisEBFD+80liJc/21nBC8UgUMPu2eXVZrsiWBfWnO8Rbqomg==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-transformer-core/-/graphql-transformer-core-3.2.2.tgz", + "integrity": "sha512-nHocW0Uy/pHrrt5iMFMzz+9IsJKnaPk9BcWZHcQSJ/9F0Kn0s/vIFT5/Ee2nJFN/h0VK3fTkT9QKOuiQ4UH3Jg==", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-transformer-interfaces": "3.10.1", + "@aws-amplify/graphql-directives": "2.4.0", + "@aws-amplify/graphql-transformer-interfaces": "4.1.2", "fs-extra": "^8.1.0", "graphql": "^15.5.0", - "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.31.1", + "graphql-mapping-template": "5.0.1", + "graphql-transformer-common": "5.1.0", "hjson": "^3.2.2", "lodash": "^4.17.21", "md5": "^2.3.0", @@ -5744,10 +5762,16 @@ "ts-dedent": "^2.0.0" }, "peerDependencies": { - "aws-cdk-lib": "^2.129.0", + "aws-cdk-lib": "^2.158.0", "constructs": "^10.3.0" } }, + "node_modules/@aws-amplify/graphql-transformer-core/node_modules/@aws-amplify/graphql-directives": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-directives/-/graphql-directives-2.4.0.tgz", + "integrity": "sha512-+oO9Lb22eIuS8rvLOR+x4F79J5aCF1GIkqYS0paRUTw78NjLTOq1LWjtGMYAfLpbHgoYtrkC2zwpw7sHbmNnzQ==", + "license": "Apache-2.0" + }, "node_modules/@aws-amplify/graphql-transformer-core/node_modules/fs-extra": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", @@ -5762,6 +5786,24 @@ "node": ">=6 <7 || >=8" } }, + "node_modules/@aws-amplify/graphql-transformer-core/node_modules/graphql-mapping-template": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/graphql-mapping-template/-/graphql-mapping-template-5.0.1.tgz", + "integrity": "sha512-hgFkXUS6Q35zE/uyPGIZYof2kutwTZmVqwJfnQofiCYWRRQS0zjzUdyqmOcCBkbJB4Zi7G7mXcl3fSIs5I5vgA==", + "license": "Apache-2.0" + }, + "node_modules/@aws-amplify/graphql-transformer-core/node_modules/graphql-transformer-common": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/graphql-transformer-common/-/graphql-transformer-common-5.1.0.tgz", + "integrity": "sha512-i1Ja0bjlsrSNT5TzjGOrPyxYGJPTutDOLTJENcGC47+KYzMfQS80KpVpUZlIVlcCbDYeSZbv8HaMtJlJpmjbmw==", + "license": "Apache-2.0", + "dependencies": { + "graphql": "^15.5.0", + "graphql-mapping-template": "5.0.1", + "md5": "^2.2.1", + "pluralize": "8.0.0" + } + }, "node_modules/@aws-amplify/graphql-transformer-core/node_modules/jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", @@ -5790,15 +5832,15 @@ } }, "node_modules/@aws-amplify/graphql-transformer-interfaces": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-transformer-interfaces/-/graphql-transformer-interfaces-3.10.1.tgz", - "integrity": "sha512-daf+cpOSw3lKiS+Tpc5Oo5H+FCkHi/8z+0mAR/greQGPJWzcHv9j2u1Jiy36UvI01ypOhHme58pAs/fKWLWDBQ==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-transformer-interfaces/-/graphql-transformer-interfaces-4.1.2.tgz", + "integrity": "sha512-fW4BIo2stFYOc6LDrSDKW0NTKmBp/c+UJUG5YjDef5fUUTbE8RZMzUGgSjgzDgwXpAT8CyYuncqMLchVkQSFFQ==", "license": "Apache-2.0", "dependencies": { "graphql": "^15.5.0" }, "peerDependencies": { - "aws-cdk-lib": "^2.129.0", + "aws-cdk-lib": "^2.158.0", "constructs": "^10.3.0" } }, @@ -32313,7 +32355,7 @@ "version": "1.2.4", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-schema-generator": "^0.9.4", + "@aws-amplify/graphql-schema-generator": "^0.11.0", "@aws-amplify/platform-core": "^1.0.5" } } From 71a94124b88179ba3e506344ea74aa00efe3c5b8 Mon Sep 17 00:00:00 2001 From: Peter Vaiciulis Date: Wed, 30 Oct 2024 13:02:05 -0700 Subject: [PATCH 5/8] update aws-cdk-lib conflicting peer dependencies --- package-lock.json | 17 +++++++---------- packages/ai-constructs/package.json | 2 +- packages/auth-construct/package.json | 2 +- packages/backend-ai/package.json | 2 +- packages/backend-auth/package.json | 2 +- packages/backend-data/package.json | 2 +- packages/backend-deployer/package.json | 2 +- packages/backend-function/package.json | 2 +- packages/backend-output-storage/package.json | 2 +- .../backend-platform-test-stubs/package.json | 2 +- packages/backend-storage/package.json | 2 +- packages/backend/package.json | 2 +- packages/integration-tests/package.json | 2 +- packages/plugin-types/package.json | 2 +- packages/sandbox/package.json | 2 +- 15 files changed, 21 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 17003c3ee0..5db391f0d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6120,9 +6120,9 @@ "license": "Apache-2.0" }, "node_modules/@aws-cdk/cloud-assembly-schema": { - "version": "36.0.25", - "resolved": "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-36.0.25.tgz", - "integrity": "sha512-AK86v4IMV4zcWfp392e3wlaVJPT72/dk39Lo2SDDFxQR+sikMOyY2IGrULyhK1TwQmPiyxM7QB/0MkTbMDAPrw==", + "version": "38.0.1", + "resolved": "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-38.0.1.tgz", + "integrity": "sha512-KvPe+NMWAulfNVwY7jenFhzhuLhLqJ/OPy5jx7wUstbjnYnjRVLpUHPU3yCjXFE0J8cuJVdx95BJ4rOs66Pi9w==", "bundleDependencies": [ "jsonschema", "semver" @@ -6131,9 +6131,6 @@ "dependencies": { "jsonschema": "^1.4.1", "semver": "^7.6.3" - }, - "engines": { - "node": ">= 18.18.0" } }, "node_modules/@aws-cdk/cloud-assembly-schema/node_modules/jsonschema": { @@ -19502,9 +19499,9 @@ } }, "node_modules/aws-cdk-lib": { - "version": "2.158.0", - "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.158.0.tgz", - "integrity": "sha512-Pl9CCLM+XRTy6nyyRJM1INEMtwIlZOib0FWyq9i9E388vurw7sNVJ6tAsfLpGIOLHsFQCbF4f6OZ0KSVxmMaiA==", + "version": "2.164.1", + "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.164.1.tgz", + "integrity": "sha512-jNvVmfZJbZoAYU94b5dzTlF2z6JXJ204NgcYY5haOa6mq3m2bzdYPXnPtB5kpAX3oBi++yoRdmLhqgckdEhUZA==", "bundleDependencies": [ "@balena/dockerignore", "case", @@ -19523,7 +19520,7 @@ "@aws-cdk/asset-awscli-v1": "^2.2.202", "@aws-cdk/asset-kubectl-v20": "^2.1.2", "@aws-cdk/asset-node-proxy-agent-v6": "^2.1.0", - "@aws-cdk/cloud-assembly-schema": "^36.0.24", + "@aws-cdk/cloud-assembly-schema": "^38.0.0", "@balena/dockerignore": "^1.0.2", "case": "1.6.3", "fs-extra": "^11.2.0", diff --git a/packages/ai-constructs/package.json b/packages/ai-constructs/package.json index f329ef6e03..19dc667752 100644 --- a/packages/ai-constructs/package.json +++ b/packages/ai-constructs/package.json @@ -38,7 +38,7 @@ "typescript": "^5.0.0" }, "peerDependencies": { - "aws-cdk-lib": "^2.152.0", + "aws-cdk-lib": "2.152.0", "constructs": "^10.0.0" } } diff --git a/packages/auth-construct/package.json b/packages/auth-construct/package.json index 292804c060..5384e741e5 100644 --- a/packages/auth-construct/package.json +++ b/packages/auth-construct/package.json @@ -25,7 +25,7 @@ "@aws-sdk/util-arn-parser": "^3.568.0" }, "peerDependencies": { - "aws-cdk-lib": "^2.152.0", + "aws-cdk-lib": "2.152.0", "constructs": "^10.0.0" } } diff --git a/packages/backend-ai/package.json b/packages/backend-ai/package.json index 12196fac93..ca9f862710 100644 --- a/packages/backend-ai/package.json +++ b/packages/backend-ai/package.json @@ -30,7 +30,7 @@ "@aws-amplify/plugin-types": "^1.0.1" }, "peerDependencies": { - "aws-cdk-lib": "^2.152.0", + "aws-cdk-lib": "2.152.0", "constructs": "^10.0.0" } } diff --git a/packages/backend-auth/package.json b/packages/backend-auth/package.json index c9bddfe7c9..32a1a7f0a4 100644 --- a/packages/backend-auth/package.json +++ b/packages/backend-auth/package.json @@ -28,7 +28,7 @@ "@aws-amplify/platform-core": "^1.0.6" }, "peerDependencies": { - "aws-cdk-lib": "^2.152.0", + "aws-cdk-lib": "2.152.0", "constructs": "^10.0.0" } } diff --git a/packages/backend-data/package.json b/packages/backend-data/package.json index 834a7bcd95..f86452c8a7 100644 --- a/packages/backend-data/package.json +++ b/packages/backend-data/package.json @@ -24,7 +24,7 @@ "@aws-amplify/platform-core": "^1.0.7" }, "peerDependencies": { - "aws-cdk-lib": "^2.152.0", + "aws-cdk-lib": "2.152.0", "constructs": "^10.0.0" }, "dependencies": { diff --git a/packages/backend-deployer/package.json b/packages/backend-deployer/package.json index d78a6b7d7a..22203e4901 100644 --- a/packages/backend-deployer/package.json +++ b/packages/backend-deployer/package.json @@ -25,7 +25,7 @@ "tsx": "^4.6.1" }, "peerDependencies": { - "aws-cdk": "^2.152.0", + "aws-cdk": "2.152.0", "typescript": "^5.0.0" } } diff --git a/packages/backend-function/package.json b/packages/backend-function/package.json index 1286d277d3..ba1f9c4cf2 100644 --- a/packages/backend-function/package.json +++ b/packages/backend-function/package.json @@ -32,7 +32,7 @@ "uuid": "^9.0.1" }, "peerDependencies": { - "aws-cdk-lib": "^2.152.0", + "aws-cdk-lib": "2.152.0", "constructs": "^10.0.0" } } diff --git a/packages/backend-output-storage/package.json b/packages/backend-output-storage/package.json index 228a0f85b1..8939bed969 100644 --- a/packages/backend-output-storage/package.json +++ b/packages/backend-output-storage/package.json @@ -24,6 +24,6 @@ "@aws-amplify/plugin-types": "^1.2.2" }, "peerDependencies": { - "aws-cdk-lib": "^2.152.0" + "aws-cdk-lib": "2.152.0" } } diff --git a/packages/backend-platform-test-stubs/package.json b/packages/backend-platform-test-stubs/package.json index 953c053355..a0fcb53edb 100644 --- a/packages/backend-platform-test-stubs/package.json +++ b/packages/backend-platform-test-stubs/package.json @@ -17,7 +17,7 @@ "license": "Apache-2.0", "dependencies": { "@aws-amplify/plugin-types": "^1.2.2", - "aws-cdk-lib": "^2.152.0", + "aws-cdk-lib": "2.152.0", "constructs": "^10.0.0" } } diff --git a/packages/backend-storage/package.json b/packages/backend-storage/package.json index ac19d60472..4f9c3c0ad3 100644 --- a/packages/backend-storage/package.json +++ b/packages/backend-storage/package.json @@ -28,7 +28,7 @@ "@aws-amplify/platform-core": "^1.0.6" }, "peerDependencies": { - "aws-cdk-lib": "^2.152.0", + "aws-cdk-lib": "2.152.0", "constructs": "^10.0.0" } } diff --git a/packages/backend/package.json b/packages/backend/package.json index 4d05c7b7a7..6880e40f2b 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -40,7 +40,7 @@ "lodash.snakecase": "^4.1.1" }, "peerDependencies": { - "aws-cdk-lib": "^2.152.0", + "aws-cdk-lib": "2.152.0", "constructs": "^10.0.0" }, "devDependencies": { diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json index b49ec966f4..30e012e1cd 100644 --- a/packages/integration-tests/package.json +++ b/packages/integration-tests/package.json @@ -33,7 +33,7 @@ "@zip.js/zip.js": "^2.7.52", "aws-amplify": "^6.0.16", "aws-appsync-auth-link": "^3.0.7", - "aws-cdk-lib": "^2.152.0", + "aws-cdk-lib": "2.152.0", "constructs": "^10.0.0", "execa": "^8.0.1", "fs-extra": "^11.1.1", diff --git a/packages/plugin-types/package.json b/packages/plugin-types/package.json index 70711832d6..ce1ea37541 100644 --- a/packages/plugin-types/package.json +++ b/packages/plugin-types/package.json @@ -11,7 +11,7 @@ }, "license": "Apache-2.0", "peerDependencies": { - "aws-cdk-lib": "^2.152.0", + "aws-cdk-lib": "2.152.0", "constructs": "^10.0.0", "@aws-sdk/types": "^3.609.0" }, diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json index b5c04aa0c8..280c987109 100644 --- a/packages/sandbox/package.json +++ b/packages/sandbox/package.json @@ -42,6 +42,6 @@ "@types/parse-gitignore": "^1.0.0" }, "peerDependencies": { - "aws-cdk": "^2.152.0" + "aws-cdk": "2.152.0" } } From 57ca3d6c78793ec5655ec3b04ce0fcdee3d0bbcb Mon Sep 17 00:00:00 2001 From: Peter Vaiciulis Date: Wed, 30 Oct 2024 13:18:08 -0700 Subject: [PATCH 6/8] update aws-cdk-lib as peerDep in packages --- packages/ai-constructs/package.json | 2 +- packages/auth-construct/package.json | 2 +- packages/backend-ai/package.json | 2 +- packages/backend-auth/package.json | 2 +- packages/backend-data/package.json | 2 +- packages/backend-deployer/package.json | 2 +- packages/backend-function/package.json | 2 +- packages/backend-output-storage/package.json | 2 +- packages/backend-platform-test-stubs/package.json | 2 +- packages/backend-storage/package.json | 2 +- packages/backend/package.json | 2 +- packages/client-config/API.md | 2 +- packages/integration-tests/package.json | 2 +- packages/plugin-types/package.json | 2 +- packages/sandbox/package.json | 2 +- templates/construct/package.json | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/ai-constructs/package.json b/packages/ai-constructs/package.json index 19dc667752..3f33f4089a 100644 --- a/packages/ai-constructs/package.json +++ b/packages/ai-constructs/package.json @@ -38,7 +38,7 @@ "typescript": "^5.0.0" }, "peerDependencies": { - "aws-cdk-lib": "2.152.0", + "aws-cdk-lib": "^2.158.0", "constructs": "^10.0.0" } } diff --git a/packages/auth-construct/package.json b/packages/auth-construct/package.json index 5384e741e5..d3e121ee4d 100644 --- a/packages/auth-construct/package.json +++ b/packages/auth-construct/package.json @@ -25,7 +25,7 @@ "@aws-sdk/util-arn-parser": "^3.568.0" }, "peerDependencies": { - "aws-cdk-lib": "2.152.0", + "aws-cdk-lib": "^2.158.0", "constructs": "^10.0.0" } } diff --git a/packages/backend-ai/package.json b/packages/backend-ai/package.json index ca9f862710..1a254af297 100644 --- a/packages/backend-ai/package.json +++ b/packages/backend-ai/package.json @@ -30,7 +30,7 @@ "@aws-amplify/plugin-types": "^1.0.1" }, "peerDependencies": { - "aws-cdk-lib": "2.152.0", + "aws-cdk-lib": "^2.158.0", "constructs": "^10.0.0" } } diff --git a/packages/backend-auth/package.json b/packages/backend-auth/package.json index 32a1a7f0a4..89d7147038 100644 --- a/packages/backend-auth/package.json +++ b/packages/backend-auth/package.json @@ -28,7 +28,7 @@ "@aws-amplify/platform-core": "^1.0.6" }, "peerDependencies": { - "aws-cdk-lib": "2.152.0", + "aws-cdk-lib": "^2.158.0", "constructs": "^10.0.0" } } diff --git a/packages/backend-data/package.json b/packages/backend-data/package.json index f86452c8a7..b9c14d8db9 100644 --- a/packages/backend-data/package.json +++ b/packages/backend-data/package.json @@ -24,7 +24,7 @@ "@aws-amplify/platform-core": "^1.0.7" }, "peerDependencies": { - "aws-cdk-lib": "2.152.0", + "aws-cdk-lib": "^2.158.0", "constructs": "^10.0.0" }, "dependencies": { diff --git a/packages/backend-deployer/package.json b/packages/backend-deployer/package.json index 22203e4901..0757312558 100644 --- a/packages/backend-deployer/package.json +++ b/packages/backend-deployer/package.json @@ -25,7 +25,7 @@ "tsx": "^4.6.1" }, "peerDependencies": { - "aws-cdk": "2.152.0", + "aws-cdk": "^2.158.0", "typescript": "^5.0.0" } } diff --git a/packages/backend-function/package.json b/packages/backend-function/package.json index ba1f9c4cf2..eee3158512 100644 --- a/packages/backend-function/package.json +++ b/packages/backend-function/package.json @@ -32,7 +32,7 @@ "uuid": "^9.0.1" }, "peerDependencies": { - "aws-cdk-lib": "2.152.0", + "aws-cdk-lib": "^2.158.0", "constructs": "^10.0.0" } } diff --git a/packages/backend-output-storage/package.json b/packages/backend-output-storage/package.json index 8939bed969..f593321058 100644 --- a/packages/backend-output-storage/package.json +++ b/packages/backend-output-storage/package.json @@ -24,6 +24,6 @@ "@aws-amplify/plugin-types": "^1.2.2" }, "peerDependencies": { - "aws-cdk-lib": "2.152.0" + "aws-cdk-lib": "^2.158.0" } } diff --git a/packages/backend-platform-test-stubs/package.json b/packages/backend-platform-test-stubs/package.json index a0fcb53edb..a395b969db 100644 --- a/packages/backend-platform-test-stubs/package.json +++ b/packages/backend-platform-test-stubs/package.json @@ -17,7 +17,7 @@ "license": "Apache-2.0", "dependencies": { "@aws-amplify/plugin-types": "^1.2.2", - "aws-cdk-lib": "2.152.0", + "aws-cdk-lib": "^2.158.0", "constructs": "^10.0.0" } } diff --git a/packages/backend-storage/package.json b/packages/backend-storage/package.json index 4f9c3c0ad3..334997595b 100644 --- a/packages/backend-storage/package.json +++ b/packages/backend-storage/package.json @@ -28,7 +28,7 @@ "@aws-amplify/platform-core": "^1.0.6" }, "peerDependencies": { - "aws-cdk-lib": "2.152.0", + "aws-cdk-lib": "^2.158.0", "constructs": "^10.0.0" } } diff --git a/packages/backend/package.json b/packages/backend/package.json index 6880e40f2b..c3bd1a6d13 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -40,7 +40,7 @@ "lodash.snakecase": "^4.1.1" }, "peerDependencies": { - "aws-cdk-lib": "2.152.0", + "aws-cdk-lib": "^2.158.0", "constructs": "^10.0.0" }, "devDependencies": { diff --git a/packages/client-config/API.md b/packages/client-config/API.md index cccafacd46..9d784bff52 100644 --- a/packages/client-config/API.md +++ b/packages/client-config/API.md @@ -627,7 +627,7 @@ export type CustomClientConfig = { export const DEFAULT_CLIENT_CONFIG_VERSION: ClientConfigVersion; // @public -export const generateClientConfig: (backendIdentifier: DeployedBackendIdentifier, version: T, awsClientProvider?: AWSClientProvider<{ +export const generateClientConfig: (backendIdentifier: DeployedBackendIdentifier, version: T, awsClientProvider?: AWSClientProvider<{ getS3Client: S3Client; getAmplifyClient: AmplifyClient; getCloudFormationClient: CloudFormationClient; diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json index 30e012e1cd..aaabea803e 100644 --- a/packages/integration-tests/package.json +++ b/packages/integration-tests/package.json @@ -33,7 +33,7 @@ "@zip.js/zip.js": "^2.7.52", "aws-amplify": "^6.0.16", "aws-appsync-auth-link": "^3.0.7", - "aws-cdk-lib": "2.152.0", + "aws-cdk-lib": "^2.158.0", "constructs": "^10.0.0", "execa": "^8.0.1", "fs-extra": "^11.1.1", diff --git a/packages/plugin-types/package.json b/packages/plugin-types/package.json index ce1ea37541..8474a4b93f 100644 --- a/packages/plugin-types/package.json +++ b/packages/plugin-types/package.json @@ -11,7 +11,7 @@ }, "license": "Apache-2.0", "peerDependencies": { - "aws-cdk-lib": "2.152.0", + "aws-cdk-lib": "^2.158.0", "constructs": "^10.0.0", "@aws-sdk/types": "^3.609.0" }, diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json index 280c987109..f334a6f66c 100644 --- a/packages/sandbox/package.json +++ b/packages/sandbox/package.json @@ -42,6 +42,6 @@ "@types/parse-gitignore": "^1.0.0" }, "peerDependencies": { - "aws-cdk": "2.152.0" + "aws-cdk": "^2.158.0" } } diff --git a/templates/construct/package.json b/templates/construct/package.json index 2a879e3768..3494b52996 100644 --- a/templates/construct/package.json +++ b/templates/construct/package.json @@ -18,7 +18,7 @@ }, "license": "Apache-2.0", "peerDependencies": { - "aws-cdk-lib": "^2.152.0", + "aws-cdk-lib": "^2.158.0", "constructs": "^10.0.0" } } From ed077ac4c505ebecc9754732c307685f4d298725 Mon Sep 17 00:00:00 2001 From: Peter Vaiciulis Date: Wed, 30 Oct 2024 13:23:17 -0700 Subject: [PATCH 7/8] add changeset for aws-cdk-lib upgrade --- .changeset/lovely-fishes-cheer.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .changeset/lovely-fishes-cheer.md diff --git a/.changeset/lovely-fishes-cheer.md b/.changeset/lovely-fishes-cheer.md new file mode 100644 index 0000000000..34797dbcdb --- /dev/null +++ b/.changeset/lovely-fishes-cheer.md @@ -0,0 +1,20 @@ +--- +'@aws-amplify/backend-platform-test-stubs': patch +'@aws-amplify/backend-output-storage': patch +'@aws-amplify/integration-tests': patch +'@aws-amplify/backend-deployer': patch +'@aws-amplify/backend-function': patch +'@aws-amplify/schema-generator': patch +'@aws-amplify/backend-storage': patch +'@aws-amplify/auth-construct': patch +'@aws-amplify/ai-constructs': patch +'@aws-amplify/client-config': patch +'@aws-amplify/backend-auth': patch +'@aws-amplify/backend-data': patch +'@aws-amplify/plugin-types': patch +'@aws-amplify/backend-ai': patch +'@aws-amplify/backend': patch +'@aws-amplify/sandbox': patch +--- + +update aws-cdk lib to ^2.158.0 From cf5704d57fe6d8a36232774ff72aa64401ba3344 Mon Sep 17 00:00:00 2001 From: Peter Vaiciulis Date: Wed, 30 Oct 2024 13:39:49 -0700 Subject: [PATCH 8/8] revert api arg order this re-ordering of the args should not have been commited --- packages/client-config/API.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client-config/API.md b/packages/client-config/API.md index 9d784bff52..cccafacd46 100644 --- a/packages/client-config/API.md +++ b/packages/client-config/API.md @@ -627,7 +627,7 @@ export type CustomClientConfig = { export const DEFAULT_CLIENT_CONFIG_VERSION: ClientConfigVersion; // @public -export const generateClientConfig: (backendIdentifier: DeployedBackendIdentifier, version: T, awsClientProvider?: AWSClientProvider<{ +export const generateClientConfig: (backendIdentifier: DeployedBackendIdentifier, version: T, awsClientProvider?: AWSClientProvider<{ getS3Client: S3Client; getAmplifyClient: AmplifyClient; getCloudFormationClient: CloudFormationClient;