Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
8319d6da
Commit
8319d6da
authored
Apr 01, 2026
by
Andrew Imm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cache remote webfonts locally to avoid network requests on server startup
parent
5db26f98
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
139 additions
and
12 deletions
+139
-12
Cargo.lock
Cargo.lock
+1
-0
Cargo.toml
crates/next-core/Cargo.toml
+1
-0
font_cache.rs
crates/next-core/src/next_font/google/font_cache.rs
+87
-0
mod.rs
crates/next-core/src/next_font/google/mod.rs
+50
-12
No files found.
Cargo.lock
View file @
8319d6da
...
...
@@ -4873,6 +4873,7 @@ dependencies = [
"serde",
"serde_json",
"serde_path_to_error",
"sha2",
"smallvec",
"swc_core",
"swc_sourcemap",
...
...
crates/next-core/Cargo.toml
View file @
8319d6da
...
...
@@ -34,6 +34,7 @@ remove_console = { workspace = true }
rustc-hash
=
{
workspace
=
true
}
serde
=
{
workspace
=
true
}
serde_json
=
{
workspace
=
true
}
sha2
=
{
workspace
=
true
}
serde_path_to_error
=
{
workspace
=
true
}
smallvec
=
{
workspace
=
true
}
swc_sourcemap
=
{
workspace
=
true
}
...
...
crates/next-core/src/next_font/google/font_cache.rs
0 → 100644
View file @
8319d6da
use
std
::{
fs
,
path
::{
Path
,
PathBuf
},
};
use
sha2
::{
Digest
,
Sha256
};
fn
hash_key
(
url
:
&
str
)
->
String
{
let
mut
hasher
=
Sha256
::
new
();
hasher
.update
(
url
.as_bytes
());
format!
(
"{:x}"
,
hasher
.finalize
())
}
/// Write to a temp file then rename into place so concurrent readers never see
/// a partial file. On Windows, rename can fail if the target exists, so we fall
/// back to a direct write.
fn
write_file_atomic
(
path
:
&
Path
,
data
:
&
[
u8
])
->
std
::
io
::
Result
<
()
>
{
let
tmp
=
path
.with_extension
(
format!
(
"tmp.{}"
,
std
::
process
::
id
()));
fs
::
write
(
&
tmp
,
data
)
?
;
if
fs
::
rename
(
&
tmp
,
path
)
.is_err
()
{
// Windows: rename fails when target exists. Fall back to direct write.
fs
::
write
(
path
,
data
)
?
;
let
_
=
fs
::
remove_file
(
&
tmp
);
}
Ok
(())
}
/// Uses synchronous I/O intentionally — turbo-tasks-fs found that blocking the
/// tokio thread is faster than `spawn_blocking` for short operations like these
/// (see turbopack/crates/turbo-tasks-fs/src/retry.rs and PR #87661).
pub
struct
FontDiskCache
{
cache_dir
:
PathBuf
,
}
impl
FontDiskCache
{
/// Create a font disk cache from a project root path.
///
/// Returns `None` if `NEXT_FONT_GOOGLE_MOCKED_RESPONSES` is set (tests
/// should bypass the cache) or if the project path cannot be resolved.
pub
fn
new
(
project_root
:
&
Path
)
->
Option
<
Self
>
{
if
std
::
env
::
var
(
"NEXT_FONT_GOOGLE_MOCKED_RESPONSES"
)
.is_ok
()
{
return
None
;
}
let
cache_dir
=
match
std
::
env
::
var
(
"NEXT_FONT_CACHE_DIR"
)
{
Ok
(
dir
)
=>
PathBuf
::
from
(
dir
),
Err
(
_
)
=>
project_root
.join
(
".next/cache/google-fonts"
),
};
Some
(
Self
{
cache_dir
})
}
pub
fn
get_css
(
&
self
,
url
:
&
str
)
->
Option
<
String
>
{
let
path
=
self
.cache_dir
.join
(
format!
(
"css-{}.txt"
,
hash_key
(
url
)));
fs
::
read_to_string
(
path
)
.ok
()
}
pub
fn
set_css
(
&
self
,
url
:
&
str
,
css
:
&
str
)
{
if
let
Err
(
e
)
=
self
.set_inner
(
&
format!
(
"css-{}.txt"
,
hash_key
(
url
)),
css
.as_bytes
())
{
tracing
::
warn!
(
"Failed to write to font cache directory {:?}: {}"
,
self
.cache_dir
,
e
);
}
}
pub
fn
get_font
(
&
self
,
url
:
&
str
)
->
Option
<
Vec
<
u8
>>
{
let
path
=
self
.cache_dir
.join
(
format!
(
"font-{}.bin"
,
hash_key
(
url
)));
fs
::
read
(
path
)
.ok
()
}
pub
fn
set_font
(
&
self
,
url
:
&
str
,
data
:
&
[
u8
])
{
if
let
Err
(
e
)
=
self
.set_inner
(
&
format!
(
"font-{}.bin"
,
hash_key
(
url
)),
data
)
{
tracing
::
warn!
(
"Failed to write to font cache directory {:?}: {}"
,
self
.cache_dir
,
e
);
}
}
fn
set_inner
(
&
self
,
filename
:
&
str
,
data
:
&
[
u8
])
->
std
::
io
::
Result
<
()
>
{
fs
::
create_dir_all
(
&
self
.cache_dir
)
?
;
write_file_atomic
(
&
self
.cache_dir
.join
(
filename
),
data
)
}
}
crates/next-core/src/next_font/google/mod.rs
View file @
8319d6da
...
...
@@ -12,7 +12,7 @@ use turbo_tasks_env::{CommandLineProcessEnv, ProcessEnv};
use
turbo_tasks_fetch
::{
FetchClientConfig
,
HttpResponseBody
};
use
turbo_tasks_fs
::{
DiskFileSystem
,
File
,
FileContent
,
FileSystem
,
FileSystemPath
,
json
::
parse_json_with_source_context
,
json
::
parse_json_with_source_context
,
to_sys_path
,
};
use
turbo_tasks_hash
::
hash_xxh3_hash64
;
use
turbopack
::
evaluate_context
::
node_evaluate_asset_context
;
...
...
@@ -44,6 +44,7 @@ use crate::{
next_font
::{
font_fallback
::
FontFallback
,
google
::{
font_cache
::
FontDiskCache
,
font_fallback
::
get_font_fallback
,
options
::{
FontDataEntry
,
FontWeights
,
NextFontGoogleOptions
,
options_from_request
},
stylesheet
::
build_stylesheet
,
...
...
@@ -58,6 +59,7 @@ use crate::{
util
::
load_next_js_json_file
,
};
pub
mod
font_cache
;
pub
mod
font_fallback
;
pub
mod
options
;
pub
mod
request
;
...
...
@@ -238,6 +240,10 @@ impl NextFontGoogleCssModuleReplacer {
.read
(
rcstr!
(
"NEXT_FONT_GOOGLE_MOCKED_RESPONSES"
))
.await
?
;
let
disk_cache
=
to_sys_path
(
self
.project_path
.clone
())
.await
?
.and_then
(|
p
|
FontDiskCache
::
new
(
&
p
));
let
stylesheet_str
=
mocked_responses_path
.as_ref
()
.map_or_else
(
...
...
@@ -246,6 +252,7 @@ impl NextFontGoogleCssModuleReplacer {
*
self
.fetch_client
,
stylesheet_url
.clone
(),
css_virtual_path
.clone
(),
&
disk_cache
,
)
.boxed
()
},
...
...
@@ -454,20 +461,35 @@ impl ImportMappingReplacement for NextFontGoogleFontFileReplacer {
.await
?
.join
(
&
format!
(
"/{name}.{ext}"
))
?
;
// doesn't seem ideal to download the font into a string, but probably doesn't
// really matter either.
let
Some
(
font
)
=
fetch_from_google_fonts
(
*
self
.fetch_client
,
url
.into
(),
font_virtual_path
.clone
())
.await
?
else
{
return
Ok
(
ImportMapResult
::
Result
(
ResolveResult
::
unresolvable
()
.resolved_cell
())
.cell
(),
);
let
disk_cache
=
to_sys_path
(
self
.project_path
.clone
())
.await
?
.and_then
(|
p
|
FontDiskCache
::
new
(
&
p
));
// Check disk cache before fetching from Google
let
font_data
=
if
let
Some
(
cached
)
=
disk_cache
.as_ref
()
.and_then
(|
c
|
c
.get_font
(
&
url
))
{
cached
}
else
{
let
Some
(
font
)
=
fetch_from_google_fonts
(
*
self
.fetch_client
,
url
.clone
()
.into
(),
font_virtual_path
.clone
(),
)
.await
?
else
{
return
Ok
(
ImportMapResult
::
Result
(
ResolveResult
::
unresolvable
()
.resolved_cell
())
.cell
(),
);
};
let
bytes
=
font
.await
?
.
0
.clone
();
if
let
Some
(
cache
)
=
&
disk_cache
{
cache
.set_font
(
&
url
,
&
bytes
);
}
bytes
};
let
font_source
=
VirtualSource
::
new
(
font_virtual_path
,
AssetContent
::
file
(
FileContent
::
Content
(
font
.await
?
.
0
.as_slice
()
.into
())
.cell
()),
AssetContent
::
file
(
FileContent
::
Content
(
font
_data
.as_slice
()
.into
())
.cell
()),
)
.to_resolved
()
.await
?
;
...
...
@@ -693,8 +715,24 @@ async fn fetch_real_stylesheet(
fetch_client
:
Vc
<
FetchClientConfig
>
,
stylesheet_url
:
RcStr
,
css_virtual_path
:
FileSystemPath
,
disk_cache
:
&
Option
<
FontDiskCache
>
,
)
->
Result
<
Option
<
Vc
<
RcStr
>>>
{
let
body
=
fetch_from_google_fonts
(
fetch_client
,
stylesheet_url
,
css_virtual_path
)
.await
?
;
// Check disk cache first
if
let
Some
(
cache
)
=
disk_cache
{
if
let
Some
(
css
)
=
cache
.get_css
(
&
stylesheet_url
)
{
return
Ok
(
Some
(
Vc
::
cell
(
css
.into
())));
}
}
let
body
=
fetch_from_google_fonts
(
fetch_client
,
stylesheet_url
.clone
(),
css_virtual_path
)
.await
?
;
if
let
Some
(
body
)
=
&
body
{
if
let
Some
(
cache
)
=
disk_cache
{
let
css_str
=
body
.to_string
()
.await
?
;
cache
.set_css
(
&
stylesheet_url
,
&
css_str
);
}
}
Ok
(
body
.map
(|
body
|
body
.to_string
()))
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment