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

aws-amplify-bot · aws-amplify-bot · commit b07b33cd6ee5 · 2025-08-06T09:58:04.000Z
diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "@types/react": "^18.0.0",
     "@types/url-parse": "^1.4.3",
     "@typescript-eslint/eslint-plugin": "^6.13.1",
-    "axios": "^1.8.4",
+    "axios": "^1.11.0",
     "cheerio": "^1.0.0-rc.12",
     "classnames": "^2.3.2",
     "cross-env": "^7.0.3",
diff --git a/src/components/Layout/Layout.tsx b/src/components/Layout/Layout.tsx
@@ -106,11 +106,16 @@ export const Layout = ({
     ? (asPathWithNoHash.split('/')[2] as Platform)
     : (asPathWithNoHash.split('/')[1] as Platform);
 
+  // Check query parameter as fallback for platform-independent pages
+  const queryPlatform = router.query.platform as Platform;
+
   const currentPlatform = platform
     ? platform
     : PLATFORMS.includes(asPathPlatform)
       ? asPathPlatform
-      : DEFAULT_PLATFORM;
+      : PLATFORMS.includes(queryPlatform) // If platform is included as query parameter, attempt to use
+        ? queryPlatform
+        : DEFAULT_PLATFORM;
 
   const title = [
     pageTitle,
diff --git a/src/directory/directory.mjs b/src/directory/directory.mjs
@@ -1027,6 +1027,12 @@ export const directory = {
             {
               path: 'src/pages/[platform]/reference/telemetry/index.mdx'
             },
+            {
+              path: 'src/pages/reference/maintenance-policy/index.mdx',
+              title: 'Maintenance Policy',
+              description:
+                'The maintenance policy for all Amplify Client Libraries.'
+            },
             {
               isExternal: true,
               route: 'https://aws-amplify.github.io/amplify-swift/docs/',
diff --git a/src/fragments/lib-v1/android-sdk.mdx b/src/fragments/lib-v1/android-sdk.mdx
@@ -15,9 +15,3 @@ While Amplify aims to build in best practices with sensible defaults, there are
 We use the term “library” to refer to programming interfaces that have been hand authored for these category based use cases, and use “SDK” to refer to lower-level programming interfaces which have largely been auto-generated from underlying backend service interfaces and are implementation specific. The existing AWS Mobile SDK contains helper classes, utilities, and a set of code-generated, implementation specific APIs defined by AWS service interfaces. You can use it in your app via an escape hatch if you need lower level control.
 
 This guide shows how to build an app using the AWS Mobile SDK for Android and the Amplify CLI toolchain. To use our new developer experience refer to the [Amplify Libraries for Android guide](/gen1/[platform]/tools/libraries/).
-
-### Should I use the Amplify libraries or AWS Mobile SDK?
-
-Amplify libraries should be used for all new applications. 
-
-For existing applications, we recommend you evaluate migration to the Amplify libraries. The AWS Mobile SDK will continue be maintained with bug fixes and security updates.
diff --git a/src/fragments/lib-v1/geo/js/google-migration.mdx b/src/fragments/lib-v1/geo/js/google-migration.mdx
@@ -150,7 +150,7 @@ Save your changes and refresh your page and you should see a default blue marker
 
 <Callout>
 
-This example uses [MapLibre's marker component](https://maplibre.org/maplibre-gl-js/docs/API/classes/Marker/) to create a marker. To see more examples with markers on from MapLibre check the examples [here](https://maplibre.org/maplibre-gl-js/docs/examples/custom-marker-icons/).
+This example uses [MapLibre's marker component](https://maplibre.org/maplibre-gl-js/docs/API/classes/Marker/) to create a marker. To see more examples with markers on from MapLibre check the examples [here](https://maplibre.org/maplibre-gl-js/docs/examples/add-custom-icons-with-markers/).
 
 </Callout>
 
@@ -198,7 +198,7 @@ Save your changes and refresh your page and now when you click on the icon a pop
 
 <Callout>
 
-This example uses [MapLibre's popup component](https://maplibre.org/maplibre-gl-js/docs/API/classes/Popup/) to create a marker popup. To see more examples with popups on from MapLibre check the examples [here](https://maplibre.org/maplibre-gl-js/docs/examples/set-popup/).
+This example uses [MapLibre's popup component](https://maplibre.org/maplibre-gl-js/docs/API/classes/Popup/) to create a marker popup. To see more examples with popups on from MapLibre check the examples [here](https://maplibre.org/maplibre-gl-js/docs/examples/attach-a-popup-to-a-marker-instance/).
 
 </Callout>
 
diff --git a/src/fragments/lib-v1/ios-sdk.mdx b/src/fragments/lib-v1/ios-sdk.mdx
@@ -1,4 +1,4 @@
-The AWS Mobile SDK for iOS enables you to build mobile apps by providing simplified APIs for AWS services such as Amazon Cognito, Amazon S3, AWS AppSync and more.
+The AWS Mobile SDK for iOS enables you to build mobile apps by providing simplified APIs for AWS services such as Amazon Cognito, Amazon S3, AWS AppSync and more. You can view the Mobile SDK API reference [here](https://aws-amplify.github.io/aws-sdk-ios/docs/reference).
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
 
@@ -15,9 +15,3 @@ While Amplify aims to build in best practices with sensible defaults, there are
 We use the term “library” to refer to programming interfaces that have been hand authored for these category based use cases, and use “SDK” to refer to lower-level programming interfaces which have largely been auto-generated from underlying backend service interfaces and are implementation specific. The existing AWS Mobile SDK contains helper classes, utilities, and a set of code-generated, implementation specific APIs defined by AWS service interfaces. You can use it in your app via an escape hatch if you need lower level control.
 
 This guide shows how to build an app using the AWS Mobile SDK for iOS and the Amplify CLI toolchain. To use our new developer experience refer to the [Amplify Libraries for iOS guide](/gen1/[platform]/tools/libraries/).
-
-### Should I use the Amplify libraries or AWS Mobile SDK?
-
-Amplify libraries should be used for all new applications. 
-
-For existing applications, we recommend you evaluate migration to the Amplify libraries. The AWS Mobile SDK will continue be maintained with bug fixes and security updates.
diff --git a/src/fragments/lib/android-sdk.mdx b/src/fragments/lib/android-sdk.mdx
@@ -15,9 +15,3 @@ While Amplify aims to build in best practices with sensible defaults, there are
 We use the term “library” to refer to programming interfaces that have been hand authored for these category based use cases, and use “SDK” to refer to lower-level programming interfaces which have largely been auto-generated from underlying backend service interfaces and are implementation specific. The existing AWS Mobile SDK contains helper classes, utilities, and a set of code-generated, implementation specific APIs defined by AWS service interfaces. You can use it in your app via an escape hatch if you need lower level control.
 
 This guide shows how to build an app using the AWS Mobile SDK for Android and the Amplify CLI toolchain. To use our new developer experience refer to the [Amplify Libraries for Android guide](/gen1/[platform]/tools/libraries/).
-
-### Should I use the Amplify libraries or AWS Mobile SDK?
-
-Amplify libraries should be used for all new applications. 
-
-For existing applications, we recommend you evaluate migration to the Amplify libraries. The AWS Mobile SDK will continue be maintained with bug fixes and security updates.
diff --git a/src/fragments/lib/geo/js/google-migration.mdx b/src/fragments/lib/geo/js/google-migration.mdx
@@ -150,7 +150,7 @@ Save your changes and refresh your page and you should see a default blue marker
 
 <Callout>
 
-This example uses [MapLibre's marker component](https://maplibre.org/maplibre-gl-js/docs/API/classes/Marker/) to create a marker. To see more examples with markers on from MapLibre check the examples [here](https://maplibre.org/maplibre-gl-js/docs/examples/custom-marker-icons/).
+This example uses [MapLibre's marker component](https://maplibre.org/maplibre-gl-js/docs/API/classes/Marker/) to create a marker. To see more examples with markers on from MapLibre check the examples [here](https://maplibre.org/maplibre-gl-js/docs/examples/add-custom-icons-with-markers/).
 
 </Callout>
 
@@ -198,7 +198,7 @@ Save your changes and refresh your page and now when you click on the icon a pop
 
 <Callout>
 
-This example uses [MapLibre's popup component](https://maplibre.org/maplibre-gl-js/docs/API/classes/Popup/) to create a marker popup. To see more examples with popups on from MapLibre check the examples [here](https://maplibre.org/maplibre-gl-js/docs/examples/set-popup/).
+This example uses [MapLibre's popup component](https://maplibre.org/maplibre-gl-js/docs/API/classes/Popup/) to create a marker popup. To see more examples with popups on from MapLibre check the examples [here](https://maplibre.org/maplibre-gl-js/docs/examples/attach-a-popup-to-a-marker-instance/).
 
 </Callout>
 
diff --git a/src/fragments/lib/ios-sdk.mdx b/src/fragments/lib/ios-sdk.mdx
@@ -1,4 +1,4 @@
-The AWS Mobile SDK for iOS enables you to build mobile apps by providing simplified APIs for AWS services such as Amazon Cognito, Amazon S3, AWS AppSync and more.
+The AWS Mobile SDK for iOS enables you to build mobile apps by providing simplified APIs for AWS services such as Amazon Cognito, Amazon S3, AWS AppSync and more. You can view the Mobile SDK API reference [here](https://aws-amplify.github.io/aws-sdk-ios/docs/reference).
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
 
@@ -15,9 +15,3 @@ While Amplify aims to build in best practices with sensible defaults, there are
 We use the term “library” to refer to programming interfaces that have been hand authored for these category based use cases, and use “SDK” to refer to lower-level programming interfaces which have largely been auto-generated from underlying backend service interfaces and are implementation specific. The existing AWS Mobile SDK contains helper classes, utilities, and a set of code-generated, implementation specific APIs defined by AWS service interfaces. You can use it in your app via an escape hatch if you need lower level control.
 
 This guide shows how to build an app using the AWS Mobile SDK for iOS and the Amplify CLI toolchain. To use our new developer experience refer to the [Amplify Libraries for iOS guide](/gen1/[platform]/tools/libraries/).
-
-### Should I use the Amplify libraries or AWS Mobile SDK?
-
-Amplify libraries should be used for all new applications. 
-
-For existing applications, we recommend you evaluate migration to the Amplify libraries. The AWS Mobile SDK will continue be maintained with bug fixes and security updates.
diff --git a/src/fragments/sdk/library-callout.mdx b/src/fragments/sdk/library-callout.mdx
@@ -1,9 +1,35 @@
 <Callout warning>
 
-You are currently viewing the AWS SDK for Mobile documentation which is a collection of low-level libraries. Use the Amplify libraries for all new app development. [Learn more](/gen1/[platform]/tools/libraries/)
+<InlineFilter filters={['android']}>
 
-import ios0 from '/src/fragments/sdk/sdk-api-ref/ios.mdx';
+The AWS SDK for Android entered Maintenance Phase as of August 1, 2025.
 
-<Fragments fragments={{ swift: ios0 }} />
+During this maintenance period:
+
+* Critical bug fixes and security patches will continue to be provided
+* No new features or enhancements will be added
+* Existing functionality will remain supported
+
+We recommend that you start using [AWS Amplify for Android](/[platform]), our modern feature-rich library designed specifically for building cloud-connected apps powered by AWS. You can refer to the [AWS SDK for Android migration guide](https://github.com/aws-amplify/amplify-android/blob/main/documents/MobileSDK_To_AmplifyAndroid.md) to help you transition to AWS Amplify for Android.
+
+This version is scheduled to reach End of Support on August 1, 2026. After this date, no further updates of any kind will be provided. See [maintenance policy](/reference/maintenance-policy) for more information about the Amplify Client Library lifecycle.
+
+</InlineFilter>
+
+<InlineFilter filters={['swift']}>
+
+The AWS SDK for iOS entered Maintenance Phase as of August 1, 2025.
+
+During this maintenance period:
+
+* Critical bug fixes and security patches will continue to be provided
+* No new features or enhancements will be added
+* Existing functionality will remain supported
+
+We recommend that you start using [AWS Amplify for iOS](/[platform]), our modern feature-rich library designed specifically for building cloud-connected apps powered by AWS. You can refer to the [AWS SDK for iOS migration guide](https://github.com/aws-amplify/amplify-swift/blob/main/MobileSDK_To_AmplifySwift_Guidance.md) to help you transition to AWS Amplify for Swift.
+
+This version is scheduled to reach End of Support on August 1, 2026. After this date, no further updates of any kind will be provided. See [maintenance policy](https://docs.amplify.aws/reference/maintenance-policy) for more information about the Amplify Client Library lifecycle.
+
+</InlineFilter>
 
 </Callout>
diff --git a/src/pages/[platform]/build-a-backend/add-aws-services/geo/google-migration/index.mdx b/src/pages/[platform]/build-a-backend/add-aws-services/geo/google-migration/index.mdx
@@ -177,7 +177,7 @@ Save your changes and refresh your page and you should see a default blue marker
 
 <Callout>
 
-This example uses [MapLibre's marker component](https://maplibre.org/maplibre-gl-js/docs/API/classes/Marker/) to create a marker. To see more examples with markers on from MapLibre check the examples [here](https://maplibre.org/maplibre-gl-js/docs/examples/custom-marker-icons/).
+This example uses [MapLibre's marker component](https://maplibre.org/maplibre-gl-js/docs/API/classes/Marker/) to create a marker. To see more examples with markers on from MapLibre check the examples [here](https://maplibre.org/maplibre-gl-js/docs/examples/add-custom-icons-with-markers/).
 
 </Callout>
 
@@ -225,7 +225,7 @@ Save your changes and refresh your page and now when you click on the icon a pop
 
 <Callout>
 
-This example uses [MapLibre's popup component](https://maplibre.org/maplibre-gl-js/docs/API/classes/Popup/) to create a marker popup. To see more examples with popups on from MapLibre check the examples [here](https://maplibre.org/maplibre-gl-js/docs/examples/set-popup/).
+This example uses [MapLibre's popup component](https://maplibre.org/maplibre-gl-js/docs/API/classes/Popup/) to create a marker popup. To see more examples with popups on from MapLibre check the examples [here](https://maplibre.org/maplibre-gl-js/docs/examples/attach-a-popup-to-a-marker-instance/).
 
 </Callout>
 
diff --git a/src/pages/[platform]/start/quickstart/nextjs-app-router-client-components/index.mdx b/src/pages/[platform]/start/quickstart/nextjs-app-router-client-components/index.mdx
@@ -219,17 +219,33 @@ This should start a local dev server at http://localhost:3000.
 
 The starter application already has a pre-configured auth backend defined in the **amplify/auth/resource.ts** file. We've configured it to support email and password login but you can extend it to support a variety of login mechanisms, including Google, Amazon, Sign In With Apple, and Facebook.
 
-The fastest way to get your login experience up and running is to use our Authenticator UI component. In your **app/layout.tsx** file, import the Authenticator UI component and wrap the children or pages components.
+The fastest way to get your login experience up and running is to use our Authenticator UI component. To properly integrate it with Next.js App Router, we'll create a client component wrapper and use it in the layout.
 
+First, create an AuthenticatorWrapper.tsx file in your app directory:
 
-```tsx title="app/layout.tsx"
+```tsx title="app/AuthenticatorWrapper.tsx"
 "use client"
 
+import { Authenticator } from "@aws-amplify/ui-react";
+
+export default function AuthenticatorWrapper({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return <Authenticator>{children}</Authenticator>;
+}
+```
+
+Next, update your app/layout.tsx file to import and use the AuthenticatorWrapper component:
+
+```tsx title="app/layout.tsx"
+
 import React from "react";
 import { Amplify } from "aws-amplify";
 import "./app.css";
 // highlight-start
-import { Authenticator } from "@aws-amplify/ui-react";
+import AuthenticatorWrapper from "./AuthenticatorWrapper";
 import "@aws-amplify/ui-react/styles.css";
 // highlight-end
 import outputs from "@/amplify_outputs.json";
@@ -245,9 +261,9 @@ export default function RootLayout({
     // highlight-start
     <html lang="en">
       <body>      
-        <Authenticator>
+        <AuthenticatorWrapper>
           {children}
-        </Authenticator>
+        </AuthenticatorWrapper>
       </body>
     </html>
     // highlight-end
diff --git a/src/pages/reference/maintenance-policy/index.mdx b/src/pages/reference/maintenance-policy/index.mdx
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1027,6 +1027,12 @@ export const directory = {`
`1027`	`1027`	`{`
`1028`	`1028`	`path: 'src/pages/[platform]/reference/telemetry/index.mdx'`
`1029`	`1029`	`},`
	`1030`	`+ {`
	`1031`	`+ path: 'src/pages/reference/maintenance-policy/index.mdx',`
	`1032`	`+ title: 'Maintenance Policy',`
	`1033`	`+ description:`
	`1034`	`+ 'The maintenance policy for all Amplify Client Libraries.'`
	`1035`	`+ },`
`1030`	`1036`	`{`
`1031`	`1037`	`isExternal: true,`
`1032`	`1038`	`route: 'https://aws-amplify.github.io/amplify-swift/docs/',`