diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 977d246d3..62b29b0ae 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,6 +26,6 @@ jobs:
key: node-modules-cache-${{ hashFiles('**/pnpm-lock.yaml') }}
- name: Install dependencies
if: steps.node-modules-cache.outputs.cache-hit != 'true'
- run: pnpm install
+ run: pnpm install --no-frozen-lockfile
- name: Run tests
run: pnpm test
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: [