Merge remote-tracking branch 'origin/canary' into wbinnssmith/routes-…

…client-component
vercel · Apr 15, 2024 · ffdc703 · ffdc703
2 parents f2a73f9 + 3491417
commit ffdc703
Show file tree

Hide file tree

Showing 13 changed files with 219 additions and 189 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,11 +37,11 @@ swc_core = { version = "0.90.30", features = [
 testing = { version = "0.35.22" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240411.3" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240415.5" }
 # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
-turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240411.3" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240415.5" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240411.3" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240415.5" }
 
 # General Deps
 

diff --git a/docs/02-app/01-building-your-application/09-authentication/index.mdx b/docs/02-app/01-building-your-application/09-authentication/index.mdx
@@ -877,7 +877,7 @@ Here are authentication solutions compatible with Next.js, please refer to the q
 - [Clerk](https://clerk.com/docs/quickstarts/nextjs)
 - [Kinde](https://kinde.com/docs/developer-tools/nextjs-sdk)
 - [Lucia](https://lucia-auth.com/getting-started/nextjs-app)
-- [NextAuth.js](https://authjs.dev/guides/upgrade-to-v5)
+- [NextAuth.js](https://authjs.dev/getting-started/migrating-to-v5)
 - [Supabase](https://supabase.com/docs/guides/getting-started/quickstarts/nextjs)
 - [Stytch](https://stytch.com/docs/guides/quickstarts/nextjs)
 - [Iron Session](https://github.com/vvo/iron-session)

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -196,7 +196,7 @@
     "@types/ws": "8.2.0",
     "@vercel/ncc": "0.34.0",
     "@vercel/nft": "0.26.4",
-    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240411.3",
+    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240415.5",
     "acorn": "8.5.0",
     "amphtml-validator": "1.0.35",
     "anser": "1.4.9",

diff --git a/packages/next/src/build/webpack-config.ts b/packages/next/src/build/webpack-config.ts
@@ -1880,7 +1880,8 @@ export default async function getBaseWebpackConfig(
         new NextFontManifestPlugin({
           appDir,
         }),
-      isClient &&
+      !dev &&
+        isClient &&
         new CssChunkingPlugin(config.experimental.cssChunking === 'strict'),
       !dev &&
         isClient &&

diff --git a/packages/next/src/lib/metadata/resolvers/resolve-opengraph.ts b/packages/next/src/lib/metadata/resolvers/resolve-opengraph.ts
@@ -96,24 +96,20 @@ export function resolveImages(
   return nonNullableImages
 }
 
+const ogTypeToFields: Record<string, readonly string[]> = {
+  article: OgTypeFields.article,
+  book: OgTypeFields.article,
+  'music.song': OgTypeFields.song,
+  'music.album': OgTypeFields.song,
+  'music.playlist': OgTypeFields.playlist,
+  'music.radio_station': OgTypeFields.radio,
+  'video.movie': OgTypeFields.video,
+  'video.episode': OgTypeFields.video,
+}
+
 function getFieldsByOgType(ogType: OpenGraphType | undefined) {
-  switch (ogType) {
-    case 'article':
-    case 'book':
-      return OgTypeFields.article
-    case 'music.song':
-    case 'music.album':
-      return OgTypeFields.song
-    case 'music.playlist':
-      return OgTypeFields.playlist
-    case 'music.radio_station':
-      return OgTypeFields.radio
-    case 'video.movie':
-    case 'video.episode':
-      return OgTypeFields.video
-    default:
-      return OgTypeFields.basic
-  }
+  if (!ogType || !(ogType in ogTypeToFields)) return OgTypeFields.basic
+  return ogTypeToFields[ogType].concat(OgTypeFields.basic)
 }
 
 function validateResolvedImageUrl(