Merge branch 'main' into chore/migrate-vite-to-rollup

Author: yuhengshs

.changeset/config.json

@@ -15,8 +15,10 @@
     "@aws-amplify/ui-docs",
     "@aws-amplify/ui-e2e",
     "@aws-amplify/ui-environments",
-    "@aws-amplify/ui-next-example",
+    "@aws-amplify/ui-next-pages-router-example",
+    "@aws-amplify/ui-next-app-router-example",
     "@aws-amplify/ui-react-native-example",
+    "@aws-amplify/ui-react-router-example",
     "@aws-amplify/ui-vue-example"
   ]
 }

.github/dependency-review/config.yml

@@ -1,7 +1,6 @@
 allow-licenses:
   - '0BSD'
   - 'Apache-2.0'
-  - 'Apache-2.0 AND MIT'
   - 'BlueOak-1.0.0'
   - 'BSL-1.0'
   - 'BSD-1-Clause'
@@ -14,12 +13,10 @@ allow-licenses:
   - 'CC-BY-3.0'
   - 'CC-BY-4.0'
   - 'CC0-1.0'
-  - 'CC0-1.0 AND MIT'
   - 'curl'
   - 'ISC'
   - 'JSON'
   - 'MIT'
-  - 'MIT AND Zlib'
   - 'MPL-2.0'
   - 'NTP'
   - 'OFL-1.0'
@@ -36,3 +33,8 @@ allow-licenses:
   - 'X11'
   - 'zlib-acknowledgement'
   - 'Zlib'
+  - 'Apache-2.0 AND MIT'
+  - 'CC0-1.0 AND MIT'
+  - 'MIT AND Zlib'
+  - 'ISC AND MIT'
+  - 'Apache-2.0 AND BSD-2-Clause AND CC0-1.0 AND ISC AND MIT'

.github/workflows/build-system-test-react-native.yml

@@ -7,7 +7,7 @@ permissions:
 
 on:
   schedule:
-    - cron: '0 * * * *' # Run at the first minute of every hour
+    - cron: '0 */2 * * *' # Run on the first minute of each even numbered hour
 
 jobs:
   build:

.github/workflows/create-hotfix.yml

@@ -0,0 +1,25 @@
+name: Create a hotfix branch
+
+on:
+  workflow_dispatch # manually triggered workflow on Actions
+
+permissions:
+  contents: write # Used to push hotfix branch
+
+jobs:
+  setup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@b80ff79f1755d06ba70441c368a6fe801f5f3a62 # v4.1.3 https://github.com/actions/checkout/commit/cd7d8d697e10461458bc61a30d094dc601a8b017
+        with:
+          # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
+          fetch-depth: 0
+
+      - name: Create hotfix branch
+        env:
+          HOTFIX_BRANCH: hotfix
+        run: |
+          # create hotfix branch from commit hash of the latest 'Version Packages'
+          git checkout -b $HOTFIX_BRANCH $(git log origin/main -1 --grep='^Version Packages' --author='github-actions\[bot\]' --pretty=format:"%H")
+          git push origin $HOTFIX_BRANCH

.github/workflows/publish-hotfix.yml

@@ -30,46 +30,43 @@ jobs:
         uses: ./.github/actions/has-changesets
 
   publish-hotfix:
-    needs: [setup]
+    needs: setup
     uses: ./.github/workflows/reusable-tagged-publish.yml
     with:
       dist-tag: hotfix
     secrets:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
   build-test:
-    runs-on: ubuntu-latest
-    needs: publish-hotfix
-    environment: ci
+    uses: ./.github/workflows/reusable-build-system-test.yml
+    needs:
+      - setup
+      - publish-hotfix
     if: ${{ needs.setup.outputs.has-changesets != 'true' }}
