fix(daily): revert RSC shell to fix React #412 on instant nav

next-env.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
-import "./.next/types/root-params.d.ts";
+import "./.next/dev/types/routes.d.ts";
+import "./.next/dev/types/root-params.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

src/app/(default-locale)/(app)/daily/loading.tsx

@@ -1,24 +1,4 @@
-import { Box, Container, Skeleton } from "@mui/material";
+import { DailyPageSkeleton } from "#/features/homePage/ui/DailyPageSkeleton";
 
-/** Instant-nav fallback for `/daily` while the client view hydrates. */
-export default function DailyLoading() {
-  return (
-    <Box component="main" sx={{ minHeight: "85vh", py: 8 }}>
-      <Container maxWidth="lg">
-        <Skeleton
-          variant="text"
-          width="60%"
-          height={48}
-          animation="wave"
-          sx={{ mx: "auto", mb: 4 }}
-        />
-        <Skeleton
-          variant="rounded"
-          height={320}
-          animation="wave"
-          sx={{ borderRadius: 2 }}
-        />
-      </Container>
-    </Box>
-  );
-}
+/** Instant-nav fallback for `/daily` while the page shell and data stream in. */
+export default DailyPageSkeleton;

src/app/[lang]/(app)/daily/loading.tsx

@@ -1,24 +1,4 @@
-import { Box, Container, Skeleton } from "@mui/material";
+import { DailyPageSkeleton } from "#/features/homePage/ui/DailyPageSkeleton";
 
-/** Instant-nav fallback for `/daily` while the client view hydrates. */
-export default function DailyLoading() {
-  return (
-    <Box component="main" sx={{ minHeight: "85vh", py: 8 }}>
-      <Container maxWidth="lg">
-        <Skeleton
-          variant="text"
-          width="60%"
-          height={48}
-          animation="wave"
-          sx={{ mx: "auto", mb: 4 }}
-        />
-        <Skeleton
-          variant="rounded"
-          height={320}
-          animation="wave"
-          sx={{ borderRadius: 2 }}
-        />
-      </Container>
-    </Box>
-  );
-}
+/** Instant-nav fallback for `/daily` while the page shell and data stream in. */
+export default DailyPageSkeleton;

src/features/homePage/ui/DailyPageSkeleton.tsx

@@ -0,0 +1,23 @@
+import { Box, Container, Skeleton } from "@mui/material";
+import React from "react";
+
+/** Instant-nav fallback for `/daily` while the page shell and data stream in. */
+export const DailyPageSkeleton: React.FC = () => (
+  <Box component="main" sx={{ minHeight: "85vh", py: 8 }}>
+    <Container maxWidth="lg">
+      <Skeleton
+        variant="text"
+        width="60%"
+        height={48}
+        animation="wave"
+        sx={{ mx: "auto", mb: 4 }}
+      />
+      <Skeleton
+        variant="rounded"
+        height={320}
+        animation="wave"
+        sx={{ borderRadius: 2 }}
+      />
+    </Container>
+  </Box>
+);

src/server/daily/getDailyInitialData.ts

@@ -6,31 +6,43 @@ import {
   QuestionOfTodayDocument,
 } from "#/graphql/generated";
 
-/**
- * Prefetch today's LeetCode daily question for RSC + Apollo cache hydration.
- * Returns null when upstream GraphQL is unavailable (client hooks refetch).
- */
-export async function getDailyInitialData(): Promise<NormalizedCacheObject | null> {
+const DAILY_PREFETCH_TIMEOUT_MS = 10_000;
+
+async function fetchDailyInitialData(): Promise<NormalizedCacheObject | null> {
   const client = createApolloClient({ ssr: true });
 
-  try {
-    const todayResult = await client.query({
-      query: QuestionOfTodayDocument,
+  const todayResult = await client.query({
+    query: QuestionOfTodayDocument,
+    fetchPolicy: "no-cache",
+  });
+
+  const titleSlug =
+    todayResult.data.activeDailyCodingChallengeQuestion?.question?.titleSlug;
+
+  if (titleSlug) {
+    await client.query({
+      query: QuestionDataDocument,
+      variables: { titleSlug },
       fetchPolicy: "no-cache",
     });
+  }
 
-    const titleSlug =
-      todayResult.data.activeDailyCodingChallengeQuestion?.question?.titleSlug;
-
-    if (titleSlug) {
-      await client.query({
-        query: QuestionDataDocument,
-        variables: { titleSlug },
-        fetchPolicy: "no-cache",
-      });
-    }
+  return client.cache.extract();
+}
 
-    return client.cache.extract();
+/**
+ * Prefetch today's LeetCode daily question for RSC + Apollo cache hydration.
+ * Returns null when upstream GraphQL is unavailable (client hooks refetch).
+ */
+export async function getDailyInitialData(): Promise<NormalizedCacheObject | null> {
+  try {
+    const result = await Promise.race([
+      fetchDailyInitialData(),
+      new Promise<null>((resolve) => {
+        setTimeout(() => resolve(null), DAILY_PREFETCH_TIMEOUT_MS);
+      }),
+    ]);
+    return result;
   } catch (error) {
     console.warn(
       "getDailyInitialData: LeetCode GraphQL prefetch failed",