feat(turbopack): Align behavior for link rel="preconnect" with webp…

…ack mode (#64011) ### What? Emit `<link data-next-font="size-adjust" rel="preconnect" href="/" crossorigin="anonymous"/>` in more cases. ### Why? To align with the default mode ### How?
vercel · Apr 8, 2024 · 697ae8a · 697ae8a
1 parent 9a6db57
commit 697ae8a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/packages/next-swc/crates/next-api/src/font.rs b/packages/next-swc/crates/next-api/src/font.rs
@@ -45,6 +45,7 @@ pub(crate) async fn create_font_manifest(
 
     let has_fonts = !font_paths.is_empty();
     let using_size_adjust = font_paths.iter().any(|path| path.contains("-s"));
+
     let font_paths = font_paths
         .into_iter()
         .filter(|path| path.contains(".p."))

diff --git a/packages/next-swc/crates/next-core/src/next_font/google/mod.rs b/packages/next-swc/crates/next-core/src/next_font/google/mod.rs
@@ -86,6 +86,7 @@ impl NextFontGoogleReplacer {
     async fn import_map_result(&self, query: String) -> Result<Vc<ImportMapResult>> {
         let request_hash = get_request_hash(&query).await?;
         let qstr = qstring::QString::from(query.as_str());
+
         let query_vc = Vc::cell(query);
 
         let font_data = load_font_data(self.project_path);

diff --git a/packages/next/src/server/dev/turbopack-utils.ts b/packages/next/src/server/dev/turbopack-utils.ts
@@ -349,6 +349,7 @@ export async function handleRouteType({
         } else {
           manifestLoader.deleteMiddlewareManifest(serverKey)
         }
+        await manifestLoader.loadFontManifest('/_app', 'pages')
         await manifestLoader.loadFontManifest(page, 'pages')
         await manifestLoader.loadLoadableManifest(page, 'pages')
 

diff --git a/test/turbopack-dev-tests-manifest.json b/test/turbopack-dev-tests-manifest.json
@@ -6616,9 +6616,10 @@
     "passed": [
       "next/font/google no preloads with _app without preload",
       "next/font/google without-preloaded-fonts without _app without fonts",
-      "next/font/google without-preloaded-fonts without _app without preload"
+      "next/font/google without-preloaded-fonts without _app without preload",
+      "next/font/google no preloads with _app without fonts"
     ],
-    "failed": ["next/font/google no preloads with _app without fonts"],
+    "failed": [],
     "pending": [],
     "flakey": [],
     "runtimeError": false