-    steps:
-      - name: Build test v2
-        uses: ./.github/workflows/reusable-build-system-test.yml
-        with:
-          dist-tag: hotfix
-        env:
-          AUTH_E2E_ROLE_ARN: ${{ secrets.AUTH_E2E_ROLE_ARN }}
-          DOMAIN: ${{ secrets.DOMAIN }}
-          PHONE_NUMBER: ${{ secrets.PHONE_NUMBER }}
-          USERNAME: ${{ secrets.USERNAME }}
-          NEW_PASSWORD: ${{ secrets.NEW_PASSWORD }}
-          VALID_PASSWORD: ${{ secrets.VALID_PASSWORD }}
+    with:
+      dist-tag: hotfix
+    secrets:
+      AUTH_E2E_ROLE_ARN: ${{ secrets.AUTH_E2E_ROLE_ARN }}
+      DOMAIN: ${{ secrets.DOMAIN }}
+      PHONE_NUMBER: ${{ secrets.PHONE_NUMBER }}
+      USERNAME: ${{ secrets.USERNAME }}
+      NEW_PASSWORD: ${{ secrets.NEW_PASSWORD }}
+      VALID_PASSWORD: ${{ secrets.VALID_PASSWORD }}
 
   build-test-react-native:
-    runs-on: ubuntu-latest
-    needs: publish-hotfix
-    environment: ci
+    uses: ./.github/workflows/reusable-build-system-test-react-native.yml
+    needs:
+      - setup
+      - publish-hotfix
     if: ${{ needs.setup.outputs.has-changesets != 'true' }}
-    steps:
-      - name: Build test v2 React Native
-        uses: ./.github/workflows/reusable-build-system-test-react-native.yml
-        with:
-          dist-tag: hotfix
+    with:
+      dist-tag: hotfix
 
   publish:
     runs-on: ubuntu-latest
     environment: deployment
     needs:
+      - setup
       - build-test
       - build-test-react-native
     if: ${{ needs.setup.outputs.has-changesets != 'true' }}
@@ -100,11 +97,40 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
+  create-pr-to-main:
+    needs: setup
+    if: ${{ needs.setup.outputs.has-changesets != 'true' }}
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      BASE_BRANCH: "main"
+      HEAD_BRANCH: "hotfix"
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@b80ff79f1755d06ba70441c368a6fe801f5f3a62 # v4.1.3 https://github.com/actions/checkout/commit/cd7d8d697e10461458bc61a30d094dc601a8b017
+      # Check if hotfix -> main PR already exists
+      - name: Check for existing PR
+        id: check-pr
+        run: |
+          PR_EXISTS=$(gh pr list --base $BASE_BRANCH --head $HEAD_BRANCH --json number --jq 'length > 0')
+          echo "exists=$PR_EXISTS" >> $GITHUB_OUTPUT
+      # Create a new PR if one doesn't exist
+      - name: Create PR to main
+        if: steps.check-pr.outputs.exists == 'false'
+        run: |
+          gh pr create \
+            --base $BASE_BRANCH \
+            --head $HEAD_BRANCH \
+            --title "chore: Merge hotfix into main" \
+            --body "Merge the recently completed hotfix back into the main development branch. Generated by the publish-hotfix workflow."
+
   log-failure-metric:
     # Send a failure data point to metric PublishLatestFailure in github-workflows@ us-east-2
     runs-on: ubuntu-latest
     environment: ci
-    needs: publish
+    needs: create-pr-to-main
     if: ${{ failure() }}
     steps:
       - name: Log failure data point to metric PublishLatestFailure
@@ -119,7 +145,7 @@ jobs:
     # Send a success data point to metric PublishLatestFailure in github-workflows@ us-east-2
     runs-on: ubuntu-latest
     environment: ci
-    needs: publish
+    needs: create-pr-to-main
     if: ${{ success() }}
     steps:
       - name: Log success data point to metric PublishLatestFailure

.github/workflows/publish-latest.yml

@@ -61,6 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: deployment
     needs:
+      - setup
       - build-test
       - build-test-react-native
     if: ${{ needs.setup.outputs.has-changesets != 'true' }}

.github/workflows/reusable-build-system-test-react-native.yml

@@ -16,9 +16,10 @@ jobs:
       fail-fast: false
       matrix:
         framework: [react-native]
