Merge branch 'main' into feat/auth/delete-user-attributes

aws-amplify · Mar 12, 2021 · 4e453ea · 4e453ea
2 parents e49d1ee + 7c8eb92
commit 4e453ea
Show file tree

Hide file tree

Showing 200 changed files with 7,328 additions and 1,028 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -111,6 +111,26 @@ commands:
       - store_artifacts:
           path: ~/amplify-js-samples-staging/cypress/screenshots
 
+  integ_test_node_js:
+    parameters:
+      test_name:
+        type: string
+      category:
+        type: string
+      sample_name:
+        type: string
+    steps:
+      - run:
+          name: 'Install << parameters.test_name >> sample'
+          command: |
+            echo "Current NPM registry: " $(yarn config get registry)
+            ~/amplify-js/.circleci/retry-yarn-script.sh -s 'install' -n 3
+      - run:
+          name: 'Run Node tests for << parameters.test_name >> sample'
+          command: |
+            cd ~/amplify-js-samples-staging
+            ~/amplify-js/.circleci/retry-yarn-script.sh -s 'ci:test node << parameters.category >> << parameters.sample_name >> dev' -n 3
+
   install_verdaccio:
     steps:
       - run:
@@ -414,19 +434,26 @@ jobs:
     steps:
       - prepare_test_env
       - integ_test_js:
-          test_name: 'Vue Authenticator'
+          test_name: 'Legacy Vue Authenticator'
           framework: vue
           category: auth
           sample_name: amplify-authenticator-legacy
           spec: authenticator
           browser: << parameters.browser >>
       - integ_test_js:
-          test_name: 'Vue Authenticator'
+          test_name: 'Vue 2 Authenticator'
           framework: vue
           category: auth
           sample_name: amplify-authenticator
           spec: ui-amplify-authenticator
           browser: << parameters.browser >>
+      - integ_test_js:
+          test_name: 'Vue 3 Authenticator'
+          framework: vue
+          category: auth
+          sample_name: authenticator-vue3
+          spec: ui-amplify-authenticator
+          browser: << parameters.browser >>
       - integ_test_js:
           test_name: 'Vue Custom Authenticator'
           framework: vue
@@ -478,13 +505,19 @@ jobs:
     steps:
       - prepare_test_env
       - integ_test_js:
-          test_name: 'Vue Interactions'
+          test_name: 'Vue 2 Interactions'
           framework: vue
           category: interactions
           sample_name: chatbot-component
           spec: chatbot-component
           browser: << parameters.browser >>
-
+      - integ_test_js:
+          test_name: 'Vue 3 Interactions'
+          framework: vue
+          category: interactions
+          sample_name: chatbot-component-vue3
+          spec: chatbot-component
+          browser: << parameters.browser >>
   integ_angular_interactions:
     parameters:
       browser:
@@ -534,6 +567,22 @@ jobs:
           sample_name: storageApp
           spec: storage
           browser: << parameters.browser >>
+  integ_react_storage_multipart_progress:
+    parameters:
+      browser:
+        type: string
+    executor: js-test-executor
+    <<: *test_env_vars
+    working_directory: ~/amplify-js-samples-staging/samples/react/storage/multi-part-upload-with-progress
+    steps:
+      - prepare_test_env
+      - integ_test_js:
+          test_name: 'React Storage Multi-Part Upload with Progress'
+          framework: react
+          category: storage
+          sample_name: multi-part-upload-with-progress
+          spec: multi-part-upload-with-progress
+          browser: << parameters.browser >>
   integ_react_storage_ui:
     executor: js-test-executor
     <<: *test_env_vars
@@ -546,7 +595,7 @@ jobs:
           category: storage
           sample_name: storageComp
           spec: storage-comp
-  integ_amazon_cognito_identity_js:
+  integ_react_amazon_cognito_identity_js:
     parameters:
       browser:
         type: string
@@ -562,14 +611,30 @@ jobs:
           sample_name: amazon-cognito-identity-js
           spec: amazon-cognito-identity-js
           browser: << parameters.browser >>
-
+  integ_node_amazon_cognito_identity_js:
+    executor: js-test-executor
+    <<: *test_env_vars
+    working_directory: ~/amplify-js-samples-staging/samples/node/auth/amazon-cognito-identity-js
+    steps:
+      - prepare_test_env
+      - integ_test_node_js:
+          test_name: 'amazon-cognito-identity-js'
+          category: auth
+          sample_name: amazon-cognito-identity-js
   integ_rn_ios_storage:
     executor: macos-executor
     <<: *test_env_vars
     working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/StorageApp
     steps:
       - integ_test_rn_ios
 
