Skip to content

Commit

Permalink
Merge branch 'canary' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
@ijjk
ijjk authored Oct 30, 2024
2 parents 5c3c656 + 12dc114 commit f37341a
Show file tree
Hide file tree
Showing 137 changed files with 2,009 additions and 1,628 deletions.
2 changes: 1 addition & 1 deletion crates/next-api/src/middleware.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ impl MiddlewareEndpoint {
}
source.push_str("/?index|/?index\\\\.json)?")
} else {
source.push_str("(.json)?")
source.push_str("{(\\\\.json)}?")
};

source.insert_str(0, "/:nextData(_next/data/[^/]{1,})?");
Expand Down
5 changes: 2 additions & 3 deletions crates/next-core/src/next_config.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,8 @@ pub struct ExperimentalConfig {
pub server_actions: Option<ServerActionsOrLegacyBool>,
pub sri: Option<SubResourceIntegrity>,
react_compiler: Option<ReactCompilerOptionsOrBoolean>,

#[serde(rename = "dynamicIO")]
pub dynamic_io: Option<bool>,
// ---
// UNSUPPORTED
// ---
Expand Down Expand Up @@ -561,8 +562,6 @@ pub struct ExperimentalConfig {
ppr: Option<ExperimentalPartialPrerendering>,
taint: Option<bool>,
react_owner_stack: Option<bool>,
#[serde(rename = "dynamicIO")]
dynamic_io: Option<bool>,
proxy_timeout: Option<f64>,
/// enables the minification of server code.
server_minification: Option<bool>,
Expand Down
183 changes: 129 additions & 54 deletions crates/next-core/src/next_font/google/util.rs
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,33 @@
use std::cmp::Ordering;

use anyhow::{anyhow, bail, Context, Result};
use turbo_tasks::{fxindexset, FxIndexSet, RcStr};
use turbo_tasks::{FxIndexSet, RcStr};

use super::options::{FontData, FontWeights};

#[derive(Debug, PartialEq)]
#[derive(Debug, Default, PartialEq)]
pub(super) struct FontAxes {
pub(super) wght: FxIndexSet<RcStr>,
pub(super) wght: FontAxesWeights,
pub(super) ital: FxIndexSet<FontStyle>,
pub(super) variable_axes: Option<Vec<(RcStr, RcStr)>>,
}

#[derive(Debug, PartialEq, Eq, Hash)]
pub(super) enum FontAxesWeights {
Variable(Option<RcStr>),
Fixed(Vec<u16>),
}

impl Default for FontAxesWeights {
fn default() -> Self {
FontAxesWeights::Fixed(vec![])
}
}

#[derive(Debug, Default, PartialEq, Eq, Hash)]
pub(super) enum FontStyle {
Italic,
#[default]
Normal,
}

Expand Down Expand Up @@ -83,28 +96,53 @@ pub(super) fn get_font_axes(
}
}

let wght = match weight_axis {
Some(weight_axis) => {
fxindexset! {weight_axis}
}
None => fxindexset! {},
};

Ok(FontAxes {
wght,
wght: FontAxesWeights::Variable(weight_axis),
ital,
variable_axes: Some(variable_axes),
})
}

FontWeights::Fixed(weights) => Ok(FontAxes {
wght: FxIndexSet::from_iter(weights.iter().map(|w| w.to_string().into())),
wght: FontAxesWeights::Fixed(weights.to_owned()),
ital,
variable_axes: None,
}),
}
}

#[derive(Debug, Clone, PartialEq, Eq)]
enum VariantValue {
String(RcStr),
U16(u16),
}

impl PartialOrd for VariantValue {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
Some(self.cmp(other))
}
}

impl Ord for VariantValue {
fn cmp(&self, other: &Self) -> Ordering {
match (self, other) {
(VariantValue::String(a), VariantValue::String(b)) => a.cmp(b),
(VariantValue::U16(a), VariantValue::U16(b)) => a.cmp(b),
(VariantValue::String(_), VariantValue::U16(_)) => Ordering::Less,
(VariantValue::U16(_), VariantValue::String(_)) => Ordering::Greater,
}
}
}

impl From<VariantValue> for RcStr {
fn from(val: VariantValue) -> Self {
match val {
VariantValue::String(s) => s,
VariantValue::U16(u) => u.to_string().into(),
}
}
}

