Resolve merge comflicts

aws-amplify · Jan 17, 2025 · 2219c33 · 2219c33
2 parents 2093e97 + d96f49a
commit 2219c33
Show file tree

Hide file tree

Showing 65 changed files with 501 additions and 3,035 deletions.
diff --git a/codebuild_specs/e2e_workflow.yml b/codebuild_specs/e2e_workflow.yml
diff --git a/packages/amplify-data-construct/.jsii b/packages/amplify-data-construct/.jsii
@@ -9,22 +9,22 @@
     "@aws-amplify/ai-constructs": "^1.0.0",
     "@aws-amplify/backend-output-schemas": "^1.0.0",
     "@aws-amplify/backend-output-storage": "^1.0.0",
-    "@aws-amplify/graphql-auth-transformer": "4.1.9",
-    "@aws-amplify/graphql-conversation-transformer": "1.1.4",
-    "@aws-amplify/graphql-default-value-transformer": "3.1.6",
+    "@aws-amplify/graphql-auth-transformer": "4.1.10",
+    "@aws-amplify/graphql-conversation-transformer": "1.1.5",
+    "@aws-amplify/graphql-default-value-transformer": "3.1.7",
     "@aws-amplify/graphql-directives": "2.6.1",
-    "@aws-amplify/graphql-function-transformer": "3.1.8",
-    "@aws-amplify/graphql-generation-transformer": "1.1.2",
-    "@aws-amplify/graphql-http-transformer": "3.0.11",
-    "@aws-amplify/graphql-index-transformer": "3.0.11",
-    "@aws-amplify/graphql-maps-to-transformer": "4.0.11",
-    "@aws-amplify/graphql-model-transformer": "3.1.3",
-    "@aws-amplify/graphql-predictions-transformer": "3.0.11",
-    "@aws-amplify/graphql-relational-transformer": "3.1.3",
-    "@aws-amplify/graphql-searchable-transformer": "3.0.11",
-    "@aws-amplify/graphql-sql-transformer": "0.4.11",
-    "@aws-amplify/graphql-transformer": "2.2.4",
-    "@aws-amplify/graphql-transformer-core": "3.3.3",
+    "@aws-amplify/graphql-function-transformer": "3.1.9",
+    "@aws-amplify/graphql-generation-transformer": "1.1.3",
+    "@aws-amplify/graphql-http-transformer": "3.0.12",
+    "@aws-amplify/graphql-index-transformer": "3.0.12",
+    "@aws-amplify/graphql-maps-to-transformer": "4.0.12",
+    "@aws-amplify/graphql-model-transformer": "3.1.4",
+    "@aws-amplify/graphql-predictions-transformer": "3.0.12",
+    "@aws-amplify/graphql-relational-transformer": "3.1.4",
+    "@aws-amplify/graphql-searchable-transformer": "3.0.12",
+    "@aws-amplify/graphql-sql-transformer": "0.4.12",
+    "@aws-amplify/graphql-transformer": "2.2.5",
+    "@aws-amplify/graphql-transformer-core": "3.3.4",
     "@aws-amplify/graphql-transformer-interfaces": "4.2.1",
     "@aws-amplify/graphql-validate-transformer": "1.0.0",
     "@aws-amplify/platform-core": "^1.0.0",
@@ -131,7 +131,7 @@
     "zod": "^3.22.2"
   },
   "dependencies": {
-    "@aws-amplify/graphql-api-construct": "1.18.5",
+    "@aws-amplify/graphql-api-construct": "1.18.6",
     "aws-cdk-lib": "^2.168.0",
     "constructs": "^10.3.0"
   },
@@ -4066,6 +4066,6 @@
     }
   },
   "types": {},
-  "version": "1.14.5",
-  "fingerprint": "Nwx2x2+l7rE9t4xzhhMADaygR5P8Fp+OmCex+8NDpws="
+  "version": "1.14.6",
+  "fingerprint": "QDQynvdLBPhlJ30EOwF4NgCCA7bk3ysjqet5f7Hm/X8="
 }
