@hashicorp/react-components 0.0.0-nightly.68ba456 → 0.0.0-nightly.7a4e895

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hashicorp/react-components",
-	"version": "0.0.0-nightly.68ba456",
+	"version": "0.0.0-nightly.7a4e895",
 	"main": "src/index.ts",
 	"scripts": {
 		"lint": "next-hashicorp lint",
@@ -11,7 +11,8 @@
 		"@hashicorp/flight-icons": "^3.7.0",
 		"@hashicorp/platform-product-meta": "^0.1.1",
 		"@hashicorp/platform-util": "^0.2.0",
-		"@hashicorp/react-design-system-components": "*",
+		"@hashicorp/react-hds": "*",
+		"@hashicorp/react-mds": "*",
 		"@hashicorp/web-mktg-logos": "*",
 		"@radix-ui/react-navigation-menu": "^1.2.0",
 		"@radix-ui/react-visually-hidden": "^1.1.0",

package/src/components/actions/index.tsx

@@ -4,8 +4,8 @@
  */
 
 import classNames from 'classnames'
-import Button from '@hashicorp/react-design-system-components/src/components/button'
-import StandaloneLink from '@hashicorp/react-design-system-components/src/components/standalone-link'
+import { HDSPlusButton } from '@hashicorp/react-mds/src/hds-plus/button'
+import { HDSPlusStandaloneLink } from '@hashicorp/react-mds/src/hds-plus/standalone-link'
 import { IconArrowRight16 } from '@hashicorp/flight-icons/svg-react/arrow-right-16'
 import { IconArrowRight24 } from '@hashicorp/flight-icons/svg-react/arrow-right-24'
 import type { ActionsProps } from './types'
@@ -49,7 +49,7 @@ export default function Actions({
 				// have the `primary` and `secondary` variations respectively.
 
 				const standaloneLinkVariant: ComponentProps<
-					typeof StandaloneLink
+					typeof HDSPlusStandaloneLink
 				>['color'] =
 					index === 0
 						? 'primary'
@@ -60,7 +60,7 @@ export default function Actions({
 
 				if (isStandaloneLink) {
 					return (
-						<StandaloneLink
+						<HDSPlusStandaloneLink
 							// eslint-disable-next-line react/no-array-index-key
 							key={index}
 							text={cta.title}
@@ -89,7 +89,7 @@ export default function Actions({
 					)
 				} else {
 					return (
-						<Button
+						<HDSPlusButton
 							// eslint-disable-next-line react/no-array-index-key
 							key={index}
 							text={cta.title}

package/src/components/call-to-action/index.tsx

@@ -4,9 +4,9 @@
  */
 
 import type { ComponentProps, ReactNode } from 'react'
-import Button from '@hashicorp/react-design-system-components/src/components/button'
-import ButtonSet from '@hashicorp/react-design-system-components/src/components/button-set'
-import StandaloneLink from '@hashicorp/react-design-system-components/src/components/standalone-link'
+import { HDSPlusButton } from '@hashicorp/react-mds/src/hds-plus/button'
+import ButtonSet from '@hashicorp/react-hds/src/components/button-set'
+import { HDSPlusStandaloneLink } from '@hashicorp/react-mds/src/hds-plus/standalone-link'
 import { IconArrowRight24 } from '@hashicorp/flight-icons/svg-react/arrow-right-24'
 import { IconExternalLink24 } from '@hashicorp/flight-icons/svg-react/external-link-24'
 import { IconDownload24 } from '@hashicorp/flight-icons/svg-react/download-24'
@@ -119,7 +119,7 @@ function CallToAction({
 					{links && (
 						<ButtonSet className={s.links} data-testid="links">
 							{links.map((link, stableIdx) => {
-								let color: ComponentProps<typeof Button>['color'] =
+								let color: ComponentProps<typeof HDSPlusButton>['color'] =
 									variant === 'links'
 										? 'tertiary'
 										: stableIdx === 0
@@ -128,7 +128,7 @@ function CallToAction({
 
 								if (color === 'tertiary') {
 									return (
-										<StandaloneLink
+										<HDSPlusStandaloneLink
 											key={stableIdx}
 											color="secondary"
 											text={link.text}
@@ -158,7 +158,7 @@ function CallToAction({
 									color = 'secondary'
 								} else if (theme === 'brand' && color === 'secondary') {
 									return (
-										<StandaloneLink
+										<HDSPlusStandaloneLink
 											key={stableIdx}
 											color="secondary-inverted"
 											text={link.text}
@@ -177,7 +177,7 @@ function CallToAction({
 								}
 
 								return (
-									<Button
+									<HDSPlusButton
 										// eslint-disable-next-line react/no-array-index-key
 										key={stableIdx}
 										// className={s.button}

package/src/components/card/partner-card/index.tsx

@@ -4,9 +4,9 @@
  */
 
 import Image, { type ImageProps } from 'next/image'
-import Badge from '@hashicorp/react-design-system-components/src/components/badge'
-import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
-import { TextPlus } from '@hashicorp/react-design-system-components/src/components/text'
+import Badge from '@hashicorp/react-hds/src/components/badge'
+import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
+import { TextPlus } from '@hashicorp/react-hds/src/components/text'
 import * as CardPrimitives from '../primitives'
 import type { CardProps } from '../types'
 import s from './style.module.css'

package/src/components/card/person-card/index.tsx

@@ -4,7 +4,7 @@
  */
 
 import { memo, type ReactNode } from 'react'
-import { TextPlus } from '@hashicorp/react-design-system-components/src/components/text'
+import { TextPlus } from '@hashicorp/react-hds/src/components/text'
 import { IconGithub16 } from '@hashicorp/flight-icons/svg-react/github-16'
 import { IconTwitter16 } from '@hashicorp/flight-icons/svg-react/twitter-16'
 import { IconLinkedin16 } from '@hashicorp/flight-icons/svg-react/linkedin-16'

package/src/components/card/primitives.tsx

@@ -7,8 +7,8 @@ import * as React from 'react'
 import classNames from 'classnames'
 import Image from 'next/image'
 import Link from 'next/link'
-import HDSCard from '@hashicorp/react-design-system-components/src/components/card'
-import { TextPlus } from '@hashicorp/react-design-system-components/src/components/text'
+import HDSCard from '@hashicorp/react-hds/src/components/card'
+import { TextPlus } from '@hashicorp/react-hds/src/components/text'
 import { IconArrowRight24 } from '@hashicorp/flight-icons/svg-react/arrow-right-24'
 import ProductBadge from '../product-badge'
 import type {

package/src/components/card/resource-card/index.tsx

@@ -13,6 +13,7 @@ export interface ResourceCardProps {
 	link: string
 	productBadges?: CardProps['productBadges']
 	thumbnail: ThumbnailProps
+	isExternal?: CardProps['isExternal']
 }
 
 export function ResourceCard({
@@ -22,6 +23,7 @@ export function ResourceCard({
 	link,
 	productBadges,
 	thumbnail,
+	isExternal,
 }: ResourceCardProps) {
 	const meta: string[] = date ? [date, category] : [category]
 
@@ -32,6 +34,7 @@ export function ResourceCard({
 			meta={meta}
 			productBadges={productBadges}
 			thumbnail={thumbnail}
+			isExternal={isExternal}
 		/>
 	)
 }

package/src/components/card/unified-card/index.tsx

@@ -4,7 +4,7 @@
  */
 
 import type { ReactNode } from 'react'
-import Badge from '@hashicorp/react-design-system-components/src/components/badge'
+import Badge from '@hashicorp/react-hds/src/components/badge'
 import * as CardPrimitives from '../primitives'
 import type { CardProps } from '../types'
 

package/src/components/marketo-form/contexts/FormMetadata.ts

@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
+'use client'
+
 import { createContext } from 'react'
 import type { MarketoFormMetadata } from '../types'
 

package/src/components/marketo-form/form/index.tsx

@@ -3,9 +3,11 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
+'use client'
+
 import { useEffect, useMemo, useRef } from 'react'
 import { useForm, FormProvider } from 'react-hook-form'
-import Button from '@hashicorp/react-design-system-components/src/components/button'
+import { HDSPlusButton } from '@hashicorp/react-mds/src/hds-plus/button'
 import VisibilityRule from '../partials/visibility-rule'
 import NameField from '../partials/fields/name-field'
 import { FormMetadataContext } from '../contexts/FormMetadata'
@@ -345,7 +347,7 @@ const Form = ({
 							/>
 						)
 					})}
-					<Button
+					<HDSPlusButton
 						type="submit"
 						size="large"
 						disabled={

package/src/components/marketo-form/partials/fields/checkbox-field/index.tsx

@@ -5,7 +5,7 @@
 
 import { useFormContext } from 'react-hook-form'
 // import CheckboxInput from '@hashicorp/react-form-fields/checkbox'
-import Checkbox from '@hashicorp/react-design-system-components/src/components/form/checkbox'
+import Checkbox from '@hashicorp/react-hds/src/components/form/checkbox'
 import FieldWrapper from '../../field-wrapper'
 import { formattedLabel, useErrorMessage } from '../../../utils'
 import type { MarketoFormCheckboxField } from '../../../types'

package/src/components/marketo-form/partials/fields/email-field/index.tsx

@@ -5,7 +5,7 @@
 
 import { useFormContext } from 'react-hook-form'
 // import TextInput from '@hashicorp/react-form-fields/text'
-import TextInput from '@hashicorp/react-design-system-components/src/components/form/text-input'
+import TextInput from '@hashicorp/react-hds/src/components/form/text-input'
 import FieldWrapper from '../../field-wrapper'
 import { formattedLabel, useErrorMessage } from '../../../utils'
 import type { MarketoFormEmailField } from '../../../types'

package/src/components/marketo-form/partials/fields/form-page-url-field/index.tsx

@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
+'use client'
+
 import { useEffect } from 'react'
 import { useFormContext } from 'react-hook-form'
 import type { MarketoFormHiddenField } from '../../../types'

package/src/components/marketo-form/partials/fields/hidden-field/index.tsx

@@ -2,6 +2,7 @@
  * Copyright (c) HashiCorp, Inc.
  * SPDX-License-Identifier: MPL-2.0
  */
+'use client'
 
 import { useEffect } from 'react'
 import { useFormContext } from 'react-hook-form'

package/src/components/marketo-form/partials/fields/radio-buttons-field/index.tsx

@@ -1,7 +1,7 @@
 import { useFormContext } from 'react-hook-form'
 import RadioCard, {
 	RadioCardGroup,
-} from '@hashicorp/react-design-system-components/src/components/form/radio-card'
+} from '@hashicorp/react-hds/src/components/form/radio-card'
 import FieldWrapper from '../../field-wrapper'
 import type { MarketoFormRadioButtonsField } from '../../../types'
 

package/src/components/marketo-form/partials/fields/select-field/index.tsx

@@ -4,7 +4,7 @@
  */
 
 import { useFormContext } from 'react-hook-form'
-import Select from '@hashicorp/react-design-system-components/src/components/form/select'
+import Select from '@hashicorp/react-hds/src/components/form/select'
 import FieldWrapper from '../../field-wrapper'
 import { formattedLabel, useErrorMessage } from '../../../utils'
 import type { MarketoFormSelectField } from '../../../types'

package/src/components/marketo-form/partials/fields/telephone-field/index.tsx

@@ -4,7 +4,7 @@
  */
 
 import { useFormContext } from 'react-hook-form'
-import TextInput from '@hashicorp/react-design-system-components/src/components/form/text-input'
+import TextInput from '@hashicorp/react-hds/src/components/form/text-input'
 import FieldWrapper from '../../field-wrapper'
 import { formattedLabel, useErrorMessage } from '../../../utils'
 import type { MarketoFormTelephoneField } from '../../../types'

package/src/components/marketo-form/partials/fields/text-field/index.tsx

@@ -4,7 +4,7 @@
  */
 
 import { useFormContext } from 'react-hook-form'
-import TextInput from '@hashicorp/react-design-system-components/src/components/form/text-input'
+import TextInput from '@hashicorp/react-hds/src/components/form/text-input'
 import FieldWrapper from '../../field-wrapper'
 import { formattedLabel, useErrorMessage } from '../../../utils'
 import type { MarketoFormTextField } from '../../../types'

package/src/components/marketo-form/partials/fields/textarea-field/index.tsx

@@ -4,7 +4,7 @@
  */
 
 import { useFormContext } from 'react-hook-form'
-import Textarea from '@hashicorp/react-design-system-components/src/components/form/textarea'
+import Textarea from '@hashicorp/react-hds/src/components/form/textarea'
 import FieldWrapper from '../../field-wrapper'
 import { formattedLabel, useErrorMessage } from '../../../utils'
 import type { MarketoFormTextAreaField } from '../../../types'

package/src/components/marketo-form/types.ts

@@ -15,6 +15,7 @@ export type MarketoFormDatatype =
 	| 'hidden'
 	| 'htmltext'
 	| 'radioButtons'
+	| 'fieldset'
 
 export interface Autofill {
 	value: string
@@ -41,7 +42,7 @@ export interface MarketoBaseFormField {
 	columnNumber: number
 	defaultValue?: string
 	label?: string
-	required: boolean
+	required?: boolean
 	validationMessage?: string
 	autoFill?: Autofill
 	visibilityRules?: VisibilityRules
@@ -106,12 +107,9 @@ export interface MarketoFormHiddenField extends MarketoBaseFormField {
 	dataType: 'hidden'
 }
 
-export interface MarketoFormHtmltextField {
-	id: string
-	labelWidth: number
+export interface MarketoFormHtmltextField extends MarketoBaseFormField {
 	dataType: 'htmltext'
-	rowNumber: number
-	columnNumber: number
+	labelWidth: number
 	visibilityRules?: VisibilityRules
 	text: string
 }
@@ -125,12 +123,8 @@ export interface MarketoFormRadioButtonsField extends MarketoBaseFormField {
 	}
 }
 
-export interface MarketoFormFieldset {
-	id: string
-	label?: string
+export interface MarketoFormFieldset extends MarketoBaseFormField {
 	dataType: 'fieldset'
-	rowNumber: number
-	columnNumber: number
 	visibilityRules?: VisibilityRules
 	fields: Array<string>
 }

package/src/components/nav-panel/components/link-list/index.tsx

@@ -1,11 +1,12 @@
 import Link from 'next/link'
 import { parseUrl } from '../../../../lib/parse-url'
 import { vercelSplit } from '../../../../lib/v'
-import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
+import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import s from './style.module.css'
 
 export interface LinkListProps {
+	locale?: string
 	links: {
 		title: string
 		url: string
@@ -37,7 +38,21 @@ const GRADIENT_VALUE_MAP = new Map([
 	],
 ])
 
-export default function LinkList({ links, linkClickHandler }: LinkListProps) {
+function getLocalizedHref(url: string, locale?: string): string {
+	const parsedHref = parseUrl(url).href
+
+	if (parsedHref.startsWith('/') && locale) {
+		return `/${locale}${parsedHref}`
+	}
+
+	return parsedHref
+}
+
+export default function LinkList({
+	locale,
+	links,
+	linkClickHandler,
+}: LinkListProps) {
 	return (
 		<ul className={s.linkList}>
 			{links.map((link) => {
@@ -53,8 +68,9 @@ export default function LinkList({ links, linkClickHandler }: LinkListProps) {
 					<li key={link.title}>
 						<NavigationMenu.Link asChild>
 							<Link
+								hrefLang={locale ? locale : undefined}
 								className={s.link}
-								href={parseUrl(link.url).href}
+								href={getLocalizedHref(link.url, locale)}
 								onClickCapture={() => {
 									linkClickHandler && linkClickHandler(link.title, link.url)
 								}}

package/src/components/nav-panel/components/promo/index.tsx

@@ -2,13 +2,15 @@ import { useCallback } from 'react'
 import classNames from 'classnames'
 import { vercelSplit } from '../../../../lib/v'
 import Link from 'next/link'
-import { parseUrl } from '../../../../lib/parse-url'
+import { getLocalizedHref } from '@web/utils/get-localized-href'
+
 import { trackNavClickEvent } from '../../../../lib/track-nav-click-event'
-import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
+import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import s from './style.module.css'
 
 export interface PromoProps {
+	locale?: string
 	title: string
 	description: string
 	linkUrl: string
@@ -20,6 +22,7 @@ export interface PromoProps {
 }
 
 export default function Promo({
+	locale,
 	title,
 	description,
 	linkUrl,
@@ -72,7 +75,9 @@ export default function Promo({
 				</div>
 				<NavigationMenu.Link asChild>
 					<Link
-						href={parseUrl(linkUrl).href}
+						locale={locale ? locale : undefined}
+						href={getLocalizedHref(linkUrl, locale)}
+						hrefLang={locale ? locale : undefined}
 						className={s.link}
 						onClickCapture={() => handleClick(title, linkUrl, linkTitle, slug)}
 					>

package/src/components/nav-panel/product-panel/index.tsx

@@ -2,10 +2,10 @@ import classNames from 'classnames'
 import Link from 'next/link'
 import * as NavPanel from '../components/panel'
 import Promo, { type PromoProps } from '../components/promo'
+import { getLocalizedHref } from '@web/utils/get-localized-href'
 import { Products } from '@hashicorp/platform-product-meta'
-import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
-import { TextPlus } from '@hashicorp/react-design-system-components/src/components/text'
-import { parseUrl } from '../../../lib/parse-url'
+import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
+import { TextPlus } from '@hashicorp/react-hds/src/components/text'
 import { trackNavClickEvent } from '../../../lib/track-nav-click-event'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import s from './style.module.css'
@@ -30,6 +30,7 @@ const PRODUCT_LOGO_EXCEPTION_CLASSNAMES = {
 }
 
 export interface ProductsPanelProps {
+	locale: string
 	productCategories: any
 	promo?: PromoProps
 	sidePanel?: {
@@ -44,6 +45,7 @@ export interface ProductsPanelProps {
 }
 
 const ProductPanel = ({
+	locale,
 	productCategories,
 	promo,
 	sidePanel,
@@ -67,7 +69,7 @@ const ProductPanel = ({
 										{products.map((product) => {
 											return (
 												<li key={product.url}>
-													<NavProduct {...product} />
+													<NavProduct locale={locale} {...product} />
 												</li>
 											)
 										})}
@@ -97,7 +99,9 @@ const ProductPanel = ({
 								<li key={title}>
 									<Link
 										aria-label={`${title} - ${description}`}
-										href={parseUrl(url).href}
+										href={getLocalizedHref(url, locale)}
+										hrefLang={locale ? locale : undefined}
+										locale={locale ? locale : undefined}
 										className={classNames(s.sidePanelItem, s.focusIndicator)}
 									>
 										<div className={s.iconBackground}>
@@ -125,17 +129,20 @@ const ProductPanel = ({
 }
 
 export interface NavProductProps {
+	locale?: string
 	url: string
 	product: Products | string
 	description: string
 }
 
-function NavProduct({ url, product, description }: NavProductProps) {
+function NavProduct({ locale, url, product, description }: NavProductProps) {
 	return (
 		<NavigationMenu.Link asChild>
 			<Link
 				aria-label={`${product} - ${description}`}
-				href={parseUrl(url).href}
+				href={getLocalizedHref(url, locale)}
+				hrefLang={locale ? locale : undefined}
+				locale={locale ? locale : undefined}
 				onClickCapture={() => {
 					trackNavClickEvent(product, url, 'products')
 				}}

package/src/components/nav-panel/standard-panel/index.tsx

@@ -12,12 +12,14 @@ interface StandardPanelProps {
 	navData: NavItem[]
 	promo?: PromoProps
 	sectionName?: string
+	locale?: any
 }
 
 const StandardPanel = ({
 	navData,
 	promo,
 	sectionName = '',
+	locale,
 }: StandardPanelProps) => {
 	return (
 		<NavPanel.Root>
@@ -26,6 +28,7 @@ const StandardPanel = ({
 					return (
 						<NavPanel.Column key={stableIdx}>
 							<LinkList
+								locale={locale}
 								links={navItems}
 								linkClickHandler={(text, href) => {
 									trackNavClickEvent(text, href, sectionName)

package/src/components/next-steps/index.tsx

@@ -2,6 +2,7 @@
  * Copyright (c) HashiCorp, Inc.
  * SPDX-License-Identifier: MPL-2.0
  */
+'use client'
 
 import { useState } from 'react'
 import Badge from '@hashicorp/react-badge'
@@ -10,7 +11,7 @@ import ExpandableArrow from '@hashicorp/react-expandable-arrow'
 import Intro from '../intro'
 import Link from 'next/link'
 import type { NextStepsProps } from './types'
-import StandaloneLink from '@hashicorp/react-design-system-components/src/components/standalone-link'
+import { HDSPlusStandaloneLink } from '@hashicorp/react-mds/src/hds-plus/standalone-link'
 import { IconArrowRight16 } from '@hashicorp/flight-icons/svg-react/arrow-right-16'
 import useProductMeta from '@hashicorp/platform-product-meta'
 import s from './style.module.css'
@@ -69,7 +70,7 @@ export default function NextSteps({
 					{cta ? (
 						<div className={s.cta}>
 							<p className={s.ctaCopy}>{cta.copy}</p>
-							<StandaloneLink
+							<HDSPlusStandaloneLink
 								href={cta.href}
 								text={cta.ctaText}
 								icon={

package/src/components/product-badge/index.tsx

@@ -4,7 +4,7 @@
  */
 
 import type { Products } from '@hashicorp/platform-product-meta'
-import Badge from '@hashicorp/react-design-system-components/src/components/badge'
+import Badge from '@hashicorp/react-hds/src/components/badge'
 import { IconDot16 } from '@hashicorp/flight-icons/svg-react/dot-16'
 import s from './style.module.css'
 

package/src/components/subnav/index.tsx

@@ -18,6 +18,7 @@ import traverse, { isObject } from './helpers/traverse'
 import { areBasePathsMatching } from './helpers/areBasePathsMatching'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import s from './style.module.css'
+import { getLocalizedHref } from '@web/utils/get-localized-href'
 
 const productAllowList = {
 	consul: 'consul',
@@ -46,6 +47,7 @@ type SubnavDropdown = {
 type MenuItem = SubnavLink | SubnavDropdown | 'divider'
 
 export interface SubnavInnerProps {
+	locale?: string
 	hasOverflow?: boolean
 	titleLink: { text: string; url: string }
 	product?: Products
@@ -61,6 +63,7 @@ export interface SubnavInnerProps {
 }
 
 function SubnavInner({
+	locale,
 	hasOverflow,
 	titleLink,
 	product,
@@ -109,17 +112,20 @@ function SubnavInner({
 			>
 				<NavigationMenu.Link asChild>
 					<TitleLink
+						locale={locale}
 						text={titleLink.text}
-						url={titleLink.url}
+						url={getLocalizedHref(titleLink.url)}
 						product={product}
 						theme={theme}
 					/>
 				</NavigationMenu.Link>
+
 				{!hasOverflow && (
 					<div className={s.subNavRight}>
 						<MenuItemsDefault
 							menuItems={menuItemsWithActive}
 							activatePanel={activatePanel}
+							locale={locale}
 						/>
 						{ctaLinks?.length > 0 && (
 							<CtaLinks

package/src/components/subnav/partials/CtaLinks/index.tsx

@@ -3,19 +3,20 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import Button, {
-	type ButtonProps,
-} from '@hashicorp/react-design-system-components/src/components/button'
-import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
+import {
+	HDSPlusButton,
+	type HDSPlusButtonProps,
+} from '@hashicorp/react-mds/src/hds-plus/button'
+import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
 import type { Products } from '@hashicorp/platform-product-meta'
-import type { ToggleButtonProps } from '@hashicorp/react-design-system-components/src/components/dropdown/toggle/button'
-import * as Dropdown from '@hashicorp/react-design-system-components/src/components/dropdown'
+import type { ToggleButtonProps } from '@hashicorp/react-hds/src/components/dropdown/toggle/button'
+import * as Dropdown from '@hashicorp/react-hds/src/components/dropdown'
 import GithubStarsLink from './github-stars-link'
 import classNames from 'classnames'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import s from './style.module.css'
 
-type CtaLink = ButtonProps & { href: string; __typename?: string }
+type CtaLink = HDSPlusButtonProps & { href: string; __typename?: string }
 
 type CtaDropdown = {
 	__typename?: string
@@ -83,7 +84,7 @@ function CtaLinks({
 						const isLastButton = stableIdx === links.length - 1
 
 						return (
-							<Button
+							<HDSPlusButton
 								key={href}
 								text={text}
 								href={href}

package/src/components/subnav/partials/DropdownTrigger/index.tsx

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
+import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
 import NavItemText from '../nav-item-text'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import s from './style.module.css'

package/src/components/subnav/partials/MenuItemsDefault/index.tsx

@@ -9,7 +9,8 @@ import NavItemText from '../nav-item-text'
 import DropdownTrigger from '../DropdownTrigger'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import s from './style.module.css'
-import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
+import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
+import { getLocalizedHref } from '@web/utils/get-localized-href'
 
 interface MenuItemsDefaultProps {
 	menuItems: (
@@ -27,10 +28,11 @@ interface MenuItemsDefaultProps {
 		| 'divider'
 	)[]
 	activatePanel: (panel: string) => void
+	locale?: string
 }
 
 function MenuItemsDefault(props: MenuItemsDefaultProps) {
-	const { menuItems, activatePanel } = props
+	const { menuItems, activatePanel, locale } = props
 	return (
 		<NavigationMenu.List className={s.root}>
 			{menuItems.map((menuItem, stableIdx) => {
@@ -47,6 +49,7 @@ function MenuItemsDefault(props: MenuItemsDefaultProps) {
 						text={text}
 						submenu={submenu}
 						activatePanel={activatePanel}
+						locale={locale}
 					/>
 				) : (
 					<NavLink
@@ -56,6 +59,7 @@ function MenuItemsDefault(props: MenuItemsDefaultProps) {
 						text={text}
 						url={url}
 						isActive={_isActiveUrl}
+						locale={locale}
 					/>
 				)
 			})}
@@ -75,14 +79,19 @@ interface NavLinkProps {
 	text: string
 	url: string
 	isActive: boolean
+	locale?: string
 }
 
 function NavLink(props: NavLinkProps) {
-	const { text, url, isActive } = props
+	const { text, url, isActive, locale } = props
 	return (
 		<NavigationMenu.Item className={s.listItem}>
 			<NavigationMenu.Link asChild>
-				<Link className={s.navLink} href={url}>
+				<Link
+					className={s.navLink}
+					href={getLocalizedHref(url, locale)}
+					hrefLang={props.locale ? props.locale : undefined}
+				>
 					<NavItemText isActive={isActive} text={text} />
 				</Link>
 			</NavigationMenu.Link>
@@ -94,6 +103,7 @@ interface NavLinkWithDropdownProps {
 	text: string
 	submenu: { icon: string; text: string; url: string; _isActiveUrl: string }[]
 	activatePanel: (panel: string) => void
+	locale?: string
 }
 
 interface NavLinkWithDropdownState {
@@ -105,7 +115,7 @@ class NavLinkWithDropdown extends React.Component<
 	NavLinkWithDropdownState
 > {
 	render() {
-		const { text, submenu, activatePanel } = this.props
+		const { text, submenu, activatePanel, locale } = this.props
 		const hasActiveChild = submenu.some((s) => s._isActiveUrl)
 
 		const handleFocusOutside = () => {
@@ -139,7 +149,11 @@ class NavLinkWithDropdown extends React.Component<
 									// eslint-disable-next-line react/no-array-index-key
 									<NavigationMenu.Item key={stableIdx}>
 										<NavigationMenu.Link asChild>
-											<Link className={s.submenuItem} href={url}>
+											<Link
+												className={s.submenuItem}
+												href={getLocalizedHref(url, locale)}
+												hrefLang={locale ? locale : undefined}
+											>
 												{icon ? <FlightIcon name={icon} /> : null}
 												{text}
 											</Link>

package/src/components/subnav/partials/MenuItemsOverflow/index.tsx

@@ -12,7 +12,8 @@ import DropdownTrigger from '../DropdownTrigger'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import classNames from 'classnames'
 import s from './style.module.css'
-import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
+import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
+import { getLocalizedHref } from '@web/utils/get-localized-href'
 
 interface MenuItemsOverflowProps {
 	menuItems: (
@@ -29,6 +30,7 @@ interface MenuItemsOverflowProps {
 	menuText: string
 	constrainWidth?: boolean
 	activatePanel: (panel: string) => void
+	locale?: string
 }
 
 interface MenuItemsOverflowState {
@@ -48,6 +50,7 @@ class MenuItemsOverflow extends React.Component<
 			menuText,
 			constrainWidth,
 			activatePanel,
+			locale,
 		} = this.props
 
 		const handleFocusOutside = () => {
@@ -91,6 +94,7 @@ class MenuItemsOverflow extends React.Component<
 													url={subItem.url}
 													text={subItem.text}
 													icon={subItem.icon}
+													locale={locale}
 												/>
 											))}
 											<hr className={s.divider} />
@@ -125,13 +129,19 @@ interface SubmenuItemProps {
 	icon?: string
 	url: string
 	text: string
+	locale?: string
 }
 
-function SubmenuItem({ icon, url, text }: SubmenuItemProps) {
+function SubmenuItem({ icon, url, text, locale }: SubmenuItemProps) {
 	return (
 		<li>
 			<NavigationMenu.Link asChild>
-				<Link className={s.submenuItem} href={url} title={vercelSplit(text)}>
+				<Link
+					className={s.submenuItem}
+					href={getLocalizedHref(url, locale)}
+					title={vercelSplit(text)}
+					hrefLang={locale ? locale : undefined}
+				>
 					{icon ? <FlightIcon name={icon} /> : null}
 					{text}
 				</Link>

package/src/components/subnav/partials/TitleLink/index.tsx

@@ -41,6 +41,7 @@ const logoDict = {
 }
 
 interface TitleLinkProps {
+	locale?: string
 	text: string
 	url: string
 	product?: string
@@ -80,7 +81,7 @@ function getLogo(
 }
 
 const TitleLink = forwardRef<HTMLAnchorElement, TitleLinkProps>(
-	({ text, url, product, theme }, ref) => {
+	({ text, url, product, theme, locale }, ref) => {
 		const parsedText = vercelSplit(text)
 		const Logo = getLogo(parsedText, theme)
 
@@ -94,6 +95,7 @@ const TitleLink = forwardRef<HTMLAnchorElement, TitleLinkProps>(
 				href={url}
 				title={parsedText}
 				ref={ref}
+				hrefLang={locale ? locale : undefined}
 			>
 				{Logo ? (
 					<Image

package/src/components/subnav/style.module.css

@@ -44,7 +44,7 @@
 
 .subnavInner {
 	display: grid;
-	grid-template-columns: minmax(max-content, 1fr) min-content;
+	grid-template-columns: max-content min-content;
 	align-items: center;
 	justify-content: space-between;
 	min-height: 62px;

package/src/lib/parse-url/index.test.ts

@@ -1,4 +1,4 @@
-import { parseUrl } from '.'
+import { parseUrl, hasHashiCorpDestination } from '.'
 
 describe('parseUrl', () => {
 	it('detects hashicorp.com URLs as internal', () => {
@@ -7,6 +7,12 @@ describe('parseUrl', () => {
 		expect(url.linkType).toBe('inbound')
 	})
 
+	it('detects www.hashicorp.com URLs as internal', () => {
+		const url = parseUrl('https://hashicorp.com/foo')
+		expect(url.href).toBe('/foo')
+		expect(url.linkType).toBe('inbound')
+	})
+
 	it('detects URLs not containing hashicorp.com as external', () => {
 		const externalUrl = 'https://google.com/example'
 		const url = parseUrl(externalUrl)
@@ -28,8 +34,36 @@ describe('parseUrl', () => {
 		expect(url.href).toBe('/resources?type=case-study&products=terraform')
 	})
 
+	it('leaves URL hash intact', () => {
+		const url = parseUrl('https://hashicorp.com/about#leadership')
+		expect(url.href).toBe('/about#leadership')
+	})
+
 	it('leaves HashiCorp subdomain URLs intact', () => {
 		const url = parseUrl('https://developer.hashicorp.com/terraform')
 		expect(url.href).toBe('https://developer.hashicorp.com/terraform')
 	})
 })
+
+describe('hasHashiCorpDestination', () => {
+	it('returns true for supported hashicorp domains', () => {
+		const isHashiCorpDestination = hasHashiCorpDestination(
+			'https://portal.cloud.hashicorp.com/foo'
+		)
+		expect(isHashiCorpDestination).toBe(true)
+	})
+	it('returns false for external domains', () => {
+		const isHashiCorpDestination = hasHashiCorpDestination(
+			'https://foo.com/bar'
+		)
+		expect(isHashiCorpDestination).toBe(false)
+	})
+	it('returns true for relative links', () => {
+		const isHashiCorpDestination = hasHashiCorpDestination('/bar')
+		expect(isHashiCorpDestination).toBe(true)
+	})
+	it('returns true for hashes', () => {
+		const isHashiCorpDestination = hasHashiCorpDestination('#someHash')
+		expect(isHashiCorpDestination).toBe(true)
+	})
+})

package/src/lib/parse-url/index.ts

@@ -1,9 +1,47 @@
+export const hashicorpDestinations: string[] = [
+	'app.terraform.io',
+	'boundaryproject.io',
+	'cloud.hashicorp.com',
+	'consul.io',
+	'developer.hashicorp.com',
+	'hashicorp.com',
+	'nomadproject.io',
+	'packer.io',
+	'portal.cloud.hashicorp.com',
+	'registry.terraform.io',
+	'terraform.io',
+	'vagrantup.com',
+	'vaultproject.io',
+	'waypointproject.io',
+] as const
+
+const containsHashiCorpDestination = (str: string): boolean =>
+	hashicorpDestinations.some(function (destination) {
+		return str.indexOf(destination) >= 0
+	})
+
+/**
+ * This function determines if a `url` is a HashiCorp link (relative URLs, hashes,
+ * or a url with a HashiCorp domain) or a  non-HashiCorp link.
+ *
+ * @param {string | undefined} url - The URL to be parsed. It may be a relative URL, an anchor, or a full external/internal URL.
+ *
+ * @returns {{ linkType: 'inbound' | 'outbound', href: string }}
+ *   An object with two properties:
+ *     - `linkType`: Indicates whether the URL is 'inbound' or 'outbound'. Can be used to conditionally
+ * 		     render the value of the target attribute.
+ *     - `href`: The parsed href (may include pathname, search, and hash for internal URLs).
+ *
+ * @throws {Error} Throws an error if the URL is undefined or invalid.
+ */
+
 export function parseUrl(url: string | undefined): {
-	linkType: 'inbound' | 'outbound'
+	linkType: 'inbound' | 'outbound' | ''
 	href: string
 } {
 	if (!url) {
-		throw new Error('url is required')
+		console.log('No url to parse, returning empty string')
+		return { linkType: '', href: '' }
 	}
 
 	if (isRelative(url) || isAnchor(url)) {
@@ -12,21 +50,50 @@ export function parseUrl(url: string | undefined): {
 
 	if (isInternal(url)) {
 		try {
-			const { pathname, search } = new URL(url)
-			const href = pathname + search
+			const { pathname, search, hash } = new URL(url)
+			const href = pathname + search + hash
 			return { linkType: 'inbound', href }
 		} catch (error) {
-			throw new Error(`Invalid href: ${url}`)
+			console.log(`Invalid href: ${url}`)
+			return { linkType: '', href: '' }
 		}
 	}
 
 	return { linkType: 'outbound', href: url }
 }
 
-const isRelative = (url) => url.startsWith('/')
-const isAnchor = (url) => url.startsWith('#')
+const isRelative = (url: string) => url.startsWith('/')
+const isAnchor = (url: string) => url.startsWith('#')
+
+/**
+ * Determines whether the provided url uses hashicorp.com or www.hashicorp.com as the hostname.
+ *
+ * @param {string} url - The URL to check.
+ * @returns {boolean} - Returns true if the link uses a HashiCorp domain, otherwise false.
+ */
 
-export const isInternal = (url) => {
+export const isInternal = (url: string): boolean => {
 	const hostname = new URL(url).hostname
-	return hostname === 'hashicorp.com'
+	return hostname === 'hashicorp.com' || hostname === 'www.hashicorp.com'
+}
+
+/**
+ * Determines whether the provided url uses a HashiCorp hostname. This is used in several
+ * components to open a new tab for non-HashiCorp links.
+ *
+ * @param {string} url - The URL to check.
+ * @returns {boolean} - Returns true if the link uses a HashiCorp domain, otherwise false.
+ */
+
+export const hasHashiCorpDestination = (url: string): boolean => {
+	// Fast return in case a relative URL or anchor is passed in
+	if (isRelative(url) || isAnchor(url)) return true
+	try {
+		const hostname = new URL(url).hostname
+		const isHashiCorpDestination = containsHashiCorpDestination(hostname)
+		return isHashiCorpDestination
+	} catch (e) {
+		console.error('Error: `url` is not a valid URL', e)
+		return false
+	}
 }