Merge branch 'next-release/main' into next-release/redirects

Author: katiegoines

cspell.json

@@ -466,6 +466,7 @@
     "CSRF",
     "css",
     "Ctrl-c",
+    "customauth",
     "CUSTOM_AUTH",
     "customerEmail",
     "customizable",
@@ -1536,14 +1537,24 @@
     "autobranch",
     "gitflow",
     "SIWA",
-    "hotswap"
+    "hotswap",
+    "clijson",
+    "parametersjson"
+  ],
+  "flagWords": [
+    "hte",
+    "full-stack",
+    "Full-stack",
+    "Full-Stack",
+    "sudo"
   ],
-  "flagWords": ["hte", "full-stack", "Full-stack", "Full-Stack", "sudo"],
   "patterns": [
     {
       "name": "youtube-embed-ids",
       "pattern": "/embedId=\".*\" /"
     }
   ],
-  "ignoreRegExpList": ["youtube-embed-ids"]
+  "ignoreRegExpList": [
+    "youtube-embed-ids"
+  ]
 }

public/assets/classic-og.png

@@ -15,33 +15,49 @@ export function Command({
     <Flex className="commands-list__command">
       <CommandHeading>{name}</CommandHeading>
       <Text>{description}</Text>
+
       <MDXCode language="terminal" codeString={usage} showLineNumbers={false} />
+
       {flags && flags.length > 0 && (
         <Flex className="commands-list__command__flags">
-          {flags.map((flag: CliCommandFlag) => (
-            <Fragment key={`${name}-${flag.short}`}>
-              <code className="commands-list__command__flags__code">
-                {flag.short && <span>-{flag.short}|</span>}
-                <span>--{flag.long}</span>
-              </code>
-              <Text>{flag.description}</Text>
-            </Fragment>
-          ))}
+          <table>
+            <thead>
+              <tr>
+                <th>Flag</th>
+                <th>Description</th>
+              </tr>
+            </thead>
+            <tbody>
+              {flags.map((flag: CliCommandFlag) => (
+                <tr key={`${name}-${flag.short}`}>
+                  <td>
+                    <code>
+                      {flag.short && <span>-{flag.short}|</span>}
+                      <span>--{flag.long}</span>
+                    </code>
+                  </td>
+                  <td>{flag.description}</td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
         </Flex>
       )}
       {subCommands && subCommands.length > 0 && (
-        <Flex className="commands-list__command__subcommands">
+        <Flex
+          className="commands-list__command__subcommands"
+          alignItems="flex-start"
+          gap="small"
+        >
           {subCommands.map((subCommand) => (
             <Fragment key={`${name}-${subCommand.name}`}>
               <SubCommandHeading parentCommand={name}>
                 {subCommand.name}
               </SubCommandHeading>
               <Text>{subCommand.description}</Text>
-              <MDXCode
-                language="terminal"
-                codeString={`amplify ${name} ${subCommand.name}`}
-                showLineNumbers={false}
-              />
+              <code>
+                amplify {name} {subCommand.name}
+              </code>
             </Fragment>
           ))}
         </Flex>

public/assets/gen2-og.png

@@ -29,6 +29,7 @@ export function SubCommandHeading({
   return (
     <Heading
       className="commands-list__command__subcommands__heading"
+      marginTop="medium"
       id={value}
       level={3}
     >

public/images/gen-ai/build-settings.png

@@ -7,14 +7,17 @@ import {
 
 import { Flex } from '@aws-amplify/ui-react';
 import featureListData from '@/constants/feature-lists-data';
+import { DEFAULT_PLATFORM } from '@/data/platforms';
 import type { Platform } from '@/data/platforms';
 import { PLATFORM_DISPLAY_NAMES } from '@/data/platforms';
+import { usePathname } from 'next/navigation';
 interface PlatformFeatureListProps {
-  platform: Platform;
+  platform: Platform | typeof DEFAULT_PLATFORM;
 }
 const PlatformFeatureList: React.FC<PlatformFeatureListProps> = ({
   platform
 }) => {
+  const pathname = usePathname();
   const categories = featureListData[platform].categories;
 
   return categories.length > 0 ? (
@@ -25,8 +28,14 @@ const PlatformFeatureList: React.FC<PlatformFeatureListProps> = ({
             {category.items.map((categoryItem, index) => (
               <FeatureItem
                 linkText={categoryItem.linkText}
-                href={categoryItem.link}
-                isExternal={true}
+                href={
+                  platform === DEFAULT_PLATFORM &&
+                  pathname === '/' &&
+                  !categoryItem.isExternal
+                    ? `${platform}/${categoryItem.link}`
+                    : categoryItem.link
+                }
+                isExternal={categoryItem.isExternal}
                 key={index}
               >
                 {categoryItem.content}

public/images/gen-ai/claude.png

@@ -190,7 +190,7 @@ export const Layout = ({
         <meta property="og:url" content={metaUrl} key="og:url" />
         <meta
           property="og:image"
-          content="https://docs.amplify.aws/assets/ogp.jpg"
+          content={`https://docs.amplify.aws/assets/${isGen2 ? 'gen2' : 'classic'}-og.png`}
           key="og:image"
         />
         <meta property="description" content={description} key="description" />
@@ -203,7 +203,7 @@ export const Layout = ({
         />
         <meta
           property="twitter:image"
-          content="https://docs.amplify.aws/assets/ogp.jpg"
+          content={`https://docs.amplify.aws/assets/${isGen2 ? 'gen2' : 'classic'}-og.png`}
           key="twitter:image"
         />
       </Head>
@@ -233,7 +233,7 @@ export const Layout = ({
                     Menu
                   </Button>
 
-                  <View
+                  {/* <View
                     className={classNames(
                       'layout-search__search',
                       `layout-search__search--${pageType}`,
@@ -254,7 +254,7 @@ export const Layout = ({
                         }}
                       />
                     </View>
-                  </View>
+                  </View> */}
                 </Flex>
                 <View
                   className={classNames('layout-sidebar', {

public/images/gen-ai/login-form.png

@@ -10,7 +10,7 @@ type MenuProps = {
   path: string;
 };
 
-const invalidChildren = ['/[platform]/prev'];
+const invalidChildren = ['/[platform]/prev', '/[platform]/tools/cli-legacy', '/[platform]/sdk'];
 
 export function Menu({
   currentPlatform,

src/components/CliCommands/Command.tsx

@@ -3,7 +3,7 @@ import { ReactElement, useContext, useEffect, useState } from 'react';
 import { Link as AmplifyUILink, Flex } from '@aws-amplify/ui-react';
 import { IconExternalLink, IconChevron } from '@/components/Icons';
 import Link from 'next/link';
-import { Platform } from '@/data/platforms';
+import { JS_PLATFORMS, Platform } from '@/data/platforms';
 import { LayoutContext } from '@/components/Layout';
 import { PageNode } from 'src/directory/directory';
 
@@ -97,6 +97,14 @@ export function MenuItem({
 
   const currentStyle = current ? 'menu__list-item__link--current' : '';
 
+  let hideAPIResources = false; 
+
+  if (JS_PLATFORMS.includes(currentPlatform) 
+      && !usePathWithoutHash().includes('/prev/') 
+      && pageNode.route == 'https://aws-amplify.github.io/amplify-js/api/') {
+        hideAPIResources = true
+  }
+
   let listItemStyle = '';
   let listItemLinkStyle = '';
   let listItemLinkInnerStyle = '';
@@ -121,7 +129,10 @@ export function MenuItem({
     return <></>;
   }
 
-  if (pageNode.isExternal) {
+  if (hideAPIResources) {
+    return <></>;
+  } else if (pageNode.isExternal &&((currentPlatform && pageNode?.platforms?.includes(currentPlatform)) ||
+  !pageNode.platforms)) {
     return (
       <li key={pageNode.route} className="menu__list-item">
         <AmplifyUILink