diff --git a/packages/amplify-data-construct/CHANGELOG.md b/packages/amplify-data-construct/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.14.6](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2025-01-16)
+
+### Bug Fixes
+
+- remove transitive dev dependencies from bundled jsii constructs ([#3092](https://github.com/aws-amplify/amplify-category-api/issues/3092)) ([f1243e2](https://github.com/aws-amplify/amplify-category-api/commit/f1243e232d6b54bc2fe2b6b7c27ad454b7063edc))
+
 ## [1.14.5](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-12-23)
 
 **Note:** Version bump only for package @aws-amplify/data-construct

diff --git a/packages/amplify-data-construct/package.json b/packages/amplify-data-construct/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/data-construct",
-  "version": "1.14.5",
+  "version": "1.14.6",
   "description": "AppSync GraphQL Api Construct using Amplify GraphQL Transformer - Aliased to use `Data` name scheme.",
   "repository": {
     "type": "git",
@@ -161,23 +161,23 @@
     "@aws-amplify/ai-constructs": "^1.0.0",
     "@aws-amplify/backend-output-schemas": "^1.0.0",
     "@aws-amplify/backend-output-storage": "^1.0.0",
-    "@aws-amplify/graphql-api-construct": "1.18.5",
-    "@aws-amplify/graphql-auth-transformer": "4.1.9",
-    "@aws-amplify/graphql-conversation-transformer": "1.1.4",
-    "@aws-amplify/graphql-default-value-transformer": "3.1.6",
+    "@aws-amplify/graphql-api-construct": "1.18.6",
+    "@aws-amplify/graphql-auth-transformer": "4.1.10",
+    "@aws-amplify/graphql-conversation-transformer": "1.1.5",
+    "@aws-amplify/graphql-default-value-transformer": "3.1.7",
     "@aws-amplify/graphql-directives": "2.6.1",
-    "@aws-amplify/graphql-function-transformer": "3.1.8",
-    "@aws-amplify/graphql-generation-transformer": "1.1.2",
-    "@aws-amplify/graphql-http-transformer": "3.0.11",
-    "@aws-amplify/graphql-index-transformer": "3.0.11",
-    "@aws-amplify/graphql-maps-to-transformer": "4.0.11",
-    "@aws-amplify/graphql-model-transformer": "3.1.3",
-    "@aws-amplify/graphql-predictions-transformer": "3.0.11",
-    "@aws-amplify/graphql-relational-transformer": "3.1.3",
-    "@aws-amplify/graphql-searchable-transformer": "3.0.11",
-    "@aws-amplify/graphql-sql-transformer": "0.4.11",
-    "@aws-amplify/graphql-transformer": "2.2.4",
-    "@aws-amplify/graphql-transformer-core": "3.3.3",
+    "@aws-amplify/graphql-function-transformer": "3.1.9",
+    "@aws-amplify/graphql-generation-transformer": "1.1.3",
+    "@aws-amplify/graphql-http-transformer": "3.0.12",
+    "@aws-amplify/graphql-index-transformer": "3.0.12",
+    "@aws-amplify/graphql-maps-to-transformer": "4.0.12",
+    "@aws-amplify/graphql-model-transformer": "3.1.4",
+    "@aws-amplify/graphql-predictions-transformer": "3.0.12",
+    "@aws-amplify/graphql-relational-transformer": "3.1.4",
+    "@aws-amplify/graphql-searchable-transformer": "3.0.12",
+    "@aws-amplify/graphql-sql-transformer": "0.4.12",
+    "@aws-amplify/graphql-transformer": "2.2.5",
+    "@aws-amplify/graphql-transformer-core": "3.3.4",
     "@aws-amplify/graphql-transformer-interfaces": "4.2.1",
     "@aws-amplify/graphql-validate-transformer": "1.0.0",
     "@aws-amplify/platform-core": "^1.0.0",

diff --git a/packages/amplify-e2e-tests/CHANGELOG.md b/packages/amplify-e2e-tests/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.1.4](https://github.com/aws-amplify/amplify-category-api/compare/amplify-category-api-e2e-tests@[email protected]) (2025-01-16)
+
+**Note:** Version bump only for package amplify-category-api-e2e-tests
+
 ## [4.1.3](https://github.com/aws-amplify/amplify-category-api/compare/amplify-category-api-e2e-tests@[email protected]) (2024-12-23)
 
 **Note:** Version bump only for package amplify-category-api-e2e-tests

diff --git a/packages/amplify-e2e-tests/package.json b/packages/amplify-e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-api-e2e-tests",
-  "version": "4.1.3",
+  "version": "4.1.4",
   "description": "E2e test suite",
   "repository": {
     "type": "git",
@@ -25,8 +25,8 @@
   },
   "dependencies": {
     "@aws-amplify/amplify-app": "^5.0.35",
-    "@aws-amplify/graphql-schema-generator": "0.11.4",
-    "@aws-amplify/graphql-transformer-core": "3.3.3",
+    "@aws-amplify/graphql-schema-generator": "0.11.5",
+    "@aws-amplify/graphql-transformer-core": "3.3.4",
     "amplify-category-api-e2e-core": "5.0.7",
     "aws-amplify": "^4.2.8",
     "aws-appsync": "^4.1.1",