// Derived from https://github.com/vercel/next.js/blob/9e098da0915a2a4581bebe2270953a1216be1ba4/packages/font/src/google/utils.ts#L128
pub(super) fn get_stylesheet_url(
root_url: &str,
Expand All @@ -114,48 +152,66 @@ pub(super) fn get_stylesheet_url(
) -> Result<String> {
// Variants are all combinations of weight and style, each variant will result
// in a separate font file
let mut variants: Vec<Vec<(&str, &str)>> = vec![];
if axes.wght.is_empty() {
let mut variants: Vec<Vec<(&str, VariantValue)>> = vec![];

let weights = match &axes.wght {
FontAxesWeights::Variable(Some(wght)) => {
vec![VariantValue::String(wght.to_owned())]
}
FontAxesWeights::Variable(None) => {
vec![]
}
FontAxesWeights::Fixed(wghts) => {
let mut wghts = wghts.clone();
wghts.sort();
wghts.iter().map(|w| VariantValue::U16(*w)).collect()
}
};

if weights.is_empty() {
let mut variant = vec![];
if let Some(variable_axes) = &axes.variable_axes {
if !variable_axes.is_empty() {
for (key, val) in variable_axes {
variant.push((key.as_str(), &val[..]));
variant.push((key.as_str(), VariantValue::String(val.clone())));
}
variants.push(variant);
}
}
} else {
for wght in &axes.wght {
for wght in &weights {
if axes.ital.is_empty() {
let mut variant = vec![];
variant.push(("wght", &wght[..]));
variant.push(("wght", wght.clone()));
if let Some(variable_axes) = &axes.variable_axes {
for (key, val) in variable_axes {
variant.push((key, &val[..]));
variant.push((key, VariantValue::String(val.clone())));
}
}
variants.push(variant);
} else {
for ital in &axes.ital {
let mut variant = vec![];
let mut variant: Vec<(&str, VariantValue)> = vec![];

// If Normal is the only requested variant, it's safe to omit the ital axis
// entirely. Otherwise, include all variants.
if matches!(ital, FontStyle::Italic) || axes.ital.len() > 1 {
variant.push((
"ital",
match ital {
FontStyle::Normal => "0",
FontStyle::Italic => "1",
},
VariantValue::String(
match ital {
FontStyle::Normal => "0",
FontStyle::Italic => "1",
}
.into(),
),
));
}

variant.push(("wght", &wght[..]));
variant.push(("wght", wght.clone()));
if let Some(variable_axes) = &axes.variable_axes {
for (key, val) in variable_axes {
variant.push((key, &val[..]));
variant.push((key, VariantValue::String(val.clone())));
}
}
variants.push(variant);
Expand Down Expand Up @@ -205,17 +261,25 @@ pub(super) fn get_stylesheet_url(
.map(|variant| {
variant
.iter()
.map(|pair| pair.1)
.collect::<Vec<&str>>()
.join(",")
.map(|pair| pair.1.clone())
.collect::<Vec<VariantValue>>()
})
.collect::<Vec<String>>();
.collect::<Vec<Vec<VariantValue>>>();
variant_values.sort();

// An encoding of the series of sorted variant values, with variants delimited
// by `;` and the values within a variant delimited by `,` e.g.
// `"0,10..100,500;1,10.100;500"`
let variant_values_str = variant_values.join(";");
let variant_values_str = variant_values
.iter()
.map(|v| {
v.iter()
.map(|vv| std::convert::Into::<RcStr>::into(vv.clone()))
.collect::<Vec<RcStr>>()
.join(",")
})
.collect::<Vec<String>>()
.join(";");

Ok(format!(
"{}?family={}:{}@{}&display={}",
Expand All @@ -238,7 +302,7 @@ mod tests {
use super::get_font_axes;
use crate::next_font::google::{
options::{FontData, FontWeights},
util::{get_stylesheet_url, FontAxes, FontStyle},
util::{get_stylesheet_url, FontAxes, FontAxesWeights, FontStyle},
GOOGLE_FONTS_STYLESHEET_URL,
};

Expand Down Expand Up @@ -325,7 +389,7 @@ mod tests {
&Some(vec!["slnt".into()]),
)?,
FontAxes {
wght: fxindexset! {"100..900".into()},
wght: FontAxesWeights::Variable(Some("100..900".into())),
ital: fxindexset! {},
variable_axes: Some(vec![("slnt".into(), "-10..0".into())])
}
Expand Down Expand Up @@ -366,9 +430,9 @@ mod tests {
&Some(vec!["slnt".into()]),
)?,
FontAxes {
wght: fxindexset! {},
ital: fxindexset! {},
variable_axes: Some(vec![("slnt".into(), "-10..0".into())])
variable_axes: Some(vec![("slnt".into(), "-10..0".into())]),
wght: FontAxesWeights::Variable(None),
..Default::default()
}
);
Ok(())
Expand Down Expand Up @@ -398,9 +462,8 @@ mod tests {
assert_eq!(
get_font_axes(&data, "Hind", &FontWeights::Fixed(vec![500]), &[], &None)?,
FontAxes {
wght: fxindexset! {"500".into()},
ital: fxindexset! {},
variable_axes: None
wght: FontAxesWeights::Fixed(vec![500]),
..Default::default()
}
);
Ok(())
Expand All @@ -413,7 +476,7 @@ mod tests {
GOOGLE_FONTS_STYLESHEET_URL,
"Roboto Mono",
&FontAxes {
wght: fxindexset! {"500".into()},
wght: FontAxesWeights::Fixed(vec![500]),
ital: fxindexset! {FontStyle::Normal},
variable_axes: None
},
Expand All @@ -432,7 +495,7 @@ mod tests {
GOOGLE_FONTS_STYLESHEET_URL,
"Roboto Serif",
&FontAxes {
wght: fxindexset! {"500".into()},
wght: FontAxesWeights::Fixed(vec![500]),
ital: fxindexset! {FontStyle::Normal},
variable_axes: Some(vec![
("GRAD".into(), "-50..100".into()),
Expand All @@ -448,14 +511,33 @@ mod tests {
Ok(())
}

#[test]
fn test_stylesheet_url_sorts_weights_numerically() -> Result<()> {
assert_eq!(
get_stylesheet_url(
GOOGLE_FONTS_STYLESHEET_URL,
"Roboto Serif",
&FontAxes {
wght: FontAxesWeights::Fixed(vec![1000, 500, 200]),
ital: fxindexset! {FontStyle::Normal},
variable_axes: None
},
"optional"
)?,
"https://fonts.googleapis.com/css2?family=Roboto+Serif:wght@200;500;1000&display=optional"
);

Ok(())
}

#[test]
fn test_stylesheet_url_encodes_all_weight_ital_combinations() -> Result<()> {
assert_eq!(
get_stylesheet_url(
GOOGLE_FONTS_STYLESHEET_URL,
"Roboto Serif",
&FontAxes {
wght: fxindexset! {"500".into(), "300".into()},
wght: FontAxesWeights::Fixed(vec![500, 300]),
ital: fxindexset! {FontStyle::Normal, FontStyle::Italic},
variable_axes: Some(vec![
("GRAD".into(), "-50..100".into()),
Expand All @@ -479,12 +561,11 @@ mod tests {
GOOGLE_FONTS_STYLESHEET_URL,
"Nabla",
&FontAxes {
wght: fxindexset! {},
ital: fxindexset! {},
variable_axes: Some(vec![
("EDPT".into(), "0..200".into()),
("EHLT".into(), "0..24".into()),
])
]),
..Default::default()
},
"optional"
)?,
Expand All @@ -500,11 +581,7 @@ mod tests {
get_stylesheet_url(
GOOGLE_FONTS_STYLESHEET_URL,
"Nabla",
&FontAxes {
wght: fxindexset! {},
ital: fxindexset! {},
variable_axes: None,
},
&Default::default(),
"swap"
)?,
"https://fonts.googleapis.com/css2?family=Nabla&display=swap"
Expand All @@ -520,9 +597,8 @@ mod tests {
GOOGLE_FONTS_STYLESHEET_URL,
"Nabla",
&FontAxes {
wght: fxindexset! {},
ital: fxindexset! {},
variable_axes: Some(vec![]),
..Default::default()
},
"swap"
)?,
Expand All @@ -539,9 +615,8 @@ mod tests {
GOOGLE_FONTS_STYLESHEET_URL,
"Hind",
&FontAxes {
wght: fxindexset! {"500".into()},
ital: fxindexset! {},
variable_axes: None
wght: FontAxesWeights::Fixed(vec![500]),
..Default::default()
},
"optional"
)?,
Expand Down
Loading

0 comments on commit f37341a

Please sign in to comment.