[5/n] `@next/font/google`: Port utilities for generating stylesheet urls #2856

wbinnssmith · 2022-11-28T23:16:10Z

In order to generate urls to stylesheets, this ports over logic from the upstream JavaScript implementation, namely getFontAxes0, which generates a font axes structure from the user's request and font data, and getUrl1, which generates a url to a Google fonts stylesheet from the user's request and the font axes structure.

Test Plan:

Added unit tests
Manually verified stylesheet urls generated by tests (will need adjusting to be valid fonts and attributes)

vercel · 2022-11-28T23:16:15Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated
examples-basic-web	🔄 Building (Inspect)			Dec 8, 2022 at 2:54AM (UTC)
examples-svelte-web	🔄 Building (Inspect)			Dec 8, 2022 at 2:54AM (UTC)

6 Ignored Deployments

Name	Status	Preview	Updated
examples-cra-web	⬜️ Ignored (Inspect)		Dec 8, 2022 at 2:54AM (UTC)
examples-designsystem-docs	⬜️ Ignored (Inspect)		Dec 8, 2022 at 2:54AM (UTC)
examples-kitchensink-blog	⬜️ Ignored (Inspect)		Dec 8, 2022 at 2:54AM (UTC)
examples-native-web	⬜️ Ignored (Inspect)		Dec 8, 2022 at 2:54AM (UTC)
examples-nonmonorepo	⬜️ Ignored (Inspect)		Dec 8, 2022 at 2:54AM (UTC)
turbo-site	⬜️ Ignored (Inspect)	Visit Preview	Dec 8, 2022 at 2:54AM (UTC)

wbinnssmith · 2022-11-28T23:16:22Z

Current dependencies on/for this PR:

main
- PR @next/font [1/n] Add query structure to module requests #2743
  - PR @next/font [2/n] Apply next/font swc transform #2742
    - PR [3/n] turbo-tasks-fetch #2769
      - PR [4/n] @next/font/google: Parse and validate query options #2812
        
        PR [5/n] @next/font/google: Port utilities for generating stylesheet urls #2856 👈
        
        PR [6/n] @next/font/google: Cache stylesheet locally #2940

This comment was auto-generated by Graphite.

crates/next-core/src/next_font_google/util.rs

wbinnssmith · 2022-12-06T22:50:35Z

Graphite Merge Job

Current status: ⚠️ Downstack blocker

A downstack pull request blocked this pull request from being merged.

This comment was auto-generated by Graphite.

Job Reference: GTwTicpFoR97BYmAqnX0

Co-authored-by: Hannes Bornö <hannes.borno@vercel.com>

Co-authored-by: Justin Ridgewell <justin@ridgewell.name>

github-actions · 2022-12-08T04:12:51Z

Benchmark for `d7f79e0`

Test	Base	PR	%	Significant %
bench_startup/Turbopack CSR/1000 modules	1485.51ms ± 7.57ms	1444.25ms ± 10.96ms	-2.78%	-0.29%
bench_startup/Turbopack SSR/1000 modules	2408.12ms ± 8.89ms	2374.96ms ± 4.72ms	-1.38%	-0.25%

Click to view full benchmark

Test	Base	PR	%	Significant %
bench_hmr_to_commit/Turbopack CSR/1000 modules	8448.22µs ± 51.35µs	8376.06µs ± 59.30µs	-0.85%
bench_hmr_to_commit/Turbopack RCC/1000 modules	8709.14µs ± 66.37µs	8697.91µs ± 66.24µs	-0.13%
bench_hmr_to_commit/Turbopack RSC/1000 modules	881.25ms ± 25.85ms	870.26ms ± 23.28ms	-1.25%
bench_hmr_to_commit/Turbopack SSR/1000 modules	8455.77µs ± 32.34µs	8474.46µs ± 66.33µs	+0.22%
bench_hmr_to_eval/Turbopack CSR/1000 modules	7435.31µs ± 53.88µs	7406.16µs ± 60.83µs	-0.39%
bench_hmr_to_eval/Turbopack RCC/1000 modules	7491.65µs ± 90.07µs	7547.84µs ± 69.66µs	+0.75%
bench_hmr_to_eval/Turbopack SSR/1000 modules	7511.65µs ± 70.51µs	7452.36µs ± 48.68µs	-0.79%
bench_hydration/Turbopack RCC/1000 modules	3564.26ms ± 19.06ms	3511.80ms ± 26.16ms	-1.47%
bench_hydration/Turbopack RSC/1000 modules	2708.83ms ± 48.23ms	2718.52ms ± 47.09ms	+0.36%
bench_hydration/Turbopack SSR/1000 modules	2989.04ms ± 7.77ms	2976.66ms ± 12.40ms	-0.41%
bench_startup/Turbopack CSR/1000 modules	1485.51ms ± 7.57ms	1444.25ms ± 10.96ms	-2.78%	-0.29%
bench_startup/Turbopack RCC/1000 modules	2695.70ms ± 23.33ms	2654.17ms ± 47.11ms	-1.54%
bench_startup/Turbopack RSC/1000 modules	2332.62ms ± 32.04ms	2352.96ms ± 36.54ms	+0.87%
bench_startup/Turbopack SSR/1000 modules	2408.12ms ± 8.89ms	2374.96ms ± 4.72ms	-1.38%	-0.25%

