chore: format codebase (#12020)

* chore: format codebase

* chore: make linter happy again

* chore: ignore .yarn

* chore: more formats

* chore: ignore changelogs

* chore: restore changelogs

Author: sobolk

.circleci/config.base.yml

@@ -41,7 +41,7 @@ executors:
     environment:
       AMPLIFY_DIR: /home/circleci/repo/out
       AMPLIFY_PATH: /home/circleci/repo/out/amplify-pkg-linux-x64
-# If you update this name, make sure to update it in split-e2e-tests.ts as well
+  # If you update this name, make sure to update it in split-e2e-tests.ts as well
   l_large: &linux-e2e-executor-large
     docker:
       - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:latest
@@ -50,7 +50,7 @@ executors:
     environment:
       AMPLIFY_DIR: /home/circleci/repo/out
       AMPLIFY_PATH: /home/circleci/repo/out/amplify-pkg-linux-x64
-# If you update this name, make sure to update it in split-e2e-tests.ts as well
+  # If you update this name, make sure to update it in split-e2e-tests.ts as well
   l_medium: &linux-e2e-executor-medium
     docker:
       - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:latest
@@ -875,10 +875,10 @@ jobs:
       - run:
           name: 'Wait for all required jobs to finish'
           command: |
-              while [[ $(curl --location --request GET "https://circleci.com/api/v2/workflow/$CIRCLE_WORKFLOW_ID/job" --header "Circle-Token: $CIRCLECI_TOKEN"| jq -r '.items[]|select(.name != "wait_for_all")|.status' | grep -c "running") -gt 0 ]]
-                do
-                  sleep 60
-                done
+            while [[ $(curl --location --request GET "https://circleci.com/api/v2/workflow/$CIRCLE_WORKFLOW_ID/job" --header "Circle-Token: $CIRCLECI_TOKEN"| jq -r '.items[]|select(.name != "wait_for_all")|.status' | grep -c "running") -gt 0 ]]
+              do
+                sleep 60
+              done
           no_output_timeout: 180m
       - run:
           name: 'Collect Results'
@@ -1018,8 +1018,8 @@ workflows:
                 - /run-e2e\/.*/
       - cleanup_resources:
           context:
-              - cleanup-resources
-              - e2e-test-context
+            - cleanup-resources
+            - e2e-test-context
           requires:
             - build
           filters:

.circleci/config.yml

@@ -190,7 +190,7 @@ jobs:
       - restore_cache:
           key: >-
             amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
-      - when: 
+      - when:
           condition:
             equal: [true, << pipeline.parameters.e2e_workflow_cleanup >>]
           steps:
@@ -201,7 +201,7 @@ jobs:
                   cd packages/amplify-e2e-tests
                   yarn clean-e2e-resources workflow << pipeline.parameters.e2e_workflow_cleanup_workflow_id >>
                 no_output_timeout: 90m
-      - when: 
+      - when:
           condition:
             equal: [true, << pipeline.parameters.e2e_resource_cleanup >>]
           steps:
@@ -245,7 +245,7 @@ workflows:
             - build
             - publish_to_local_registry
   e2e_resource_cleanup:
-    when: 
+    when:
       or:
         - equal: [true, << pipeline.parameters.e2e_resource_cleanup >>]
         - equal: [true, << pipeline.parameters.e2e_workflow_cleanup >>]

.circleci/scan_artifacts.ts

@@ -8,13 +8,12 @@ import { ARTIFACT_STORAGE_PATH_ALLOW_LIST } from '../scripts/artifact-storage-pa
 // This is because of the location of this file in ~/repo/.circleci/scan_artifacts
 const ROOT_FOLDER_ABSOLUTE_PATH = path.normalize(path.join(__dirname, '..', '..'));
 
-
 export const hasMatchingContentInFolder = (
   patterns: string[],
   folder: string,
-  excludeFolder = '{node_modules,.cache,.git,\.cache,\.git}',
+  excludeFolder = '{node_modules,.cache,.git,.cache,.git}',
 ): boolean => {
-  console.log("Scanning folder:", folder);
+  console.log('Scanning folder:', folder);
   const patternParam = patterns.reduce<string[]>((acc, v) => [...acc, '-e', v], []);
 
   try {
@@ -25,21 +24,21 @@ export const hasMatchingContentInFolder = (
     if (e.exitCode === 1) {
       return false;
     }
-    if (e.message.includes('No such file or directory')){
-      console.log("No artifacts found at:", folder);
+    if (e.message.includes('No such file or directory')) {
+      console.log('No artifacts found at:', folder);
       return false;
     }
     throw new Error('Scanning artifacts failed');
   }
 };
 
 const main = () => {
-  const envVarNameWithCredentialValues = (process.env.ENV_VAR_WITH_SECRETS || '').split(',').map(v => v.trim());
-  const values = envVarNameWithCredentialValues.map(v => process.env[v]).filter(Boolean);
+  const envVarNameWithCredentialValues = (process.env.ENV_VAR_WITH_SECRETS || '').split(',').map((v) => v.trim());
+  const values = envVarNameWithCredentialValues.map((v) => process.env[v]).filter(Boolean);
   if (values.length) {
-    for(let folder of ARTIFACT_STORAGE_PATH_ALLOW_LIST){
-      if (folder.startsWith("~/")) {
-        const normalizedFolder = path.normalize(folder.replace("~", ROOT_FOLDER_ABSOLUTE_PATH));
+    for (let folder of ARTIFACT_STORAGE_PATH_ALLOW_LIST) {
+      if (folder.startsWith('~/')) {
+        const normalizedFolder = path.normalize(folder.replace('~', ROOT_FOLDER_ABSOLUTE_PATH));
         const hasContent = hasMatchingContentInFolder(values, normalizedFolder);
         if (hasContent) {
           console.log('Scanning artifact has found secret value. Failing the build: ', normalizedFolder);

.eslintrc.js

@@ -43,7 +43,7 @@ module.exports = {
     '@typescript-eslint/no-misused-promises': 'error',
     'no-bitwise': 'warn',
     'consistent-return': 'error',
-    'eol-last': [ 'error', 'always' ],
+    'eol-last': ['error', 'always'],
     'no-restricted-syntax': [
       'error',
       {
@@ -104,7 +104,7 @@ module.exports = {
     },
     {
       // disable spell checker in tests
-      files: ['**/__tests__/**','**/__test__/**', '*.test.ts', 'packages/amplify-e2e-*/**', '**/test/**', '**/tests/**'],
+      files: ['**/__tests__/**', '**/__test__/**', '*.test.ts', 'packages/amplify-e2e-*/**', '**/test/**', '**/tests/**'],
       plugins: ['jest'],
       extends: ['plugin:jest/recommended'],
       rules: {

.github/CODE_OF_CONDUCT.md

@@ -1,4 +1,5 @@
 ## Code of Conduct
-This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct). 
-For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact 
-[email protected] with any additional questions or comments.
+
+This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
+For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
+[email protected] with any additional questions or comments.

.github/ISSUE_TEMPLATE/1.bug_report.yaml

@@ -1,6 +1,6 @@
 name: Bug Report
 description: Create a report to help us improve Amplify CLI
-labels: ["pending-triage"]
+labels: ['pending-triage']
 
 body:
   - type: markdown
@@ -19,7 +19,7 @@ body:
   - type: input
     attributes:
       label: How did you install the Amplify CLI?
-      description: "For example: npm, yarn, curl, etc."
+      description: 'For example: npm, yarn, curl, etc.'
   - type: input
     attributes:
       label: If applicable, what version of Node.js are you using?
@@ -33,13 +33,13 @@ body:
   - type: input
     attributes:
       label: What operating system are you using?
-      description: "For example: Mac, Windows, Ubuntu."
+      description: 'For example: Mac, Windows, Ubuntu.'
     validations:
       required: true
   - type: textarea
     attributes:
       label: Did you make any manual changes to the cloud resources managed by Amplify? Please describe the changes made.
-      description: "For example: \"Deleted DynamoDB GSIs from the AWS Console or using AWS CLI\" Or \"No manual changes made\""
+      description: 'For example: "Deleted DynamoDB GSIs from the AWS Console or using AWS CLI" Or "No manual changes made"'
     validations:
       required: true
   - type: markdown

.github/ISSUE_TEMPLATE/2.feature_request.yaml

@@ -1,6 +1,6 @@
 name: Feature Request
 description: Suggest an idea for the CLI
-labels: ["pending-triage"]
+labels: ['pending-triage']
 
 body:
   - type: markdown

.github/ISSUE_TEMPLATE/3.usage_question.yaml

@@ -1,6 +1,6 @@
 name: Usage Question
 description: Ask a question about AWS Amplify CLI usage
-labels: ["question", "pending-triage"]
+labels: ['question', 'pending-triage']
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -2,4 +2,4 @@ blank_issues_enabled: true
 contact_links:
   - name: I want help writing my Amplify application
     url: https://discord.com/invite/amplify
-    about: Check out the `*-help` channels on Amplify's community Discord to ask your questions about building applications with the CLI or other Amplify libraries.
+    about: Check out the `*-help` channels on Amplify's community Discord to ask your questions about building applications with the CLI or other Amplify libraries.

.github/workflows/codeql.yaml

@@ -1,5 +1,5 @@
 # Ref: https://tinyurl.com/5d6rr8s7
-name: "CodeQL"
+name: 'CodeQL'
 
 on:
   push:
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: ["javascript"]
+        language: ['javascript']
 
     steps:
       - name: Checkout repository
@@ -33,4 +33,4 @@ jobs:
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2
         with:
-          category: "/language:${{matrix.language}}"
+          category: '/language:${{matrix.language}}'

.prettierignore

@@ -0,0 +1,6 @@
+.yarn
+packages/*/lib
+coverage
+node_modules
+API.md
+CHANGELOG.md

.prettierrc

@@ -1,10 +1,10 @@
 {
-    "trailingComma": "all",
-    "singleQuote": true,
-    "printWidth": 140,
-    "tabWidth": 2,
-    "bracketSpacing": true,
-    "semi": true,
-    "useTabs": false,
-    "bracketSameLine": false
+  "trailingComma": "all",
+  "singleQuote": true,
+  "printWidth": 140,
+  "tabWidth": 2,
+  "bracketSpacing": true,
+  "semi": true,
+  "useTabs": false,
+  "bracketSameLine": false
 }

Readme.md

@@ -65,7 +65,7 @@ The Amplify CLI supports the commands shown in the following table.
 | amplify pull                                                           | Fetch upstream backend environment definition changes from the cloud and updates the local environment to match that definition.                                                                                     |
 | amplify publish                                                        | Runs `amplify push`, publishes a static assets to Amazon S3 and Amazon CloudFront (\*hosting category is required).                                                                                                  |
 | amplify status [ `<category>`...]                                      | Displays the state of local resources that haven't been pushed to the cloud (Create/Update/Delete).                                                                                                                  |
-| amplify status -v [ `<category>`...]                                   | Verbose mode - Shows the detailed verbose diff between local and deployed resources, including cloudformation-diff | 
+| amplify status -v [ `<category>`...]                                   | Verbose mode - Shows the detailed verbose diff between local and deployed resources, including cloudformation-diff                                                                                                   |
 | amplify serve                                                          | Runs `amplify push`, and then executes the project's start command to test run the client-side application.                                                                                                          |
 | amplify delete                                                         | Deletes resources tied to the project.                                                                                                                                                                               |
 | amplify help \| amplify `<category>` help                              | Displays help for the core CLI.                                                                                                                                                                                      |

artifacts/readme.md

@@ -1,3 +1,3 @@
 CircleCI Workflow results are stored in this artifacts directory.
 
-After each e2e run, you can locate the artifact file here & observe the workflow results summary.
+After each e2e run, you can locate the artifact file here & observe the workflow results summary.

cypress.json

@@ -1,3 +1,3 @@
 {
-    "baseUrl": "http://localhost:3000/"
-}
+  "baseUrl": "http://localhost:3000/"
+}

cypress/fixtures/example.json

@@ -2,4 +2,4 @@
   "name": "Using fixtures to represent data",
   "email": "[email protected]",
   "body": "Fixtures are a great way to mock data for responses to routes"
-}
+}

cypress/integration/api_spec.js

@@ -1,28 +1,28 @@
-describe('API test post and get', { 
-  // Configure retry attempts for `cypress run` (will run a total pf 3 times)
-  // retries added as the test is getting response greater than default responseTimeout = 30s on first try 
-  retries: {
+describe(
+  'API test post and get',
+  {
+    // Configure retry attempts for `cypress run` (will run a total pf 3 times)
+    // retries added as the test is getting response greater than default responseTimeout = 30s on first try
+    retries: {
       runMode: 2,
     },
-  }, function() {
-  beforeEach(function() {
-    cy.visit('/');
-  });
+  },
+  function () {
+    beforeEach(function () {
+      cy.visit('/');
+    });
 
-  it('successfully adds data to dynamodb', function() {
-    // Check for user not signed up
-    cy.get('input[name=itemNo]').type('1');
-    cy.get('.amplify-submit-put-button')
-      .contains('Put')
-      .click();
-    cy.get('.amplify-put-result').contains('post call succeed!');
-  });
+    it('successfully adds data to dynamodb', function () {
+      // Check for user not signed up
+      cy.get('input[name=itemNo]').type('1');
+      cy.get('.amplify-submit-put-button').contains('Put').click();
+      cy.get('.amplify-put-result').contains('post call succeed!');
+    });
 
-  it('successfully get data from dynamodb', function() {
-    // Check for user not signed up
-    cy.get('.amplify-submit-get-button')
-      .contains('Get')
-      .click();
-    cy.get('.amplify-get-result').contains('"itemNo":1');
-  });
-});
+    it('successfully get data from dynamodb', function () {
+      // Check for user not signed up
+      cy.get('.amplify-submit-get-button').contains('Get').click();
+      cy.get('.amplify-get-result').contains('"itemNo":1');
+    });
+  },
+);

cypress/integration/auth_spec.js

@@ -1,21 +1,23 @@
-describe('withAuthenticator Sign In', { 
-  // Configure retry attempts for `cypress run` (will run a total pf 3 times)
-  // retries added as the test is getting response greater than default responseTimeout = 30s on first try 
-  retries: {
+describe(
+  'withAuthenticator Sign In',
+  {
+    // Configure retry attempts for `cypress run` (will run a total pf 3 times)
+    // retries added as the test is getting response greater than default responseTimeout = 30s on first try
+    retries: {
       runMode: 2,
     },
-  }, function() {
-  beforeEach(function() {
-    cy.visit('/');
-  });
+  },
+  function () {
+    beforeEach(function () {
+      cy.visit('/');
+    });
 
-  it('throws error when user is not signed up', function() {
-    // Check for user not signed up
-    cy.get('input[name=username]').type('testuser');
-    cy.get('input[name=password]').type('testPassword');
-    cy.get('button')
-      .contains('Sign In')
-      .click();
-    cy.get('div').contains('User does not exist');
-  });
-});
+    it('throws error when user is not signed up', function () {
+      // Check for user not signed up
+      cy.get('input[name=username]').type('testuser');
+      cy.get('input[name=password]').type('testPassword');
+      cy.get('button').contains('Sign In').click();
+      cy.get('div').contains('User does not exist');
+    });
+  },
+);

lerna.json

@@ -1,7 +1,5 @@
 {
-  "packages": [
-    "packages/*"
-  ],
+  "packages": ["packages/*"],
   "version": "independent",
   "npmClient": "yarn",
   "useWorkspaces": true