-        framework-version: [
-            # uncomment to enable
+        framework-version:
+          [
             { formatted: latest, value: latest },
+            { formatted: 078, value: 0.78 },
             { formatted: 077, value: 0.77 },
             { formatted: 076, value: 0.76 },
             { formatted: 075, value: 0.75 },
@@ -38,6 +39,9 @@ jobs:
         exclude:
           - build-tool: expo
             platform: ios
+          - build-tool: expo
+            platform: android
+            framework-version: { formatted: '078', value: '0.78' }
           - build-tool: expo
             platform: android
             framework-version: { formatted: '077', value: '0.77' }
@@ -64,17 +68,17 @@ jobs:
           # https://stackoverflow.com/questions/63463373/create-an-expo-project-with-a-specific-version
           # Only include officially supported Expo SDK versions: https://docs.expo.dev/versions/latest/
           - framework: react-native
-            framework-version: { formatted: 073, value: '0.73' }
+            framework-version: { formatted: 077, value: '0.77' }
             build-tool: expo
-            build-tool-version: 50
+            build-tool-version: 52
             platform: android
             pkg-manager: npm
             node-version: 20
             logfile: test.log
           - framework: react-native
-            framework-version: { formatted: 074, value: '0.74' }
+            framework-version: { formatted: 076, value: '0.76' }
             build-tool: expo
-            build-tool-version: 51
+            build-tool-version: 52
             platform: android
             pkg-manager: npm
             node-version: 20
@@ -88,17 +92,17 @@ jobs:
             node-version: 20
             logfile: test.log
           - framework: react-native
-            framework-version: { formatted: 076, value: '0.76' }
+            framework-version: { formatted: 074, value: '0.74' }
             build-tool: expo
-            build-tool-version: 52
+            build-tool-version: 51
             platform: android
             pkg-manager: npm
             node-version: 20
             logfile: test.log
           - framework: react-native
-            framework-version: { formatted: 077, value: '0.77' }
+            framework-version: { formatted: 073, value: '0.73' }
             build-tool: expo
-            build-tool-version: 52
+            build-tool-version: 50
             platform: android
             pkg-manager: npm
             node-version: 20
@@ -130,6 +134,7 @@ jobs:
           restore-keys: pods-${{ hashFiles('examples/react-native/ios/Podfile.lock') }}
         env:
           SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
+
       - name: Restore node_modules cache
         if: ${{ matrix.platform == 'ios' }}
         uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 https://github.com/actions/cache/commit/1bd1e32a3bdc45362d1e726936510720a7c30a57
@@ -141,6 +146,7 @@ jobs:
           key: ${{ runner.os }}-nodemodules
         env:
           SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3
+
       - name: Install Java 17
         if: ${{ matrix.platform == 'android' }}
         uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # 3.6.0
@@ -158,6 +164,7 @@ jobs:
           echo "ruby --version"
           ruby --version
         continue-on-error: true # brew overwrite step addresses a python install issue: https://github.com/actions/runner-images/issues/8500
+
       - name: Update CocoaPods
         if: ${{ matrix.platform == 'ios' }}
         run: |
@@ -169,16 +176,13 @@ jobs:
         run: |
           echo -e "echo \$ANDROID_HOME"
           echo $ANDROID_HOME
-          $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install 'build-tools;33.0.2' platform-tools
-          echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-27;default;x86_64"
-          echo "no" | $ANDROID_HOME/cmdline-tools/latest/bin/avdmanager create avd --force --name Pixel_5_API_27 --device "pixel_5" --abi x86_64 --package "system-images;android-27;default;x86_64"
-          printf 'hw.cpu.ncore=2\n' >> ~/.android/avd/Pixel_5_API_27.avd/config.ini
-          printf 'hw.ramSize=2048\n' >> ~/.android/avd/Pixel_5_API_27.avd/config.ini
-          printf 'hw.heapSize=576\n' >> ~/.android/avd/Pixel_5_API_27.avd/config.ini
+          $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install "build-tools;33.0.2" "platform-tools" "system-images;android-27;default;x86_64"
+          $ANDROID_HOME/cmdline-tools/latest/bin/avdmanager create avd --name Pixel_5_API_27 --force --device "pixel_5" --abi x86_64 --package "system-images;android-27;default;x86_64"
+
       - name: Start Android emulator
         if: ${{ matrix.platform == 'android' }}
         run: |
-          nohup $ANDROID_HOME/emulator/emulator -avd Pixel_5_API_27 -port ${{ env.EMULATOR_PORT }} -no-boot-anim -no-audio -no-snapshot-load -gpu host -accel on &
+          $ANDROID_HOME/emulator/emulator -avd Pixel_5_API_27 -port ${{ env.EMULATOR_PORT }} -no-boot-anim -no-audio -no-snapshot-load -gpu host -accel on &
           $ANDROID_HOME/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed | tr -d '\r') ]]; do sleep 1; done; input keyevent 82'
           $ANDROID_HOME/platform-tools/adb devices
           # disable spell checker
