Merge remote-tracking branch 'upstream/master' into defer-init

aws-amplify · May 6, 2021 · 6792dda · 6792dda
2 parents c60fe33 + fedb6c4
commit 6792dda
Show file tree

Hide file tree

Showing 184 changed files with 5,057 additions and 523 deletions.
diff --git a/.circleci/config.base.yml b/.circleci/config.base.yml
@@ -5,10 +5,10 @@ machine:
   environment:
     PATH: '${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin'
 
-node10: &node10
+node12: &node12
   working_directory: ~/repo
   docker:
-    - image: circleci/node:10
+    - image: circleci/node:12
       auth:
         username: $DOCKERHUB_USERNAME
         password: $DOCKERHUB_ACCESS_TOKEN
@@ -58,7 +58,7 @@ install_cli_from_local_registery: &install_cli_from_local_registery
 
 jobs:
   build:
-    <<: *node10
+    <<: *node12
     steps:
       - checkout
       - run: yarn run production-build
@@ -75,15 +75,15 @@ jobs:
           paths: .
 
   test:
-    <<: *node10
+    <<: *node12
     steps:
       - attach_workspace:
           at: ./
       - restore_cache:
           key: amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
       - run:
           name: Install Java
-          command: sudo apt-get install default-jdk
+          command: sudo apt-get update && sudo apt-get install default-jdk
       - run:
           name: Lint
           command: yarn lint
@@ -95,15 +95,15 @@ jobs:
           command: yarn coverage
 
   mock_e2e_tests:
-    <<: *node10
+    <<: *node12
     steps:
       - attach_workspace:
           at: ./
       - restore_cache:
           key: amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
       - run:
           name: Install Java
-          command: sudo apt-get install default-jdk
+          command: sudo apt-get update && sudo apt-get install default-jdk
       - run:
           name: Run Transformer end-to-end tests with mock server
           command: cd packages/amplify-util-mock/ && yarn e2e
@@ -114,7 +114,7 @@ jobs:
           path: packages/amplify-util-mock/
 
   publish_to_local_registry:
-    <<: *node10
+    <<: *node12
     steps:
       - attach_workspace:
           at: ./
@@ -154,7 +154,7 @@ jobs:
             - ~/repo/.amplify-pkg-version
 
   build_pkg_binaries:
-    <<: *node10
+    <<: *node12
     steps:
       - attach_workspace:
           at: ./
@@ -227,12 +227,12 @@ jobs:
           path: ~/repo/packages/amplify-e2e-tests/amplify-e2e-reports
 
   done_with_node_e2e_tests:
-    <<: *node10
+    <<: *node12
     steps:
       - run: echo 'Done with Node CLI E2E Tests'
 
   done_with_pkg_linux_e2e_tests:
-    <<: *node10
+    <<: *node12
     steps:
       - run: echo 'Done with pkg CLI E2E Tests'
 
@@ -358,7 +358,7 @@ jobs:
   integration_test:
     working_directory: ~/repo
     docker:
-      - image: cypress/base:10.18.0
+      - image: cypress/base:12
         environment:
           TERM: dumb
     resource_class: large
@@ -473,7 +473,7 @@ jobs:
               echo "Skipping deploy."
             fi
   github_prerelease:
-    <<: *node10
+    <<: *node12
     steps:
       - attach_workspace:
           at: ./
@@ -497,7 +497,7 @@ jobs:
             yarn ts-node scripts/github-prerelease.ts $version
 
   github_prerelease_install_sanity_check:
-    <<: *node10
+    <<: *node12
     steps:
       - restore_cache:
           key: amplfiy-pkg-tag-{{ .Branch }}-{{ .Revision }}
@@ -512,7 +512,7 @@ jobs:
           command: |
             amplify version
   github_release:
-    <<: *node10
+    <<: *node12
     steps:
       - attach_workspace:
           at: ./
@@ -526,7 +526,7 @@ jobs:
             version=$(cat .amplify-pkg-version)
             yarn ts-node scripts/github-release.ts $version
   cleanup_resources:
-    <<: *node10
+    <<: *node12
     steps:
       - attach_workspace:
           at: ./
@@ -543,7 +543,7 @@ jobs:
     working_directory: ~/repo
 
   cleanup_resources_after_e2e_runs:
-    <<: *node10
+    <<: *node12
     steps:
       - attach_workspace:
           at: ./

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,10 +5,10 @@ orbs:
 machine:
   environment:
     PATH: ${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin
-node10:
+node12:
   working_directory: ~/repo
   docker: &ref_0
-    - image: circleci/node:10
+    - image: circleci/node:12
       auth:
         username: $DOCKERHUB_USERNAME
         password: $DOCKERHUB_ACCESS_TOKEN
@@ -81,7 +81,7 @@ jobs:
           key: amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
       - run:
           name: Install Java
-          command: sudo apt-get install default-jdk
+          command: sudo apt-get update && sudo apt-get install default-jdk
       - run:
           name: Lint
           command: yarn lint
@@ -102,7 +102,7 @@ jobs:
           key: amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
       - run:
           name: Install Java
-          command: sudo apt-get install default-jdk
+          command: sudo apt-get update && sudo apt-get install default-jdk
       - run:
           name: Run Transformer end-to-end tests with mock server
           command: cd packages/amplify-util-mock/ && yarn e2e
@@ -367,7 +367,7 @@ jobs:
   integration_test:
     working_directory: ~/repo
     docker:
-      - image: cypress/base:10.18.0
+      - image: cypress/base:12
         environment:
           TERM: dumb
     resource_class: large

diff --git a/.github/ISSUE_TEMPLATE/1.bug_report.yaml b/.github/ISSUE_TEMPLATE/1.bug_report.yaml
@@ -4,14 +4,13 @@ description: Create a report to help us improve Amplify CLI
 body:
   - type: markdown
     attributes:
-      value: Thanks for taking the time to fill out this bug report! Try to include as much information as you can.
-  - type: markdown
-    attributes:
-      value: For reference, the current version of the Amplify CLI is <img src="https://img.shields.io/npm/v/@aws-amplify/cli.svg" />.
-  - type: markdown
-    attributes:
-      value: |
-        > **Note**: If your issue is regarding the AWS Amplify Console service, please log it in the [Amplify Console GitHub Issue Tracker](https://github.com/aws-amplify/amplify-console/issues).
+      value: | 
+        Thanks for taking the time to fill out this bug report! Try to include as much information as you can.
+
+        For reference, the current version of the Amplify CLI is <img src="https://img.shields.io/npm/v/@aws-amplify/cli.svg" />.
+
+        **Note**: If your issue is regarding the AWS Amplify Console service, please log it in the [Amplify Console GitHub Issue Tracker](https://github.com/aws-amplify/amplify-console/issues).
+ 
   - type: checkboxes
     attributes:
       label: |

diff --git a/.github/ISSUE_TEMPLATE/2.feature_request.md b/.github/ISSUE_TEMPLATE/2.feature_request.md
diff --git a/.github/ISSUE_TEMPLATE/2.feature_request.yaml b/.github/ISSUE_TEMPLATE/2.feature_request.yaml
@@ -0,0 +1,73 @@
+name: Feature request
+description: Suggest an idea for the CLI
+labels: feature-request
+
+body:
+  - type: markdown
+    attributes:
+      value: | 
+        Thanks for taking the time to submit a feature request! Try to include as much information as you can.
+
+        For reference, the current version of the Amplify CLI is <img src="https://img.shields.io/npm/v/@aws-amplify/cli.svg" />.
+
+  - type: dropdown
+    attributes:
+      label: Is this related to a new or existing Amplify category?
+      description: Which categories does this request impact?
+      multiple: true
+      options:
+        - auth
+        - storage
+        - function
+        - api
+        - analytics
+        - hosting
+        - notifications
+        - interactions
+        - predictions
+        - xr
+        - New category
+
+  - type: input
+    attributes:
+      label: Is this related to another service?
+      placeholder: e.g. DynamoDB, S3
+
+  - type: textarea
+    attributes:
+      label: Describe the feature you'd like to request
+      description: |
+        A clear and concise description of what you want to happen. Please include **any related issues**, documentation, etc.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like
+      description: |
+        A clear and concise description of what you want to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: |
+        A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: |
+        Add any other use cases or context about the feature request here. Please include any prototype, workaround, reference implementation, etc.
+  
+  - type: checkboxes
+    attributes:
+      label: Is this something that you'd be interested in working on?
+      options:
+        - label: 👋 I may be able to implement this feature request  
+        - label: ⚠️ This feature might incur a breaking change
+
+
diff --git a/.github/ISSUE_TEMPLATE/4.bug_report.md b/.github/ISSUE_TEMPLATE/4.bug_report.md
diff --git a/jest.config.js b/jest.config.js
@@ -44,6 +44,8 @@ module.exports = {
     '<rootDir>/packages/amplify-frontend-javascript',
     // '<rootDir>/packages/amplify-graphiql-explorer',
     '<rootDir>/packages/amplify-graphql-docs-generator',
+    '<rootDir>/packages/amplify-graphql-function-transformer',
+    '<rootDir>/packages/amplify-graphql-http-transformer',
     '<rootDir>/packages/amplify-graphql-types-generator',
     '<rootDir>/packages/amplify-provider-awscloudformation',
     '<rootDir>/packages/amplify-storage-simulator',

diff --git a/packages/amplify-app/CHANGELOG.md b/packages/amplify-app/CHANGELOG.md
@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.23.5](https://github.com/aws-amplify/amplify-cli/compare/amplify-app@2.23.3...amplify-app@2.23.5) (2021-05-03)
+
+
+
+## 4.50.1 (2021-05-03)
+
+**Note:** Version bump only for package amplify-app
+
+
+
+
+
+## [2.23.4](https://github.com/aws-amplify/amplify-cli/compare/amplify-app@2.23.3...amplify-app@2.23.4) (2021-05-03)
+
+**Note:** Version bump only for package amplify-app
+
+
+
+
+
+## [2.23.3](https://github.com/aws-amplify/amplify-cli/compare/amplify-app@2.23.2...amplify-app@2.23.3) (2021-04-27)
+
+**Note:** Version bump only for package amplify-app
+
+
+
+
+
 ## [2.23.2](https://github.com/aws-amplify/amplify-cli/compare/amplify-app@2.23.1...amplify-app@2.23.2) (2021-04-19)
 
 **Note:** Version bump only for package amplify-app