Merge branch 'add-external-link-icon' of https://github.com/aws-ampli…

…fy/amplify-ui into add-external-link-icon

.github/workflows/publish-next.yml

@@ -55,101 +55,6 @@ jobs:
       DOCSEARCH_DOCS_API_KEY: ${{ secrets.DOCSEARCH_DOCS_API_KEY }}
       DOCSEARCH_DOCS_INDEX_NAME: ${{ secrets.DOCSEARCH_DOCS_INDEX_NAME }}
 
-  guides:
-    if: false # temporarily disable job
-    runs-on: ubuntu-latest
-    environment: ci
-    env:
-      NODE_ENV: test
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - path: ./guides/react/protected-routes
-            tags: '@guides and not @todo-guides'
-
-    steps:
-      - name: Checkout Amplify UI
-        uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0 https://github.com/actions/checkout/commit/24cb9080177205b6e8c946b17badbe402adc938f
-        with:
-          persist-credentials: false
-
-      - name: Setup Node.js 20
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0 https://github.com/actions/setup-node/commit/64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
-        with:
-          node-version: 20
-          cache: 'yarn'
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
-
-      - name: Restore cypress runner Cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 https://github.com/actions/cache/commit/88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
-        id: restore-cypress-cache
-        with:
-          path: ~/.cache/Cypress
-          key: ${{ runner.os }}-cypress-${{ hashFiles('yarn.lock') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
-
-      - name: Install packages
-        run: yarn install
-      - name: Add Amplify CLI
-        run: yarn global add @aws-amplify/cli
-
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@e1e17a757e536f70e52b5a12b2e8d1d1c60e04ef # v2.0.0 https://github.com/aws-actions/configure-aws-credentials/commit/e1e17a757e536f70e52b5a12b2e8d1d1c60e04ef
-        with:
-          aws-region: us-east-2
-          role-to-assume: ${{ secrets.AUTH_E2E_ROLE_ARN }}
-      # Amplify CLI does not support headless pull with temporary credentials
-      # when useProfile is false.
-      # See: https://github.com/aws-amplify/amplify-cli/issues/11009.
-      - name: Create temp AWS profile
-        run: |
-          aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID && \
-          aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY && \
-          aws configure set aws_session_token $AWS_SESSION_TOKEN && \
-          aws configure set default.region $AWS_REGION
-      - name: Pull down AWS environments
-        run: yarn environments auth pull:email
-      - name: Delete AWS Profile
-        run: rm -rf ~/.aws
-
-      - name: Install guides
-        run: yarn install
-        working-directory: ${{ matrix.path }}
-
-      - name: Build guides
-        run: yarn build
-        working-directory: ${{ matrix.path }}
-
-      - name: Start guides site
-        run: yarn start & npx wait-on -c waitOnConfig.json -t 20000 http-get://localhost:3000
-        working-directory: ${{ matrix.path }}
-
-      - name: Run E2E tests against guides
-        run: yarn e2e test:guides
-        id: e2e
-        env:
-          # Override on the default value in `cypress.json` with framework-specific tag
-          TAGS: '${{ matrix.tags }}'
-
-          # Env values for testing flows
-          DOMAIN: ${{ secrets.DOMAIN }}
-          PHONE_NUMBER: ${{ secrets.PHONE_NUMBER }}
-          USERNAME: ${{ secrets.USERNAME }}
-          NEW_PASSWORD: ${{ secrets.NEW_PASSWORD }}
-          VALID_PASSWORD: ${{ secrets.VALID_PASSWORD }}
-      - name: Upload videos and screenshots
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 https://github.com/actions/upload-artifact/commit/0b7f8abb1508181956e8e162db84b466c27e18ce
-        if: ${{ failure() && steps.e2e.outcome != 'success' }}
-        with:
-          name: guides-cypress-error
-          path: |
-            packages/e2e/cypress/videos/**
-            packages/e2e/cypress/screenshots/**
-          retention-days: 5
-
   publish:
     uses: aws-amplify/amplify-ui/.github/workflows/reusable-tagged-publish.yml@main
     with:

canary/apps/react/next/package.json

@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@aws-amplify/ui-react": "latest",
+    "@aws-amplify/ui-react-liveness": "latest",
     "aws-amplify": "latest",
     "next": "12.0.10",
     "react": "latest",

canary/apps/react/next/pages/index.js

@@ -7,8 +7,7 @@ import {
   withAuthenticator,
   useAuthenticator,
 } from '@aws-amplify/ui-react';
-// Todo-migration re-enable once liveness has been updated
-// import { FaceLivenessDetector } from '@aws-amplify/ui-react-liveness';
+import { FaceLivenessDetector } from '@aws-amplify/ui-react-liveness';
 import '@aws-amplify/ui-react/styles.css';
 import { Amplify } from 'aws-amplify';
 import aws_exports from '../../../../environments/auth-with-email/src/aws-exports.js';
@@ -23,11 +22,11 @@ function App() {
         <Button variation="primary">Click me!</Button>
         <Button onClick={signOut}>Sign out</Button>
       </Card>
-      {/* <FaceLivenessDetector
+      <FaceLivenessDetector
         sessionId="123"
         region="us-east-1"
         handleGetLivenessDetection={async () => {}}
-      /> */}
+      />
     </ThemeProvider>
   );
 }

