Fix cache kind validation

crates/next-core/src/next_config.rs

@@ -43,8 +43,21 @@ struct CustomRoutes {
 pub struct ModularizeImports(FxIndexMap<String, ModularizeImportPackageConfig>);
 
 #[turbo_tasks::value(transparent)]
+#[derive(Clone, Debug)]
 pub struct CacheKinds(FxHashSet<RcStr>);
 
+impl CacheKinds {
+    pub fn extend<I: IntoIterator<Item = RcStr>>(&mut self, iter: I) {
+        self.0.extend(iter);
+    }
+}
+
+impl Default for CacheKinds {
+    fn default() -> Self {
+        CacheKinds(["default", "remote"].iter().map(|&s| s.into()).collect())
+    }
+}
+
 #[turbo_tasks::value(serialization = "custom", eq = "manual")]
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, OperationValue)]
 #[serde(rename_all = "camelCase")]
@@ -1421,13 +1434,13 @@ impl NextConfig {
 
     #[turbo_tasks::function]
     pub fn cache_kinds(&self) -> Vc<CacheKinds> {
-        Vc::cell(
-            self.experimental
-                .cache_handlers
-                .as_ref()
-                .map(|handlers| handlers.keys().cloned().collect())
-                .unwrap_or_default(),
-        )
+        let mut cache_kinds = CacheKinds::default();
+
+        if let Some(handlers) = self.experimental.cache_handlers.as_ref() {
+            cache_kinds.extend(handlers.keys().cloned());
+        }
+
+        cache_kinds.cell()
     }
 
     #[turbo_tasks::function]

packages/next/src/build/swc/options.ts

@@ -221,7 +221,9 @@ function getBaseSWCOptions({
             isReactServerLayer,
             useCacheEnabled,
             hashSalt: serverReferenceHashSalt,
-            cacheKinds: cacheHandlers ? Object.keys(cacheHandlers) : [],
+            cacheKinds: ['default', 'remote'].concat(
+              cacheHandlers ? Object.keys(cacheHandlers) : []
+            ),
           }
         : undefined,
     // For app router we prefer to bundle ESM,

packages/next/src/server/next-server.ts

@@ -400,6 +400,14 @@ export default class NextNodeServer extends BaseServer<
           cacheHandlerGlobal[cacheHandlersSymbol]?.DefaultCache ||
           DefaultCacheHandler
       }
+
+      if (
+        !cacheHandlers.remote &&
+        cacheHandlerGlobal[cacheHandlersSymbol]?.RemoteCache
+      ) {
+        cacheHandlerGlobal.__nextCacheHandlers.remote =
+          cacheHandlerGlobal[cacheHandlersSymbol].RemoteCache
+      }
     }
   }
 

test/e2e/app-dir/use-cache-unknown-cache-kind/app/remote/page.tsx

@@ -0,0 +1,5 @@
+'use cache: remote'
+
+export default async function Page() {
+  return <p>hello world</p>
+}

test/e2e/app-dir/use-cache-unknown-cache-kind/instrumentation.ts

@@ -0,0 +1,7 @@
+import DefaultCacheHandler from 'next/dist/server/lib/cache-handlers/default'
+
+export function register() {
+  globalThis[Symbol.for('@next/cache-handlers')] = {
+    RemoteCache: DefaultCacheHandler,
+  }
+}

test/e2e/app-dir/use-cache-unknown-cache-kind/next.config.js

@@ -4,6 +4,8 @@
 const nextConfig = {
   experimental: {
     dynamicIO: true,
+    cacheHandlers: {}, // overwrite the default config
+    prerenderEarlyExit: false,
   },
 }
 

test/e2e/app-dir/use-cache-unknown-cache-kind/use-cache-unknown-cache-kind.test.ts

@@ -33,9 +33,12 @@ describe('use-cache-unknown-cache-kind', () => {
     process.env.__NEXT_EXPERIMENTAL_NEW_DEV_OVERLAY === 'true'
 
   if (isNextStart) {
+    beforeAll(async () => {
+      await next.build()
+    })
+
     it('should fail the build with an error', async () => {
-      const { cliOutput } = await next.build()
-      const buildOutput = getBuildOutput(cliOutput)
+      const buildOutput = getBuildOutput(next.cliOutput)
 
       if (isTurbopack) {
         expect(buildOutput).toMatchInlineSnapshot(`
@@ -79,7 +82,16 @@ describe('use-cache-unknown-cache-kind', () => {
         `)
       }
     })
+
+    it('should not fail the build for default cache kinds', async () => {
+      expect(next.cliOutput).not.toInclude('Unknown cache kind "remote"')
+    })
   } else {
+    it('should not show an error for default cache kinds', async () => {
+      const browser = await next.browser('/remote')
+      await assertNoRedbox(browser)
+    })
+
     it('should show a build error', async () => {
       const browser = await next.browser('/')
 

test/lib/next-modes/next-dev.ts

@@ -161,13 +161,13 @@ export class NextDevInstance extends NextInstance {
   ) {
     await this.handleDevWatchDelayBeforeChange(filename)
     try {
-      const cliOutputLengthBefore = this.cliOutput.length
+      let cliOutputLength = this.cliOutput.length
       const isServerRunning = this.childProcess && !this.isStopping
 
       const detectServerRestart = async () => {
         await retry(async () => {
           const isServerReady = this.serverReadyPattern.test(
-            this.cliOutput.slice(cliOutputLengthBefore)
+            this.cliOutput.slice(cliOutputLength)
           )
           if (isServerRunning && !isServerReady) {
             throw new Error('Server has not finished restarting.')
@@ -202,6 +202,7 @@ export class NextDevInstance extends NextInstance {
           runWithTempContent
             ? async (...args) => {
                 await waitServerToBeReadyAfterPatchFile()
+                cliOutputLength = this.cliOutput.length
 
                 return runWithTempContent(...args)
               }