Merge pull request #165 from aws-amplify/pr/repo-sync

Sync amplify-ui to amplify-ui-staging
aws-amplify · Dec 16, 2021 · 88f6676 · 88f6676
2 parents c7174f1 + 8cc082f
commit 88f6676
Show file tree

Hide file tree

Showing 18 changed files with 3,587 additions and 23 deletions.
diff --git a/.changeset/modern-ligers-attack.md b/.changeset/modern-ligers-attack.md
@@ -0,0 +1,5 @@
+---
+'@aws-amplify/ui': patch
+---
+
+Updated Xstate so users who are in the FORCE CHANGE PASSWORD state also check for setup TOTP MFA.
diff --git a/amplify.yml b/amplify.yml
@@ -7,7 +7,7 @@ applications:
             - nvm install 14
             - nvm use 14
             - node -v
-            - (cd .. && yarn install)
+            - (cd .. && yarn install && yarn build)
         build:
           commands:
             - nvm install 14
@@ -17,7 +17,7 @@ applications:
       artifacts:
         baseDirectory: out
         files:
-          - '**/*'
+          - "**/*"
       cache:
         paths:
           - node_modules/**/*

diff --git a/docs/package.json b/docs/package.json
@@ -10,6 +10,7 @@
     "test": "$_ run build"
   },
   "dependencies": {
+    "@aws-amplify/ui-react": "^2.1.5",
     "@aws-amplify/ui-react-v1": "npm:@aws-amplify/ui-react",
     "@codesandbox/sandpack-react": "0.1.9",
     "@cucumber/gherkin": "^19.0.3",
@@ -27,7 +28,7 @@
     "gray-matter": "^4.0.3",
     "lodash": "^4.17.21",
     "mdx-prism": "^0.3.3",
-    "next": "12",
+    "next": "^11.1.3",
     "next-plugin-preval": "^1.2.1",
     "prism-react-renderer": "^1.2.1",
     "prism-theme-night-owl": "^1.4.0",

diff --git a/docs/public/amplify-logo.svg b/docs/public/amplify-logo.svg