feat: Maintain current page when switching between frontend and backend

.github/workflows/accessibility_scan.yml

@@ -20,6 +20,8 @@ jobs:
         uses: ./.github/actions/set_yarn_berry
       - name: Install dependencies
         run: yarn
+      - name: Install Chrome for Puppeteer
+        run: npx puppeteer browsers install chrome
       - name: Build
         run: yarn build
         env:

.github/workflows/build.yml

@@ -20,6 +20,8 @@ jobs:
         uses: ./.github/actions/set_yarn_berry
       - name: Install Dependencies
         run: yarn
+      - name: Install Chrome for Puppeteer
+        run: npx puppeteer browsers install chrome
       - name: Run tests
         run: yarn prebuild && yarn test:unit
       - name: Run Build

.github/workflows/check_for_console_errors.yml

@@ -21,6 +21,8 @@ jobs:
         uses: ./.github/actions/set_yarn_berry
       - name: Install Dependencies
         run: yarn
+      - name: Install Chrome for Puppeteer
+        run: npx puppeteer browsers install chrome
       - name: Run Build
         run: yarn build:release
         env:

.github/workflows/check_pr_for_broken_links.yml

@@ -19,6 +19,8 @@ jobs:
         uses: ./.github/actions/set_yarn_berry
       - name: Install Dependencies
         run: yarn
+      - name: Install Chrome for Puppeteer
+        run: npx puppeteer browsers install chrome
       - name: Run Build
         run: yarn build
         env:

cspell.json

@@ -11,6 +11,8 @@
     "_userauth.auth_fail",
     "_userauth.sign_in",
     "_userauth.sign_up",
+    "agentic",
+    "awslabs",
     "@aws-amplify/auth",
     "@aws-amplify/core",
     "@aws-amplify/storage",
@@ -1122,7 +1124,9 @@
     "reactnative",
     "realtime",
     "reCaptcha",
+    "recordcache",
     "RecyclerView",
+    "retryable",
     "redirect_to",
     "referrerpolicy",
     "refetches",
@@ -1346,6 +1350,7 @@
     "UIViewController",
     "unauth",
     "Unauth",
+    "uncategorized",
     "uncommenting",
     "unencrypted",
     "unioned",
@@ -1522,6 +1527,7 @@
     "CHALLENGEANSWER",
     "Fargate",
     "Dockerizing",
+    "duckdb",
     "WORKDIR",
     "endregion",
     "entrypoint",

package.json

@@ -129,5 +129,5 @@
   "overrides": {
     "tmp": "^0.2.4"
   },
-  "packageManager": "yarn@4.9.0"
+  "packageManager": "yarn@4.14.1"
 }

redirects.json

@@ -129,46 +129,6 @@
 		"target": "/<platform>/frontend/server-side-rendering/<*>",
 		"status": "301"
 	},
-	{
-		"source": "/<platform>/build-a-backend/add-aws-services/analytics/<*>",
-		"target": "/<platform>/frontend/analytics/<*>",
-		"status": "301"
-	},
-	{
-		"source": "/<platform>/build-a-backend/add-aws-services/geo/<*>",
-		"target": "/<platform>/frontend/geo/<*>",
-		"status": "301"
-	},
-	{
-		"source": "/<platform>/build-a-backend/add-aws-services/in-app-messaging/<*>",
-		"target": "/<platform>/frontend/in-app-messaging/<*>",
-		"status": "301"
-	},
-	{
-		"source": "/<platform>/build-a-backend/add-aws-services/rest-api/<*>",
-		"target": "/<platform>/frontend/rest-api/<*>",
-		"status": "301"
-	},
-	{
-		"source": "/<platform>/build-a-backend/add-aws-services/predictions/<*>",
-		"target": "/<platform>/frontend/predictions/<*>",
-		"status": "301"
-	},
-	{
-		"source": "/<platform>/build-a-backend/add-aws-services/logging/<*>",
-		"target": "/<platform>/frontend/logging/<*>",
-		"status": "301"
-	},
-	{
-		"source": "/<platform>/build-a-backend/add-aws-services/interactions/<*>",
-		"target": "/<platform>/frontend/interactions/<*>",
-		"status": "301"
-	},
-	{
-		"source": "/<platform>/build-a-backend/add-aws-services/pubsub/<*>",
-		"target": "/<platform>/frontend/pubsub/<*>",
-		"status": "301"
-	},
 	{
 		"source": "/<platform>/ai/conversation/<*>",
 		"target": "/<platform>/frontend/ai/conversation/<*>",
@@ -10453,5 +10413,20 @@
 		"source": "/vue/start/connect-existing-aws-resources",
 		"target": "/vue/start/connect-to-aws-resources",
 		"status": "301"
+	},
+	{
+		"source": "/<platform>/build-a-backend/q-developer/",
+		"target": "/<platform>/develop-with-ai/q-developer/",
+		"status": "301"
+	},
+	{
+		"source": "/<platform>/start/mcp-server/",
+		"target": "/<platform>/develop-with-ai/mcp-server/",
+		"status": "301"
+	},
+	{
+		"source": "/<platform>/start/mcp-server/<*>",
+		"target": "/<platform>/develop-with-ai/mcp-server/<*>",
+		"status": "301"
 	}
 ]