@@ -192,6 +196,7 @@ jobs:
         run: npm run setup:${{matrix.framework}}:${{matrix.build-tool}} -- --name ${{ env.MEGA_APP_NAME }} --platform ${{matrix.platform}} --tag ${{inputs.dist-tag}} --framework-version ${{matrix.framework-version.value}} --build-tool-version ${{matrix.build-tool-version}}
         shell: bash
         working-directory: build-system-tests
+
       - name: Detect Mega App Error in Log
         run: npm run checkReactNativeLogs -- --log-file-name ${{ matrix.logfile }} --mega-app-name ${{ env.MEGA_APP_NAME }} --platform ${{ matrix.platform }}
         shell: bash

.github/workflows/reusable-e2e.yml

@@ -69,14 +69,25 @@ jobs:
         include:
           - example: angular
             package: angular
+            resource-path: ui/components/authenticator/sign-in-with-username
             tags: '@angular and not @todo-angular'
 
           - example: next
             package: react
+            resource-path: ui/components/authenticator/sign-in-with-username
             tags: '@react and not @todo-react'
 
+          - example: react-router
+            package: react
+            tags: '@react-router and not @todo-react-router'
+
+          - example: next-app-router
+            package: react
+            tags: '@next-app-router and not @todo-next-app-router'
+
           - example: vue
             package: vue
+            resource-path: ui/components/authenticator/sign-in-with-username
             tags: '@vue and not @todo-vue'
 
     steps:
@@ -184,6 +195,9 @@ jobs:
         if: ${{ matrix.package == 'react' }}
         run: yarn react-ai build
 
+      - name: Build test-utils package
+        run: yarn test-utils build
+
       - name: Add Amplify CLI
         run: yarn global add @aws-amplify/cli
 
@@ -311,7 +325,7 @@ jobs:
         run: yarn ${{ matrix.example }}-example build
 
       - name: Start ${{ matrix.example }} example
-        run: yarn ${{ matrix.example }}-example start & npx wait-on -c waitOnConfig.json -t 20000 http-get://localhost:3000/ui/components/authenticator/sign-in-with-username
+        run: yarn ${{ matrix.example }}-example start & npx wait-on -c waitOnConfig.json -t 20000 http-get://localhost:3000/${{ matrix.resource-path || '' }}
         env:
           # Setting this value temporarily since the beta liveness sample app hits the gamma endpoint
           NEXT_PUBLIC_STREAMING_API_URL: wss://streaming-rekognition-gamma.us-east-1.amazonaws.com

.github/workflows/reusable-unit.yml

@@ -146,6 +146,7 @@ jobs:
       - name: Check ${{ matrix.package }} bundle size
         if: |
           matrix.package == 'react' ||
+          matrix.package == 'react-ai' ||
           matrix.package == 'react-auth' ||
           matrix.package == 'react-geo' ||
           matrix.package == 'react-liveness' ||

.github/workflows/version-packages.yml

@@ -7,7 +7,7 @@ name: Version Packages
 
 on:
   push:
-    branches: [main]
+    branches: [main, hotfix]
 
 permissions:
   contents: write # Used to commit to "Version Packages" PR
@@ -42,5 +42,9 @@ jobs:
         uses: changesets/action@b98cec97583b917ff1dc6179dd4d230d3e439894
         with:
           version: yarn bumpVersions
+          # Use the current branch as the base for the PR
+          base: ${{ github.ref_name }}
+          # Custom title based on branch
+          title: 'Version Packages (${{ github.ref_name }})'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}