Merge branch 'main' into predictions/bug-7808

.circleci/config.yml

@@ -13,6 +13,16 @@ executors:
     resource_class: large
     working_directory: ~/amplify-js
 
+  unit-test-executor:
+    docker:
+      - image: cypress/base:12
+        auth:
+          username: $DOCKERHUB_USERNAME
+          password: $DOCKERHUB_ACCESS_TOKEN
+
+    resource_class: xlarge
+    working_directory: ~/amplify-js
+
   js-test-executor:
     docker:
       - image: cypress/included:5.2.0
@@ -319,7 +329,7 @@ jobs:
             - amplify-js
 
   unit_test:
-    executor: build-executor
+    executor: unit-test-executor
     steps:
       - attach_workspace:
           at: /root
@@ -552,6 +562,23 @@ jobs:
           spec: many-to-many
           browser: << parameters.browser >>
 
+  integ_react_datastore_multi_auth:
+    parameters:
+      browser:
+        type: string
+    executor: js-test-executor
+    <<: *test_env_vars
+    working_directory: ~/amplify-js-samples-staging/samples/react/datastore/multi-auth
+    steps:
+      - prepare_test_env
+      - integ_test_js:
+          test_name: 'React DataStore Multi-Auth'
+          framework: react
+          category: datastore
+          sample_name: multi-auth
+          spec: multi-auth
+          browser: << parameters.browser >>
+
   integ_react_datastore_subs_disabled:
     parameters:
       browser:
@@ -569,6 +596,23 @@ jobs:
           spec: subs-disabled
           browser: << parameters.browser >>
 
+  integ_react_datastore_consecutive_saves:
+    parameters:
+      browser:
+        type: string
+    executor: js-test-executor
+    <<: *test_env_vars
+    working_directory: ~/amplify-js-samples-staging/samples/react/datastore/consecutive-saves
+    steps:
+      - prepare_test_env
+      - integ_test_js:
+          test_name: 'DataStore - Subs Disabled'
+          framework: react
+          category: datastore
+          sample_name: consecutive-saves
+          spec: consecutive-saves
+          browser: << parameters.browser >>
+
   integ_react_storage:
     parameters:
       browser:
@@ -613,6 +657,22 @@ jobs:
           category: storage
           sample_name: storageComp
           spec: storage-comp
+  integ_react_amazon_cognito_identity_js_cookie_storage:
+    parameters:
+      browser:
+        type: string
+    executor: js-test-executor
+    <<: *test_env_vars
+    working_directory: ~/amplify-js-samples-staging/samples/react/auth/amazon-cognito-identity-js-cookie-storage
+    steps:
+      - prepare_test_env
+      - integ_test_js:
+          test_name: 'amazon-cognito-identity-js-cookie-storage'
+          framework: react
+          category: auth
+          sample_name: amazon-cognito-identity-js-cookie-storage
+          spec: amazon-cognito-identity-js-cookie-storage
+          browser: << parameters.browser >>
   integ_react_amazon_cognito_identity_js:
     parameters:
       browser:
@@ -698,6 +758,23 @@ jobs:
           spec: << parameters.scenario >>
           browser: firefox
 
+  integ_duplicate_packages:
+    parameters:
+      browser:
+        type: string
+    executor: js-test-executor
+    <<: *test_env_vars
+    working_directory: ~/amplify-js-samples-staging/samples/react/version-conflict/duplicate-packages
+    steps:
+      - prepare_test_env
+      - integ_test_js:
+          test_name: 'Duplicate Package Errors'
+          framework: react
+          category: version-conflict
+          sample_name: duplicate-packages
+          spec: duplicate-packages
+          browser: << parameters.browser >>
+
   deploy:
     executor: macos-executor
     working_directory: ~/amplify-js
@@ -848,6 +925,15 @@ workflows:
           matrix:
             parameters:
               <<: *test_browsers
+      - integ_react_datastore_multi_auth:
+          requires:
+            - integ_setup
+            - build
+          filters:
+            <<: *releasable_branches
+          matrix:
+            parameters:
+              <<: *test_browsers
       - integ_react_datastore_subs_disabled:
           requires:
             - integ_setup
@@ -857,6 +943,15 @@ workflows:
           matrix:
             parameters:
               <<: *test_browsers
+      - integ_react_datastore_consecutive_saves:
+          requires:
+            - integ_setup
+            - build
+          filters:
+            <<: *releasable_branches
+          matrix:
+            parameters:
+              <<: *test_browsers
       - integ_react_storage:
           requires:
             - integ_setup
@@ -881,6 +976,15 @@ workflows:
             - build
           filters:
             <<: *releasable_branches
+      - integ_react_amazon_cognito_identity_js_cookie_storage:
+          requires:
+            - integ_setup
+            - build
+          filters:
+            <<: *releasable_branches
+          matrix:
+            parameters:
+              <<: *test_browsers
       - integ_react_amazon_cognito_identity_js:
           requires:
             - integ_setup
@@ -935,30 +1039,44 @@ workflows:
           matrix:
             parameters:
               <<: *datastore_auth_scenarios