github-actions · 2022-12-08T05:11:11Z

⚠️ CI failed ⚠️

The following steps have failed in CI:

Rust benchmark tests

See workflow summary for details

…rls (vercel/turbo#2856) * Implement get_font_axes * Implement get_stylesheet_url * Handle font axes without wght Co-authored-by: Hannes Bornö <hannes.borno@vercel.com> * Implement extract_font_urls * Update crates/next-core/src/next_font_google/util.rs Co-authored-by: Justin Ridgewell <justin@ridgewell.name> * Remove extraction of fonts Co-authored-by: Hannes Bornö <hannes.borno@vercel.com> Co-authored-by: Justin Ridgewell <justin@ridgewell.name>

This was referenced Nov 28, 2022

[4/n] @next/font/google: Parse and validate query options #2812

Merged

[3/n] turbo-tasks-fetch #2769

Merged

github-actions bot added the area: turbopack label Nov 28, 2022

wbinnssmith force-pushed the wbinnssmith/next-font-google-utils branch 3 times, most recently from 10ae16f to f815dd9 Compare November 29, 2022 00:00

wbinnssmith requested a review from hanneslund November 29, 2022 00:01

wbinnssmith marked this pull request as ready for review November 29, 2022 00:01

wbinnssmith requested a review from a team as a code owner November 29, 2022 00:01

hanneslund suggested changes Nov 29, 2022

View reviewed changes

crates/next-core/src/next_font_google/util.rs Outdated Show resolved Hide resolved

wbinnssmith force-pushed the wbinnssmith/import-map-next-font branch from 685c47f to 6e09f52 Compare November 29, 2022 19:31

wbinnssmith mentioned this pull request Nov 29, 2022

@next/font [2/n] Apply next/font swc transform #2742

Merged

wbinnssmith force-pushed the wbinnssmith/next-font-google-utils branch from f815dd9 to 1263828 Compare November 29, 2022 19:31

wbinnssmith mentioned this pull request Nov 29, 2022

@next/font [1/n] Add query structure to module requests #2743

Merged

wbinnssmith changed the title ~~@next/font/google: Port utilities for generating stylesheet urls~~ [5/n] @next/font/google: Port utilities for generating stylesheet urls Nov 29, 2022

wbinnssmith force-pushed the wbinnssmith/next-font-google-utils branch 2 times, most recently from 7ca5381 to 513e0ea Compare November 29, 2022 19:50

hanneslund suggested changes Nov 30, 2022

View reviewed changes

crates/next-core/src/next_font_google/util.rs Outdated Show resolved Hide resolved

wbinnssmith force-pushed the wbinnssmith/next-font-google-utils branch from 513e0ea to 6e30f5d Compare November 30, 2022 19:51

wbinnssmith force-pushed the wbinnssmith/import-map-next-font branch from 6e09f52 to 6dc35c2 Compare December 1, 2022 00:35

wbinnssmith force-pushed the wbinnssmith/next-font-google-utils branch from 6e30f5d to 98d622e Compare December 1, 2022 00:35

vercel bot deployed to Preview – turbo-site December 1, 2022 00:36 View deployment

wbinnssmith force-pushed the wbinnssmith/next-font-google-utils branch from 98d622e to db1b739 Compare December 1, 2022 01:38

vercel bot deployed to Preview – turbo-site December 1, 2022 01:39 View deployment

wbinnssmith force-pushed the wbinnssmith/import-map-next-font branch from 6dc35c2 to 9f147a3 Compare December 1, 2022 19:23

wbinnssmith force-pushed the wbinnssmith/next-font-google-utils branch from db1b739 to ca1e9dc Compare December 1, 2022 19:23

vercel bot deployed to Preview – turbo-site December 1, 2022 19:24 View deployment

wbinnssmith force-pushed the wbinnssmith/import-map-next-font branch from 9f147a3 to 35435c3 Compare December 1, 2022 19:31

wbinnssmith force-pushed the wbinnssmith/next-font-google-utils branch from 98de4f5 to 00e9df7 Compare December 6, 2022 20:46

vercel bot deployed to Preview – turbo-site December 6, 2022 20:49 View deployment

wbinnssmith force-pushed the wbinnssmith/import-map-next-font branch 3 times, most recently from ea3de66 to b9d916c Compare December 8, 2022 00:03

wbinnssmith force-pushed the wbinnssmith/next-font-google-utils branch from 00e9df7 to 05b7714 Compare December 8, 2022 00:03

vercel bot deployed to Preview – turbo-site December 8, 2022 00:04 View deployment

wbinnssmith force-pushed the wbinnssmith/import-map-next-font branch from b9d916c to 32b98b7 Compare December 8, 2022 01:07

wbinnssmith force-pushed the wbinnssmith/next-font-google-utils branch from 05b7714 to 9394851 Compare December 8, 2022 01:08

vercel bot deployed to Preview – turbo-site December 8, 2022 01:09 View deployment

wbinnssmith force-pushed the wbinnssmith/import-map-next-font branch from 32b98b7 to e833889 Compare December 8, 2022 01:36

wbinnssmith force-pushed the wbinnssmith/next-font-google-utils branch from 9394851 to 2f4e4e1 Compare December 8, 2022 01:36

vercel bot deployed to Preview – turbo-site December 8, 2022 01:37 View deployment

Base automatically changed from wbinnssmith/import-map-next-font to main December 8, 2022 02:20

wbinnssmith and others added 5 commits December 7, 2022 18:20

Implement get_font_axes

7ff0a83

Implement get_stylesheet_url

2f48224

Handle font axes without wght

7bd59d6

Co-authored-by: Hannes Bornö <hannes.borno@vercel.com>

Implement extract_font_urls

9f25011

Update crates/next-core/src/next_font_google/util.rs

3530d78

Co-authored-by: Justin Ridgewell <justin@ridgewell.name>

wbinnssmith force-pushed the wbinnssmith/next-font-google-utils branch from 2f4e4e1 to 3530d78 Compare December 8, 2022 02:21

vercel bot deployed to Preview – turbo-site December 8, 2022 02:22 View deployment

Remove extraction of fonts

df5f495

wbinnssmith merged commit b90a395 into main Dec 8, 2022

wbinnssmith deleted the wbinnssmith/next-font-google-utils branch December 8, 2022 03:38

DuCanhGH mentioned this pull request Mar 15, 2023

Fix(typedRoutes): fixed files from directories other than pages and app getting into Route vercel/next.js#47184

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[5/n] `@next/font/google`: Port utilities for generating stylesheet urls #2856

[5/n] `@next/font/google`: Port utilities for generating stylesheet urls #2856

wbinnssmith commented Nov 28, 2022 •

edited

vercel bot commented Nov 28, 2022 •

edited

wbinnssmith commented Nov 28, 2022 •

edited

wbinnssmith commented Dec 6, 2022 •

edited

github-actions bot commented Dec 8, 2022

github-actions bot commented Dec 8, 2022

[5/n] @next/font/google: Port utilities for generating stylesheet urls #2856

[5/n] @next/font/google: Port utilities for generating stylesheet urls #2856

Conversation

wbinnssmith commented Nov 28, 2022 • edited

vercel bot commented Nov 28, 2022 • edited

wbinnssmith commented Nov 28, 2022 • edited

wbinnssmith commented Dec 6, 2022 • edited

github-actions bot commented Dec 8, 2022

Benchmark for d7f79e0

github-actions bot commented Dec 8, 2022

⚠️ CI failed ⚠️

[5/n] `@next/font/google`: Port utilities for generating stylesheet urls #2856

[5/n] `@next/font/google`: Port utilities for generating stylesheet urls #2856

wbinnssmith commented Nov 28, 2022 •

edited

vercel bot commented Nov 28, 2022 •

edited

wbinnssmith commented Nov 28, 2022 •

edited

wbinnssmith commented Dec 6, 2022 •

edited

Benchmark for `d7f79e0`