Merge branch 'master' into merge-gqlv2-fix-into-master

Author: alharris-at

.circleci/config.base.yml

@@ -18,7 +18,7 @@ executors:
       shell: bash.exe
   macos_node12: &macos_node12
     macos:
-      xcode: "11.2.1"
+      xcode: 13.2.1
       resource_class: large
 
 defaults: &defaults
@@ -46,6 +46,7 @@ clean_up_e2e_resources: &cleanup_e2e
     cd packages/amplify-codegen-e2e-tests
     yarn clean-e2e-resources job ${CIRCLE_BUILD_NUM}
   working_directory: ~/repo
+  when: always
 
 jobs:
   build:
@@ -79,6 +80,8 @@ jobs:
               - equal: [ *windows_node12, << parameters.os >> ]
           steps:
             - checkout
+            - run: nvm install 12.22.7
+            - run: nvm alias default 12.22.7
             - run: yarn config set workspaces-experimental true
             - run: yarn cache clean --force
             - run: yarn run production-build

.circleci/config.yml

@@ -19,7 +19,7 @@ executors:
       shell: bash.exe
   macos_node12: &ref_1
     macos:
-      xcode: 11.2.1
+      xcode: 13.2.1
       resource_class: large
 defaults:
   working_directory: ~/repo
@@ -44,6 +44,7 @@ clean_up_e2e_resources: &ref_7
     cd packages/amplify-codegen-e2e-tests
     yarn clean-e2e-resources job ${CIRCLE_BUILD_NUM}
   working_directory: ~/repo
+  when: always
 jobs:
   build:
     working_directory: ~/repo
@@ -81,6 +82,8 @@ jobs:
                   - << parameters.os >>
           steps:
             - checkout
+            - run: nvm install 12.22.7
+            - run: nvm alias default 12.22.7
             - run: yarn config set workspaces-experimental true
             - run: yarn cache clean --force
             - run: yarn run production-build

packages/amplify-codegen-e2e-tests/CHANGELOG.md

