diff --git a/.yarn/cache/@babel-helper-validator-identifier-npm-7.22.20-18305bb306-136412784d.zip b/.yarn/cache/@babel-helper-validator-identifier-npm-7.22.20-18305bb306-136412784d.zip new file mode 100644 index 000000000..53d7fc033 Binary files /dev/null and b/.yarn/cache/@babel-helper-validator-identifier-npm-7.22.20-18305bb306-136412784d.zip differ diff --git a/.yarn/cache/@eslint-eslintrc-npm-2.1.1-ced87d94ab-bf909ea183.zip b/.yarn/cache/@eslint-eslintrc-npm-2.1.3-088d1bae55-5c6c387819.zip similarity index 63% rename from .yarn/cache/@eslint-eslintrc-npm-2.1.1-ced87d94ab-bf909ea183.zip rename to .yarn/cache/@eslint-eslintrc-npm-2.1.3-088d1bae55-5c6c387819.zip index be537ecad..937c836db 100644 Binary files a/.yarn/cache/@eslint-eslintrc-npm-2.1.1-ced87d94ab-bf909ea183.zip and b/.yarn/cache/@eslint-eslintrc-npm-2.1.3-088d1bae55-5c6c387819.zip differ diff --git a/.yarn/cache/@eslint-js-npm-8.46.0-3cfe1ee88b-7aed479832.zip b/.yarn/cache/@eslint-js-npm-8.53.0-1ffdbc6083-e0d5cfb000.zip similarity index 50% rename from .yarn/cache/@eslint-js-npm-8.46.0-3cfe1ee88b-7aed479832.zip rename to .yarn/cache/@eslint-js-npm-8.53.0-1ffdbc6083-e0d5cfb000.zip index 730f35f30..0c81ca542 100644 Binary files a/.yarn/cache/@eslint-js-npm-8.46.0-3cfe1ee88b-7aed479832.zip and b/.yarn/cache/@eslint-js-npm-8.53.0-1ffdbc6083-e0d5cfb000.zip differ diff --git a/.yarn/cache/@humanwhocodes-config-array-npm-0.11.10-7b63df9e7f-1b1302e240.zip b/.yarn/cache/@humanwhocodes-config-array-npm-0.11.13-12314014f2-f8ea57b0d7.zip similarity index 51% rename from .yarn/cache/@humanwhocodes-config-array-npm-0.11.10-7b63df9e7f-1b1302e240.zip rename to .yarn/cache/@humanwhocodes-config-array-npm-0.11.13-12314014f2-f8ea57b0d7.zip index 3970ef9bc..4a8665e83 100644 Binary files a/.yarn/cache/@humanwhocodes-config-array-npm-0.11.10-7b63df9e7f-1b1302e240.zip and b/.yarn/cache/@humanwhocodes-config-array-npm-0.11.13-12314014f2-f8ea57b0d7.zip differ diff --git a/.yarn/cache/@humanwhocodes-object-schema-npm-1.2.1-eb622b5d0e-a824a1ec31.zip b/.yarn/cache/@humanwhocodes-object-schema-npm-1.2.1-eb622b5d0e-a824a1ec31.zip deleted file mode 100644 index 2b79104af..000000000 Binary files a/.yarn/cache/@humanwhocodes-object-schema-npm-1.2.1-eb622b5d0e-a824a1ec31.zip and /dev/null differ diff --git a/.yarn/cache/@humanwhocodes-object-schema-npm-2.0.1-c23364bbfc-24929487b1.zip b/.yarn/cache/@humanwhocodes-object-schema-npm-2.0.1-c23364bbfc-24929487b1.zip new file mode 100644 index 000000000..ddd36cec8 Binary files /dev/null and b/.yarn/cache/@humanwhocodes-object-schema-npm-2.0.1-c23364bbfc-24929487b1.zip differ diff --git a/.yarn/cache/@types-node-npm-20.4.4-6c302e7a15-43f3c4a8ac.zip b/.yarn/cache/@types-node-npm-20.4.4-6c302e7a15-43f3c4a8ac.zip deleted file mode 100644 index 956948e07..000000000 Binary files a/.yarn/cache/@types-node-npm-20.4.4-6c302e7a15-43f3c4a8ac.zip and /dev/null differ diff --git a/.yarn/cache/@types-node-npm-20.9.0-d5b5fa6634-bfd927da6b.zip b/.yarn/cache/@types-node-npm-20.9.0-d5b5fa6634-bfd927da6b.zip new file mode 100644 index 000000000..c37c18578 Binary files /dev/null and b/.yarn/cache/@types-node-npm-20.9.0-d5b5fa6634-bfd927da6b.zip differ diff --git a/.yarn/cache/@types-react-dom-npm-18.2.15-2269cd02ff-8e9631600c.zip b/.yarn/cache/@types-react-dom-npm-18.2.15-2269cd02ff-8e9631600c.zip new file mode 100644 index 000000000..028bed216 Binary files /dev/null and b/.yarn/cache/@types-react-dom-npm-18.2.15-2269cd02ff-8e9631600c.zip differ diff --git a/.yarn/cache/@types-react-dom-npm-18.2.7-a20ba684a5-e02ea90828.zip b/.yarn/cache/@types-react-dom-npm-18.2.7-a20ba684a5-e02ea90828.zip deleted file mode 100644 index 96320e00b..000000000 Binary files a/.yarn/cache/@types-react-dom-npm-18.2.7-a20ba684a5-e02ea90828.zip and /dev/null differ diff --git a/.yarn/cache/@types-react-npm-18.2.16-ae9a0e7dba-3d4fdc1250.zip b/.yarn/cache/@types-react-npm-18.2.16-ae9a0e7dba-3d4fdc1250.zip deleted file mode 100644 index 06543abfc..000000000 Binary files a/.yarn/cache/@types-react-npm-18.2.16-ae9a0e7dba-3d4fdc1250.zip and /dev/null differ diff --git a/.yarn/cache/@types-react-npm-18.2.37-3fa76216da-2d2599f1a0.zip b/.yarn/cache/@types-react-npm-18.2.37-3fa76216da-2d2599f1a0.zip new file mode 100644 index 000000000..3ee4953ed Binary files /dev/null and b/.yarn/cache/@types-react-npm-18.2.37-3fa76216da-2d2599f1a0.zip differ diff --git a/.yarn/cache/@ungap-structured-clone-npm-1.2.0-648f0b82e0-4f656b7b46.zip b/.yarn/cache/@ungap-structured-clone-npm-1.2.0-648f0b82e0-4f656b7b46.zip new file mode 100644 index 000000000..598a36e08 Binary files /dev/null and b/.yarn/cache/@ungap-structured-clone-npm-1.2.0-648f0b82e0-4f656b7b46.zip differ diff --git a/.yarn/cache/eslint-npm-8.46.0-dc7af99e61-7a7d36b1a3.zip b/.yarn/cache/eslint-npm-8.53.0-2fc5c501d2-2da808655c.zip similarity index 54% rename from .yarn/cache/eslint-npm-8.46.0-dc7af99e61-7a7d36b1a3.zip rename to .yarn/cache/eslint-npm-8.53.0-2fc5c501d2-2da808655c.zip index d2c109dde..fc046374c 100644 Binary files a/.yarn/cache/eslint-npm-8.46.0-dc7af99e61-7a7d36b1a3.zip and b/.yarn/cache/eslint-npm-8.53.0-2fc5c501d2-2da808655c.zip differ diff --git a/.yarn/cache/eslint-plugin-unicorn-npm-48.0.1-5cea5507f4-e63112cbaa.zip b/.yarn/cache/eslint-plugin-unicorn-npm-49.0.0-b6195f02e8-7580dc96b2.zip similarity index 62% rename from .yarn/cache/eslint-plugin-unicorn-npm-48.0.1-5cea5507f4-e63112cbaa.zip rename to .yarn/cache/eslint-plugin-unicorn-npm-49.0.0-b6195f02e8-7580dc96b2.zip index 783ae95f9..f96e11dc2 100644 Binary files a/.yarn/cache/eslint-plugin-unicorn-npm-48.0.1-5cea5507f4-e63112cbaa.zip and b/.yarn/cache/eslint-plugin-unicorn-npm-49.0.0-b6195f02e8-7580dc96b2.zip differ diff --git a/.yarn/cache/eslint-visitor-keys-npm-3.4.3-a356ac7e46-36e9ef87fc.zip b/.yarn/cache/eslint-visitor-keys-npm-3.4.3-a356ac7e46-36e9ef87fc.zip new file mode 100644 index 000000000..7c61b814b Binary files /dev/null and b/.yarn/cache/eslint-visitor-keys-npm-3.4.3-a356ac7e46-36e9ef87fc.zip differ diff --git a/.yarn/cache/lodash-npm-4.17.21-6382451519-eb835a2e51.zip b/.yarn/cache/lodash-npm-4.17.21-6382451519-eb835a2e51.zip deleted file mode 100644 index 22ac44c4e..000000000 Binary files a/.yarn/cache/lodash-npm-4.17.21-6382451519-eb835a2e51.zip and /dev/null differ diff --git a/.yarn/cache/prettier-plugin-tailwindcss-npm-0.4.1-280e71424b-9bdf3b7c27.zip b/.yarn/cache/prettier-plugin-tailwindcss-npm-0.4.1-280e71424b-9bdf3b7c27.zip deleted file mode 100644 index e238ef859..000000000 Binary files a/.yarn/cache/prettier-plugin-tailwindcss-npm-0.4.1-280e71424b-9bdf3b7c27.zip and /dev/null differ diff --git a/.yarn/cache/prettier-plugin-tailwindcss-npm-0.5.7-37e26935aa-616c6eabd3.zip b/.yarn/cache/prettier-plugin-tailwindcss-npm-0.5.7-37e26935aa-616c6eabd3.zip new file mode 100644 index 000000000..1525f515f Binary files /dev/null and b/.yarn/cache/prettier-plugin-tailwindcss-npm-0.5.7-37e26935aa-616c6eabd3.zip differ diff --git a/.yarn/cache/react-npm-18.2.0-1eae08fee2-88e38092da.zip b/.yarn/cache/react-npm-18.2.0-1eae08fee2-88e38092da.zip deleted file mode 100644 index 392c40e13..000000000 Binary files a/.yarn/cache/react-npm-18.2.0-1eae08fee2-88e38092da.zip and /dev/null differ diff --git a/.yarn/cache/react-npm-18.3.0-canary-6b3834a45-20231110-ba61e1cb89-1c89235bd8.zip b/.yarn/cache/react-npm-18.3.0-canary-6b3834a45-20231110-ba61e1cb89-1c89235bd8.zip new file mode 100644 index 000000000..c8c1e3620 Binary files /dev/null and b/.yarn/cache/react-npm-18.3.0-canary-6b3834a45-20231110-ba61e1cb89-1c89235bd8.zip differ diff --git a/.yarn/cache/undici-types-npm-5.26.5-de4f7c7bb9-3192ef6f3f.zip b/.yarn/cache/undici-types-npm-5.26.5-de4f7c7bb9-3192ef6f3f.zip new file mode 100644 index 000000000..6ab5ae67e Binary files /dev/null and b/.yarn/cache/undici-types-npm-5.26.5-de4f7c7bb9-3192ef6f3f.zip differ diff --git a/app/[locale]/about/page.tsx b/app/[locale]/about/page.tsx index 46cd14681..039f64945 100644 --- a/app/[locale]/about/page.tsx +++ b/app/[locale]/about/page.tsx @@ -5,6 +5,7 @@ import Navbar from 'components/layout/navbar'; import { getCart, getPage, getProduct } from 'lib/shopify'; import { Product } from 'lib/shopify/types'; import { cookies } from 'next/headers'; +import { Suspense } from 'react'; import AboutNaraiDetail from './about-narai-detail'; const { SITE_NAME } = process.env; @@ -35,9 +36,11 @@ export default async function Page({ params }: { params: { locale?: SupportedLoc return (
-
- -
+ +
+ +
+
diff --git a/app/[locale]/bar/page.tsx b/app/[locale]/bar/page.tsx index 24101dcb7..2015c0ee2 100644 --- a/app/[locale]/bar/page.tsx +++ b/app/[locale]/bar/page.tsx @@ -5,6 +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 { Suspense } from 'react'; import SagyobarDetail from './sagyobar-detail'; const { SITE_NAME } = process.env; @@ -33,9 +34,11 @@ export default async function Page({ params }: { params: { locale?: SupportedLoc return (
-
- -
+ +
+ +
+
diff --git a/app/[locale]/company/page.tsx b/app/[locale]/company/page.tsx index d5a19255c..5315416b6 100644 --- a/app/[locale]/company/page.tsx +++ b/app/[locale]/company/page.tsx @@ -5,6 +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 { Suspense } from 'react'; import CompanyDetail from './company-detail'; const { SITE_NAME } = process.env; @@ -33,9 +34,11 @@ export default async function Page({ params }: { params: { locale?: SupportedLoc return (
-
- -
+ +
+ +
+
diff --git a/app/[locale]/concept/page.tsx b/app/[locale]/concept/page.tsx index 534ab26fd..009ad8c02 100644 --- a/app/[locale]/concept/page.tsx +++ b/app/[locale]/concept/page.tsx @@ -5,6 +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 { Suspense } from 'react'; import ConceptDetail from './concept-detail'; const { SITE_NAME } = process.env; @@ -33,9 +34,11 @@ export default async function Page({ params }: { params: { locale?: SupportedLoc return (
-
- -
+ +
+ +
+
diff --git a/app/[locale]/disclosures/page.tsx b/app/[locale]/disclosures/page.tsx index 6719cdcd5..d643eec3a 100644 --- a/app/[locale]/disclosures/page.tsx +++ b/app/[locale]/disclosures/page.tsx @@ -5,6 +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 { Suspense } from 'react'; import Disclosures from './disclosures'; const { SITE_NAME } = process.env; @@ -37,9 +38,11 @@ export default async function DisclosuresPage({ return (
-
- -
+ +
+ +
+
diff --git a/app/[locale]/layout.tsx b/app/[locale]/layout.tsx index 2e59d8982..2e8f5ed97 100644 --- a/app/[locale]/layout.tsx +++ b/app/[locale]/layout.tsx @@ -1,10 +1,9 @@ import { Lato, Noto_Serif_JP } from 'next/font/google'; import localFont from 'next/font/local'; -import { ReactNode } from 'react'; +import { ReactNode, Suspense } from 'react'; import { SupportedLocale } from 'components/layout/navbar/language-control'; import { NextIntlClientProvider } from 'next-intl'; -import { notFound } from 'next/navigation'; import Analytics from './analytics'; import './globals.css'; @@ -81,12 +80,7 @@ export default async function RootLayout({ children: ReactNode; params: { locale?: SupportedLocale }; }) { - let messages; - try { - messages = (await import(`../../messages/${params?.locale}.json`)).default; - } catch (error) { - notFound(); - } + const messages = (await import(`../../messages/${params?.locale}.json`)).default; return ( - + + +
{children}
 diff --git a/app/[locale]/page.tsx b/app/[locale]/page.tsx index bc06f68f9..5704a378c 100644 --- a/app/[locale]/page.tsx +++ b/app/[locale]/page.tsx @@ -24,6 +24,7 @@ import { getCart, getProduct } from 'lib/shopify'; import { Product } from 'lib/shopify/types'; import { cookies } from 'next/headers'; import Image from 'next/image'; +import { Suspense } from 'react'; const { SITE_NAME } = process.env; @@ -59,7 +60,9 @@ export default async function HomePage({
- + + +
- + + +
diff --git a/app/[locale]/privacy/page.tsx b/app/[locale]/privacy/page.tsx index a45f3c815..5d419fc6d 100644 --- a/app/[locale]/privacy/page.tsx +++ b/app/[locale]/privacy/page.tsx @@ -5,6 +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 { Suspense } from 'react'; import PrivacyPolicy from './privacy-policy'; const { SITE_NAME } = process.env; @@ -37,9 +38,11 @@ export default async function PrivacyPage({ return (
-
- -
+ +
+ +
+
diff --git a/app/[locale]/products/page.tsx b/app/[locale]/products/page.tsx index 44fff7efd..9309b5130 100644 --- a/app/[locale]/products/page.tsx +++ b/app/[locale]/products/page.tsx @@ -6,6 +6,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 { Suspense } from 'react'; const { SITE_NAME } = process.env; @@ -37,9 +38,11 @@ export default async function ProductPage({ return (
-
- -
+ +
+ +
+
diff --git a/app/[locale]/shop-list/page.tsx b/app/[locale]/shop-list/page.tsx index a2991ab4f..b264f2b66 100644 --- a/app/[locale]/shop-list/page.tsx +++ b/app/[locale]/shop-list/page.tsx @@ -3,12 +3,12 @@ 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 { 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 async function generateMetadata({ @@ -16,7 +16,10 @@ export async function generateMetadata({ }: { params: { locale?: SupportedLocale }; }): Promise { - const page = await getPage({ handle: 'shop-list', language: params?.locale?.toUpperCase() }); + const page = await getPage({ + handle: 'shop-list', + language: params?.locale?.toUpperCase() || 'JA' + }); if (!page) return notFound(); @@ -39,26 +42,21 @@ 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 (
- -
- -
+
+ +
+ + - {/*

{page.title}

*/} -