move to canary next for ppr support

This commit is contained in:
Sol Irvine 2023-11-12 16:01:44 +09:00
parent 2a52c4920c
commit 848e841419
14 changed files with 66 additions and 71 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -5,7 +5,7 @@ import { ReactNode } from 'react';
import { SupportedLocale } from 'components/layout/navbar/language-control'; import { SupportedLocale } from 'components/layout/navbar/language-control';
import { NextIntlClientProvider } from 'next-intl'; import { NextIntlClientProvider } from 'next-intl';
import { notFound } from 'next/navigation'; import { notFound } from 'next/navigation';
import Analytics from './[locale]/analytics'; import Analytics from './analytics';
import './globals.css'; import './globals.css';
const { TWITTER_CREATOR, TWITTER_SITE, SITE_NAME } = process.env; const { TWITTER_CREATOR, TWITTER_SITE, SITE_NAME } = process.env;

View File

@ -8,6 +8,7 @@ import { getCart, getPage, getProduct } from 'lib/shopify';
import { Product } from 'lib/shopify/types'; import { Product } from 'lib/shopify/types';
import { cookies } from 'next/headers'; import { cookies } from 'next/headers';
import { notFound } from 'next/navigation'; import { notFound } from 'next/navigation';
import { Suspense } from 'react';
import ShopsNav from './shops-nav'; import ShopsNav from './shops-nav';
export async function generateMetadata({ export async function generateMetadata({
@ -51,9 +52,11 @@ export default async function Page({ params }: { params: { locale?: SupportedLoc
<div> <div>
<Navbar cart={cart} locale={params?.locale} compact showTop promotedItem={promotedItem} /> <Navbar cart={cart} locale={params?.locale} compact showTop promotedItem={promotedItem} />
<div className="mx-auto max-w-xl px-6 pb-24 pt-12 md:pb-48 md:pt-24"> <div className="mx-auto max-w-xl px-6 pb-24 pt-12 md:pb-48 md:pt-24">
<Suspense>
<div className="pb-12"> <div className="pb-12">
<ShopsNav /> <ShopsNav />
</div> </div>
</Suspense>
{/* <h2 className="font-multilingual mb-8 text-3xl font-medium">{page.title}</h2> */} {/* <h2 className="font-multilingual mb-8 text-3xl font-medium">{page.title}</h2> */}
<Prose html={page.body as string} /> <Prose html={page.body as string} />
</div> </div>

View File

@ -34,7 +34,7 @@
"eslint-plugin-unused-imports": "^3.0.0", "eslint-plugin-unused-imports": "^3.0.0",
"js-cookie": "^3.0.5", "js-cookie": "^3.0.5",
"negotiator": "^0.6.3", "negotiator": "^0.6.3",
"next": "latest", "next": "canary",
"next-intl": "latest", "next-intl": "latest",
"prettier-plugin-organize-imports": "^3.2.3", "prettier-plugin-organize-imports": "^3.2.3",
"react": "latest", "react": "latest",

124
yarn.lock
View File

@ -292,10 +292,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@next/env@npm:13.4.19": "@next/env@npm:14.0.3-canary.3":
version: 13.4.19 version: 14.0.3-canary.3
resolution: "@next/env@npm:13.4.19" resolution: "@next/env@npm:14.0.3-canary.3"
checksum: ace4f82890954ade0164fbe2b7ff988268d2b99b2e80caa6707c51fa4cbfaaa31e48fbbcecd4fd142af3503c544e1b4c91e8185d4af253c8fb46550e9e70ad7e checksum: b54b00343ae5d3af64b1dde1f3aacc2915893ef2b95b8f9102df5f8822d17c05c0eb240354c875a33be24a83b62d6ee9cc3e30cdcda634c951c3e8d326246b0e
languageName: node languageName: node
linkType: hard linkType: hard
@ -308,65 +308,65 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@next/swc-darwin-arm64@npm:13.4.19": "@next/swc-darwin-arm64@npm:14.0.3-canary.3":
version: 13.4.19 version: 14.0.3-canary.3
resolution: "@next/swc-darwin-arm64@npm:13.4.19" resolution: "@next/swc-darwin-arm64@npm:14.0.3-canary.3"
conditions: os=darwin & cpu=arm64 conditions: os=darwin & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@next/swc-darwin-x64@npm:13.4.19": "@next/swc-darwin-x64@npm:14.0.3-canary.3":
version: 13.4.19 version: 14.0.3-canary.3
resolution: "@next/swc-darwin-x64@npm:13.4.19" resolution: "@next/swc-darwin-x64@npm:14.0.3-canary.3"
conditions: os=darwin & cpu=x64 conditions: os=darwin & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@next/swc-linux-arm64-gnu@npm:13.4.19": "@next/swc-linux-arm64-gnu@npm:14.0.3-canary.3":
version: 13.4.19 version: 14.0.3-canary.3
resolution: "@next/swc-linux-arm64-gnu@npm:13.4.19" resolution: "@next/swc-linux-arm64-gnu@npm:14.0.3-canary.3"
conditions: os=linux & cpu=arm64 & libc=glibc conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node languageName: node
linkType: hard linkType: hard
"@next/swc-linux-arm64-musl@npm:13.4.19": "@next/swc-linux-arm64-musl@npm:14.0.3-canary.3":
version: 13.4.19 version: 14.0.3-canary.3
resolution: "@next/swc-linux-arm64-musl@npm:13.4.19" resolution: "@next/swc-linux-arm64-musl@npm:14.0.3-canary.3"
conditions: os=linux & cpu=arm64 & libc=musl conditions: os=linux & cpu=arm64 & libc=musl
languageName: node languageName: node
linkType: hard linkType: hard
"@next/swc-linux-x64-gnu@npm:13.4.19": "@next/swc-linux-x64-gnu@npm:14.0.3-canary.3":
version: 13.4.19 version: 14.0.3-canary.3
resolution: "@next/swc-linux-x64-gnu@npm:13.4.19" resolution: "@next/swc-linux-x64-gnu@npm:14.0.3-canary.3"
conditions: os=linux & cpu=x64 & libc=glibc conditions: os=linux & cpu=x64 & libc=glibc
languageName: node languageName: node
linkType: hard linkType: hard
"@next/swc-linux-x64-musl@npm:13.4.19": "@next/swc-linux-x64-musl@npm:14.0.3-canary.3":
version: 13.4.19 version: 14.0.3-canary.3
resolution: "@next/swc-linux-x64-musl@npm:13.4.19" resolution: "@next/swc-linux-x64-musl@npm:14.0.3-canary.3"
conditions: os=linux & cpu=x64 & libc=musl conditions: os=linux & cpu=x64 & libc=musl
languageName: node languageName: node
linkType: hard linkType: hard
"@next/swc-win32-arm64-msvc@npm:13.4.19": "@next/swc-win32-arm64-msvc@npm:14.0.3-canary.3":
version: 13.4.19 version: 14.0.3-canary.3
resolution: "@next/swc-win32-arm64-msvc@npm:13.4.19" resolution: "@next/swc-win32-arm64-msvc@npm:14.0.3-canary.3"
conditions: os=win32 & cpu=arm64 conditions: os=win32 & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@next/swc-win32-ia32-msvc@npm:13.4.19": "@next/swc-win32-ia32-msvc@npm:14.0.3-canary.3":
version: 13.4.19 version: 14.0.3-canary.3
resolution: "@next/swc-win32-ia32-msvc@npm:13.4.19" resolution: "@next/swc-win32-ia32-msvc@npm:14.0.3-canary.3"
conditions: os=win32 & cpu=ia32 conditions: os=win32 & cpu=ia32
languageName: node languageName: node
linkType: hard linkType: hard
"@next/swc-win32-x64-msvc@npm:13.4.19": "@next/swc-win32-x64-msvc@npm:14.0.3-canary.3":
version: 13.4.19 version: 14.0.3-canary.3
resolution: "@next/swc-win32-x64-msvc@npm:13.4.19" resolution: "@next/swc-win32-x64-msvc@npm:14.0.3-canary.3"
conditions: os=win32 & cpu=x64 conditions: os=win32 & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
@ -435,12 +435,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@swc/helpers@npm:0.5.1": "@swc/helpers@npm:0.5.2":
version: 0.5.1 version: 0.5.2
resolution: "@swc/helpers@npm:0.5.1" resolution: "@swc/helpers@npm:0.5.2"
dependencies: dependencies:
tslib: ^2.4.0 tslib: ^2.4.0
checksum: 71e0e27234590435e4c62b97ef5e796f88e786841a38c7116a5e27a3eafa7b9ead7cdec5249b32165902076de78446945311c973e59bddf77c1e24f33a8f272a checksum: 51d7e3d8bd56818c49d6bfbd715f0dbeedc13cf723af41166e45c03e37f109336bbcb57a1f2020f4015957721aeb21e1a7fff281233d797ff7d3dd1f447fa258
languageName: node languageName: node
linkType: hard linkType: hard
@ -1376,7 +1376,7 @@ __metadata:
js-cookie: ^3.0.5 js-cookie: ^3.0.5
lint-staged: ^13.2.3 lint-staged: ^13.2.3
negotiator: ^0.6.3 negotiator: ^0.6.3
next: latest next: canary
next-intl: latest next-intl: latest
postcss: ^8.4.27 postcss: ^8.4.27
prettier: 3.0.1 prettier: 3.0.1
@ -3638,7 +3638,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"nanoid@npm:^3.3.4, nanoid@npm:^3.3.6": "nanoid@npm:^3.3.6":
version: 3.3.6 version: 3.3.6
resolution: "nanoid@npm:3.3.6" resolution: "nanoid@npm:3.3.6"
bin: bin:
@ -3682,27 +3682,26 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"next@npm:latest": "next@npm:canary":
version: 13.4.19 version: 14.0.3-canary.3
resolution: "next@npm:13.4.19" resolution: "next@npm:14.0.3-canary.3"
dependencies: dependencies:
"@next/env": 13.4.19 "@next/env": 14.0.3-canary.3
"@next/swc-darwin-arm64": 13.4.19 "@next/swc-darwin-arm64": 14.0.3-canary.3
"@next/swc-darwin-x64": 13.4.19 "@next/swc-darwin-x64": 14.0.3-canary.3
"@next/swc-linux-arm64-gnu": 13.4.19 "@next/swc-linux-arm64-gnu": 14.0.3-canary.3
"@next/swc-linux-arm64-musl": 13.4.19 "@next/swc-linux-arm64-musl": 14.0.3-canary.3
"@next/swc-linux-x64-gnu": 13.4.19 "@next/swc-linux-x64-gnu": 14.0.3-canary.3
"@next/swc-linux-x64-musl": 13.4.19 "@next/swc-linux-x64-musl": 14.0.3-canary.3
"@next/swc-win32-arm64-msvc": 13.4.19 "@next/swc-win32-arm64-msvc": 14.0.3-canary.3
"@next/swc-win32-ia32-msvc": 13.4.19 "@next/swc-win32-ia32-msvc": 14.0.3-canary.3
"@next/swc-win32-x64-msvc": 13.4.19 "@next/swc-win32-x64-msvc": 14.0.3-canary.3
"@swc/helpers": 0.5.1 "@swc/helpers": 0.5.2
busboy: 1.6.0 busboy: 1.6.0
caniuse-lite: ^1.0.30001406 caniuse-lite: ^1.0.30001406
postcss: 8.4.14 postcss: 8.4.31
styled-jsx: 5.1.1 styled-jsx: 5.1.1
watchpack: 2.4.0 watchpack: 2.4.0
zod: 3.21.4
peerDependencies: peerDependencies:
"@opentelemetry/api": ^1.1.0 "@opentelemetry/api": ^1.1.0
react: ^18.2.0 react: ^18.2.0
@ -3734,7 +3733,7 @@ __metadata:
optional: true optional: true
bin: bin:
next: dist/bin/next next: dist/bin/next
checksum: f4873dab8888ed4dae14d36d7cf8dc54cd042695cf7ee41d05e8757f463d11952a594eb066143cc2f7253ea1d41c6efe681cdc3ab8c2fa6eb0815fa5a94de3dc checksum: 3d17cec5bde2003192fc727212459f65da8f330e3d645a8e4421e84df339634d16222672d69c6d192ec416e71cccdd6b141066ff53842b118cdec3c8875ccf4a
languageName: node languageName: node
linkType: hard linkType: hard
@ -4248,14 +4247,14 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"postcss@npm:8.4.14": "postcss@npm:8.4.31":
version: 8.4.14 version: 8.4.31
resolution: "postcss@npm:8.4.14" resolution: "postcss@npm:8.4.31"
dependencies: dependencies:
nanoid: ^3.3.4 nanoid: ^3.3.6
picocolors: ^1.0.0 picocolors: ^1.0.0
source-map-js: ^1.0.2 source-map-js: ^1.0.2
checksum: fe58766ff32e4becf65a7d57678995cfd239df6deed2fe0557f038b47c94e4132e7e5f68b5aa820c13adfec32e523b693efaeb65798efb995ce49ccd83953816 checksum: 1d8611341b073143ad90486fcdfeab49edd243377b1f51834dc4f6d028e82ce5190e4f11bb2633276864503654fb7cab28e67abdc0fbf9d1f88cad4a0ff0beea
languageName: node languageName: node
linkType: hard linkType: hard
@ -5791,10 +5790,3 @@ __metadata:
checksum: f77b3d8d00310def622123df93d4ee654fc6a0096182af8bd60679ddcdfb3474c56c6c7190817c84a2785648cdee9d721c0154eb45698c62176c322fb46fc700 checksum: f77b3d8d00310def622123df93d4ee654fc6a0096182af8bd60679ddcdfb3474c56c6c7190817c84a2785648cdee9d721c0154eb45698c62176c322fb46fc700
languageName: node languageName: node
linkType: hard linkType: hard
"zod@npm:3.21.4":
version: 3.21.4
resolution: "zod@npm:3.21.4"
checksum: f185ba87342ff16f7a06686767c2b2a7af41110c7edf7c1974095d8db7a73792696bcb4a00853de0d2edeb34a5b2ea6a55871bc864227dace682a0a28de33e1f
languageName: node
linkType: hard