chore: fix build

sanity-io · Oct 27, 2023 · 9c9a604 · 9c9a604 · vercel · Oct 27, 2023
1 parent 2031f7f
commit 9c9a604
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 12 deletions.
diff --git a/apps/next-app-router/app/RefreshButton.tsx b/apps/next-app-router/app/RefreshButton.tsx
@@ -2,7 +2,7 @@
 
 import { useRouter } from 'next/navigation'
 import { useEffect, useTransition } from 'react'
-import { experimental_useFormStatus as useFormStatus } from 'react-dom'
+import { useFormStatus } from 'react-dom'
 import { Button } from 'ui/react'
 import { revalidate } from './actions'
 import { useIsEnabled } from '@sanity/preview-kit'

diff --git a/apps/next-app-router/app/sanity.fetch.ts b/apps/next-app-router/app/sanity.fetch.ts
@@ -12,12 +12,10 @@ const DEFAULT_TAGS = [] as string[]
 export async function sanityFetch<QueryResponse>({
   query,
   params = DEFAULT_PARAMS,
-  cache = 'force-cache',
   tags = DEFAULT_TAGS,
 }: {
   query: string
   params?: QueryParams
-  cache?: RequestCache
   tags: string[]
 }): Promise<QueryResponse> {
   const isDraftMode = draftMode().isEnabled
@@ -28,13 +26,12 @@ export async function sanityFetch<QueryResponse>({
   }
 
   return client.fetch<QueryResponse>(query, params, {
-    cache,
     ...(isDraftMode && {
       token,
       perspective: 'previewDrafts',
     }),
     next: {
-      ...(isDraftMode && { revalidate: 0 }),
+      revalidate: isDraftMode ? 0 : false,
       tags,
     },
   })

diff --git a/apps/next-app-router/next.config.mjs b/apps/next-app-router/next.config.mjs
@@ -2,13 +2,12 @@ import withBundleAnalyzer from '@next/bundle-analyzer'
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  experimental: {
-    logging: {
-      level: 'verbose',
+  logging: {
+    fetches: {
       fullUrl: true,
     },
-    serverActions: true,
   },
+  serverActions: true,
   productionBrowserSourceMaps: true,
 }
 

diff --git a/apps/next-app-router/package.json b/apps/next-app-router/package.json
@@ -28,6 +28,7 @@
     "@next/bundle-analyzer": "14.0.0",
     "@types/node": "^18.18.6",
     "@types/react": "^18.2.31",
+    "@types/react-dom": "^18.2.14",
     "eslint-config-next": "14.0.0",
     "typescript": "^5.2.2"
   },

diff --git a/apps/next-pages-router/next.config.mjs b/apps/next-pages-router/next.config.mjs
@@ -2,8 +2,10 @@ import withBundleAnalyzer from '@next/bundle-analyzer'
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  experimental: {
-    logging: 'verbose',
+  logging: {
+    fetches: {
+      fullUrl: true,
+    }
   },
   productionBrowserSourceMaps: true,
 }

diff --git a/apps/next-pages-router/package.json b/apps/next-pages-router/package.json
@@ -26,6 +26,7 @@
     "@next/bundle-analyzer": "14.0.0",
     "@types/node": "^18.18.6",
     "@types/react": "^18.2.31",
+    "@types/react-dom": "^18.2.14",
     "eslint-config-next": "14.0.0",
     "typescript": "^5.2.2"
   },

diff --git a/apps/studio/package.json b/apps/studio/package.json
@@ -13,6 +13,7 @@
     "@sanity/ui": "1.8.2",
     "@sanity/vision": "3.18.1",
     "@types/react": "^18.2.31",
+    "@types/react-dom": "^18.2.14",
     "esbuild": "^0.19.5",
     "esbuild-register": "^3.5.0",
     "eslint": "^8.52.0",

diff --git a/packages/preview-kit/package.json b/packages/preview-kit/package.json
@@ -168,6 +168,7 @@
     "@types/lodash.isplainobject": "^4.0.8",
     "@types/node": "^18.18.6",
     "@types/react": "^18.2.33",
+    "@types/react-dom": "^18.2.14",
     "@types/use-sync-external-store": "^0.0.5",
     "@typescript-eslint/eslint-plugin": "^6.8.0",
     "@typescript-eslint/parser": "^6.8.0",

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -62,6 +62,7 @@
   "devDependencies": {
     "@sanity/pkg-utils": "^3.1.1",
     "@types/react": "^18.2.31",
+    "@types/react-dom": "^18.2.14",
     "@typescript-eslint/eslint-plugin": "^6.8.0",
     "@typescript-eslint/parser": "^6.8.0",
     "eslint": "^8.52.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml