Merge remote-tracking branch 'origin/main' into pre-prod/main

aws-amplify-bot · aws-amplify-bot · commit e297d7269a48 · 2025-04-29T00:20:54.000Z
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.github/actions/set_yarn_berry/action.yml b/.github/actions/set_yarn_berry/action.yml
@@ -0,0 +1,13 @@
+name: Set Yarn Berry
+description: Enable Yarn Berry in the workflow
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Enable corepack
+      run: corepack enable
+      shell: bash
+    - name: Set yarn version to berry
+      run: yarn set version berry
+      shell: bash
+    
diff --git a/.github/workflows/accessibility_scan.yml b/.github/workflows/accessibility_scan.yml
@@ -16,6 +16,8 @@ jobs:
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 20.x
+      - name: Set Yarn Berry
+        uses: ./.github/actions/set_yarn_berry
       - name: Install dependencies
         run: yarn
       - name: Build
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,6 +16,8 @@ jobs:
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 20.x
+      - name: Set Yarn Berry
+        uses: ./.github/actions/set_yarn_berry
       - name: Install Dependencies
         run: yarn
       - name: Run tests
diff --git a/.github/workflows/check_bundle_size.yml b/.github/workflows/check_bundle_size.yml
@@ -17,6 +17,8 @@ jobs:
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 20.x
+      - name: Set Yarn Berry
+        uses: ./.github/actions/set_yarn_berry
       - name: Install dependencies
         run: yarn
       - name: Run build and analyze base bundle sizes
@@ -41,6 +43,8 @@ jobs:
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 20.x
+      - name: Set Yarn Berry
+        uses: ./.github/actions/set_yarn_berry
       - name: Install dependencies
         run: yarn
       - name: Run build and analyze head bundle sizes
diff --git a/.github/workflows/check_for_broken_links.yml b/.github/workflows/check_for_broken_links.yml
@@ -16,6 +16,8 @@ jobs:
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 20.x
+      - name: Set Yarn Berry
+        uses: ./.github/actions/set_yarn_berry
       - name: Install Dependencies
         run: yarn
       - name: Run Link Checker
diff --git a/.github/workflows/check_for_console_errors.yml b/.github/workflows/check_for_console_errors.yml
@@ -17,6 +17,8 @@ jobs:
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 20.x
+      - name: Set Yarn Berry
+        uses: ./.github/actions/set_yarn_berry
       - name: Install Dependencies
         run: yarn
       - name: Run Build
diff --git a/.github/workflows/check_for_new_files.yml b/.github/workflows/check_for_new_files.yml
@@ -20,6 +20,8 @@ jobs:
           script: |
             const { getAddedFiles } = require('./.github/workflows/scripts/check_for_new_files.js');
             return await getAddedFiles({github, context, core});
+      - name: Set yarn Berry
+        uses: ./.github/actions/set_yarn_berry
       - name: Install npm package ignore
         if: ${{ steps.set-added-files-count.outputs.result > 0 }}
         run: yarn add ignore@5.2.4 -W # help verify CODEOWNERS
diff --git a/.github/workflows/check_pr_for_broken_links.yml b/.github/workflows/check_pr_for_broken_links.yml
@@ -15,6 +15,8 @@ jobs:
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 20.x
+      - name: Set Yarn Berry
+        uses: ./.github/actions/set_yarn_berry
       - name: Install Dependencies
         run: yarn
       - name: Run Build
diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml
@@ -14,6 +14,8 @@ jobs:
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 20.x
+      - name: Set Yarn Berry
+        uses: ./.github/actions/set_yarn_berry
       - name: Install Dependencies
         run: yarn
       - name: Run Spellcheck
diff --git a/.github/workflows/validate_redirects.yml b/.github/workflows/validate_redirects.yml
@@ -17,6 +17,8 @@ jobs:
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 20.x
+      - name: Set Yarn Berry
+        uses: ./.github/actions/set_yarn_berry
       - name: Install Dependencies
         run: yarn
       - name: Validate redirects
