Merge branch 'main' into feature/12820/crossTab-signIn-signOut

Author: ahmedhamouda78

.github/dependency-review/dependency-review-config.yml

@@ -10,6 +10,7 @@ allow-licenses:
   - 'BSL-1.0'
   - 'CC-BY-3.0'
   - 'CC-BY-4.0'
+  - 'CC-BY-SA-4.0'
   - 'CC0-1.0'
   - 'curl'
   - 'ISC'

.github/workflows/callable-canary-sampleapp-tests.yml

@@ -125,7 +125,7 @@ jobs:
         run: npm install
         working-directory: amplify-js-samples-staging/samples/next/auth/new-next-app
       - name: Install latest stable amplify version
-        run: npm install aws-amplify@latest @aws-amplify/adapter-nextjs@latest
+        run: npm install aws-amplify@latest @aws-amplify/adapter-nextjs@latest @aws-amplify/auth@latest
         working-directory: amplify-js-samples-staging/samples/next/auth/new-next-app
       - name: Start application and run test
         run: |

.gitignore

@@ -11,6 +11,7 @@ packages/**/esm/
 packages/**/cjs/
 **/.DS_Store
 .vscode
+.kiro
 .idea
 *.log
 .npm/

.husky/pre-push

@@ -0,0 +1,24 @@
+#!/usr/bin/env sh
+
+# Pre-push hook to scan for secrets using git-secrets
+# This prevents accidentally pushing AWS credentials or other secrets
+
+# Check if git-secrets is installed
+if ! command -v git-secrets >/dev/null 2>&1; then
+  echo ""
+  echo "ERROR: git-secrets is not installed."
+  echo ""
+  echo "Please install git-secrets to continue:"
+  echo ""
+  echo "  macOS:   brew install git-secrets"
+  echo "  Linux:   See https://github.com/awslabs/git-secrets#installing-git-secrets"
+  echo "  Windows: See https://github.com/awslabs/git-secrets#installing-git-secrets"
+  echo ""
+  echo "After installation, register AWS patterns:"
+  echo "  git secrets --register-aws"
+  echo ""
+  exit 1
+fi
+
+# Run git-secrets scan and propagate exit code
+git secrets --scan

CONTRIBUTING.md

@@ -8,6 +8,7 @@ Whether it's a bug report, new feature, correction, or additional documentation,
 - [Our Design](#our-design)
 - [Development Process](#development-process)
   - [Setting up for local development](#setting-up-for-local-development)
+  - [Setting up git-secrets](#setting-up-git-secrets)
   - [Architecture of the codebase](#architecture-of-the-codebase)
   - [Steps towards contributions](#steps-towards-contributions)
 - [Bug Reports](#bug-reports)
@@ -68,6 +69,74 @@ yarn build
 
 > Note: Make sure to always [sync your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork) with main branch of `amplify-js`
 
+## Setting up git-secrets
+
+This repository uses [git-secrets](https://github.com/awslabs/git-secrets) to prevent accidentally pushing AWS credentials or other secrets. A pre-push hook will scan your commits before pushing to the remote repository.
+
+### Installing git-secrets
+
+**macOS (using Homebrew):**
+
+```bash
+brew install git-secrets
+```
+
+**Linux (Debian/Ubuntu):**
+
+```bash
+sudo apt-get install git-secrets
+```
+
+**Linux (manual installation):**
+
+```bash
+git clone https://github.com/awslabs/git-secrets.git
+cd git-secrets
+sudo make install
+```
+
+**Windows (manual installation):**
+
+1. Clone the repository: `git clone https://github.com/awslabs/git-secrets.git`
+2. Add the `git-secrets` directory to your PATH
+3. Alternatively, copy `git-secrets` to a directory already in your PATH
+
+### Registering AWS patterns
+
+After installing git-secrets, register the AWS secret patterns in your local repository:
+
+```bash
+git secrets --register-aws
+```
+
+This registers patterns to detect:
+
+- AWS Access Key IDs (e.g., `AKIAIOSFODNN7EXAMPLE`)
+- AWS Secret Access Keys
+- AWS Session Tokens
+
+You can verify the registered patterns with:
+
+```bash
+git secrets --list
+```
+
+### Handling false positives
+
+If git-secrets flags a legitimate string as a potential secret (false positive), you can add an allowed pattern:
+
+```bash
+# Allow a specific pattern
+git secrets --add --allowed 'AKIAIOSFODNN7EXAMPLE'
+
+# Allow patterns matching a regex
+git secrets --add --allowed 'my-test-pattern.*'
+```
+
+Allowed patterns are stored in `.git/config` and apply only to your local repository.
+
+> **Note:** The pre-push hook will block pushes if git-secrets is not installed. Please install and configure git-secrets before contributing.
+
 ## Architecture of the codebase
 
 Amplify JS is a monorepo built with `Yarn` and `Lerna`. All the categories of Amplify live within the `packages` directory in the root. Each category inside packages has its own `src/` and `package.json`.

README.md

@@ -52,6 +52,14 @@ AWS Amplify is available as `aws-amplify` on [npm](https://www.npmjs.com/package
 
 To get started pick your platform from our [**Getting Started** home page](https://docs.amplify.aws/javascript/)
 
+## Version Support
+AWS Amplify JavaScript library v4 and below will end support on **April 13, 2026**, as documented in our [AWS Amplify JavaScript library version support calendar](https://github.com/aws-amplify/amplify-js/issues/14580).
+
+Effective immediately, the AWS Amplify JavaScript library v4 and below will enter **Maintenance Mode** until April 13, 2026 after which it will receive no more updates. While in Maintenance Mode, the libraries will only receive updates for **critical bug fixes and security vulnerabilities**. Refer to [Amplify Documentation](https://docs.amplify.aws/reference/maintenance-policy) for more information on the maintenance policy.
+
+If you are using AWS Amplify JavaScript library v4 and below, we strongly recommend upgrading to the AWS Amplify JavaScript Library v6 before April 13, 2026.
+
+
 ## Notice:
 
 ### Amplify 6.x.x has breaking changes. Please see the breaking changes on our [migration guide](https://docs.amplify.aws/javascript/build-a-backend/troubleshooting/migrate-from-javascript-v5-to-v6/)