+      - integ_duplicate_packages:
+          requires:
+            - integ_setup
+            - build
+          filters:
+            <<: *releasable_branches
+          matrix:
+            parameters:
+              <<: *test_browsers
       - deploy:
           filters:
             <<: *releasable_branches
           requires:
             - unit_test
             - integ_react_predictions
             - integ_react_datastore
+            - integ_react_datastore_multi_auth
+            - integ_react_datastore_subs_disabled
+            - integ_react_datastore_consecutive_saves
             - integ_react_storage
             - integ_react_storage_multipart_progress
             - integ_react_storage_ui
             - integ_react_interactions
             - integ_angular_interactions
             - integ_vue_interactions
+            - integ_react_amazon_cognito_identity_js_cookie_storage
             - integ_react_amazon_cognito_identity_js
             - integ_node_amazon_cognito_identity_js
             - integ_react_auth
             - integ_angular_auth
             - integ_vue_auth
             - integ_rn_ios_storage
             - integ_rn_ios_storage_multipart_progress
+            - integ_rn_android_storage_multipart_progress
             - integ_rn_ios_push_notifications
             - integ_rn_android_storage
-            - integ_rn_android_storage_multipart_progress
             - integ_datastore_auth
+            - integ_duplicate_packages
       - post_release:
           filters:
             branches:

.github/ISSUE_TEMPLATE/1.bug_report.yaml

@@ -1,7 +1,6 @@
 name: Bug report
 description: Create a report to help us improve Amplify JS
-title: ''
-issue_body: true
+
 body:
   - type: markdown
     attributes:
@@ -10,10 +9,12 @@ body:
   - type: markdown
     attributes:
       value: |
-        For reference, the current versions of the Amplify JS packages are listed below. Please verify your issue against the latest version(s) of the relevant package(s):
+        For reference, the current versions of the Amplify JS packages are listed below. Please verify your issue against the latest version(s) of the relevant package(s).
+
+        You can find information in our docs site regarding [Upgrading Amplify packages](https://docs.amplify.aws/lib/troubleshooting/upgrading/q/platform/js).
 
         <details>
-          <summary>Click to expand version list</summary>
+          <summary>Click to expand package version list</summary>
 
           | Package                         | Version                                                                                                                                          |
           | ------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
@@ -44,21 +45,19 @@ body:
           | `@aws-amplify/xr`               | [![version](https://img.shields.io/npm/v/@aws-amplify/xr/latest.svg)](https://www.npmjs.com/package/@aws-amplify/xr)                             |
 
         </details>
+
   - type: checkboxes
     attributes:
       label: |
         Before opening, please confirm:
       options:
-        - label: I have [searched for duplicate or closed issues](https://github.com/aws-amplify/amplify-js/issues?q=is%3Aissue+).
+        - label: I have [searched for duplicate or closed issues](https://github.com/aws-amplify/amplify-js/issues?q=is%3Aissue+) and [discussions](https://github.com/aws-amplify/amplify-js/discussions).
           required: true
         - label: I have read the guide for [submitting bug reports](https://github.com/aws-amplify/amplify-js/blob/main/CONTRIBUTING.md#bug-reports).
           required: true
         - label: I have done my best to include a minimal, self-contained set of instructions for consistently reproducing the issue.
           required: true
-  - type: markdown
-    attributes:
-      value: |
-        ---
+
   - type: markdown
     attributes:
       value: |
@@ -74,6 +73,7 @@ body:
         - React Native
         - Vue
         - Web Components
+        - Next.js
         - Not applicable
     validations:
       required: true
@@ -123,7 +123,7 @@ body:
       description: |
         Please run the following command inside your project and copy/paste the output below:
         ```
-        npx envinfo --system --binaries --browsers --npmPackages --npmGlobalPackages
+        npx envinfo --system --binaries --browsers --npmPackages --duplicates --npmGlobalPackages
         ```
       value: |
         <details>
@@ -144,20 +144,20 @@ body:
   - type: textarea
     attributes:
       label: Describe the bug
-      description: A clear and concise description of what the bug is. Markdown formatting supported.
+      description: A clear and concise description of what the bug is.
     validations:
       required: true
   - type: textarea
     attributes:
       label: Expected behavior
-      description: A clear and concise description of what you expected to happen. Markdown formatting supported.
+      description: A clear and concise description of what you expected to happen.
     validations:
       required: true
   - type: textarea
     attributes:
       label: Reproduction steps
       description: |
-        How do you trigger this bug? Please walk us through it step by step. Screenshots can be provided in the issue body below. Markdown formatting supported.
+        How do you trigger this bug? Please walk us through it step by step. Screenshots can be attached in textarea below.
       placeholder: |
         1. Install '...'
         2. Configure '...'
@@ -279,13 +279,10 @@ body:
     attributes:
       label: Mobile Browser Version
       description: For example, 22
-  - type: markdown
-    attributes:
-      value: |
-        ## Additional information and screenshots
-  - type: markdown
+  - type: textarea
     attributes:
-      value: >
+      label: Additional information and screenshots
+      description: |
         If you have any additional information (i.e. `package.json`), workarounds, etc. for us, use the field below.
         Please note, you can attach screenshots or screen recordings here, by
         dragging and dropping files in the field below.