Author: gnoff

crates/next-custom-transforms/tests/fixture/debug-instant-stack/with-instant-true/input.js

@@ -0,0 +1,5 @@
+export const unstable_instant = true
+
+export default function Page() {
+  return <div>Hello</div>
+}

packages/next/src/server/app-render/create-flight-router-state-from-loader-tree.ts

@@ -90,7 +90,10 @@ async function createFlightRouterStateFromLoaderTreeImpl(
 
   if (instantConfig === false) {
     prefetchHints |= PrefetchHint.PrefetchDisabled
-  } else if (instantConfig === true || typeof instantConfig === 'object') {
+  } else if (
+    instantConfig === true ||
+    (typeof instantConfig === 'object' && instantConfig !== null)
+  ) {
     prefetchHints |= PrefetchHint.SubtreeHasInstant
   }
 

packages/next/src/server/app-render/instant-validation/instant-config.tsx

@@ -48,12 +48,13 @@ export async function isPageAllowedToBlock(tree: LoaderTree): Promise<boolean> {
   // the page isn't allowed to block. The config expresses a requirement for
   // instant UI, so we should make sure that a static shell exists.
   // (even if it'd use runtime prefetching for client navs)
-  if (instantConfig !== undefined) {
-    if (instantConfig === false) {
-      return true
-    } else {
-      return false
-    }
+  if (instantConfig === false) {
+    return true
+  } else if (
+    instantConfig === true ||
+    (typeof instantConfig === 'object' && instantConfig !== null)
+  ) {
+    return false
   }
 
   const { parallelRoutes } = parseLoaderTree(tree)
@@ -157,8 +158,8 @@ export const resolveInstantConfigSamplesForPage = async (
 
   let samples: InstantSample[] | null = null
   if (
-    instantConfig !== undefined &&
     typeof instantConfig === 'object' &&
+    instantConfig !== null &&
     instantConfig.samples
   ) {
     samples = instantConfig.samples

packages/next/src/server/app-render/instant-validation/instant-validation.tsx

@@ -1153,7 +1153,10 @@ export async function createCombinedPayloadAtDepth(
         (layoutOrPageMod as AppSegmentConfig).unstable_instant ?? null
       prefetchConfig =
         (layoutOrPageMod as AppSegmentConfig).unstable_prefetch ?? null
-      if (instantConfig && typeof instantConfig === 'object') {
+      if (
+        instantConfig === true ||
+        (typeof instantConfig === 'object' && instantConfig !== null)
+      ) {
         const rawFactory: unknown = (layoutOrPageMod as any)
           .__debugCreateInstantConfigStack
         localCreateInstantStack =
@@ -1241,7 +1244,10 @@ export async function createCombinedPayloadAtDepth(
       requiresInstantUI = false
       createInstantStack = null
       configDepth = -1
-    } else if (instantConfig === true || typeof instantConfig === 'object') {
+    } else if (
+      instantConfig === true ||
+      (typeof instantConfig === 'object' && instantConfig !== null)
+    ) {
       requiresInstantUI = true
       createInstantStack = localCreateInstantStack
       configDepth = segmentDepth

test/development/app-dir/cache-components-dev-warmup/fixtures/with-prefetch-config/app/apis/[param]/page.tsx

@@ -3,7 +3,7 @@ import { CachedData } from '../../data-fetching'
 import { connection } from 'next/server'
 import { Suspense } from 'react'
 
-export const unstable_instant = { prefetch: 'runtime', samples: [{}] }
+export const unstable_instant = true
 export const unstable_prefetch = 'runtime'
 
 const CACHE_KEY = __dirname + '/__PAGE__'

test/development/app-dir/cache-components-dev-warmup/fixtures/with-prefetch-config/app/private-cache/layout.tsx

@@ -2,7 +2,7 @@ import { Suspense } from 'react'
 import { UncachedFetch, CachedData } from '../data-fetching'
 import { PrivateCachedData } from './data-fetching'
 
-export const unstable_instant = { prefetch: 'runtime', samples: [{}] }
+export const unstable_instant = true
 export const unstable_prefetch = 'runtime'
 
 const CACHE_KEY = '/private-cache/__LAYOUT__'

test/development/app-dir/cache-components-dev-warmup/fixtures/with-prefetch-config/app/short-lived-cache/layout.tsx

@@ -2,7 +2,7 @@ import { Suspense } from 'react'
 import { UncachedFetch, CachedData } from '../data-fetching'
 import { ShortLivedCache } from './data-fetching'
 
-export const unstable_instant = { prefetch: 'runtime', samples: [{}] }
+export const unstable_instant = true
 export const unstable_prefetch = 'runtime'
 
 const CACHE_KEY = __dirname + '/__LAYOUT__'

test/development/app-dir/cache-components-dev-warmup/fixtures/with-prefetch-config/app/simple/layout.tsx

@@ -1,7 +1,7 @@
 import { Suspense } from 'react'
 import { UncachedFetch, CachedFetch, CachedData } from '../data-fetching'
 
-export const unstable_instant = { prefetch: 'runtime', samples: [{}] }
+export const unstable_instant = true
 export const unstable_prefetch = 'runtime'
 
 const CACHE_KEY = __dirname + '/__LAYOUT__'

test/development/app-dir/cache-components-dev-warmup/fixtures/with-prefetch-config/app/successive-caches/page.tsx

@@ -1,4 +1,4 @@
-export const unstable_instant = { prefetch: 'runtime', samples: [{}] }
+export const unstable_instant = true
 export const unstable_prefetch = 'runtime'
 
 export default async function Page() {

test/development/app-dir/cache-components-dev-warmup/fixtures/with-prefetch-config/app/sync-io/runtime/page.tsx

@@ -2,7 +2,7 @@ import { Suspense } from 'react'
 import { CachedData, getCachedData } from '../../data-fetching'
 import { cookies } from 'next/headers'
 
-export const unstable_instant = { prefetch: 'runtime', samples: [{}] }
+export const unstable_instant = true
 export const unstable_prefetch = 'runtime'
 
 const CACHE_KEY = __dirname + '/__PAGE__'