Fix build #3890

Author: padms

web/app/[locale]/(pages)/[...slug]/page.tsx

@@ -8,7 +8,8 @@ import { getLocale } from 'next-intl/server'
 import { decodeSlugs } from '@/lib/helpers/getFullUrl'
 import { Flags } from '@/sanity/helpers/datasetHelpers'
 import { getNameFromIso } from '@/sanity/helpers/localization'
-import { routeSanityFetch } from '@/sanity/lib/fetch'
+import { IS_FETCH_OPTIMIZED, routeSanityFetch } from '@/sanity/lib/fetch'
+import { optimizedFetch } from '@/sanity/lib/simpleFetch'
 import { constructSanityMetadata, getPage } from '@/sanity/pages/utils'
 import { menuQuery as globalMenuQuery } from '@/sanity/queries/menu'
 import {
@@ -23,18 +24,23 @@ type Props = {
   params: Promise<{ slug: string[]; locale: string }>
   searchParams: Promise<{ [key: string]: string | string[] | undefined }>
 }
+
 const MagazinePage = dynamic(() => import('@/templates/magazine/MagazinePage'))
 const EventPage = dynamic(() => import('@/templates/event/Event'))
 const NewsPage = dynamic(() => import('@/templates/news/News'))
 const TopicPage = dynamic(() => import('@/templates/topic/TopicPage'))
 const MagazineRoom = dynamic(() => import('@/templates/magazine/Magazineroom'))
 
+const getSanityFetch = (isDraftMode: boolean) =>
+  isDraftMode || !IS_FETCH_OPTIMIZED ? routeSanityFetch : optimizedFetch
+
 export async function generateMetadata({
   params,
 }: PageProps<'/[locale]/[...slug]'>): Promise<Metadata> {
   //array, separated by /. e.g. [news, last slug]
-  const { slug: encodedSlug } = await params
-  const locale = await getLocale()
+  const { slug: encodedSlug, locale } = await params
+  const { isEnabled: isDraftMode } = await draftMode()
+  const sanityFetch = getSanityFetch(isDraftMode)
   const slug = decodeSlugs(encodedSlug) as string[]
 
   const sanityLang = getNameFromIso(locale)
@@ -59,7 +65,7 @@ export async function generateMetadata({
     query = magazineroomMetaQuery
   }
 
-  const { data: metaData }: { data: any } = await routeSanityFetch({
+  const { data: metaData }: { data: any } = await sanityFetch({
     query,
     params: {
       lang: sanityLang,
@@ -75,14 +81,16 @@ export async function generateMetadata({
 }
 
 export default async function Page({ params, searchParams }: Props) {
-  const { slug, locale } = await params
+  const { slug } = await params
+  const locale = await getLocale()
   const resolvedSearchParams = await searchParams
   /*   const isInPresentationToolContext =
     (await cookies()).get('preview-fetch-dest')?.value === 'iframe' */
   const { isEnabled: isDraftMode } = await draftMode()
+  const sanityFetch = getSanityFetch(isDraftMode)
   let pageContent = null
   const [siteMenuResult, pageResults] = await Promise.all([
-    routeSanityFetch({
+    sanityFetch({
       query: Flags.HAS_FANCY_MENU ? globalMenuQuery : simpleMenuQuery,
       params: {
         lang: getNameFromIso(locale) ?? 'en_GB',
@@ -93,6 +101,7 @@ export default async function Page({ params, searchParams }: Props) {
       slug: decodeSlugs(slug),
       locale,
       searchParams: resolvedSearchParams,
+      fetch: sanityFetch,
     }),
   ])
   pageContent = pageResults

web/app/[locale]/layout.tsx

@@ -7,6 +7,7 @@ import Script from 'next/script'
 import { NextIntlClientProvider } from 'next-intl'
 import { getLocale, getTranslations } from 'next-intl/server'
 import { PageProvider } from '@/contexts/pageContext'
+import { getValidLanguagesLocales } from '@/languageConfig'
 import { getLocaleFromIso, getNameFromIso } from '@/sanity/helpers/localization'
 import { dataset } from '@/sanity/lib/api'
 import { IS_FETCH_OPTIMIZED, routeSanityFetch } from '@/sanity/lib/fetch'
@@ -33,6 +34,12 @@ const equinor = localFont({
 
 //the [locale] segment corresponds to the locale (iso format), not the prefix(/no).
 
+export const instant = false
+
+export function generateStaticParams() {
+  return getValidLanguagesLocales().map(locale => ({ locale }))
+}
+
 export default async function LocaleLayout({
   children,
 }: LayoutProps<'/[locale]'>) {

web/sanity/pages/utils.ts

@@ -1,5 +1,6 @@
 import type { Metadata } from 'next'
 import { type QueryParams, toPlainText } from 'next-sanity'
+import type { DefinedFetchType } from 'next-sanity/live'
 import {
   defaultLanguage,
   domain,
@@ -175,6 +176,7 @@ type Params = {
   slug?: string | string[]
   locale: string
   tags?: string[]
+  fetch?: DefinedFetchType
   searchParams?: {
     [key: string]: string[] | string | undefined
   }
@@ -196,7 +198,7 @@ function languagePrefixedSlug(
 }
 
 export async function getPage(params: Params) {
-  const { slug, locale, searchParams } = params
+  const { slug, locale, searchParams, fetch = routeSanityFetch } = params
   const tagParam = searchParams?.tag
   const tag =
     typeof tagParam === 'string'
@@ -208,7 +210,7 @@ export async function getPage(params: Params) {
   if (slug?.[0]?.includes('preview')) {
     const id = slug[1]
     if (id) {
-      const { data: draftInfo }: { data: any } = await routeSanityFetch({
+      const { data: draftInfo }: { data: any } = await fetch({
         query: pageInfoById,
         params: {
           id,
@@ -217,7 +219,7 @@ export async function getPage(params: Params) {
       })
 
       if (draftInfo?.lang) {
-        const { data } = await routeSanityFetch({
+        const { data } = await fetch({
           query: contentQueryById,
           params: {
             id,
@@ -232,7 +234,7 @@ export async function getPage(params: Params) {
     const { query: pageQuery, queryParams: pageQueryParams } =
       await getQueryFromSlug(slug, locale)
 
-    const { data }: { data: any } = await routeSanityFetch({
+    const { data }: { data: any } = await fetch({
       query: pageQuery,
       tags: [`sanity:page:${Array.isArray(slug) ? slug?.join('/') : slug}`],
       params: { ...pageQueryParams },
@@ -243,7 +245,7 @@ export async function getPage(params: Params) {
 
   let magazineArticles = null
   if (pageData?.template === 'magazineIndex') {
-    const { data: articles } = await routeSanityFetch({
+    const { data: articles } = await fetch({
       query:
         tag && tag !== 'all'
           ? getMagazineArticlesByTag(false, false)