@@ -3,7 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [2.39.8-gqlv2-fix.0](https://github.com/aws-amplify/amplify-codegen/compare/[email protected]@2.39.8-gqlv2-fix.0) (2021-12-04)
+## [2.39.9](https://github.com/aws-amplify/amplify-codegen/compare/[email protected]@2.39.9) (2022-01-05)
+
+
+### Reverts
+
+* Revert "build: update packages (#325)" (#343) ([694856a](https://github.com/aws-amplify/amplify-codegen/commit/694856a38513aacfa071a02090de8fdc7fc9a1fd)), closes [#325](https://github.com/aws-amplify/amplify-codegen/issues/325) [#343](https://github.com/aws-amplify/amplify-codegen/issues/343)
+
+
+
+
+
+## [2.39.8](https://github.com/aws-amplify/amplify-codegen/compare/[email protected]@2.39.8) (2022-01-04)
 
 **Note:** Version bump only for package amplify-codegen-e2e-tests
 

packages/amplify-codegen-e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amplify-codegen-e2e-tests",
-  "version": "2.39.8-gqlv2-fix.0",
+  "version": "2.39.9",
   "description": "",
   "repository": {
     "type": "git",

packages/amplify-codegen/CHANGELOG.md

@@ -3,31 +3,37 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [2.26.19-gqlv2-fix.3](https://github.com/aws-amplify/amplify-codegen/compare/[email protected].19-gqlv2-fix.2...[email protected].19-gqlv2-fix.3) (2021-12-21)
+## [2.26.22](https://github.com/aws-amplify/amplify-codegen/compare/[email protected].21...[email protected].22) (2022-01-05)
 
-**Note:** Version bump only for package amplify-codegen
 
+### Reverts
+
+* Revert "fix(amplify-codegen): Add Amplify CLI version as a comment for the Modelgen output files (#133)" ([9d3c49f](https://github.com/aws-amplify/amplify-codegen/commit/9d3c49f028d1361e6601edc62265d978235802fd)), closes [#133](https://github.com/aws-amplify/amplify-codegen/issues/133)
 
 
 
 
-## [2.26.19-gqlv2-fix.2](https://github.com/aws-amplify/amplify-codegen/compare/[email protected]@2.26.19-gqlv2-fix.2) (2021-12-15)
 
-**Note:** Version bump only for package amplify-codegen
+## [2.26.21](https://github.com/aws-amplify/amplify-codegen/compare/[email protected]@2.26.21) (2022-01-05)
+
+
+### Reverts
+
+* Revert "build: update packages (#325)" (#343) ([694856a](https://github.com/aws-amplify/amplify-codegen/commit/694856a38513aacfa071a02090de8fdc7fc9a1fd)), closes [#325](https://github.com/aws-amplify/amplify-codegen/issues/325) [#343](https://github.com/aws-amplify/amplify-codegen/issues/343)
 
 
 
 
 
-## [2.26.19-gqlv2-fix.1](https://github.com/aws-amplify/amplify-codegen/compare/[email protected]-gqlv2-fix.0...[email protected].19-gqlv2-fix.1) (2021-12-15)
+## [2.26.20](https://github.com/aws-amplify/amplify-codegen/compare/[email protected]...[email protected].20) (2022-01-04)
 
 **Note:** Version bump only for package amplify-codegen
 
 
 
 
 
-## [2.26.19-gqlv2-fix.0](https://github.com/aws-amplify/amplify-codegen/compare/[email protected]@2.26.19-gqlv2-fix.0) (2021-12-04)
+## [2.26.19](https://github.com/aws-amplify/amplify-codegen/compare/[email protected]@2.26.19) (2021-12-15)
 
 **Note:** Version bump only for package amplify-codegen
 

packages/amplify-codegen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amplify-codegen",
-  "version": "2.26.19-gqlv2-fix.3",
+  "version": "2.26.22",
   "description": "amplify code generator",
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
     "test-watch": "jest --watch"
   },
   "dependencies": {
-    "@aws-amplify/appsync-modelgen-plugin": "1.29.10-gqlv2-fix.3",
+    "@aws-amplify/appsync-modelgen-plugin": "1.29.12",
     "@aws-amplify/graphql-docs-generator": "2.4.2",
     "@aws-amplify/graphql-types-generator": "2.8.6",
     "@graphql-codegen/core": "1.8.3",

packages/appsync-modelgen-plugin/CHANGELOG.md

@@ -3,47 +3,31 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.29.10-gqlv2-fix.3](https://github.com/aws-amplify/amplify-codegen/compare/@aws-amplify/[email protected].10-gqlv2-fix.2...@aws-amplify/[email protected].10-gqlv2-fix.3) (2021-12-21)
+## [1.29.12](https://github.com/aws-amplify/amplify-codegen/compare/@aws-amplify/[email protected].11...@aws-amplify/[email protected].12) (2022-01-05)
 
 
-### Bug Fixes
-
-* **appsync-modelgen-plugin:** associatedWith correctly points to model field rather than ID in bi-directional relations ([a39b61d](https://github.com/aws-amplify/amplify-codegen/commit/a39b61dec2d8adf3589212fe2aaf7400f98f01b9))
-* **appsync-modelgen-plugin:** revert [#326](https://github.com/aws-amplify/amplify-codegen/issues/326) ([d36323d](https://github.com/aws-amplify/amplify-codegen/commit/d36323d7f9adf92167bf9153c80435b42320053f))
-* **appsync-modelgen-plugin:** turn on the shouldUseModelNameFieldInHasManyAndBelongsTo flag for Android ([6cf1ebb](https://github.com/aws-amplify/amplify-codegen/commit/6cf1ebb31dbc28534525fcefc3be73c05596a41b))
-
-
-
-
-
-## [1.29.10-gqlv2-fix.2](https://github.com/aws-amplify/amplify-codegen/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2021-12-15)
-
-
-### Bug Fixes
-
-* change the if statement ([0b0b075](https://github.com/aws-amplify/amplify-codegen/commit/0b0b075a798aab63360ccd847e25d7989baa5522))
-
+### Reverts
 
+* Revert "build: update packages (#325)" (#343) ([694856a](https://github.com/aws-amplify/amplify-codegen/commit/694856a38513aacfa071a02090de8fdc7fc9a1fd)), closes [#325](https://github.com/aws-amplify/amplify-codegen/issues/325) [#343](https://github.com/aws-amplify/amplify-codegen/issues/343)
 
 
 
-## [1.29.10-gqlv2-fix.1](https://github.com/aws-amplify/amplify-codegen/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2021-12-15)
 
 
-### Bug Fixes
+## [1.29.11](https://github.com/aws-amplify/amplify-codegen/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2022-01-04)
 
-* set associatedWith to correct field with hasOne/hasMany and belongsTo ([289e38b](https://github.com/aws-amplify/amplify-codegen/commit/289e38ba4c6fd69616eb459c90e26467c6a1e314))
+**Note:** Version bump only for package @aws-amplify/appsync-modelgen-plugin
 
 
 
 
 
-## [1.29.10-gqlv2-fix.0](https://github.com/aws-amplify/amplify-codegen/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]-gqlv2-fix.0) (2021-12-04)
+## [1.29.10](https://github.com/aws-amplify/amplify-codegen/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2021-12-15)
 
 
 ### Bug Fixes
 
-* partially rolling back commit 310 for flutter, swift, and java platforms ([#319](https://github.com/aws-amplify/amplify-codegen/issues/319)) ([6c2f0c8](https://github.com/aws-amplify/amplify-codegen/commit/6c2f0c8920e4347d59f345867778fd49579a2cd4))
+* **appsync-modelgen-plugin:** revert not removing the additional fields in join for many-to-many ([6bf2156](https://github.com/aws-amplify/amplify-codegen/commit/6bf215691d1fdcdc56be114958ecec4d1b1fc5f5))
 
 
 

packages/appsync-modelgen-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/appsync-modelgen-plugin",
-  "version": "1.29.10-gqlv2-fix.3",
+  "version": "1.29.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/aws-amplify/amplify-codegen.git",

packages/appsync-modelgen-plugin/src/visitors/appsync-visitor.ts

@@ -701,6 +701,9 @@ export class AppSyncModelVisitor<
               isList: false,
               isNullable: field.isNullable,
             });
+          } else if (connectionInfo.targetName !== 'id') {
+            // Need to remove the field that is targetName
+            removeFieldFromModel(model, connectionInfo.targetName);
           }
           field.connectionInfo = connectionInfo;
         }