diff --git a/app/layout.tsx b/app/layout.tsx
index 6dc05ea08..58f5a9708 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,6 +1,6 @@
import Navbar from 'components/layout/navbar';
+import { GeistSans } from 'geist/font';
import { ensureStartsWith } from 'lib/utils';
-import { Inter } from 'next/font/google';
import { ReactNode, Suspense } from 'react';
import './globals.css';
@@ -31,15 +31,9 @@ export const metadata = {
})
};
-const inter = Inter({
- subsets: ['latin'],
- display: 'swap',
- variable: '--font-inter'
-});
-
export default async function RootLayout({ children }: { children: ReactNode }) {
return (
-
+
diff --git a/components/cart/add-to-cart.tsx b/components/cart/add-to-cart.tsx
index b3b560b58..5e7afbff9 100644
--- a/components/cart/add-to-cart.tsx
+++ b/components/cart/add-to-cart.tsx
@@ -6,11 +6,7 @@ import { addItem } from 'components/cart/actions';
import LoadingDots from 'components/loading-dots';
import { ProductVariant } from 'lib/shopify/types';
import { useSearchParams } from 'next/navigation';
-import {
- // @ts-ignore
- experimental_useFormState as useFormState,
- experimental_useFormStatus as useFormStatus
-} from 'react-dom';
+import { useFormState, useFormStatus } from 'react-dom';
function SubmitButton({
availableForSale,
diff --git a/components/cart/delete-item-button.tsx b/components/cart/delete-item-button.tsx
index 3f95be0ac..814e1f389 100644
--- a/components/cart/delete-item-button.tsx
+++ b/components/cart/delete-item-button.tsx
@@ -5,11 +5,7 @@ import clsx from 'clsx';
import { removeItem } from 'components/cart/actions';
import LoadingDots from 'components/loading-dots';
import type { CartItem } from 'lib/shopify/types';
-import {
- // @ts-ignore
- experimental_useFormState as useFormState,
- experimental_useFormStatus as useFormStatus
-} from 'react-dom';
+import { useFormState, useFormStatus } from 'react-dom';
function SubmitButton() {
const { pending } = useFormStatus();
diff --git a/components/cart/edit-item-quantity-button.tsx b/components/cart/edit-item-quantity-button.tsx
index 87cade4cf..b743ab704 100644
--- a/components/cart/edit-item-quantity-button.tsx
+++ b/components/cart/edit-item-quantity-button.tsx
@@ -5,11 +5,7 @@ import clsx from 'clsx';
import { updateItemQuantity } from 'components/cart/actions';
import LoadingDots from 'components/loading-dots';
import type { CartItem } from 'lib/shopify/types';
-import {
- // @ts-ignore
- experimental_useFormState as useFormState,
- experimental_useFormStatus as useFormStatus
-} from 'react-dom';
+import { useFormState, useFormStatus } from 'react-dom';
function SubmitButton({ type }: { type: 'plus' | 'minus' }) {
const { pending } = useFormStatus();
diff --git a/components/opengraph-image.tsx b/components/opengraph-image.tsx
index 17592bca8..288e0bd50 100644
--- a/components/opengraph-image.tsx
+++ b/components/opengraph-image.tsx
@@ -1,4 +1,4 @@
-import { ImageResponse } from 'next/server';
+import { ImageResponse } from 'next/og';
import LogoIcon from './icons/logo';
export type Props = {
diff --git a/next.config.js b/next.config.js
index 53a8515e2..8bab35c40 100644
--- a/next.config.js
+++ b/next.config.js
@@ -4,9 +4,6 @@ module.exports = {
// Disabling on production builds because we're running checks on PRs via GitHub Actions.
ignoreDuringBuilds: true
},
- experimental: {
- serverActions: true
- },
images: {
formats: ['image/avif', 'image/webp'],
remotePatterns: [
diff --git a/package.json b/package.json
index caf5195cc..4500306c2 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
"@headlessui/react": "^1.7.17",
"@heroicons/react": "^2.0.18",
"clsx": "^2.0.0",
+ "geist": "^0.1.16",
"next": "14.0.0",
"react": "18.2.0",
"react-dom": "18.2.0"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 73e811b9b..74e75639b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -14,6 +14,9 @@ dependencies:
clsx:
specifier: ^2.0.0
version: 2.0.0
+ geist:
+ specifier: ^0.1.16
+ version: 0.1.16
next:
specifier: 14.0.0
version: 14.0.0(react-dom@18.2.0)(react@18.2.0)
@@ -235,6 +238,10 @@ packages:
glob: 7.1.7
dev: true
+ /@next/font@13.5.6:
+ resolution: {integrity: sha512-urmUq05uCVJsBqAAJEV+xK5OTTodrSxdiG+351SOSjlWctywdBM6qX+K9pIe3K48RxjfnxlBbXjGyOJAji+pfw==}
+ dev: false
+
/@next/swc-darwin-arm64@14.0.0:
resolution: {integrity: sha512-HQKi159jCz4SRsPesVCiNN6tPSAFUkOuSkpJsqYTIlbHLKr1mD6be/J0TvWV6fwJekj81bZV9V/Tgx3C2HO9lA==}
engines: {node: '>= 10'}
@@ -1528,6 +1535,12 @@ packages:
resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
dev: true
+ /geist@0.1.16:
+ resolution: {integrity: sha512-X7d+BN+VZamS9KqyjLjQpIogl7qCwRVvGEmYzBc1PUkshhq7hS9vJOu4kY4iqSv7gCMq72dwc+g7kgcn8PG/dQ==}
+ dependencies:
+ '@next/font': 13.5.6
+ dev: false
+
/get-intrinsic@1.2.2:
resolution: {integrity: sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==}
dependencies:
diff --git a/tailwind.config.js b/tailwind.config.js
index 0f10cf955..eaf8db155 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -6,7 +6,7 @@ module.exports = {
theme: {
extend: {
fontFamily: {
- sans: ['var(--font-inter)']
+ sans: ['var(--font-geist-sans)']
},
keyframes: {
fadeIn: {