Merge branch 'canary' into canary

vercel · Dec 12, 2024 · 4466de9 · 4466de9
2 parents 73bfb6e + 6d05f24
commit 4466de9
Show file tree

Hide file tree

Showing 24 changed files with 434 additions and 270 deletions.
diff --git a/docs/01-app/02-building-your-application/01-routing/05-error-handling.mdx b/docs/01-app/02-building-your-application/01-routing/05-error-handling.mdx
@@ -19,7 +19,7 @@ Expected errors are those that can occur during the normal operation of the appl
 
 Use the `useActionState` hook to manage the state of Server Actions, including handling errors. This approach avoids `try`/`catch` blocks for expected errors, which should be modeled as return values rather than thrown exceptions.
 
-```tsx filename="app/actions.ts" switcher
+```ts filename="app/actions.ts" switcher
 'use server'
 
 import { redirect } from 'next/navigation'
@@ -36,7 +36,7 @@ export async function createUser(prevState: any, formData: FormData) {
 }
 ```
 
-```jsx filename="app/actions.js" switcher
+```js filename="app/actions.js" switcher
 'use server'
 
 import { redirect } from 'next/navigation'

diff --git a/docs/01-app/03-api-reference/04-functions/after.mdx b/docs/01-app/03-api-reference/04-functions/after.mdx
@@ -70,7 +70,7 @@ We recommend using `after` as it has been designed to consider other Next.js API
 
 You can use request APIs such as [`cookies`](/docs/app/api-reference/functions/cookies) and [`headers`](/docs/app/api-reference/functions/headers) inside `after` in [Server Actions](/docs/app/building-your-application/data-fetching/server-actions-and-mutations) and [Route Handlers](/docs/app/api-reference/file-conventions/route). This is useful for logging activity after a mutation. For example:
 
-```tsx filename="app/api/route.ts" highlight={2,7-9} switcher
+```ts filename="app/api/route.ts" highlight={2,7-9} switcher
 import { after } from 'next/server'
 import { cookies, headers } from 'next/headers'
 import { logUserAction } from '@/app/utils'
@@ -95,7 +95,7 @@ export async function POST(request: Request) {
 }
 ```
 
-```jsx filename="app/api/route.js" highlight={2,7-9} switcher
+```js filename="app/api/route.js" highlight={2,7-9} switcher
 import { after } from 'next/server'
 import { cookies, headers } from 'next/headers'
 import { logUserAction } from '@/app/utils'

diff --git a/packages/next/src/build/load-entrypoint.ts b/packages/next/src/build/load-entrypoint.ts
@@ -53,7 +53,7 @@ export async function loadEntrypoint(
     for (const [innerKey, importPath] of Object.entries(
       importMaps?.[key] || {}
     )) {
-      file = `import ${key}_${innerKey} from "${importPath}"\n${file}`
+      file = `import ${key}_${innerKey} from ${JSON.stringify(importPath)}\n${file}`
       importMapItems[key][innerKey] = `${key}_${innerKey}`
     }
   }

diff --git a/packages/next/src/client/components/app-router.tsx b/packages/next/src/client/components/app-router.tsx
@@ -564,14 +564,14 @@ function Router({
 
   const layoutRouterContext = useMemo(() => {
     return {
-      childNodes: cache.parallelRoutes,
-      tree,
+      parentTree: tree,
+      parentCacheNode: cache,
+      parentSegmentPath: null,
       // Root node always has `url`
       // Provided in AppTreeContext to ensure it can be overwritten in layout-router
       url: canonicalUrl,
-      loading: cache.loading,
     }
-  }, [cache.parallelRoutes, tree, canonicalUrl, cache.loading])
+  }, [tree, cache, canonicalUrl])
 
   const globalLayoutRouterContext = useMemo(() => {
     return {