Merge pull request #17 from zenzen-sol/sol/preview

chose: preview -> narai

.github/workflows/test.yml

@@ -5,11 +5,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cancel running workflows
-        uses: styfle/cancel-workflow-action@0.11.0
+        uses: styfle/cancel-workflow-action@0.12.0
         with:
           access_token: ${{ github.token }}
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set node version
         uses: actions/setup-node@v3
         with:
@@ -27,6 +27,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

README.md

@@ -23,13 +23,26 @@ A Next.js 13 and App Router-ready ecommerce template featuring:
 
 Vercel will only be actively maintaining a Shopify version [as outlined in our vision and strategy for Next.js Commerce](https://github.com/vercel/commerce/pull/966).
 
-Vercel is more than happy to partner and work with any commerce provider to help them get a similar template up and running and listed below. Alternative providers should be able to fork this repository and swap out the `lib/shopify` file with their own implementation while leaving the rest of the template mostly unchanged.
+Vercel is happy to partner and work with any commerce provider to help them get a similar template up and running and listed below. Alternative providers should be able to fork this repository and swap out the `lib/shopify` file with their own implementation while leaving the rest of the template mostly unchanged.
 
 - Shopify (this repository)
 - [BigCommerce](https://github.com/bigcommerce/nextjs-commerce) ([Demo](https://next-commerce-v2.vercel.app/))
 - [Medusa](https://github.com/medusajs/vercel-commerce) ([Demo](https://medusa-nextjs-commerce.vercel.app/))
 - [Saleor](https://github.com/saleor/nextjs-commerce) ([Demo](https://saleor-commerce.vercel.app/))
+- [Shopware](https://github.com/shopwareLabs/vercel-commerce) ([Demo](https://shopware-vercel-commerce-react.vercel.app/))
 - [Swell](https://github.com/swellstores/verswell-commerce) ([Demo](https://verswell-commerce.vercel.app/))
+- [Umbraco](https://github.com/umbraco/Umbraco.VercelCommerce.Demo) ([Demo](https://vercel-commerce-demo.umbraco.com/))
+- [Wix](https://github.com/wix/nextjs-commerce) ([Demo](https://wix-nextjs-commerce.vercel.app/))
+
+> Note: Providers, if you are looking to use similar products for your demo, you can [download these assets](https://drive.google.com/file/d/1q_bKerjrwZgHwCw0ovfUMW6He9VtepO_/view?usp=sharing).
+
+## Integrations
+
+Integrations enable upgraded or additional functionality for Next.js Commerce
+
+- [Orama](https://github.com/oramasearch/nextjs-commerce) ([Demo](https://vercel-commerce.oramasearch.com/))
+  - Upgrades search to include typeahead with dynamic re-rendering, vector-based similarity search, and JS-based configuration.
+  - Search runs entirely in the browser for smaller catalogs or on a CDN for larger.
 
 ## Running locally
 
@@ -55,199 +68,9 @@ Your app should now be running on [localhost:3000](http://localhost:3000/).
 1. Select the `Vercel Solutions` scope.
 1. Connect to the existing `commerce-shopify` project.
 1. Run `vc env pull` to get environment variables.
-1. Run `pmpm dev` to ensure everything is working correctly.
+1. Run `pnpm dev` to ensure everything is working correctly.
 </details>
 
-## How to configure your Shopify store for Next.js Commerce
+## Vercel, Next.js Commerce, and Shopify Integration Guide
 
-Next.js Commerce requires a [paid Shopify plan](https://www.shopify.com/pricing).
+You can use this comprehensive [integration guide](http://vercel.com/docs/integrations/shopify) with step-by-step instructions on how to configure Shopify as a headless CMS using Next.js Commerce as your headless Shopify storefront on Vercel.
-
-> Note: Next.js Commerce will not work with a Shopify Starter plan as it does not allow installation of custom themes, which is required to run as a headless storefront.
-
-### Add Shopify domain to an environment variable
-
-Create a `SHOPIFY_STORE_DOMAIN` environment variable and use your Shopify domain as the the value (ie. `[your-shopify-store-subdomain].myshopify.com`).
-
-> Note: Do not include the `https://`.
-
-### Accessing the Shopify Storefront API
-
-Next.js Commerce utilizes [Shopify's Storefront API](https://shopify.dev/docs/api/storefront) to create unique customer experiences. The API offers a full range of commerce options making it possible for customers to control products, collections, menus, pages, cart, checkout, and more.
-
-In order to use the Shopify's Storefront API, you need to install the [Headless app](https://apps.shopify.com/headless) in your Shopify store.
-
-Once installed, you'll need to create a `SHOPIFY_STOREFRONT_ACCESS_TOKEN` environment variable and use the public access token as the value.
-
-> Note: Shopify does offer a Node.js Storefront API SDK. We use the Storefront API via GraphQL directly instead of the Node.js SDK so we have more control over fetching and caching.
-
-<details>
-  <summary>Expand to view detailed walkthrough</summary>
-
-1. Navigate to `https://[your-shopify-store-subdomain].myshopify.com/admin/settings/apps`.
-1. Click the green `Shopify App Store` button. ![Shopify App Store](https://user-images.githubusercontent.com/446260/233220545-cb4c1461-ebc5-424e-a421-bf0d32044027.jpg)
-1. Search for `Headless` and click on the `Headless` app. ![Headless](https://user-images.githubusercontent.com/446260/233220547-6d93b5ef-16c7-45db-99e7-13ae7e18eb39.jpg)
-1. Click the black `Add app` button. ![Add app](https://user-images.githubusercontent.com/446260/233220550-a34c8bda-75a8-437a-9673-125f3794ff35.jpg)
-1. Click the green `Add sales channel` button. ![Add sales channel](https://user-images.githubusercontent.com/446260/233220553-42d94a74-421d-4f8a-99ab-a95936b707a3.jpg)
-1. Click the green `Create storefront` button. ![Create storefront](https://user-images.githubusercontent.com/446260/233220556-1eee15c4-a45d-446e-9f73-2e7c9f56b29c.jpg)
-1. Copy and paste the public access token and assign it to a `SHOPIFY_STOREFRONT_ACCESS_TOKEN` environment variable. ![Pubic access token](https://user-images.githubusercontent.com/446260/233220558-5db04ff9-b894-40fe-bfba-0e92f26b8e1f.jpg)
-1. If you ever need to reference the public access token again, you can navigate to `https://[your-shopify-store-subdomain].myshopify.com/admin/headless_storefronts`.
-</details>
-
-### Install a headless theme
-
-When using a headless Shopify setup, you normally don't want customers to access any of the theme pages except for checkout. However, you can't totally disable the theme and a lot of links will still point to the theme (e.g. links in emails, order details, plugins, checkout, etc.).
-
-To enable a seamless flow between your headless site and Shopify, you can install the [Shopify Headless Theme](https://github.com/instantcommerce/shopify-headless-theme).
-
-Follow the installation instructions and configure the theme with your headless site's values.
-
-<details>
-  <summary>Expand to view detailed walkthrough</summary>
-
-1. Download [Shopify Headless Theme](https://github.com/instantcommerce/shopify-headless-theme). ![Download Shoify Headless Theme](https://user-images.githubusercontent.com/446260/233220560-9f3f5ab0-ffb4-4305-b4ee-2c9d33eea90f.jpg)
-1. Navigate to `https://[your-shopify-store-subdomain].myshopify.com/admin/themes`.
-1. Click `Add theme`, then `Upload zip file`. ![Upload zip file](https://user-images.githubusercontent.com/446260/233220561-7a53809e-0d95-45eb-b52f-3a52e3663a9c.jpg)
-1. Select the downloaded zip file from above, and click the green `Upload file` button. ![Select and upload file](https://user-images.githubusercontent.com/446260/233220563-135fb9f7-2921-4189-8f17-3b1cc15c0ea6.jpg)
-1. Click `Customize`. ![Customize theme](https://user-images.githubusercontent.com/446260/233220565-24b9c954-c18a-46f1-9db5-3d2a00040e48.jpg)
-1. Click `Theme settings` (ie. the paintbrush icon), expand the `STOREFRONT` section, enter your headless store domain, click the gray `Publish` button. ![Set headless domain in theme settings](https://user-images.githubusercontent.com/446260/233220566-acaee14d-03f8-400d-a2a2-28e85eb5ecdc.jpg)
-1. Confirm the theme change by clicking the green `Save and publish` button. ![Confirm save and publish](https://user-images.githubusercontent.com/446260/233220567-504d5bde-cfb9-426d-a264-f9a12d02af13.jpg)
-1. The headless theme should now be your current active theme. ![Headless theme is current and active](https://user-images.githubusercontent.com/446260/233220569-63cab2b4-241b-4bf1-9b5b-451daaeceb91.jpg)
-</details>
-
-### Branding & Design
-
-Since you're creating a headless Shopify store, you'll be in full control of your brand and design. However, there are still a few aspects we're leaving within Shopify's control.
-
-- Checkout
-- Emails
-- Order status
-- Order history
-- Favicon (for any Shopify controlled pages)
-
-You can use Shopify's admin to customize these pages to match your brand and design.
-
-<details>
-  <summary>Expand to view detailed walkthrough</summary>
-
-#### Checkout, order status, and order history
-
-1. Navigate to `https://[your-shopify-store-subdomain].myshopify.com/admin/settings/checkout`.
-1. Click the green `Customize` button. ![Customize](https://user-images.githubusercontent.com/446260/233220530-9beda4b4-5008-440a-b923-9d196b722539.jpg)
-1. Click `Branding` (ie. the paintbrush icon) and customize your brand. Please note, there are three steps / pages to the checkout flow. Use the dropdown to change pages and adjust branding as needed on each page. Click `Save` when you are done. ![Branding](https://user-images.githubusercontent.com/446260/233220534-e884d9fd-1a39-4f4d-9d09-163dde47c2e8.jpg)
-1. Navigate to `https://[your-shopify-store-subdomain].myshopify.com/admin/settings/branding`.
-1. Customize settings to match your brand. ![Branding](https://user-images.githubusercontent.com/446260/233220536-452b8802-9a1e-40f0-9a12-52b3dace84a5.jpg)
-
-#### Emails
-
-1. Navigate to `https://[your-shopify-store-subdomain].myshopify.com/admin/settings/email_settings`.
-1. Customize settings to match your brand. ![Branding](https://user-images.githubusercontent.com/446260/233220538-13c83a9e-55f8-41e6-9b34-a39ee0848a8a.jpg)
-
-#### Favicon
-
-1. Navigate to `https://[your-shopify-store-subdomain].myshopify.com/admin/themes`.
-1. Click the green `Customize` button. ![Customize theme](https://user-images.githubusercontent.com/446260/233220539-4869a6cd-f59f-4de6-8091-95ed81d2302d.jpg)
-1. Click `Theme settings` (ie. the paintbrush icon), expand the `FAVICON` section, upload favicon, then click the `Save` button. ![Favicon](https://user-images.githubusercontent.com/446260/233220542-ac81b674-d86e-4172-ab38-c79d1ad1ff36.jpg)
-
-</details>
-
-### Configure webhooks for on-demand incremental static regeneration (ISR)
-
-Utilizing [Shopify's webhooks](https://shopify.dev/docs/apps/webhooks), and listening for select [Shopify webhook event topics](https://shopify.dev/docs/api/admin-rest/2022-04/resources/webhook#event-topics), we can use [Next'js on-demand revalidation](https://nextjs.org/docs/app/building-your-application/data-fetching/revalidating#using-on-demand-revalidation) to keep data fetches indefinitely cached until certain events in the Shopify store occur.
-
-Next.js is pre-configured to listen for the following Shopify webhook events and automatically revalidate fetches.
-
-- `collections/create`
-- `collections/delete`
-- `collections/update`
-- `products/create`
-- `products/delete`
-- `products/update` (this also includes when variants are added, updated, and removed as well as when products are purchased so inventory and out of stocks can be updated)
-
-<details>
-  <summary>Expand to view detailed walkthrough</summary>
-
-#### Setup secret for secure revalidation
-
-1. Create your own secret or [generate a random UUID](https://www.uuidgenerator.net/guid).
-1. Create a [Vercel Environment Variable](https://vercel.com/docs/concepts/projects/environment-variables) named `SHOPIFY_REVALIDATION_SECRET` and use the value from above.
-
-#### Configure Shopify webhooks
-
-1. Navigate to `https://[your-shopify-store-subdomain].myshopify.com/admin/settings/notifications`.
-1. Add webhooks for all six event topics listed above. You can add more sets for other preview urls, environments, or local development. Append `?secret=[SECRET]` to each url, where `[SECRET]` is the secret you created above. ![Shopify store webhooks](https://github.com/vercel/commerce/assets/446260/3d713fd7-b642-46e2-b2ce-f2b695ff6d2b) ![Shopify store add webhook](https://github.com/vercel/commerce/assets/446260/f0240a22-be07-42bc-bf6c-b97873868677)
-
-#### Testing webhooks during local development
-
-The easiest way to test webhooks while developing locally is to use [ngrok](https://ngrok.com).
-
-1. [Install and configure ngrok](https://ngrok.com/download) (you will need to create an account).
-1. Run your app locally, `npm run dev`.
-1. In a separate terminal session, run `ngrok http 3000`.
-1. Use the url generated by ngrok and add or update your webhook urls in Shopify. ![ngrok](https://github.com/vercel/commerce/assets/446260/5dc09c5d-0e48-479c-ab64-de8dc9a2c4b1) ![Shopify store edit webhook](https://github.com/vercel/commerce/assets/446260/13fd397d-4666-4e8d-b25f-4adc674345c0)
-1. You can now make changes to your store and your local app should receive updates. You can also use the `Send test notification` button to trigger a generic webhook test. ![Shopify store webhook send test notification](https://github.com/vercel/commerce/assets/446260/e872e233-1663-446d-961f-8c9455358530)
-
-</details>
-
-### Using Shopify as a CMS
-
-Next.js Commerce is fully powered by Shopify in a truly headless and data driven way.
-
-#### Products
-
-`https://[your-shopify-store-subdomain].myshopify.com/admin/products`
-
-Only `Active` products are shown. `Draft` products will not be shown until they are marked as `Active`.
-
-`Active` products can still be hidden and not seen by navigating the site, by adding a `nextjs-frontend-hidden` tag on the product. This tag will also tell search engines to not index or crawl the product. The product is still directly accessible via url. This feature is great for "secret" products you only want to people you share the url with.
-
-Product options and option combinations are driven from Shopify options and variants. When selecting options on the product detail page, other option and variant combinations will be visually validated and verified for availability, like Amazon does.
-
-Products that are active and "out of stock" are still shown on the site, but the ability to add the product to the cart is disabled.
-
-#### Collections
-
-`https://[your-shopify-store-subdomain].myshopify.com/admin/collections`
-
-Create whatever collections you want and configure them however you want. All available collections will show on the search page as filters on the left, with one exception...
-
-Any collection names that start with the word "hidden" will not show up on the headless front end. The Next.js Commerce theme comes pre-configured to look for two hidden collections. Collections were chosen for this over tags so that order of products could be controlled (collections allow for manual ordering).
-
-Create the following collections:
-
-- `Hidden: Homepage Featured Items` -- Products in this collection are displayed in the three featured blocks on the homepage.
-- `Hidden: Homepage Carousel` -- Products in this collection are displayed in the auto-scrolling carousel section on the homepage.
-
-![Shopify collections](https://user-images.githubusercontent.com/446260/233220543-81896a2b-7085-4abc-a4f1-ce321e08b953.jpg)
-
-![Shopify collection detail](https://user-images.githubusercontent.com/446260/233220544-ecd4c069-49fc-4a0b-8378-aa5e1b4b5257.jpg)
-
-#### Pages
-
-`https://[your-shopify-store-subdomain].myshopify.com/admin/pages`
-
-Next.js Commerce contains a dynamic `[page]` route. It will use the value to look for a corresponding page in Shopify. If a page is found, it will display its rich content using Tailwind's prose. If a page is not found, a 404 page is displayed.
-
-![Shopify pages](https://user-images.githubusercontent.com/446260/233221142-4dc3fa56-5256-4d84-b0a3-331ffb7d79b2.jpg)
-
-![Shopify page detail](https://user-images.githubusercontent.com/446260/233247700-cbeaf917-fb67-49e9-b9b9-5ee8cb188639.jpg)
-
-#### Navigation menus
-
-`https://[your-shopify-store-subdomain].myshopify.com/admin/menus`
-
-Next.js Commerce's header and footer navigation is pre-configured to be controlled by Shopify navigation menus. This means you have full control over what links go here. They can be to collections, pages, external links, and more.
-
-Create the following navigation menus:
-
-- `Next.js Frontend Header Menu` -- Menu items to be shown in the headless frontend header.
-- `Next.js Frontend Footer Menu` -- Menu items to be shown in the headless frontend footer.
-
-![Shopify navigation menus](https://user-images.githubusercontent.com/446260/233220571-33f9d5a8-1206-4ab4-ad79-83b4ca954331.jpg)
-
-![Shopify navigation menu detail](https://user-images.githubusercontent.com/446260/233220573-5f03a51f-4100-461f-a696-f085856e391b.jpg)
-
-#### SEO
-
-Shopify's products, collections, pages, etc. allow you to create custom SEO titles and descriptions. Next.js Commerce is pre-configured to display these custom values, but also comes with sensible default fallbacks if they are not provided.
-
-![Shopify SEO](https://user-images.githubusercontent.com/446260/233247701-0ff2a560-7949-4e6c-b3a8-8168ed6341f8.jpg)

app/[locale]/about/layout.tsx

@@ -1,5 +1,3 @@
-import { Suspense } from 'react';
-
 export default function Layout({ children }: { children: React.ReactNode }) {
-  return <Suspense>{children}</Suspense>;
+  return <>{children}</>;
 }

app/[locale]/about/page.tsx

@@ -4,13 +4,11 @@ import { SupportedLocale } from 'components/layout/navbar/language-control';
 import Navbar from 'components/layout/navbar';
 import { getCart, getPage, getProduct } from 'lib/shopify';
 import { Product } from 'lib/shopify/types';
+import { unstable_setRequestLocale } from 'next-intl/server';
 import { cookies } from 'next/headers';
 import { Suspense } from 'react';
 import AboutNaraiDetail from './about-narai-detail';
 
-export const runtime = 'edge';
-export const revalidate = 43200; // 12 hours in seconds
-
 const { SITE_NAME } = process.env;
 
 export const metadata = {
@@ -22,6 +20,10 @@ export const metadata = {
 };
 
 export default async function Page({ params }: { params: { locale?: SupportedLocale } }) {
+  if (!!params?.locale) {
+    unstable_setRequestLocale(params.locale);
+  }
+
   const cartId = cookies().get('cartId')?.value;
   let cart;
 
@@ -39,13 +41,13 @@ export default async function Page({ params }: { params: { locale?: SupportedLoc
   return (
     <div>
       <Navbar cart={cart} locale={params?.locale} compact promotedItem={promotedItem} />
+      <Suspense fallback={null}>
         <div className="pt-24 md:pt-32">
           <AboutNaraiDetail awards={awardsPage.body} />
         </div>
-
-      <Suspense>
-        <Footer cart={cart} />
       </Suspense>
+
+      <Footer cart={cart} />
     </div>
   );
 }

app/[locale]/bar/layout.tsx

@@ -1,5 +1,3 @@
-import { Suspense } from 'react';
-
 export default function Layout({ children }: { children: React.ReactNode }) {
-  return <Suspense>{children}</Suspense>;
+  return <>{children}</>;
 }

app/[locale]/bar/page.tsx

@@ -4,13 +4,11 @@ import { SupportedLocale } from 'components/layout/navbar/language-control';
 import Navbar from 'components/layout/navbar';
 import { getCart, getProduct } from 'lib/shopify';
 import { Product } from 'lib/shopify/types';
+import { unstable_setRequestLocale } from 'next-intl/server';
 import { cookies } from 'next/headers';
 import { Suspense } from 'react';
 import SagyobarDetail from './sagyobar-detail';
 
-export const runtime = 'edge';
-export const revalidate = 43200; // 12 hours in seconds
-
 const { SITE_NAME } = process.env;
 
 export const metadata = {
@@ -22,6 +20,10 @@ export const metadata = {
 };
 
 export default async function Page({ params }: { params: { locale?: SupportedLocale } }) {
+  if (!!params?.locale) {
+    unstable_setRequestLocale(params.locale);
+  }
+
   const cartId = cookies().get('cartId')?.value;
   let cart;
 
@@ -37,13 +39,13 @@ export default async function Page({ params }: { params: { locale?: SupportedLoc
   return (
     <div>
       <Navbar cart={cart} locale={params?.locale} compact promotedItem={promotedItem} />
+      <Suspense fallback={null}>
         <div className="pt-12">
           <SagyobarDetail />
         </div>
-
-      <Suspense>
-        <Footer cart={cart} />
       </Suspense>
+
+      <Footer cart={cart} />
     </div>
   );
 }

app/[locale]/company/layout.tsx

@@ -1,5 +1,3 @@
-import { Suspense } from 'react';
-
 export default function Layout({ children }: { children: React.ReactNode }) {
-  return <Suspense>{children}</Suspense>;
+  return <>{children}</>;
 }

app/[locale]/company/page.tsx

@@ -4,13 +4,11 @@ import { SupportedLocale } from 'components/layout/navbar/language-control';
 import Navbar from 'components/layout/navbar';
 import { getCart, getProduct } from 'lib/shopify';
 import { Product } from 'lib/shopify/types';
+import { unstable_setRequestLocale } from 'next-intl/server';
 import { cookies } from 'next/headers';
 import { Suspense } from 'react';
 import CompanyDetail from './company-detail';
 
-export const runtime = 'edge';
-export const revalidate = 43200; // 12 hours in seconds
-
 const { SITE_NAME } = process.env;
 
 export const metadata = {
@@ -22,6 +20,10 @@ export const metadata = {
 };
 
 export default async function Page({ params }: { params: { locale?: SupportedLocale } }) {
+  if (!!params?.locale) {
+    unstable_setRequestLocale(params.locale);
+  }
+
   const cartId = cookies().get('cartId')?.value;
   let cart;
 
@@ -37,13 +39,13 @@ export default async function Page({ params }: { params: { locale?: SupportedLoc
   return (
     <div>
       <Navbar cart={cart} locale={params?.locale} compact promotedItem={promotedItem} />
+      <Suspense fallback={null}>
         <div className="pt-12">
           <CompanyDetail />
         </div>
-
-      <Suspense>
-        <Footer cart={cart} />
       </Suspense>
+
+      <Footer cart={cart} />
     </div>
   );
 }

app/[locale]/concept/layout.tsx

@@ -1,5 +1,3 @@
-import { Suspense } from 'react';
-
 export default function Layout({ children }: { children: React.ReactNode }) {
-  return <Suspense>{children}</Suspense>;
+  return <>{children}</>;
 }

app/[locale]/concept/page.tsx

@@ -4,13 +4,11 @@ import { SupportedLocale } from 'components/layout/navbar/language-control';
 import Navbar from 'components/layout/navbar';
 import { getCart, getProduct } from 'lib/shopify';
 import { Product } from 'lib/shopify/types';
+import { unstable_setRequestLocale } from 'next-intl/server';
 import { cookies } from 'next/headers';
 import { Suspense } from 'react';
 import ConceptDetail from './concept-detail';
 
-export const runtime = 'edge';
-export const revalidate = 43200; // 12 hours in seconds
-
 const { SITE_NAME } = process.env;
 
 export const metadata = {
@@ -22,6 +20,10 @@ export const metadata = {
 };
 
 export default async function Page({ params }: { params: { locale?: SupportedLocale } }) {
+  if (!!params?.locale) {
+    unstable_setRequestLocale(params.locale);
+  }
+
   const cartId = cookies().get('cartId')?.value;
   let cart;
 
@@ -37,13 +39,13 @@ export default async function Page({ params }: { params: { locale?: SupportedLoc
   return (
     <div>
       <Navbar cart={cart} locale={params?.locale} compact promotedItem={promotedItem} />
+      <Suspense fallback={null}>
         <div className="pt-12">
           <ConceptDetail />
         </div>
-
-      <Suspense>
-        <Footer cart={cart} />
       </Suspense>
+
+      <Footer cart={cart} />
     </div>
   );
 }

app/[locale]/disclosures/page.tsx

@@ -4,13 +4,11 @@ import { SupportedLocale } from 'components/layout/navbar/language-control';
 import Navbar from 'components/layout/navbar';
 import { getCart, getProduct } from 'lib/shopify';
 import { Product } from 'lib/shopify/types';
+import { unstable_setRequestLocale } from 'next-intl/server';
 import { cookies } from 'next/headers';
 import { Suspense } from 'react';
 import Disclosures from './disclosures';
 
-export const runtime = 'edge';
-export const revalidate = 43200; // 12 hours in seconds
-
 const { SITE_NAME } = process.env;
 
 export const metadata = {
@@ -26,6 +24,10 @@ export default async function DisclosuresPage({
 }: {
   params: { locale?: SupportedLocale };
 }) {
+  if (!!locale) {
+    unstable_setRequestLocale(locale);
+  }
+
   const cartId = cookies().get('cartId')?.value;
   let cart;
 
@@ -41,13 +43,13 @@ export default async function DisclosuresPage({
   return (
     <div>
       <Navbar cart={cart} locale={locale} compact promotedItem={promotedItem} />
+      <Suspense fallback={null}>
         <div className="py-24 md:py-48">
           <Disclosures />
         </div>
-
-      <Suspense>
-        <Footer cart={cart} />
       </Suspense>
+
+      <Footer cart={cart} />
     </div>
   );
 }

app/[locale]/layout.tsx

@@ -4,6 +4,7 @@ import { ReactNode, Suspense } from 'react';
 
 import { SupportedLocale } from 'components/layout/navbar/language-control';
 import { NextIntlClientProvider } from 'next-intl';
+import { unstable_setRequestLocale } from 'next-intl/server';
 import { notFound } from 'next/navigation';
 import Analytics from './analytics';
 import './globals.css';
@@ -70,8 +71,10 @@ const noto = Noto_Serif_JP({
   variable: '--font-noto'
 });
 
+const locales = ['en', 'ja'] as const;
+
 export function generateStaticParams() {
-  return [{ locale: 'ja' }, { locale: 'en' }];
+  return locales.map((locale) => ({ locale }));
 }
 
 export default async function RootLayout({
@@ -81,13 +84,16 @@ export default async function RootLayout({
   children: ReactNode;
   params: { locale?: SupportedLocale };
 }) {
-  let messages;
+  // Validate that the incoming `locale` parameter is valid
-  try {
+  const isValidLocale = locales.some((cur: string) => cur === params?.locale);
-    messages = (await import(`../../messages/${params?.locale}.json`)).default;
+  if (!isValidLocale) notFound();
-  } catch (error) {
+
-    notFound();
+  if (params?.locale) {
+    unstable_setRequestLocale(params.locale);
   }
 
+  const messages = (await import(`../../messages/${params?.locale}.json`)).default;
+
   return (
     <html
       lang={params.locale}
@@ -95,10 +101,10 @@ export default async function RootLayout({
     >
       <body className="bg-dark text-white selection:bg-green-800 selection:text-green-400">
         <NextIntlClientProvider locale={params?.locale} messages={messages}>
-          <Suspense>
+          <Suspense fallback={null}>
             <Analytics />
-            <main>{children}</main>
           </Suspense>
+          <main>{children}</main>
         </NextIntlClientProvider>
       </body>
     </html>

app/[locale]/opengraph-image.tsx

@@ -1,7 +1,6 @@
 import OpengraphImage from 'components/opengraph-image';
 
 export const runtime = 'edge';
-export const revalidate = 300; // 5 minutes in seconds
 
 export default async function Image() {
   return await OpengraphImage();

app/[locale]/page.tsx

@@ -22,13 +22,11 @@ import StoriesPreview from 'components/layout/stories-preview';
 import { BLOG_HANDLE } from 'lib/constants';
 import { getCart, getProduct } from 'lib/shopify';
 import { Product } from 'lib/shopify/types';
+import { unstable_setRequestLocale } from 'next-intl/server';
 import { cookies } from 'next/headers';
 import Image from 'next/image';
 import { Suspense } from 'react';
 
-export const runtime = 'edge';
-export const revalidate = 300; // 5 minutes in seconds
-
 const { SITE_NAME } = process.env;
 
 export const metadata = {
@@ -44,6 +42,10 @@ export default async function HomePage({
 }: {
   params: { locale?: SupportedLocale };
 }) {
+  if (!!locale) {
+    unstable_setRequestLocale(locale);
+  }
+
   const cartId = cookies().get('cartId')?.value;
   let cart;
 
@@ -63,7 +65,9 @@ export default async function HomePage({
         <HomepageProducts lang={locale} />
       </div>
       <div className="py-24 md:py-48">
+        <Suspense fallback={null}>
           <NewsletterSignup />
+        </Suspense>
       </div>
       <div className="relative mx-auto max-w-screen-xl">
         <Image
@@ -74,7 +78,9 @@ export default async function HomePage({
         />
       </div>
       <div className="py-24">
+        <Suspense fallback={null}>
           <Shoplist />
+        </Suspense>
       </div>
 
       <div className="relative pb-48">
@@ -152,9 +158,7 @@ export default async function HomePage({
         />
       </div>
 
-      <Suspense>
       <Footer cart={cart} promotedItem={promotedItem} />
-      </Suspense>
     </div>
   );
 }

app/[locale]/privacy/page.tsx

@@ -4,13 +4,11 @@ import { SupportedLocale } from 'components/layout/navbar/language-control';
 import Navbar from 'components/layout/navbar';
 import { getCart, getProduct } from 'lib/shopify';
 import { Product } from 'lib/shopify/types';
+import { unstable_setRequestLocale } from 'next-intl/server';
 import { cookies } from 'next/headers';
 import { Suspense } from 'react';
 import PrivacyPolicy from './privacy-policy';
 
-export const runtime = 'edge';
-export const revalidate = 43200; // 12 hours in seconds
-
 const { SITE_NAME } = process.env;
 
 export const metadata = {
@@ -26,6 +24,10 @@ export default async function PrivacyPage({
 }: {
   params: { locale?: SupportedLocale };
 }) {
+  if (!!locale) {
+    unstable_setRequestLocale(locale);
+  }
+
   const cartId = cookies().get('cartId')?.value;
   let cart;
 
@@ -41,13 +43,13 @@ export default async function PrivacyPage({
   return (
     <div>
       <Navbar cart={cart} locale={locale} compact promotedItem={promotedItem} />
+      <Suspense fallback={null}>
         <div className="py-24 md:py-48">
           <PrivacyPolicy />
         </div>
-
-      <Suspense>
-        <Footer cart={cart} />
       </Suspense>
+
+      <Footer cart={cart} />
     </div>
   );
 }

app/[locale]/product/[handle]/layout.tsx

@@ -4,10 +4,7 @@ import { SupportedLocale } from 'components/layout/navbar/language-control';
 import Navbar from 'components/layout/navbar';
 import { getCart } from 'lib/shopify';
 import { cookies } from 'next/headers';
-import { ReactNode, Suspense } from 'react';
+import { ReactNode } from 'react';
-
-export const runtime = 'edge';
-export const revalidate = 300; // 5 minutes in seconds
 
 const { SITE_NAME } = process.env;
 
@@ -37,9 +34,7 @@ export default async function ProductLayout({
     <div>
       <Navbar cart={cart} locale={locale} compact />
       {children}
-      <Suspense>
       <Footer cart={cart} />
-      </Suspense>
     </div>
   );
 }

app/[locale]/product/[handle]/page.tsx

@@ -1,6 +1,4 @@
 import type { Metadata } from 'next';
-import { notFound } from 'next/navigation';
-import { Suspense } from 'react';
 
 import { ChevronDoubleRightIcon } from '@heroicons/react/24/outline';
 import clsx from 'clsx';
@@ -15,11 +13,10 @@ import { VariantSelector } from 'components/product/variant-selector';
 import { HIDDEN_PRODUCT_TAG } from 'lib/constants';
 import { getProduct, getProductRecommendations } from 'lib/shopify';
 import { Image as MediaImage, Product } from 'lib/shopify/types';
+import { unstable_setRequestLocale } from 'next-intl/server';
 import Image from 'next/image';
 import Link from 'next/link';
-
+import { Suspense } from 'react';
-export const runtime = 'edge';
-export const revalidate = 300; // 5 minutes in seconds
 
 export async function generateMetadata({
   params
@@ -31,7 +28,7 @@ export async function generateMetadata({
     language: params?.locale?.toUpperCase()
   });
 
-  if (!product) return notFound();
+  if (!product) return {};
 
   const { url, width, height, altText: alt } = product.featuredImage || {};
   const indexable = !product.tags.includes(HIDDEN_PRODUCT_TAG);
@@ -67,6 +64,10 @@ export default async function ProductPage({
 }: {
   params: { handle: string; locale?: SupportedLocale };
 }) {
+  if (!!params?.locale) {
+    unstable_setRequestLocale(params.locale);
+  }
+
   const numberOfOtherImages = 3;
   const product = await getProduct({
     handle: params.handle,
@@ -80,7 +81,7 @@ export default async function ProductPage({
       .filter((image) => image?.url !== product.featuredImage?.url);
   }
 
-  if (!product) return notFound();
+  if (!product) return {};
 
   const productJsonLd = {
     '@context': 'https://schema.org',
@@ -136,13 +137,17 @@ export default async function ProductPage({
                 </div>
 
                 <div className="max-w-sm">
+                  <Suspense>
                     <VariantSelector options={product.options} variants={product.variants} />
+                  </Suspense>
 
+                  <Suspense>
                     <AddManyToCart
                       quantity={1}
                       variants={product.variants}
                       availableForSale={product.availableForSale}
                     />
+                  </Suspense>
                 </div>
 
                 <div className="border-b border-white/20 pb-6"></div>
@@ -165,6 +170,7 @@ export default async function ProductPage({
           )}
 
           <div className="grid grid-cols-1 gap-4 px-4 md:grid-cols-2 md:px-0">
+            <Suspense fallback={null}>
               {!!otherImages &&
                 otherImages?.length > 0 &&
                 otherImages.map((image, index) => {
@@ -189,6 +195,7 @@ export default async function ProductPage({
                     </div>
                   );
                 })}
+            </Suspense>
           </div>
 
           {!!product?.lower?.value && (
@@ -197,9 +204,7 @@ export default async function ProductPage({
             </div>
           )}
 
-          <Suspense>
           <RelatedProducts id={product.id} />
-          </Suspense>
         </div>
       </div>
     </>

app/[locale]/products/page.tsx

@@ -5,12 +5,10 @@ import { ProductGrid } from 'components/grid/product-grid';
 import Navbar from 'components/layout/navbar';
 import { getCart, getProduct } from 'lib/shopify';
 import { Product } from 'lib/shopify/types';
+import { unstable_setRequestLocale } from 'next-intl/server';
 import { cookies } from 'next/headers';
 import { Suspense } from 'react';
 
-export const runtime = 'edge';
-export const revalidate = 300; // 5 minutes in seconds
-
 const { SITE_NAME } = process.env;
 
 export const metadata = {
@@ -26,6 +24,10 @@ export default async function ProductPage({
 }: {
   params: { locale?: SupportedLocale };
 }) {
+  if (!!locale) {
+    unstable_setRequestLocale(locale);
+  }
+
   const cartId = cookies().get('cartId')?.value;
   let cart;
 
@@ -41,13 +43,13 @@ export default async function ProductPage({
   return (
     <div>
       <Navbar cart={cart} locale={locale} compact promotedItem={promotedItem} />
+      <Suspense fallback={null}>
         <div className="py-24 md:py-48">
           <ProductGrid lang={locale} />
         </div>
-
-      <Suspense>
-        <Footer cart={cart} />
       </Suspense>
+
+      <Footer cart={cart} />
     </div>
   );
 }

app/[locale]/shop-list/layout.tsx

@@ -1,7 +1,3 @@
-import { Suspense } from 'react';
-
-export const revalidate = 300; // 5 minutes in seconds
-
 export default function Layout({ children }: { children: React.ReactNode }) {
-  return <Suspense>{children}</Suspense>;
+  return <>{children}</>;
 }

app/[locale]/shop-list/opengraph-image.tsx

@@ -1,11 +1,16 @@
+import { SupportedLocale } from 'components/layout/navbar/language-control';
 import OpengraphImage from 'components/opengraph-image';
 import { getPage } from 'lib/shopify';
 
-export const runtime = 'edge';
+export default async function Image({
-export const revalidate = 300; // 5 minutes in seconds
+  params
-
+}: {
-export default async function Image({ params }: { params: { page: string } }) {
+  params: { page: string; locale?: SupportedLocale };
-  const page = await getPage({ handle: params.page });
+}) {
+  const page = await getPage({
+    handle: params.page,
+    language: params?.locale?.toUpperCase() || 'JA'
+  });
   const title = page.seo?.title || page.title;
 
   return await OpengraphImage({ title });

app/[locale]/shop-list/page.tsx

@@ -3,24 +3,27 @@ import type { Metadata } from 'next';
 import Footer from 'components/layout/footer';
 import Navbar from 'components/layout/navbar';
 import { SupportedLocale } from 'components/layout/navbar/language-control';
-import Prose from 'components/prose';
 import { getCart, getPage, getProduct } from 'lib/shopify';
 import { Product } from 'lib/shopify/types';
+import { unstable_setRequestLocale } from 'next-intl/server';
+import { unstable_noStore } from 'next/cache';
 import { cookies } from 'next/headers';
-import { notFound } from 'next/navigation';
 import { Suspense } from 'react';
+import ShopListDetail from './shop-list-detail';
 import ShopsNav from './shops-nav';
 
-export const revalidate = 300; // 5 minutes in seconds
-
 export async function generateMetadata({
   params
 }: {
   params: { locale?: SupportedLocale };
 }): Promise<Metadata> {
-  const page = await getPage({ handle: 'shop-list', language: params?.locale?.toUpperCase() });
+  unstable_noStore(); // opt out from partial prerendering
+  const page = await getPage({
+    handle: 'shop-list',
+    language: params?.locale?.toUpperCase() || 'JA'
+  });
 
-  if (!page) return notFound();
+  if (!page) return {};
 
   return {
     title: page.seo?.title || page.title,
@@ -34,6 +37,10 @@ export async function generateMetadata({
 }
 
 export default async function Page({ params }: { params: { locale?: SupportedLocale } }) {
+  if (!!params?.locale) {
+    unstable_setRequestLocale(params.locale);
+  }
+
   const cartId = cookies().get('cartId')?.value;
   let cart;
 
@@ -41,13 +48,9 @@ export default async function Page({ params }: { params: { locale?: SupportedLoc
     cart = await getCart(cartId);
   }
 
-  const page = await getPage({ handle: 'shop-list', language: params?.locale?.toUpperCase() });
-
-  if (!page) return notFound();
-
   const promotedItem: Product | undefined = await getProduct({
     handle: 'gift-bag-and-postcard-set',
-    language: params?.locale?.toUpperCase()
+    language: params?.locale?.toUpperCase() || 'JA'
   });
 
   return (
@@ -57,13 +60,12 @@ export default async function Page({ params }: { params: { locale?: SupportedLoc
         <div className="pb-12">
           <ShopsNav />
         </div>
-        {/* <h2 className="font-multilingual mb-8 text-3xl font-medium">{page.title}</h2> */}
+        <Suspense fallback={null}>
-        <Prose html={page.body as string} />
+          <ShopListDetail language={params?.locale?.toUpperCase()} />
+        </Suspense>
       </div>
 
-      <Suspense>
       <Footer cart={cart} />
-      </Suspense>
     </div>
   );
 }

app/[locale]/shop-list/shop-list-detail.tsx

@@ -0,0 +1,13 @@
+'use server';
+
+import Prose from 'components/prose';
+import { getPage } from 'lib/shopify';
+import { notFound } from 'next/navigation';
+
+export default async function ShopListDetail({ language }: { language?: string }) {
+  const page = await getPage({ handle: 'shop-list', language });
+
+  if (!page) notFound();
+
+  return <Prose html={page.body as string} />;
+}

app/[locale]/stories/[handle]/layout.tsx

@@ -5,10 +5,7 @@ import Navbar from 'components/layout/navbar';
 import { getCart, getProduct } from 'lib/shopify';
 import { Product } from 'lib/shopify/types';
 import { cookies } from 'next/headers';
-import { ReactNode, Suspense } from 'react';
+import { ReactNode } from 'react';
-
-export const runtime = 'edge';
-export const revalidate = 300; // 5 minutes in seconds
 
 const { SITE_NAME } = process.env;
 
@@ -43,9 +40,7 @@ export default async function BlogLayout({
     <div>
       <Navbar cart={cart} locale={locale} compact promotedItem={promotedItem} />
       {children}
-      <Suspense>
       <Footer cart={cart} />
-      </Suspense>
     </div>
   );
 }

app/[locale]/stories/[handle]/page.tsx

@@ -6,11 +6,9 @@ import Prose from 'components/prose';
 import { BLOG_HANDLE, HIDDEN_ARTICLE_TAG } from 'lib/constants';
 import { getBlogArticle } from 'lib/shopify';
 import { BlogArticle } from 'lib/shopify/types';
+import { unstable_setRequestLocale } from 'next-intl/server';
 import Image from 'next/image';
 
-export const runtime = 'edge';
-export const revalidate = 300; // 5 minutes in seconds
-
 export async function generateMetadata({
   params
 }: {
@@ -22,7 +20,7 @@ export async function generateMetadata({
     language: params?.locale?.toUpperCase()
   });
 
-  if (!article) return notFound();
+  if (!article) return {};
 
   const { url, width, height, altText: alt } = article.image || {};
   const indexable = !article?.tags?.includes(HIDDEN_ARTICLE_TAG);
@@ -58,13 +56,17 @@ export default async function BlogArticlePage({
 }: {
   params: { handle: string; locale?: SupportedLocale };
 }) {
+  if (!!params?.locale) {
+    unstable_setRequestLocale(params.locale);
+  }
+
   const article: BlogArticle | undefined = await getBlogArticle({
     handle: BLOG_HANDLE,
     articleHandle: params.handle,
     language: params?.locale?.toUpperCase()
   });
 
-  if (!article) return notFound();
+  if (!article) notFound();
 
   return (
     <>

app/[locale]/stories/page.tsx

@@ -9,9 +9,6 @@ import { Product } from 'lib/shopify/types';
 import { cookies } from 'next/headers';
 import { Suspense } from 'react';
 
-export const runtime = 'edge';
-export const revalidate = 300; // 5 minutes in seconds
-
 const { SITE_NAME } = process.env;
 
 export const metadata = {
@@ -42,13 +39,13 @@ export default async function StoriesPage({
   return (
     <div>
       <Navbar cart={cart} locale={locale} compact promotedItem={promotedItem} />
+      <Suspense fallback={null}>
         <div className="py-24 md:py-48">
           <StoriesDetail handle={BLOG_HANDLE} locale={locale} />
         </div>
-
-      <Suspense>
-        <Footer cart={cart} />
       </Suspense>
+
+      <Footer cart={cart} />
     </div>
   );
 }

app/[locale]/terms/page.tsx

@@ -4,13 +4,11 @@ import { SupportedLocale } from 'components/layout/navbar/language-control';
 import Navbar from 'components/layout/navbar';
 import { getCart, getProduct } from 'lib/shopify';
 import { Product } from 'lib/shopify/types';
+import { unstable_setRequestLocale } from 'next-intl/server';
 import { cookies } from 'next/headers';
 import { Suspense } from 'react';
 import TermsOfUse from './terms-of-use';
 
-export const runtime = 'edge';
-export const revalidate = 43200; // 12 hours in seconds
-
 const { SITE_NAME } = process.env;
 
 export const metadata = {
@@ -26,6 +24,10 @@ export default async function TermsPage({
 }: {
   params: { locale?: SupportedLocale };
 }) {
+  if (!!locale) {
+    unstable_setRequestLocale(locale);
+  }
+
   const cartId = cookies().get('cartId')?.value;
   let cart;
 
@@ -41,13 +43,13 @@ export default async function TermsPage({
   return (
     <div>
       <Navbar cart={cart} locale={locale} compact promotedItem={promotedItem} />
+      <Suspense fallback={null}>
         <div className="py-24 md:py-48">
           <TermsOfUse />
         </div>
-
-      <Suspense>
-        <Footer cart={cart} />
       </Suspense>
+
+      <Footer cart={cart} />
     </div>
   );
 }

components/cart/actions.ts

@@ -1,9 +1,11 @@
 'use server';
 
+import { TAGS } from 'lib/constants';
 import { addToCart, createCart, getCart, removeFromCart, updateCart } from 'lib/shopify';
+import { revalidateTag } from 'next/cache';
 import { cookies } from 'next/headers';
 
-export const addItem = async (variantId: string | undefined): Promise<String | undefined> => {
+export async function addItem(selectedVariantId: string | undefined) {
   let cartId = cookies().get('cartId')?.value;
   let cart;
 
@@ -17,16 +19,17 @@ export const addItem = async (variantId: string | undefined): Promise<String | u
     cookies().set('cartId', cartId);
   }
 
-  if (!variantId) {
+  if (!selectedVariantId) {
     return 'Missing product variant ID';
   }
 
   try {
-    await addToCart(cartId, [{ merchandiseId: variantId, quantity: 1 }]);
+    await addToCart(cartId, [{ merchandiseId: selectedVariantId, quantity: 1 }]);
+    revalidateTag(TAGS.cart);
   } catch (e) {
     return 'Error adding item to cart';
   }
-};
+}
 
 export const addItems = async ({
   variantId,
@@ -59,34 +62,44 @@ export const addItems = async ({
   }
 };
 
-export const removeItem = async (lineId: string): Promise<String | undefined> => {
+export async function removeItem(prevState: any, lineId: string) {
   const cartId = cookies().get('cartId')?.value;
 
   if (!cartId) {
     return 'Missing cart ID';
   }
+
   try {
     await removeFromCart(cartId, [lineId]);
+    revalidateTag(TAGS.cart);
   } catch (e) {
     return 'Error removing item from cart';
   }
-};
+}
 
-export const updateItemQuantity = async ({
+export async function updateItemQuantity(
-  lineId,
+  prevState: any,
-  variantId,
+  payload: {
-  quantity
-}: {
     lineId: string;
     variantId: string;
     quantity: number;
-}): Promise<String | undefined> => {
+  }
+) {
   const cartId = cookies().get('cartId')?.value;
 
   if (!cartId) {
     return 'Missing cart ID';
   }
+
+  const { lineId, variantId, quantity } = payload;
+
   try {
+    if (quantity === 0) {
+      await removeFromCart(cartId, [lineId]);
+      revalidateTag(TAGS.cart);
+      return;
+    }
+
     await updateCart(cartId, [
       {
         id: lineId,
@@ -94,7 +107,8 @@ export const updateItemQuantity = async ({
         quantity
       }
     ]);
+    revalidateTag(TAGS.cart);
   } catch (e) {
     return 'Error updating item quantity';
   }
-};
+}

components/cart/add-to-cart.tsx

@@ -1,71 +0,0 @@
-'use client';
-
-import clsx from 'clsx';
-import { addItem } from 'components/cart/actions';
-import LoadingDots from 'components/loading-dots';
-import { ProductVariant } from 'lib/shopify/types';
-import { useTranslations } from 'next-intl';
-import { useRouter, useSearchParams } from 'next/navigation';
-import { useTransition } from 'react';
-
-export function AddToCart({
-  variants,
-  availableForSale
-}: {
-  variants: ProductVariant[];
-  availableForSale: boolean;
-}) {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-  const t = useTranslations('Index');
-
-  const [isPending, startTransition] = useTransition();
-  const defaultVariantId = variants.length === 1 ? variants[0]?.id : undefined;
-  const variant = variants.find((variant: ProductVariant) =>
-    variant.selectedOptions.every(
-      (option) => option.value === searchParams.get(option.name.toLowerCase())
-    )
-  );
-  const selectedVariantId = variant?.id || defaultVariantId;
-  const title = !availableForSale
-    ? 'Out of stock'
-    : !selectedVariantId
-    ? 'Please select options'
-    : undefined;
-
-  return (
-    <button
-      aria-label="Add item to cart"
-      disabled={isPending || !availableForSale || !selectedVariantId}
-      title={title}
-      onClick={() => {
-        // Safeguard in case someone messes with `disabled` in devtools.
-        if (!availableForSale || !selectedVariantId) return;
-
-        startTransition(async () => {
-          const error = await addItem(selectedVariantId);
-
-          if (error) {
-            // Trigger the error boundary in the root error.js
-            throw new Error(error.toString());
-          }
-
-          router.refresh();
-        });
-      }}
-      className={clsx(
-        'relative flex w-full items-center justify-center bg-white p-4 font-serif text-xl tracking-wide text-black hover:opacity-90',
-        {
-          'cursor-not-allowed opacity-60 hover:opacity-60': !availableForSale || !selectedVariantId,
-          'cursor-not-allowed': isPending
-        }
-      )}
-    >
-      {!isPending ? (
-        <span>{availableForSale ? t('cart.add') : t('cart.out-of-stock')}</span>
-      ) : (
-        <LoadingDots className="my-3 bg-black" />
-      )}
-    </button>
-  );
-}

components/cart/delete-item-button.tsx

@@ -1,40 +1,31 @@
-import { XMarkIcon } from '@heroicons/react/24/outline';
+'use client';
-import LoadingDots from 'components/loading-dots';
-import { useRouter } from 'next/navigation';
 
+import { XMarkIcon } from '@heroicons/react/24/outline';
 import clsx from 'clsx';
 import { removeItem } from 'components/cart/actions';
+import LoadingDots from 'components/loading-dots';
 import type { CartItem } from 'lib/shopify/types';
-import { useTransition } from 'react';
+import { useFormState, useFormStatus } from 'react-dom';
 
-export default function DeleteItemButton({ item }: { item: CartItem }) {
+function SubmitButton() {
-  const router = useRouter();
+  const { pending } = useFormStatus();
-  const [isPending, startTransition] = useTransition();
 
   return (
     <button
-      aria-label="Remove cart item"
+      type="submit"
-      onClick={() => {
+      onClick={(e: React.FormEvent<HTMLButtonElement>) => {
-        startTransition(async () => {
+        if (pending) e.preventDefault();
-          const error = await removeItem(item.id);
-
-          if (error) {
-            // Trigger the error boundary in the root error.js
-            throw new Error(error.toString());
-          }
-
-          router.refresh();
-        });
       }}
-      disabled={isPending}
+      aria-label="Remove cart item"
+      aria-disabled={pending}
       className={clsx(
         'ease flex h-[17px] w-[17px] items-center justify-center rounded-full bg-dark transition-all duration-200',
         {
-          'cursor-not-allowed px-0': isPending
+          'cursor-not-allowed px-0': pending
         }
       )}
     >
-      {isPending ? (
+      {pending ? (
         <LoadingDots className="bg-white" />
       ) : (
         <XMarkIcon className="mx-[1px] h-4 w-4 text-white transition-opacity duration-150 hover:opacity-60 dark:text-black" />
@@ -42,3 +33,18 @@ export default function DeleteItemButton({ item }: { item: CartItem }) {
     </button>
   );
 }
+
+export function DeleteItemButton({ item }: { item: CartItem }) {
+  const [message, formAction] = useFormState(removeItem, null);
+  const itemId = item.id;
+  const actionWithVariant = formAction.bind(null, itemId);
+
+  return (
+    <form action={actionWithVariant}>
+      <SubmitButton />
+      <p aria-live="polite" className="sr-only" role="status">
+        {message}
+      </p>
+    </form>
+  );
+}

components/cart/edit-item-quantity-button.tsx

@@ -1,54 +1,32 @@
-import { useRouter } from 'next/navigation';
+'use client';
-import { useTransition } from 'react';
 
 import { MinusIcon, PlusIcon } from '@heroicons/react/24/outline';
 import clsx from 'clsx';
-import { removeItem, updateItemQuantity } from 'components/cart/actions';
+import { updateItemQuantity } from 'components/cart/actions';
 import LoadingDots from 'components/loading-dots';
 import type { CartItem } from 'lib/shopify/types';
+import { useFormState, useFormStatus } from 'react-dom';
 
-export default function EditItemQuantityButton({
+function SubmitButton({ type }: { type: 'plus' | 'minus' }) {
-  item,
+  const { pending } = useFormStatus();
-  type
-}: {
-  item: CartItem;
-  type: 'plus' | 'minus';
-}) {
-  const router = useRouter();
-  const [isPending, startTransition] = useTransition();
 
   return (
     <button
-      aria-label={type === 'plus' ? 'Increase item quantity' : 'Reduce item quantity'}
+      type="submit"
-      onClick={() => {
+      onClick={(e: React.FormEvent<HTMLButtonElement>) => {
-        startTransition(async () => {
+        if (pending) e.preventDefault();
-          const error =
-            type === 'minus' && item.quantity - 1 === 0
-              ? await removeItem(item.id)
-              : await updateItemQuantity({
-                  lineId: item.id,
-                  variantId: item.merchandise.id,
-                  quantity: type === 'plus' ? item.quantity + 1 : item.quantity - 1
-                });
-
-          if (error) {
-            // Trigger the error boundary in the root error.js
-            throw new Error(error.toString());
-          }
-
-          router.refresh();
-        });
       }}
-      disabled={isPending}
+      aria-label={type === 'plus' ? 'Increase item quantity' : 'Reduce item quantity'}
+      aria-disabled={pending}
       className={clsx(
         'ease flex h-full min-w-[36px] max-w-[36px] flex-none items-center justify-center rounded-full px-2 transition-all duration-200 hover:border-neutral-800 hover:opacity-80',
         {
-          'cursor-not-allowed': isPending,
+          'cursor-not-allowed': pending,
           'ml-auto': type === 'minus'
         }
       )}
     >
-      {isPending ? (
+      {pending ? (
         <LoadingDots className="bg-black dark:bg-white" />
       ) : type === 'plus' ? (
         <PlusIcon className="h-4 w-4 dark:text-neutral-500" />
@@ -58,3 +36,22 @@ export default function EditItemQuantityButton({
     </button>
   );
 }
+
+export function EditItemQuantityButton({ item, type }: { item: CartItem; type: 'plus' | 'minus' }) {
+  const [message, formAction] = useFormState(updateItemQuantity, null);
+  const payload = {
+    lineId: item.id,
+    variantId: item.merchandise.id,
+    quantity: type === 'plus' ? item.quantity + 1 : item.quantity - 1
+  };
+  const actionWithVariant = formAction.bind(null, payload);
+
+  return (
+    <form action={actionWithVariant}>
+      <SubmitButton type={type} />
+      <p aria-live="polite" className="sr-only" role="status">
+        {message}
+      </p>
+    </form>
+  );
+}

components/cart/modal.tsx

@@ -13,8 +13,8 @@ import Image from 'next/image';
 import Link from 'next/link';
 import { Fragment, useEffect, useRef, useState } from 'react';
 import CloseCart from './close-cart';
-import DeleteItemButton from './delete-item-button';
+import { DeleteItemButton } from './delete-item-button';
-import EditItemQuantityButton from './edit-item-quantity-button';
+import { EditItemQuantityButton } from './edit-item-quantity-button';
 import OpenCart from './open-cart';
 import { PromotedCartItem } from './promoted-cart-item';
 

components/grid/homepage-products.tsx

@@ -8,9 +8,6 @@ import Link from 'next/link';
 import Label from '../label';
 import { GridTileImage } from './tile';
 
-export const runtime = 'edge';
-export const revalidate = 300; // 5 minutes in seconds
-
 function HomepageProductsItem({ item, priority }: { item: Product; priority?: boolean }) {
   const size = item?.variants?.[0]?.selectedOptions?.find((option) => option.name === 'Size');
   const image = item?.variants?.[0]?.image;

components/layout/footer.tsx

@@ -5,6 +5,7 @@ import InstagramIcon from 'components/icons/instagram';
 import KanjiLogo from 'components/icons/kanji';
 import { Cart, Product } from 'lib/shopify/types';
 import Link from 'next/link';
+import { Suspense } from 'react';
 import FooterMenu from './footer-menu';
 import NewsletterFooter from './newsletter-footer';
 
@@ -95,7 +96,9 @@ export default async function Footer({
 
             <div className="flex flex-col space-y-2 pt-24">
               <div className="flex flex-row justify-between space-x-4">
+                <Suspense>
                   <CartModal cart={cart} promotedItem={promotedItem} />
+                </Suspense>
                 <div className="flex flex-row items-center space-x-6">
                   <Link
                     href="https://www.instagram.com/narai.sake/"

components/layout/menu/modal.tsx

@@ -7,7 +7,7 @@ import Logo from 'components/icons/logo';
 import MenuIcon from 'components/icons/menu';
 import { useLocale, useTranslations } from 'next-intl';
 import Link from 'next/link';
-import { Fragment, useRef, useState } from 'react';
+import { Fragment, Suspense, useRef, useState } from 'react';
 import { LanguageControl, SupportedLocale } from '../navbar/language-control';
 
 export function MenuModal({ scrolled }: { scrolled: boolean }) {
@@ -72,6 +72,7 @@ export function MenuModal({ scrolled }: { scrolled: boolean }) {
                     </button>
                   </div>
 
+                  <Suspense fallback={null}>
                     <div className="grid h-[calc(100vh-124px)] grid-cols-1 place-content-center">
                       <div className="flex flex-row justify-end">
                         <nav className="flex flex-col space-y-4 px-4 text-right">
@@ -149,6 +150,7 @@ export function MenuModal({ scrolled }: { scrolled: boolean }) {
                         </nav>
                       </div>
                     </div>
+                  </Suspense>
                 </div>
               </Dialog.Panel>
             </div>

components/layout/navbar/index.tsx

@@ -7,6 +7,7 @@ import CartModal from 'components/cart/modal';
 import LogoNamemark from 'components/icons/namemark';
 import { Cart, Product } from 'lib/shopify/types';
 import Link from 'next/link';
+import { Suspense } from 'react';
 import { useInView } from 'react-intersection-observer';
 import { MenuModal } from '../menu/modal';
 import { LanguageControl, SupportedLocale } from './language-control';
@@ -62,8 +63,12 @@ export default function Navbar({
             </div>
             <nav className="flex flex-row items-center space-x-4 px-6">
               <div className="flex flex-col-reverse items-center justify-center space-y-2 px-2 md:flex-row md:space-x-6">
+                <Suspense>
                   <CartModal cart={cart} promotedItem={promotedItem} />
+                </Suspense>
+                <Suspense>
                   <MenuModal scrolled={!inView} />
+                </Suspense>
               </div>
             </nav>
           </div>
@@ -84,13 +89,19 @@ export default function Navbar({
           </Link>
         </div>
         <nav className="flex flex-row items-center space-x-4 px-2 md:pt-6">
+          <Suspense fallback={null}>
             <div className="hidden md:block">
               <LanguageControl lang={locale} />
             </div>
             <div className="flex flex-col-reverse items-center justify-center space-y-2 rounded md:flex-row md:space-x-6 md:space-y-0">
+              <Suspense>
                 <CartModal cart={cart} promotedItem={promotedItem} />
+              </Suspense>
+              <Suspense>
                 <MenuModal scrolled={!inView} />
+              </Suspense>
             </div>
+          </Suspense>
         </nav>
       </div>
     </div>

components/layout/navbar/language-control.tsx

@@ -1,11 +1,12 @@
 'use client';
 
 import clsx from 'clsx';
-import Link from 'next-intl/link';
+import { createSharedPathnamesNavigation } from 'next-intl/navigation';
-import { usePathname } from 'next/navigation';
 
 export type SupportedLocale = 'en' | 'ja';
 
+const locales = ['en', 'ja'] as const;
+
 function removeItem<T>(arr: Array<T>, value: T): Array<T> {
   const index = arr.indexOf(value);
   if (index > -1) {
@@ -15,6 +16,7 @@ function removeItem<T>(arr: Array<T>, value: T): Array<T> {
 }
 
 export const LanguageControl = ({ lang }: { lang?: SupportedLocale }) => {
+  const { Link, usePathname } = createSharedPathnamesNavigation({ locales });
   const pathName = usePathname();
 
   const basePathName = () => {

components/layout/navbar/mobile-menu.tsx

@@ -3,7 +3,7 @@
 import { Dialog, Transition } from '@headlessui/react';
 import Link from 'next/link';
 import { usePathname, useSearchParams } from 'next/navigation';
-import { Fragment, useEffect, useState } from 'react';
+import { Fragment, Suspense, useEffect, useState } from 'react';
 
 import { Bars3Icon, XMarkIcon } from '@heroicons/react/24/outline';
 import { Menu } from 'lib/shopify/types';
@@ -72,7 +72,9 @@ export default function MobileMenu({ menu }: { menu: Menu[] }) {
                 </button>
 
                 <div className="mb-4 w-full">
+                  <Suspense fallback={null}>
                     <Search />
+                  </Suspense>
                 </div>
                 {menu.length ? (
                   <ul className="flex w-full flex-col">

components/layout/navbar/search.tsx

@@ -1,19 +1,12 @@
 'use client';
 
-import { useRouter, useSearchParams } from 'next/navigation';
-import { useEffect, useState } from 'react';
-
 import { MagnifyingGlassIcon } from '@heroicons/react/24/outline';
 import { createUrl } from 'lib/utils';
+import { useRouter, useSearchParams } from 'next/navigation';
 
 export default function Search() {
   const router = useRouter();
   const searchParams = useSearchParams();
-  const [searchValue, setSearchValue] = useState('');
-
-  useEffect(() => {
-    setSearchValue(searchParams?.get('q') || '');
-  }, [searchParams, setSearchValue]);
 
   function onSubmit(e: React.FormEvent<HTMLFormElement>) {
     e.preventDefault();
@@ -34,12 +27,12 @@ export default function Search() {
   return (
     <form onSubmit={onSubmit} className="relative w-full max-w-[550px] lg:w-80 xl:w-full">
       <input
+        key={searchParams?.get('q')}
         type="text"
         name="search"
         placeholder="Search for products..."
         autoComplete="off"
-        value={searchValue}
+        defaultValue={searchParams?.get('q') || ''}
-        onChange={(e) => setSearchValue(e.target.value)}
         className="w-full rounded-lg border bg-white px-4 py-2 text-sm text-black placeholder:text-neutral-500 dark:border-neutral-800 dark:bg-transparent dark:text-white dark:placeholder:text-neutral-400"
       />
       <div className="absolute right-0 top-0 mr-3 flex h-full items-center">

components/layout/search/filter/index.tsx

@@ -1,4 +1,5 @@
 import { SortFilterItem } from 'lib/constants';
+import { Suspense } from 'react';
 import FilterItemDropdown from './dropdown';
 import { FilterItem } from './item';
 
@@ -19,12 +20,20 @@ export default function FilterList({ list, title }: { list: ListItem[]; title?:
   return (
     <>
       <nav>
-        {title ? <h3 className="hidden text-xs text-neutral-500 md:block">{title}</h3> : null}
+        {title ? (
+          <h3 className="hidden text-xs text-neutral-500 dark:text-neutral-400 md:block">
+            {title}
+          </h3>
+        ) : null}
         <ul className="hidden md:block">
+          <Suspense fallback={null}>
             <FilterItemList list={list} />
+          </Suspense>
         </ul>
         <ul className="md:hidden">
+          <Suspense fallback={null}>
             <FilterItemDropdown list={list} />
+          </Suspense>
         </ul>
       </nav>
     </>

components/opengraph-image.tsx

@@ -1,4 +1,4 @@
-import { ImageResponse } from 'next/server';
+import { ImageResponse } from 'next/og';
 import Logo from './icons/logo';
 
 export type Props = {

components/product/variant-selector.tsx

@@ -3,8 +3,7 @@
 import clsx from 'clsx';
 import { ProductOption, ProductVariant } from 'lib/shopify/types';
 import { createUrl } from 'lib/utils';
-import Link from 'next/link';
+import { usePathname, useRouter, useSearchParams } from 'next/navigation';
-import { usePathname, useSearchParams } from 'next/navigation';
 
 type Combination = {
   id: string;
@@ -19,6 +18,7 @@ export function VariantSelector({
   options: ProductOption[];
   variants: ProductVariant[];
 }) {
+  const router = useRouter();
   const pathname = usePathname();
   const searchParams = useSearchParams();
   const hasNoOptionsOrJustOneOption =
@@ -76,17 +76,14 @@ export function VariantSelector({
           // The option is active if it's in the url params.
           const isActive = searchParams.get(optionNameLowerCase) === value;
 
-          // You can't disable a link, so we need to render something that isn't clickable.
-          const DynamicTag = isAvailableForSale ? Link : 'p';
-          const dynamicProps = {
-            ...(isAvailableForSale && { scroll: false })
-          };
-
           return (
-            <DynamicTag
+            <button
               key={value}
               aria-disabled={!isAvailableForSale}
-              href={optionUrl}
+              disabled={!isAvailableForSale}
+              onClick={() => {
+                router.replace(optionUrl, { scroll: false });
+              }}
               title={`${option.name} ${value}${!isAvailableForSale ? ' (Out of Stock)' : ''}`}
               className={clsx(
                 'flex min-w-[48px] items-center justify-center rounded-full border bg-white px-2 py-1 text-sm text-black',
@@ -98,10 +95,9 @@ export function VariantSelector({
                     !isAvailableForSale
                 }
               )}
-              {...dynamicProps}
             >
               {value}
-            </DynamicTag>
+            </button>
           );
         })}
       </dd>

deprecated/[page]/layout.tsx

@@ -1,15 +0,0 @@
-import Footer from 'components/layout/footer';
-import { Suspense } from 'react';
-
-export default function Layout({ children }: { children: React.ReactNode }) {
-  return (
-    <Suspense>
-      <div className="w-full">
-        <div className="mx-8 max-w-2xl py-20 sm:mx-auto">
-          <Suspense>{children}</Suspense>
-        </div>
-      </div>
-      <Footer />
-    </Suspense>
-  );
-}

deprecated/[page]/opengraph-image.tsx

@@ -1,12 +0,0 @@
-import OpengraphImage from 'components/opengraph-image';
-import { getPage } from 'lib/shopify';
-
-export const runtime = 'edge';
-export const revalidate = 300; // 5 minutes in seconds
-
-export default async function Image({ params }: { params: { page: string } }) {
-  const page = await getPage({ handle: params.page });
-  const title = page.seo?.title || page.title;
-
-  return await OpengraphImage({ title });
-}

deprecated/[page]/page.tsx

@@ -1,53 +0,0 @@
-import type { Metadata } from 'next';
-
-import { SupportedLocale } from 'components/layout/navbar/language-control';
-import Prose from 'components/prose';
-import { getPage } from 'lib/shopify';
-import { notFound } from 'next/navigation';
-
-export const runtime = 'edge';
-export const revalidate = 43200; // 12 hours in seconds
-
-export async function generateMetadata({
-  params
-}: {
-  params: { page: string; locale?: SupportedLocale };
-}): Promise<Metadata> {
-  const page = await getPage({ handle: params.page, language: params?.locale?.toUpperCase() });
-
-  if (!page) return notFound();
-
-  return {
-    title: page.seo?.title || page.title,
-    description: page.seo?.description || page.bodySummary,
-    openGraph: {
-      publishedTime: page.createdAt,
-      modifiedTime: page.updatedAt,
-      type: 'article'
-    }
-  };
-}
-
-export default async function Page({
-  params
-}: {
-  params: { page: string; locale?: SupportedLocale };
-}) {
-  const page = await getPage({ handle: params.page, language: params?.locale?.toUpperCase() });
-
-  if (!page) return notFound();
-
-  return (
-    <div className="text-white">
-      <h1 className="mb-8 text-5xl font-bold">{page.title}</h1>
-      <Prose className="mb-8" html={page.body as string} />
-      <p className="text-sm italic">
-        {`This document was last updated on ${new Intl.DateTimeFormat(undefined, {
-          year: 'numeric',
-          month: 'long',
-          day: 'numeric'
-        }).format(new Date(page.updatedAt))}.`}
-      </p>
-    </div>
-  );
-}

deprecated/search/[collection]/opengraph-image.tsx

@@ -1,12 +0,0 @@
-import OpengraphImage from 'components/opengraph-image';
-import { getCollection } from 'lib/shopify';
-
-export const runtime = 'edge';
-export const revalidate = 300; // 5 minutes in seconds
-
-export default async function Image({ params }: { params: { collection: string } }) {
-  const collection = await getCollection({ handle: params.collection });
-  const title = collection?.seo?.title || collection?.title;
-
-  return await OpengraphImage({ title });
-}

deprecated/search/[collection]/page.tsx

@@ -1,50 +0,0 @@
-import { getCollection, getCollectionProducts } from 'lib/shopify';
-import { Metadata } from 'next';
-import { notFound } from 'next/navigation';
-
-import Grid from 'components/grid';
-import ProductGridItems from 'components/layout/product-grid-items';
-import { defaultSort, sorting } from 'lib/constants';
-
-export const runtime = 'edge';
-export const revalidate = 300; // 5 minutes in seconds
-
-export async function generateMetadata({
-  params
-}: {
-  params: { collection: string };
-}): Promise<Metadata> {
-  const collection = await getCollection({ handle: params.collection });
-
-  if (!collection) return notFound();
-
-  return {
-    title: collection.seo?.title || collection.title,
-    description:
-      collection.seo?.description || collection.description || `${collection.title} products`
-  };
-}
-
-export default async function CategoryPage({
-  params,
-  searchParams
-}: {
-  params: { collection: string };
-  searchParams?: { [key: string]: string | string[] | undefined };
-}) {
-  const { sort } = searchParams as { [key: string]: string };
-  const { sortKey, reverse } = sorting.find((item) => item.slug === sort) || defaultSort;
-  const products = await getCollectionProducts({ collection: params.collection, sortKey, reverse });
-
-  return (
-    <section>
-      {products.length === 0 ? (
-        <p className="py-3 text-lg">{`No products found in this collection`}</p>
-      ) : (
-        <Grid className="grid-cols-1 sm:grid-cols-2 lg:grid-cols-3">
-          <ProductGridItems products={products} />
-        </Grid>
-      )}
-    </section>
-  );
-}

deprecated/search/layout.tsx

@@ -1,22 +0,0 @@
-import Footer from 'components/layout/footer';
-import Collections from 'components/layout/search/collections';
-import FilterList from 'components/layout/search/filter';
-import { sorting } from 'lib/constants';
-import { Suspense } from 'react';
-
-export default function SearchLayout({ children }: { children: React.ReactNode }) {
-  return (
-    <Suspense>
-      <div className="mx-auto flex max-w-screen-xl flex-col gap-8 px-4 pb-4 text-black dark:text-white md:flex-row">
-        <div className="order-first w-full flex-none md:max-w-[125px]">
-          <Collections />
-        </div>
-        <div className="order-last min-h-screen w-full md:order-none">{children}</div>
-        <div className="order-none flex-none md:order-last md:w-[125px]">
-          <FilterList list={sorting} title="Sort by" />
-        </div>
-      </div>
-      <Footer />
-    </Suspense>
-  );
-}

deprecated/search/loading.tsx

@@ -1,15 +0,0 @@
-import Grid from 'components/grid';
-
-export default function Loading() {
-  return (
-    <Grid className="grid-cols-2 lg:grid-cols-3">
-      {Array(12)
-        .fill(0)
-        .map((_, index) => {
-          return (
-            <Grid.Item key={index} className="animate-pulse bg-neutral-100 dark:bg-neutral-900" />
-          );
-        })}
-    </Grid>
-  );
-}

deprecated/search/page.tsx

@@ -1,42 +0,0 @@
-import Grid from 'components/grid';
-import ProductGridItems from 'components/layout/product-grid-items';
-import { defaultSort, sorting } from 'lib/constants';
-import { getProducts } from 'lib/shopify';
-
-export const runtime = 'edge';
-export const revalidate = 300; // 5 minutes in seconds
-
-export const metadata = {
-  title: 'Search',
-  description: 'Search for products in the store.'
-};
-
-export default async function SearchPage({
-  searchParams
-}: {
-  searchParams?: { [key: string]: string | string[] | undefined };
-}) {
-  const { sort, q: searchValue } = searchParams as { [key: string]: string };
-  const { sortKey, reverse } = sorting.find((item) => item.slug === sort) || defaultSort;
-
-  const products = await getProducts({ sortKey, reverse, query: searchValue });
-  const resultsText = products.length > 1 ? 'results' : 'result';
-
-  return (
-    <>
-      {searchValue ? (
-        <p className="mb-4">
-          {products.length === 0
-            ? 'There are no products that match '
-            : `Showing ${products.length} ${resultsText} for `}
-          <span className="font-bold">&quot;{searchValue}&quot;</span>
-        </p>
-      ) : null}
-      {products.length > 0 ? (
-        <Grid className="grid-cols-1 sm:grid-cols-2 lg:grid-cols-3">
-          <ProductGridItems products={products} />
-        </Grid>
-      ) : null}
-    </>
-  );
-}

deprecated/sitemap.ts

@@ -1,49 +0,0 @@
-import { getCollections, getPages, getProducts } from 'lib/shopify';
-import { MetadataRoute } from 'next';
-
-type Route = {
-  url: string;
-  lastModified: string;
-};
-
-const baseUrl = process.env.NEXT_PUBLIC_VERCEL_URL
-  ? `https://${process.env.NEXT_PUBLIC_VERCEL_URL}`
-  : 'http://localhost:3000';
-
-export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
-  const routesMap = [''].map((route) => ({
-    url: `${baseUrl}${route}`,
-    lastModified: new Date().toISOString()
-  }));
-
-  const collectionsPromise = getCollections().then((collections) =>
-    collections.map((collection) => ({
-      url: `${baseUrl}${collection.path}`,
-      lastModified: collection.updatedAt
-    }))
-  );
-
-  const productsPromise = getProducts({}).then((products) =>
-    products.map((product) => ({
-      url: `${baseUrl}/product/${product.handle}`,
-      lastModified: product.updatedAt
-    }))
-  );
-
-  const pagesPromise = getPages({}).then((pages) =>
-    pages.map((page) => ({
-      url: `${baseUrl}/${page.handle}`,
-      lastModified: page.updatedAt
-    }))
-  );
-
-  let fetchedRoutes: Route[] = [];
-
-  try {
-    fetchedRoutes = (await Promise.all([collectionsPromise, productsPromise, pagesPromise])).flat();
-  } catch (error) {
-    throw JSON.stringify(error, null, 2);
-  }
-
-  return [...routesMap, ...fetchedRoutes];
-}

i18n.ts

@@ -0,0 +1,5 @@
+import { getRequestConfig } from 'next-intl/server';
+
+export default getRequestConfig(async ({ locale }) => ({
+  messages: (await import(`./messages/${locale}.json`)).default
+}));

lib/constants.ts

@@ -22,7 +22,8 @@ export const sorting: SortFilterItem[] = [
 
 export const TAGS = {
   collections: 'collections',
-  products: 'products'
+  products: 'products',
+  cart: 'cart'
 };
 
 export const HIDDEN_PRODUCT_TAG = 'nextjs-frontend-hidden';

lib/shopify/index.ts

@@ -1,5 +1,6 @@
 import { HIDDEN_PRODUCT_TAG, SHOPIFY_GRAPHQL_API_ENDPOINT, TAGS } from 'lib/constants';
 import { isShopifyError } from 'lib/type-guards';
+import { ensureStartsWith } from 'lib/utils';
 import { revalidateTag } from 'next/cache';
 import { headers } from 'next/headers';
 import { NextRequest, NextResponse } from 'next/server';
@@ -55,7 +56,9 @@ import {
   ShopifyUpdateCartOperation
 } from './types';
 
-const domain = `https://${process.env.SHOPIFY_STORE_DOMAIN!}`;
+const domain = process.env.SHOPIFY_STORE_DOMAIN
+  ? ensureStartsWith(process.env.SHOPIFY_STORE_DOMAIN, 'https://')
+  : '';
 const endpoint = `${domain}${SHOPIFY_GRAPHQL_API_ENDPOINT}`;
 const key = process.env.SHOPIFY_STOREFRONT_ACCESS_TOKEN!;
 
@@ -103,6 +106,7 @@ export async function shopifyFetch<T>({
   } catch (e) {
     if (isShopifyError(e)) {
       throw {
+        cause: e.cause?.toString() || 'unknown',
         status: e.status || 500,
         message: e.message,
         query
@@ -273,6 +277,7 @@ export async function getCart(cartId: string): Promise<Cart | undefined> {
   const res = await shopifyFetch<ShopifyCartOperation>({
     query: getCartQuery,
     variables: { cartId },
+    tags: [TAGS.cart],
     cache: 'no-store'
   });
 
@@ -395,6 +400,7 @@ export async function getPage({
 }): Promise<Page> {
   const res = await shopifyFetch<ShopifyPageOperation>({
     query: getPageQuery,
+    cache: 'no-store',
     variables: { handle, language, country }
   });
 
@@ -410,6 +416,7 @@ export async function getPages({
 }): Promise<Page[]> {
   const res = await shopifyFetch<ShopifyPagesOperation>({
     query: getPagesQuery,
+    cache: 'no-store',
     variables: { language, country }
   });
 

lib/type-guards.ts

@@ -1,6 +1,7 @@
 export interface ShopifyErrorLike {
   status: number;
   message: Error;
+  cause?: Error;
 }
 
 export const isObject = (object: unknown): object is Record<string, unknown> => {

lib/utils.ts

@@ -6,3 +6,34 @@ export const createUrl = (pathname: string, params: URLSearchParams | ReadonlyUR
 
   return `${pathname}${queryString}`;
 };
+
+export const ensureStartsWith = (stringToCheck: string, startsWith: string) =>
+  stringToCheck.startsWith(startsWith) ? stringToCheck : `${startsWith}${stringToCheck}`;
+
+export const validateEnvironmentVariables = () => {
+  const requiredEnvironmentVariables = ['SHOPIFY_STORE_DOMAIN', 'SHOPIFY_STOREFRONT_ACCESS_TOKEN'];
+  const missingEnvironmentVariables = [] as string[];
+
+  requiredEnvironmentVariables.forEach((envVar) => {
+    if (!process.env[envVar]) {
+      missingEnvironmentVariables.push(envVar);
+    }
+  });
+
+  if (missingEnvironmentVariables.length) {
+    throw new Error(
+      `The following environment variables are missing. Your site will not work without them. Read more: https://vercel.com/docs/integrations/shopify#configure-environment-variables\n\n${missingEnvironmentVariables.join(
+        '\n'
+      )}\n`
+    );
+  }
+
+  if (
+    process.env.SHOPIFY_STORE_DOMAIN?.includes('[') ||
+    process.env.SHOPIFY_STORE_DOMAIN?.includes(']')
+  ) {
+    throw new Error(
+      'Your `SHOPIFY_STORE_DOMAIN` environment variable includes brackets (ie. `[` and / or `]`). Your site will not work with them there. Please remove them.'
+    );
+  }
+};

next.config.js

@@ -1,11 +1,14 @@
 /** @type {import('next').NextConfig} */
-module.exports = {
+
+const withNextIntl = require('next-intl/plugin')('./i18n.ts');
+
+module.exports = withNextIntl({
   eslint: {
     // Disabling on production builds because we're running checks on PRs via GitHub Actions.
     ignoreDuringBuilds: true
   },
   experimental: {
-    serverActions: true
+    ppr: true
   },
   images: {
     formats: ['image/avif', 'image/webp'],
@@ -16,5 +19,14 @@ module.exports = {
         pathname: '/s/files/**'
       }
     ]
+  },
+  async redirects() {
+    return [
+      {
+        source: '/password',
+        destination: '/',
+        permanent: true
       }
-};
+    ];
+  }
+});