Solve build issues, EditBillingAddressForm missing

graphcommerce-org · Feb 17, 2025 · 303f992 · 303f992
1 parent 6224558
commit 303f992
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/packages/magento-cart/components/index.ts b/packages/magento-cart/components/index.ts
@@ -12,3 +12,4 @@ export * from './CartSummary/CartSummary.gql'
 export * from './CartTotals/CartTotals'
 export * from './EmptyCart/EmptyCart'
 export * from './InlineAccount/InlineAccount'
+export * from './EditBillingAddressForm/EditBillingAddressForm'
diff --git a/packages/magento-store/components/GlobalHead/GlobalHead.tsx b/packages/magento-store/components/GlobalHead/GlobalHead.tsx
@@ -6,10 +6,10 @@ import { getImageProps } from 'next/image'
 import React from 'react'
 import { StoreConfigDocument } from '../../graphql'
 
-export type GlobalHeadProps = Omit<GlobalHeadPropsBase, 'name'> & { disableIcon?: boolean }
+export type GlobalHeadProps = Omit<GlobalHeadPropsBase, 'name'>
 
 export const GlobalHead = React.memo<GlobalHeadProps>((props) => {
-  const { children, disableIcon = false } = props
+  const { children } = props
   const name = useQuery(StoreConfigDocument).data?.storeConfig?.website_name ?? ''
 
   const { head_shortcut_icon, secure_base_media_url } =
@@ -27,13 +27,8 @@ export const GlobalHead = React.memo<GlobalHeadProps>((props) => {
 
   return (
     <GlobalHeadBase name={name} {...props}>
-      {!disableIcon && (
-        <>
-          <link rel='icon' href={icon ?? '/favicon.ico'} sizes='any' key='icon' />
-          {!icon && <link rel='icon' href='/favicon.svg' type='image/svg+xml' key='icon-svg' />}
-        </>
-      )}
-      {children}
+      <link rel='icon' href={icon ?? '/favicon.ico'} sizes='any' key='icon' />
+      {!icon && <link rel='icon' href='/favicon.svg' type='image/svg+xml' key='icon-svg' />}
     </GlobalHeadBase>
   )
 })
diff --git a/packages/next-ui/LayoutParts/GlobalHead.tsx b/packages/next-ui/LayoutParts/GlobalHead.tsx
@@ -1,10 +1,14 @@
 import { useTheme } from '@mui/material'
 import Head from 'next/head'
+import type React from 'react'
 
-export type GlobalHeadProps = { name: string }
+export type GlobalHeadProps = {
+  name: string
+  children?: React.ReactNode
+}
 
 export function GlobalHead(props: GlobalHeadProps) {
-  const { name } = props
+  const { name, children } = props
   const theme = useTheme()
 
   return (
@@ -25,10 +29,9 @@ export function GlobalHead(props: GlobalHeadProps) {
       <meta name='apple-mobile-web-app-title' content={name} key='apple-mobile-web-app-title' />
       <meta name='format-detection' content='telephone=no' key='format-detection' />
       <meta name='mobile-web-app-capable' content='yes' key='mobile-web-app-capable' />
-      <link rel='icon' href='/favicon.ico' sizes='any' />
-      <link rel='icon' href='/favicon.svg' type='image/svg+xml' />
       <link rel='apple-touch-icon' href='/apple-touch-icon.png' />
       <link rel='manifest' href='/manifest.webmanifest' key='manifest' />
+      {children}
     </Head>
   )
 }
diff --git a/packages/next-ui/PageMeta/PageMeta.tsx b/packages/next-ui/PageMeta/PageMeta.tsx
@@ -21,9 +21,9 @@ type MetaRobotsAll = ['all' | 'none']
 export type PageMetaProps = {
   title: string
   canonical?: Canonical
-  metaDescription?: string
+  metaDescription?: string | null
   metaRobots?: MetaRobotsAll | MetaRobots[]
-  metaKeywords?: string
+  metaKeywords?: string | null
   children?: React.ReactNode
   ogImage?: string | null
   ogImageUseFallback?: boolean