docs/__tests__/__snapshots__/sitemap.test.ts.snap

@@ -123,7 +123,6 @@ exports[`Sitemap Snapshot 1`] = `
 /react/getting-started/usage/nextjs, 
 /react/getting-started/usage/vite, 
 /react/guides, 
-/react/guides/auth-protected, 
 /react/guides/css-in-js, 
 /react/theming, 
 /react/theming/css-variables, 

docs/package.json

@@ -23,7 +23,7 @@
     "test:links": "node --require esbuild-register ./scripts/link-checker-puppeteer.ts"
   },
   "dependencies": {
-    "@aws-amplify/ui-react": "6.0.1",
+    "@aws-amplify/ui-react": "6.0.3",
     "@docsearch/react": "3",
     "@mdx-js/loader": "^2.1.0",
     "@mdx-js/mdx": "^2.1.0",

docs/src/components/Icons.tsx

@@ -50,14 +50,16 @@ export const DesignTokenIcon = ({ ariaLabel = '', ...rest }) => (
   />
 );
 
-export const AmplifyIcon = ({ ariaLabel = '', ...rest }) => (
+export const AmplifyIcon = (props) => (
   <Icon
-    ariaLabel={ariaLabel}
-    {...rest}
+    {...props}
+    viewBox={{ width: 24, height: 22 }}
     paths={[
       {
-        d: 'M5.22274 17.8571H11.9827L13.7143 20.9048H13.6655H0L4.8154 12.5604L6.83337 9.06616L8.56591 12.0683L5.22274 17.8571ZM7.74389 7.48595L9.40738 4.60353L18.8218 20.9047H15.4878L7.74389 7.48595ZM10.3333 3H13.6628L24 20.9048H20.6662L10.3333 3Z',
-        fillRule: 'evenodd',
+        d: 'M14.3128 20.0394C14.3651 20.1298 14.4618 20.1855 14.5664 20.1855H16.8444C17.0698 20.1855 17.2107 19.942 17.098 19.7472L8.82308 5.44278C8.71037 5.24795 8.4286 5.24795 8.31589 5.44278L7.09981 7.54494C7.09518 7.55294 7.09518 7.56281 7.09981 7.57081L7.10128 7.57334C7.1106 7.58946 7.09894 7.60961 7.08029 7.60961C7.07163 7.60961 7.06363 7.61422 7.0593 7.62171L0.0396396 19.7616C-0.0730193 19.9565 0.0678714 20.2 0.293265 20.2H10.9633C11.1887 20.2 11.3296 19.9564 11.2169 19.7616L10.1254 17.8749C10.0731 17.7845 9.97646 17.7288 9.87184 17.7288H4.4145C4.3018 17.7288 4.23135 17.607 4.28771 17.5096L8.4417 10.3288C8.49805 10.2314 8.63894 10.2314 8.6953 10.3288L14.3128 20.0394Z',
+      },
+      {
+        d: 'M10.1282 2.30989C10.0759 2.40032 10.0759 2.51172 10.1282 2.60214L20.2155 20.0394C20.2678 20.1298 20.3645 20.1855 20.4691 20.1855H22.7412C22.9666 20.1855 23.1075 19.942 22.9948 19.7472L11.7715 0.346077C11.6588 0.151242 11.377 0.151243 11.2643 0.346077L10.1282 2.30989Z',
       },
     ]}
   />