diff --git a/.gitignore b/.gitignore
@@ -72,6 +72,7 @@ public/next-image-export-optimizer-hashes.json
 src/directory/directory.json
 src/directory/flatDirectory.json
 src/references/raw-references.json
+.yarn/*
 
 #amplify-do-not-edit-begin
 amplify/\#current-cloud-backend
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/Readme.md b/Readme.md
@@ -6,15 +6,15 @@
 
 ### Prerequisites
 
-- [Node.js 18.17.0 or later, but below 22.0.0](https://nodejs.org/en/)
-- [Yarn classic](https://classic.yarnpkg.com/lang/en/docs/install/#mac-stable)
+- [Node.js 20+, but below 22.0.0](https://nodejs.org/en/)
 
 ## Set up the docs repo
 
 1. [Fork this repo](/fork) and `git clone` it.
 2. In your terminal, navigate to the repo from where it was just cloned. This should be located at the `/docs` directory.
-3. From your command line, run `yarn && yarn dev`.
-4. <http://localhost:3000/> should open automatically.
+3. Set yarn version to the modern latest version, run `corepack enable && yarn set version berry`.
+4. From your command line, run `yarn && yarn dev`.
+5. <http://localhost:3000/> should open automatically.
 
 ## How to contribute
 
diff --git a/amplify.yml b/amplify.yml
@@ -3,7 +3,9 @@ frontend:
   phases:
     preBuild:
       commands:
-        - yarn install
+        - corepack enable
+        - yarn set version stable
+        - yarn install --frozen-lockfile
     build:
       commands:
         - echo "BUILD_ENV=$BUILD_ENV" >> .env.custom
diff --git a/cspell.json b/cspell.json
@@ -1623,6 +1623,7 @@
     "rehype",
     "assetlinks",
     "AMPLIFYRULES",
+    "preconfigured",
     "manylinux",
     "GOARCH",
     "norpc"
diff --git a/package.json b/package.json
@@ -16,18 +16,18 @@
     "ajv": "^8.16.0",
     "aws-amplify": "^6.0.9",
     "next": "^14.2.25",
-    "next-image-export-optimizer": "^1.8.3",
+    "next-image-export-optimizer": "^1.18.0",
     "next-transpile-modules": "^9.0.0",
     "parse-imports": "^1.1.0",
     "prism-react-renderer": "^2.1.0",
-    "prismjs": "^1.27.0",
+    "prismjs": "^1.30.0",
     "react": "^18.3.1",
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^18.3.1",
     "react-icons": "^4.7.1"
   },
   "devDependencies": {
-    "@actions/core": "^1.10.1",
+    "@actions/core": "^1.11.1",
     "@axe-core/puppeteer": "^4.9.1",
     "@mdx-js/loader": "^2.3.0",
     "@mdx-js/mdx": "^2.3.0",
@@ -43,7 +43,7 @@
     "@types/react": "^18.0.0",
     "@types/url-parse": "^1.4.3",
     "@typescript-eslint/eslint-plugin": "^6.13.1",
-    "axios": "^1.7.4",
+    "axios": "^1.8.4",
     "cheerio": "^1.0.0-rc.12",
     "classnames": "^2.3.2",
     "cross-env": "^7.0.3",
@@ -60,12 +60,12 @@
     "jest": "^29.7.0",
     "jest-cli": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
-    "jest-puppeteer": "^10.0.1",
+    "jest-puppeteer": "^10.1.4",
     "json5": "^2.2.3",
     "lint-staged": "^15.2.7",
     "next-bundle-analyzer": "^0.6.7",
     "prettier": "^3.0.3",
-    "puppeteer": "^22.8.0",
+    "puppeteer": "^22.15.0",
     "rehype": "^11.0.0",
     "rehype-img-size": "^1.0.1",
     "rehype-mdx-code-props": "^2.0.0",
@@ -83,21 +83,19 @@
     "unist-util-visit": "^4.1.0"
   },
   "resolutions": {
-    "**/trim": "0.0.3",
     "@babel/core": "^7.23.2",
     "@babel/traverse": "^7.23.2",
     "loader-utils": "2.0.4",
