Merge pull request #460 from aws-amplify/main

Release PR

Author: alharris-at

.eslintrc.js

@@ -119,6 +119,7 @@ module.exports = {
     'no-plusplus': 'off',
 
     // TODO enable later
+    'camelcase': 'off',
     'consistent-return': 'off', // https://eslint.org/docs/rules/consistent-return
     'no-console': 'off', // https://eslint.org/docs/rules/no-console
     'no-prototype-builtins': 'off', // https://eslint.org/docs/rules/no-prototype-builtins
@@ -138,7 +139,13 @@ module.exports = {
     'no-return-await': 'off', // https://eslint.org/docs/rules/no-return-await
 
     // TSLint existing rules
-    '@typescript-eslint/class-name-casing': 'error',
+    '@typescript-eslint/naming-convention': [
+      'error',
+      {
+        'selector': ['class', 'interface'],
+        'format': ['PascalCase'],
+      }
+    ],
     'curly': 'off', // Enable later
     'guard-for-in': 'error',
     'indent': 'off', // Enable later

package.json

@@ -23,8 +23,8 @@
     "verdaccio-publish": "yarn verdaccio-clean && yarn publish-to-verdaccio",
     "verdaccio-disconnect": "source .circleci/local_publish_helpers.sh && unsetNpmRegistryUrl",
     "verdaccio-stop": "kill -9 $(lsof -n -t -iTCP:4873 -sTCP:LISTEN)",
-    "setup-dev": "(yarn && lerna run build) && yarn add-cli-no-save && (yarn hoist-cli && yarn rm-dev-link && yarn link-dev)",
-    "add-cli-no-save": "yarn add @aws-amplify/cli-internal -W && git restore package.json",
+    "setup-dev": "rm -rf yarn.lock && (yarn && lerna run build) && yarn add-cli-no-save && (yarn hoist-cli && yarn rm-dev-link && yarn link-dev)",
+    "add-cli-no-save": "yarn add @aws-amplify/amplify-category-api @aws-amplify/cli-internal -W && git restore package.json yarn.lock",
     "hoist-cli": "rm -rf node_modules/amplify-cli-internal && mkdir node_modules/amplify-cli-internal && cp -r node_modules/@aws-amplify/cli-internal/ node_modules/amplify-cli-internal",
     "link-dev": "cd node_modules/amplify-cli-internal && ln -s \"$(pwd)/bin/amplify\" \"$(yarn global bin)/amplify-dev\" && cd -",
     "rm-dev-link": "rm -f \"$(yarn global bin)/amplify-dev\"",
@@ -62,10 +62,10 @@
     "@commitlint/cli": "^17.0.3",
     "@commitlint/config-conventional": "^17.0.3",
     "@commitlint/config-lerna-scopes": "^17.0.2",
-    "@types/jest": "^25.2.1",
+    "@types/jest": "^28.1.6",
     "@types/js-yaml": "^3.12.3",
-    "@typescript-eslint/eslint-plugin": "^2.16.0",
-    "@typescript-eslint/parser": "^2.16.0",
+    "@typescript-eslint/eslint-plugin": "^4.0.0",
+    "@typescript-eslint/parser": "^4.0.0",
     "cmd-shim": "^3.0.3",
     "codecov": "^3.7.0",
     "commitizen": "^4.2.4",
@@ -76,34 +76,36 @@
     "eslint-config-prettier": "^6.9.0",
     "eslint-import-resolver-typescript": "^2.0.0",
     "eslint-plugin-import": "^2.20.0",
-    "eslint-plugin-jest": "^23.6.0",
+    "eslint-plugin-jest": "^26.6.0",
     "eslint-plugin-json": "^2.0.1",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-prettier": "^3.1.2",
     "eslint-plugin-react": "^7.21.5",
     "eslint-plugin-spellcheck": "^0.0.17",
     "glob": "^7.1.6",
     "husky": "^3.0.3",
-    "jest": "^25.5.4",
-    "jest-circus": "^25.5.4",
-    "jest-junit": "^10.0.0",
+    "jest": "^28.1.3",
+    "jest-circus": "^28.1.3",
+    "jest-junit": "^14.0.0",
     "js-yaml": "3.13.1",
     "lnk": "1.1.0",
     "prettier": "^1.19.1",
     "prettier-eslint": "^9.0.1",
     "pretty-quick": "^3.1.0",
     "rimraf": "^3.0.0",
-    "ts-jest": "^25.5.0",
+    "ts-jest": "^28.0.7",
     "ts-node": "^8.10.1",
-    "typescript": "^3.8.3",
-    "amplify-cli-core": "^2.3.0",
+    "typescript": "^4.7.4",
+    "amplify-cli-core":  "^2.3.0",
     "graphql-transformer-core": "^7.2.1",
     "amplify-headless-interface": "^1.13.1"
   },
   "resolutions": {
     "minimist": "^1.2.6",
     "lodash": "^4.17.21",
-    "node-fetch": "^2.6.7"
+    "node-fetch": "^2.6.7",
+    "cross-fetch": "^2.2.6",
+    "glob-parent": "^6.0.2"
   },
   "config": {
     "commitizen": {

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

@@ -36,7 +36,7 @@
     "yargs": "^15.1.0"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.22",
+    "@types/jest": "^28.1.6",
     "ts-node": "^8.9.0"
   },
   "peerDependencies": {

packages/amplify-codegen/package.json

@@ -27,7 +27,7 @@
     "chalk": "^3.0.0",
     "fs-extra": "^8.1.0",
     "glob-all": "^3.1.0",
-    "glob-parent": "^5.1.1",
+    "glob-parent": "^6.0.2",
     "graphql": "^14.5.8",
     "graphql-config": "^2.2.1",
     "inquirer": "^7.3.3",

packages/amplify-codegen/src/commands/models.js

@@ -84,6 +84,7 @@ async function generateModels(context) {
   const emitAuthProvider = readFeatureFlag('codegen.emitAuthProvider');
   const usePipelinedTransformer = readFeatureFlag('graphQLTransformer.useExperimentalPipelinedTransformer')
   const transformerVersion = readNumericFeatureFlag('graphQLTransformer.transformerVersion');
+  const respectPrimaryKeyAttributesOnConnectionField = readFeatureFlag('graphQLTransformer.respectPrimaryKeyAttributesOnConnectionField');
 
   let isTimestampFieldsAdded = readFeatureFlag('codegen.addTimestampFields');
   let enableDartNullSafety = readFeatureFlag('codegen.enableDartNullSafety');
@@ -125,7 +126,8 @@ async function generateModels(context) {
       usePipelinedTransformer,
       enableDartZeroThreeFeatures,
       transformerVersion,
-      dartUpdateAmplifyCoreDependency
+      dartUpdateAmplifyCoreDependency,
+      respectPrimaryKeyAttributesOnConnectionField,
     },
   });
 

packages/appsync-modelgen-plugin/src/__tests__/utils/fieldUtils.test.ts

@@ -0,0 +1,10 @@
+import { toCamelCase } from "../../utils/fieldUtils";
+
+describe('Field util function tests', () => {
+  describe('toCamelCase test', () => {
+    it('should construct the string array to a camel case phrase', () => {
+      const words: string[] = ['AMPlify', 'data', 'build', 'time'];
+      expect(toCamelCase(words)).toBe('aMPlifyDataBuildTime');
+    });
+  });
+});