src/components/Breadcrumbs/__tests__/Breadcrumbs.test.tsx

@@ -6,7 +6,7 @@ describe('Breadcrumbs', () => {
   it('should render the Breadcrumbs component', async () => {
     const component = (
       <Breadcrumbs
-        route={'/react/build-a-backend/auth/set-up-auth/'}
+        route={'/[platform]/build-a-backend/auth/set-up-auth/'}
         platform={'react'}
       />
     );
@@ -18,28 +18,25 @@ describe('Breadcrumbs', () => {
   it('should render links for Breadcrumbs including platform', async () => {
     const component = (
       <Breadcrumbs
-        route={'/react/build-a-backend/auth/set-up-auth/'}
+        route={'/[platform]/build-a-backend/auth/set-up-auth/'}
         platform={'react'}
       />
     );
     render(component);
-    const routeList = component.props.route.split('/').filter(function (el) {
-      return el != '';
-    });
     const breadcrumbsNode = await screen.findByLabelText('Breadcrumb');
     const breadcrumbsList =
       breadcrumbsNode.getElementsByClassName('breadcrumb__item');
 
-    let route = '';
+    // Verify each rendered breadcrumb has a valid link
     for (let i = 0; i < breadcrumbsList.length; i++) {
       const breadcrumbLink = breadcrumbsList[i].getElementsByClassName(
         'amplify-breadcrumbs__link'
       )[0];
-      route = route + '/' + routeList[i];
-
       expect(breadcrumbLink).toBeInTheDocument();
-      expect(breadcrumbLink).toHaveAttribute('href', route);
+      expect(breadcrumbLink).toHaveAttribute('href');
     }
+    // Should have breadcrumbs for: [platform], build-a-backend, auth, set-up-auth
+    expect(breadcrumbsList.length).toBeGreaterThanOrEqual(4);
   });
 
   it('should replace "prev" with applicable version in Breadcrumbs text', async () => {
@@ -83,49 +80,48 @@ describe('Breadcrumbs', () => {
 
   it('should render links for Breadcrumbs for gen2', async () => {
     const component = (
-      <Breadcrumbs route={'/gen2/build-a-backend/auth/set-up-auth/'} />
+      <Breadcrumbs
+        route={'/[platform]/build-a-backend/auth/set-up-auth/'}
+        platform={'react'}
+      />
     );
     render(component);
-    const routeList = component.props.route.split('/').filter(function (el) {
-      return el != '';
-    });
     const breadcrumbsNode = await screen.findByLabelText('Breadcrumb');
     const breadcrumbsList =
       breadcrumbsNode.getElementsByClassName('breadcrumb__item');
 
-    let route = '';
     for (let i = 0; i < breadcrumbsList.length; i++) {
       const breadcrumbLink = breadcrumbsList[i].getElementsByClassName(
         'amplify-breadcrumbs__link'
       )[0];
-      route = route + '/' + routeList[i];
-
       expect(breadcrumbLink).toBeInTheDocument();
-      expect(breadcrumbLink).toHaveAttribute('href', route);
+      expect(breadcrumbLink).toHaveAttribute('href');
     }
   });
 
-  it('should render links for Breadcrumbs with no platform', async () => {
+  it('should skip segments without directory entries', async () => {
     const component = (
-      <Breadcrumbs route={'/build-a-backend/auth/set-up-auth/'} />
+      <Breadcrumbs
+        route={
+          '/[platform]/build-a-backend/add-aws-services/analytics/existing-resources/'
+        }
+        platform={'react'}
+      />
     );
     render(component);
-    const routeList = component.props.route.split('/').filter(function (el) {
-      return el != '';
-    });
     const breadcrumbsNode = await screen.findByLabelText('Breadcrumb');
-    const breadcrumbsList =
-      breadcrumbsNode.getElementsByClassName('breadcrumb__item');
-
-    let route = '';
-    for (let i = 0; i < breadcrumbsList.length; i++) {
-      const breadcrumbLink = breadcrumbsList[i].getElementsByClassName(
-        'amplify-breadcrumbs__link'
-      )[0];
-      route = route + '/' + routeList[i];
+    const breadcrumbsList = breadcrumbsNode.getElementsByClassName(
+      'amplify-breadcrumbs__link'
+    );
 
-      expect(breadcrumbLink).toBeInTheDocument();
-      expect(breadcrumbLink).toHaveAttribute('href', route);
-    }
+    const labels = Array.from(breadcrumbsList).map((el) => el.textContent);
+    // "add-aws-services" should be skipped since it has no directory entry
+    expect(labels).not.toContain('add-aws-services');
+    expect(labels).not.toContain(
+      '/[platform]/build-a-backend/add-aws-services'
+    );
+    // But other segments should still be present
+    expect(labels).toContain('React');
+    expect(labels).toContain('Build a Backend');
   });
 });

src/components/Breadcrumbs/index.tsx

@@ -67,6 +67,7 @@ function generateBreadcrumbs(
     if (url.includes('[platform]')) {
       href['query'] = { platform };
     }
+
     let label = directoryEntry ? directoryEntry.title : url;
 
     const override = overrides[url]
@@ -77,6 +78,11 @@ function generateBreadcrumbs(
       label = override;
     }
 
+    // Skip path segments that have no directory entry and no override.
+    // These are intermediate URL segments that were flattened out of
+    // the directory tree (e.g. "add-aws-services").
+    if (!directoryEntry && !override) return;
+
     breadcrumbs.push({
       href,
       label

src/components/Layout/Layout.tsx

@@ -374,9 +374,11 @@ export const Layout = ({
                     )}
                     {(asPathWithNoHash.includes('/push-notifications/') ||
                       asPathWithNoHash.includes('/analytics/') ||
-                      asPathWithNoHash.includes('/in-app-messaging/')) && (
-                      <PinpointEOLBanner />
-                    )}
+                      asPathWithNoHash.includes('/in-app-messaging/')) &&
+                      !asPathWithNoHash.includes('/kinesis') &&
+                      !asPathWithNoHash.includes('/firehose') && (
+                        <PinpointEOLBanner />
+                      )}
                     {asPathWithNoHash.includes('/interactions/') && (
                       <LexV1EOLBanner />
                     )}

src/data/__tests__/sections.test.ts

@@ -16,6 +16,12 @@ describe('getSectionFromPath', () => {
     );
   });
 
+  it('returns ai for /develop-with-ai/ paths', () => {
+    expect(getSectionFromPath('/react/develop-with-ai/q-developer/')).toBe(
+      'ai'
+    );
+  });
+
   it('returns backend for /build-a-backend/ paths', () => {
     expect(getSectionFromPath('/react/build-a-backend/auth/set-up-auth/')).toBe(
       'backend'
@@ -81,16 +87,23 @@ describe('getDefaultPathForSection', () => {
       '/swift/reference/'
     );
   });
+
+  it('returns ai path', () => {
+    expect(getDefaultPathForSection('ai', 'react')).toBe(
+      '/react/develop-with-ai/'
+    );
+  });
 });
 
 describe('SECTIONS config', () => {
-  it('has all 6 sections defined', () => {
+  it('has all 7 sections defined', () => {
     const keys = Object.keys(SECTIONS) as SectionKey[];
     expect(keys).toEqual([
       'quickstart',
       'backend',
       'frontend',
       'ui',
+      'ai',
       'hosting',
       'reference'
     ]);

src/data/sections.ts

@@ -2,8 +2,9 @@ export type SectionKey =
   | 'quickstart'
   | 'backend'
   | 'frontend'
-  | 'hosting'
   | 'ui'
+  | 'ai'
+  | 'hosting'
   | 'reference';
 
 export interface SectionConfig {
@@ -18,6 +19,7 @@ export const SECTIONS: Record<SectionKey, SectionConfig> = {
   backend: { label: 'Build a Backend', subtitle: 'What runs on AWS' },
   frontend: { label: 'Frontend Libraries', subtitle: 'What runs in your app' },
   ui: { label: 'UI Libraries', subtitle: 'Pre-built components' },
+  ai: { label: 'Develop with AI' },
   hosting: { label: 'Hosting' },
   reference: { label: 'Reference' }
 };
@@ -40,6 +42,8 @@ export function getDefaultPathForSection(
       return `/${platform}/deploy-and-host/`;
     case 'ui':
       return `/${platform}/build-ui/`;
+    case 'ai':
+      return `/${platform}/develop-with-ai/`;
     case 'reference':
       return `/${platform}/reference/`;
     default:
@@ -77,6 +81,7 @@ export function getSectionFromPath(path: string): SectionKey | undefined {
   if (/\/start(\/|$)/.test(path) || /\/how-amplify-works(\/|$)/.test(path)) {
     return 'quickstart';
   }
+  if (/\/develop-with-ai(\/|$)/.test(path)) return 'ai';
   if (/\/deploy-and-host(\/|$)/.test(path)) return 'hosting';
   if (/\/reference(\/|$)/.test(path)) return 'reference';
   if (/\/build-ui(\/|$)/.test(path)) return 'ui';

src/directory/directory.mjs

@@ -474,6 +474,10 @@ export const directory = {
                   path: 'src/pages/[platform]/build-a-backend/add-aws-services/analytics/set-up-analytics/index.mdx',
                 section: 'backend'
                 },
+                {
+                  path: 'src/pages/[platform]/build-a-backend/add-aws-services/analytics/kinesis/index.mdx',
+                section: 'backend'
+                },
                 {
                   path: 'src/pages/[platform]/build-a-backend/add-aws-services/analytics/existing-resources/index.mdx',
                 section: 'backend'
@@ -800,6 +804,9 @@ export const directory = {
             {
               path: 'src/pages/[platform]/frontend/analytics/index.mdx',
               children: [
+                {
+                  path: 'src/pages/[platform]/frontend/analytics/kinesis/index.mdx'
+                },
                 {
                   path: 'src/pages/[platform]/frontend/analytics/record-events/index.mdx'
                 },