+  integ_rn_ios_storage_multipart_progress:
+    executor: macos-executor
+    <<: *test_env_vars
+    working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/MultiPartUploadWithProgress
+    steps:
+      - integ_test_rn_ios
+
   integ_rn_ios_push_notifications:
     executor: macos-executor
     <<: *test_env_vars
@@ -584,6 +649,13 @@ jobs:
     steps:
       - integ_test_rn_android
 
+  integ_rn_android_storage_multipart_progress:
+    executor: macos-executor
+    <<: *test_env_vars
+    working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/MultiPartUploadWithProgress
+    steps:
+      - integ_test_rn_android
+
   integ_datastore_auth:
     parameters:
       scenario:
@@ -617,17 +689,13 @@ jobs:
       - run:
           name: 'Publish to Amplify Package'
           command: |
-            if [ -z "$CIRCLE_PULL_REQUEST" ]; then
-              echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
-              npm whoami
-              git config --global user.email $GITHUB_EMAIL
-              git config --global user.name $GITHUB_USER
-              git status
-              git --no-pager diff
-              yarn publish:$CIRCLE_BRANCH
-            else
-              echo "Skipping deploy."
-            fi
+            echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
+            npm whoami
+            git config --global user.email $GITHUB_EMAIL
+            git config --global user.name $GITHUB_USER
+            git status
+            git --no-pager diff
+            yarn publish:$CIRCLE_BRANCH
 
   post_release:
     executor: build-executor
@@ -771,13 +839,22 @@ workflows:
           matrix:
             parameters:
               <<: *test_browsers
+      - integ_react_storage_multipart_progress:
+          requires:
+            - integ_setup
+            - build
+          filters:
+            <<: *releasable_branches
+          matrix:
+            parameters:
+              <<: *test_browsers
       - integ_react_storage_ui:
           requires:
             - integ_setup
             - build
           filters:
             <<: *releasable_branches
-      - integ_amazon_cognito_identity_js:
+      - integ_react_amazon_cognito_identity_js:
           requires:
             - integ_setup
             - build
@@ -786,12 +863,24 @@ workflows:
           matrix:
             parameters:
               <<: *test_browsers
+      - integ_node_amazon_cognito_identity_js:
+          requires:
+            - integ_setup
+            - build
+          filters:
+            <<: *releasable_branches
       - integ_rn_ios_storage:
           requires:
             - integ_setup
             - build
           filters:
             <<: *releasable_branches
+      - integ_rn_ios_storage_multipart_progress:
+          requires:
+            - integ_setup
+            - build
+          filters:
+            <<: *releasable_branches
       - integ_rn_ios_push_notifications:
           requires:
             - integ_setup
@@ -804,6 +893,12 @@ workflows:
             - build
           filters:
             <<: *releasable_branches
+      - integ_rn_android_storage_multipart_progress:
+          requires:
+            - integ_setup
+            - build
+          filters:
+            <<: *releasable_branches
       - integ_datastore_auth:
           requires:
             - integ_setup
@@ -821,17 +916,21 @@ workflows:
             - integ_react_predictions
             - integ_react_datastore
             - integ_react_storage
+            - integ_react_storage_multipart_progress
             - integ_react_storage_ui
             - integ_react_interactions
             - integ_angular_interactions
             - integ_vue_interactions
-            - integ_amazon_cognito_identity_js
+            - 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_ios_push_notifications
             - integ_rn_android_storage
+            - integ_rn_android_storage_multipart_progress
             - integ_datastore_auth
       - post_release:
           filters:

diff --git a/packages/amplify-ui-components/.editorconfig → .editorconfig b/packages/amplify-ui-components/.editorconfig → .editorconfig
@@ -4,7 +4,7 @@ root = true
 
 [*]
 charset = utf-8
-indent_style = space
+indent_style = tab
 indent_size = 2
 end_of_line = lf
 insert_final_newline = true

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -87,4 +87,4 @@ npx envinfo --system --binaries --browsers --npmPackages --npmGlobalPackages
 **Additional context**
 Add any other context about the problem here.
 
-**_You can turn on the debug mode to provide more info for us by setting window.LOG_LEVEL = 'DEBUG'; in your app._**
+**_You can turn on the debug mode to provide more info for us by setting window.LOG_LEVEL = 'DEBUG'; in your app._**