+    "nanoid": "3.3.8",
     "minimatch": "3.1.2",
     "decode-uri-component": "0.2.1",
-    "**/fast-xml-parser": "4.4.1",
     "cross-spawn": "^7.0.5",
     "semver": "7.5.2",
     "tough-cookie": "4.1.3",
     "aws-cdk-lib": "2.80.0",
-    "prismjs": "^1.27.0",
     "@adobe/css-tools": "4.3.2",
     "follow-redirects": "^1.15.6",
-    "sharp": "0.32.6",
+    "sharp": "0.33.1",
     "ejs": "3.1.10",
     "braces": "^3.0.3",
     "ws": "^8.17.1"
@@ -111,9 +109,9 @@
     "dev": "yarn prebuild && next dev",
     "spellcheck": "cspell \"src/**/*.mdx\" --no-progress",
     "spellcheck-diff": "git diff --name-only --cached | awk \"/src.*\\.mdx/{print}\" | npx cspell --no-must-find-files --file-list stdin",
-    "build": "next build",
+    "build": "yarn prebuild && next build && yarn postbuild",
     "postbuild": "node tasks/postBuildTasks.mjs",
-    "build:release": "yarn build && next-image-export-optimizer --exportFolderPath client/www/next-build",
+    "build:release": "yarn build && next-image-export-optimizer --nextConfigPath ./next.config.mjs --exportFolderPath client/www/next-build",
     "next-build": "next build",
     "next-start": "next start",
     "prepare": "husky install",
@@ -122,5 +120,5 @@
     "lint": "next lint",
     "clean-references": "node tasks/clean-references.mjs"
   },
-  "packageManager": "yarn@1.22.22"
+  "packageManager": "yarn@4.9.0"
 }
diff --git a/src/directory/directory.mjs b/src/directory/directory.mjs
@@ -408,6 +408,9 @@ export const directory = {
                 {
                   path: 'src/pages/[platform]/build-a-backend/functions/configure-functions/index.mdx'
                 },
+                {
+                  path: 'src/pages/[platform]/build-a-backend/functions/configure-client-library/index.mdx'
+                },
                 {
                   path: 'src/pages/[platform]/build-a-backend/functions/scheduling-functions/index.mdx'
                 },
@@ -966,6 +969,9 @@ export const directory = {
                 },
                 {
                   path: 'src/pages/[platform]/deploy-and-host/sandbox-environments/features/index.mdx'
+                },
+                {
+                  path: 'src/pages/[platform]/deploy-and-host/sandbox-environments/seed/index.mdx'
                 }
               ]
             },
diff --git a/src/fragments/lib/project-setup/native_common/prereq/common_header.mdx b/src/fragments/lib/project-setup/native_common/prereq/common_header.mdx
@@ -1,5 +1,5 @@
 Before you begin, make sure you have the following installed:
 
