Merge pull request #2057 from aws-amplify/main

Release API Category, and CDK Constructs

.github/CODEOWNERS

@@ -4,8 +4,10 @@
 # API approval - public surface and dependencies.
 **/API.md @aws-amplify/amplify-data-admins
 
-# Changes to CI/CD scripts/buildspecs need admin approval
+# Dependency Licensing approval
+dependency_licenses.txt @aws-amplify/amplify-data-admins
 
+# Changes to CI/CD scripts/buildspecs need admin approval
 /scripts/ @aws-amplify/amplify-data-admins
 /shared-scripts.sh @aws-amplify/amplify-data-admins
 /codebuild_specs/ @aws-amplify/amplify-data-admins

.prettierignore

@@ -7,13 +7,16 @@ node_modules
 API.md
 CHANGELOG.md
 client-test-apps
+packages/amplify-category-api/resources/
+packages/amplify-category-api/src/__tests__/commands/api/mock-data/invalid_schema.graphql
 packages/amplify-e2e-core/dist/index.html
 packages/amplify-e2e-tests/amplify-e2e-reports
-packages/amplify-category-api/src/__tests__/commands/api/mock-data/invalid_schema.graphql
-packages/amplify-category-api/resources/
-packages/amplify-graphql-model-transformer/rds-lambda/
+packages/amplify-graphql-api-construct-tests/amplify-e2e-reports
+packages/amplify-graphql-api-construct/README.md
+packages/amplify-graphql-api-construct/tsconfig.json
+packages/amplify-data-construct/README.md
+packages/amplify-data-construct/tsconfig.json
 packages/amplify-graphql-model-transformer/publish-notification-lambda/lib/
-packages/amplify-graphql-schema-generator/vpc-db-lambda/lib/
+packages/amplify-graphql-model-transformer/rds-lambda/
 packages/amplify-graphql-model-transformer/rds-patching-lambda/lib/
-packages/amplify-graphql-api-construct/tsconfig.json
-packages/amplify-graphql-api-construct/README.md
+packages/amplify-graphql-schema-generator/vpc-db-lambda/lib/

.vscode/extensions.json

@@ -1,5 +1,5 @@
 {
   // See http://go.microsoft.com/fwlink/?LinkId=827846
   // for the documentation about the extensions.json format
-  "recommendations": ["dbaeumer.vscode-eslint", "Orta.vscode-jest"]
+  "recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode", "Orta.vscode-jest"]
 }

.vscode/settings.json

@@ -1,28 +1,24 @@
 {
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": false
+  },
+  "editor.formatOnSave": false,
   "editor.rulers": [140],
+  "eslint.format.enable": true,
+  "eslint.lintTask.enable": true,
+  "eslint.quiet": true,
+  "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
   "files.exclude": {
     "**/.git": true,
     "**/node_modules": true,
     "**/build": true,
     "**/coverage": true
   },
-  "editor.formatOnSave": false,
-  "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
-  "eslint.alwaysShowStatus": true,
-  "eslint.format.enable": true,
-  "eslint.lintTask.enable": true,
-  "eslint.packageManager": "yarn",
-  "eslint.quiet": true,
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": false
-  },
-  "jest.enableInlineErrorMessages": true,
   "jest.showCoverageOnLoad": true,
-  "jest.runAllTestsFirst": false,
-  "[typescript]": {
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
-  },
   "[javascript]": {
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   }
 }

client-test-apps/js/api-model-relationship-app/package.json

@@ -19,7 +19,7 @@
     "cypress": "^10.4.0",
     "hjson": "^3.2.2",
     "ini": "^3.0.1",
-    "jest-dev-server": "~7.0.1",
+    "jest-dev-server": "~9.0.1",
     "jest-junit": "^14.0.1",
     "lodash": "^4.17.21",
     "node-pty": "^0.10.1",
@@ -64,5 +64,10 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "jest": {
+    "moduleNameMapper": {
+      "axios": "axios/dist/node/axios.cjs"
+    }
   }
 }

client-test-apps/js/api-model-relationship-app/src/__tests__/utils/testHarness.ts

@@ -3,6 +3,7 @@ import { existsSync, PathLike, rmSync, lstatSync } from 'fs';
 import cypress from 'cypress';
 import { setup, teardown } from 'jest-dev-server';
 import { AmplifyCLI } from './amplifyCLI';
+import { SpawndChildProcess } from 'spawnd';
 
 jest.setTimeout(20 * 60 * 1000); // 20 minutes
 
@@ -58,6 +59,8 @@ const cleanupJSGeneratedFiles = (projectRoot: string) => {
 };
 
 export const executeAmplifyTestHarness = (testName: string, projectRoot: string, setupApp: (cli: AmplifyCLI) => Promise<void>) => {
+  let serverProcs: SpawndChildProcess[] | undefined;
+
   describe(testName, () => {
     const cli = new AmplifyCLI(projectRoot);
 
@@ -71,11 +74,12 @@ export const executeAmplifyTestHarness = (testName: string, projectRoot: string,
       }
 
       if (getTestExecutionStages().has(TestExecutionStage.CYPRESS_EXECUTE) || getTestExecutionStages().has(TestExecutionStage.CYPRESS_WATCH)) {
-        await setup({
+        serverProcs = await setup({
           command: `yarn start`,
           launchTimeout: 5 * 60 * 1000,
+          host: '127.0.0.1',
           port: 3000,
-        })
+        });
       }
     });
 
@@ -91,7 +95,9 @@ export const executeAmplifyTestHarness = (testName: string, projectRoot: string,
       }
 
       if (getTestExecutionStages().has(TestExecutionStage.CYPRESS_EXECUTE) || getTestExecutionStages().has(TestExecutionStage.CYPRESS_WATCH)) {
-        await teardown();
+        if (serverProcs) {
+          await teardown(serverProcs);
+        }
       }
     });