-- [Node.js](https://nodejs.org/) v16.x or later
-- [npm](https://www.npmjs.com/get-npm) v7.x or later
+- [Node.js](https://nodejs.org/) v18.x or later
+- [npm](https://www.npmjs.com/get-npm) v10.x or later
 - [git](https://git-scm.com/) v2.14.1 or later
diff --git a/src/fragments/lib/troubleshooting/common/upgrading.mdx b/src/fragments/lib/troubleshooting/common/upgrading.mdx
@@ -73,8 +73,8 @@ A key part of Amplify's React Native strategy going forward is to reduce our rel
 
 In order to use Amplify JavaScript v6, you will need to make sure you are using the following versions in your development environment:
 
-- [Node.js](https://nodejs.org/) v16.x or later
-- [npm](https://www.npmjs.com/) v9.7.1 or later
+- [Node.js](https://nodejs.org/) v18.x or later
+- [npm](https://www.npmjs.com/) v10.x or later
 
 ## Step 2: Upgrade your Amplify project dependencies
 
diff --git a/src/fragments/sdk/auth/android/federated-identities.mdx b/src/fragments/sdk/auth/android/federated-identities.mdx
@@ -162,7 +162,7 @@ To federate Sign in with Apple as a user sign-in provider for AWS services calle
 
 1. **Implementing Sign in with Apple in your app**
 
-   Since we don’t have an SDK that supports Sign in with Apple for Android, you need to use the web flow in a web view. To configure Sign in with Apple in your application, follow [Configuring Your Webpage for Sign In with Apple](https://developer.apple.com/documentation/signinwithapplejs/configuring_your_webpage_for_sign_in_with_apple) in the Apple documentation. To add a Sign in with Apple button to your Android user interface, follow [Displaying and Configuring Sign In with Apple Buttons](https://developer.apple.com/documentation/signinwithapplejs/displaying_and_configuring_sign_in_with_apple_buttons) in the Apple documentation. To securely authenticate users using Sign in with Apple, follow [Configuring Your Webpage for Sign In with Apple](https://developer.apple.com/documentation/signinwithapplerestapi/authenticating_users_with_sign_in_with_apple) in the Apple documentation.
+   Since we don’t have an SDK that supports Sign in with Apple for Android, you need to use the web flow in a web view. To configure Sign in with Apple in your application, follow [Configuring Your Webpage for Sign In with Apple](https://developer.apple.com/documentation/signinwithapple/configuring-your-webpage-for-sign-in-with-apple) in the Apple documentation. To add a Sign in with Apple button to your Android user interface, follow [Displaying and Configuring Sign In with Apple Buttons](https://developer.apple.com/documentation/signinwithapple/displaying-sign-in-with-apple-buttons-on-the-web) in the Apple documentation. To securely authenticate users using Sign in with Apple, follow [Configuring Your Webpage for Sign In with Apple](https://developer.apple.com/documentation/signinwithapple/authenticating-users-with-sign-in-with-apple) in the Apple documentation.
 
 2. **Configuring Sign in with Apple as an authentication provider in your Amazon Cognito Identity Pool**
 
diff --git a/src/pages/[platform]/ai/conversation/connect-your-frontend/index.mdx b/src/pages/[platform]/ai/conversation/connect-your-frontend/index.mdx
@@ -303,11 +303,12 @@ const { data: message, errors } = await chat.sendMessage({
 The `aiContext` argument allows you to optionally attach arbitrary data to the message. This is useful for passing additional information, like user information or current state of your application, in a user message to the AI assistant.
 
 ```ts
-const { data: message, errors } = await chat.sendMessage('Hello, world!', {
+const { data: message, errors } = await chat.sendMessage({
+  content: [{ text: 'Hello, world!' }],
   aiContext: {
     user: {
-      name: 'Ian',
-    },
+      name: "Dan"
+    }
   },
 });
 ```
diff --git a/src/pages/[platform]/build-a-backend/data/connect-event-api/index.mdx b/src/pages/[platform]/build-a-backend/data/connect-event-api/index.mdx
@@ -42,7 +42,7 @@ Before you begin, you will need:
 
 ```tsx title="src/App.tsx"
 import type { EventsChannel } from 'aws-amplify/data';
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useRef } from 'react';
 import { Amplify } from 'aws-amplify';
 import { events } from 'aws-amplify/data';
 
@@ -53,32 +53,40 @@ Amplify.configure({
         'https://abcdefghijklmnopqrstuvwxyz.appsync-api.us-east-1.amazonaws.com/event',
       region: 'us-east-1',
       defaultAuthMode: 'apiKey',
-      apiKey: 'da2-abcdefghijklmnopqrstuvwxyz'
-    }
-  }
+      apiKey: 'da2-abcdefghijklmnopqrstuvwxyz',
+    },
+  },
 });
 
 export default function App() {
-  const [myEvents, setMyEvents] = useState<unknown[]>([]);
+ const [myEvents, setMyEvents] = useState<unknown[]>([]);
+
+  const sub = useRef<ReturnType<EventsChannel['subscribe']>>(null);
 
   useEffect(() => {
     let channel: EventsChannel;
 
     const connectAndSubscribe = async () => {
       channel = await events.connect('default/channel');
 
-      channel.subscribe({
-        next: (data) => {
-          console.log('received', data);
-          setMyEvents((prev) => [data, ...prev]);
-        },
-        error: (err) => console.error('error', err)
-      });
+      if (!sub.current) {
+        sub.current = channel.subscribe({
+          next: (data) => {
+            console.log('received', data);
+            setMyEvents((prev) => [data, ...prev]);
+          },
+          error: (err) => console.error('error', err),
+        });
+      }
     };
 
     connectAndSubscribe();
 
-    return () => channel && channel.close();
+    return () => {
+      sub.current?.unsubscribe();
+      sub.current = null;
+      return channel?.close();
+    };
   }, []);
 
   async function publishEvent() {
@@ -94,8 +102,8 @@ export default function App() {
     <>
       <button onClick={publishEvent}>Publish Event</button>
       <ul>
-        {myEvents.map((data) => (
-          <li key={data.id}>{JSON.stringify(data.event)}</li>
+        {myEvents.map((data, idx) => (
+          <li key={idx}>{JSON.stringify(data.event, null, 2)}</li>
         ))}
       </ul>
     </>
diff --git a/src/pages/[platform]/build-a-backend/data/custom-business-logic/connect-amazon-rekognition/index.mdx b/src/pages/[platform]/build-a-backend/data/custom-business-logic/connect-amazon-rekognition/index.mdx
@@ -117,9 +117,9 @@ backend.storage.resources.bucket.grantReadWrite(
 ```
 ## Step 5 - Configure the function handler
 
-Define the function handler by creating a new file, `amplify/data/identifyText.ts`. This function analyzes the image and extracts text using the Amazon Rekognition DetectText service.
+Define the function handler by creating a new file, `amplify/data/identifyText.js`. This function analyzes the image and extracts text using the Amazon Rekognition DetectText service.
 
-```ts title="amplify/data/identifyText.ts"
+```ts title="amplify/data/identifyText.js"
 
 export function request(ctx) {
   return {
diff --git a/src/pages/[platform]/build-a-backend/data/customize-authz/grant-lambda-function-access-to-api/index.mdx b/src/pages/[platform]/build-a-backend/data/customize-authz/grant-lambda-function-access-to-api/index.mdx
diff --git a/src/pages/[platform]/build-a-backend/functions/configure-client-library/index.mdx b/src/pages/[platform]/build-a-backend/functions/configure-client-library/index.mdx
diff --git a/src/pages/[platform]/build-a-backend/server-side-rendering/index.mdx b/src/pages/[platform]/build-a-backend/server-side-rendering/index.mdx
diff --git a/src/pages/[platform]/build-a-backend/storage/use-with-custom-s3/index.mdx b/src/pages/[platform]/build-a-backend/storage/use-with-custom-s3/index.mdx
diff --git a/src/pages/[platform]/deploy-and-host/sandbox-environments/seed/index.mdx b/src/pages/[platform]/deploy-and-host/sandbox-environments/seed/index.mdx
diff --git a/src/pages/[platform]/reference/cli-commands/index.mdx b/src/pages/[platform]/reference/cli-commands/index.mdx
diff --git a/src/pages/gen1/[platform]/build-a-backend/auth/auth-migration-guide/index.mdx b/src/pages/gen1/[platform]/build-a-backend/auth/auth-migration-guide/index.mdx
diff --git a/src/pages/gen1/[platform]/build-a-backend/server-side-rendering/nextjs/index.mdx b/src/pages/gen1/[platform]/build-a-backend/server-side-rendering/nextjs/index.mdx
diff --git a/src/pages/gen1/[platform]/tools/cli/reference/files/index.mdx b/src/pages/gen1/[platform]/tools/cli/reference/files/index.mdx
diff --git a/yarn.lock b/yarn.lock
