Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Accept next/font/google as well as @next/font/google #3723

Merged
merged 1 commit into from Feb 9, 2023
Merged

Accept next/font/google as well as @next/font/google #3723

merged 1 commit into from Feb 9, 2023

Conversation

wbinnssmith
Copy link
Member

Aligning with vercel/next.js#45707, this allows users to import fonts from next/font/google as well as @next/font/google.

Test Plan: Adjusted tests to use next/font/google and added another test to verify @next/font/google continues to work.

@wbinnssmith
Accept next/font/google as well as @next/font/google
04720b9 
Aligning with vercel/next.js#45707, this allows users to import fonts from `next/font/google` as well as `@next/font/google`.

Test Plan: Adjusted tests to use `next/font/google` and added another test to verify `@next/font/google` continues to work.
@wbinnssmith wbinnssmith requested a review from a team as a code owner February 9, 2023 18:00
@vercel
Copy link

vercel bot commented Feb 9, 2023 •
edited

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

Name Status Preview Comments Updated
turbo-site ✅ Ready (Inspect) Visit Preview 💬 Add your feedback Feb 9, 2023 at 6:01PM (UTC)
9 Ignored Deployments
Name Status Preview Comments Updated
examples-basic-web ⬜️ Ignored (Inspect) Feb 9, 2023 at 6:01PM (UTC)
examples-cra-web ⬜️ Ignored (Inspect) Feb 9, 2023 at 6:01PM (UTC)
examples-designsystem-docs ⬜️ Ignored (Inspect) Feb 9, 2023 at 6:01PM (UTC)
examples-kitchensink-blog ⬜️ Ignored (Inspect) Feb 9, 2023 at 6:01PM (UTC)
examples-native-web ⬜️ Ignored (Inspect) Feb 9, 2023 at 6:01PM (UTC)
examples-nonmonorepo ⬜️ Ignored (Inspect) Feb 9, 2023 at 6:01PM (UTC)
examples-svelte-web ⬜️ Ignored (Inspect) Feb 9, 2023 at 6:01PM (UTC)
examples-tailwind-web ⬜️ Ignored (Inspect) Feb 9, 2023 at 6:01PM (UTC)
examples-vite-web ⬜️ Ignored (Inspect) Feb 9, 2023 at 6:01PM (UTC)

@wbinnssmith wbinnssmith added the pr: automerge Kodiak will merge these automatically after checks pass label Feb 9, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Feb 9, 2023 •
edited

⚠️ CI failed ⚠️

The following steps have failed in CI:

  • Turbopack Rust tests (mac/win, non-blocking)

See workflow summary for details

@kodiakhq kodiakhq bot merged commit 80d4e12 into main Feb 9, 2023
@kodiakhq kodiakhq bot deleted the wbinnssmith/next-font branch February 9, 2023 18:15
@github-actions
Copy link
Contributor

github-actions bot commented Feb 9, 2023

Benchmark for 606adba

Click to view benchmark
Test Base PR % Significant %
bench_hmr_to_commit/Turbopack CSR/1000 modules 10.17ms ± 0.05ms 9963.62µs ± 81.47µs -2.06%
bench_hmr_to_commit/Turbopack RCC/1000 modules 10.49ms ± 0.08ms 10.30ms ± 0.10ms -1.85%
bench_hmr_to_commit/Turbopack RSC/1000 modules 500.88ms ± 3.28ms 515.28ms ± 5.06ms +2.88%
bench_hmr_to_commit/Turbopack SSR/1000 modules 10.22ms ± 0.09ms 10.29ms ± 0.07ms +0.73%
bench_hmr_to_eval/Turbopack CSR/1000 modules 9025.27µs ± 60.98µs 8910.55µs ± 93.75µs -1.27%
bench_hmr_to_eval/Turbopack RCC/1000 modules 9283.71µs ± 82.04µs 9155.99µs ± 96.72µs -1.38%
bench_hmr_to_eval/Turbopack SSR/1000 modules 8980.50µs ± 88.43µs 9038.95µs ± 72.46µs +0.65%
bench_hydration/Turbopack RCC/1000 modules 4260.97ms ± 11.48ms 4279.38ms ± 5.61ms +0.43%
bench_hydration/Turbopack RSC/1000 modules 3870.21ms ± 22.87ms 3863.98ms ± 16.87ms -0.16%
bench_hydration/Turbopack SSR/1000 modules 3742.13ms ± 16.06ms 3721.74ms ± 7.87ms -0.54%
bench_startup/Turbopack CSR/1000 modules 2794.71ms ± 6.01ms 2797.78ms ± 10.14ms +0.11%
bench_startup/Turbopack RCC/1000 modules 2587.39ms ± 6.54ms 2583.77ms ± 6.46ms -0.14%
bench_startup/Turbopack RSC/1000 modules 2472.86ms ± 7.28ms 2482.55ms ± 7.89ms +0.39%
bench_startup/Turbopack SSR/1000 modules 2137.97ms ± 3.08ms 2138.33ms ± 1.72ms +0.02%

@jridgewell jridgewell mentioned this pull request Feb 10, 2023
Merged
timneutkens pushed a commit to vercel/next.js that referenced this pull request Feb 10, 2023
@Brooooooklyn @kodiakhq
Update turbopack to 230209.02 (#45776)Co-authored-by: kodiakhq[bot] <…
946ccb0 
…49736102+kodiakhq[bot]@users.noreply.github.com>

# New Features
- vercel/turbo#3540
- vercel/turbo#3549
- vercel/turbo#3465
- vercel/turbo#3550
- vercel/turbo#3495
- vercel/turbo#3624
- vercel/turbo#3600
- vercel/turbo#3676
- vercel/turbo#3689

# Fixes

- vercel/turbo#3437
- vercel/turbo#3542
- vercel/turbo#3531
- vercel/turbo#3552
- vercel/turbo#3551
- vercel/turbo#3597
- vercel/turbo#3644
- vercel/turbo#3623
- vercel/turbo#3634
- vercel/turbo#3574
- vercel/turbo#3673
- vercel/turbo#3675
- vercel/turbo#3723
- vercel/turbo#3677
- vercel/turbo#3717
- vercel/turbo#3701

# Performance Improvements

- vercel/turbo#3361 
- vercel/turbo#3619

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
jridgewell pushed a commit to vercel/next.js that referenced this pull request Mar 10, 2023
@wbinnssmith
Accept next/font/google as well as @next/font/google (vercel/turb…
4dce10c 
…o#3723)

Aligning with #45707, this allows users to import fonts from `next/font/google` as well as `@next/font/google`.

Test Plan: Adjusted tests to use `next/font/google` and added another test to verify `@next/font/google` continues to work.
sokra pushed a commit to vercel/next.js that referenced this pull request Mar 13, 2023
@wbinnssmith
Accept next/font/google as well as @next/font/google (vercel/turb…
337ac59 
…o#3723)

Aligning with #45707, this allows users to import fonts from `next/font/google` as well as `@next/font/google`.

Test Plan: Adjusted tests to use `next/font/google` and added another test to verify `@next/font/google` continues to work.
@DuCanhGH DuCanhGH mentioned this pull request Mar 15, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jridgewell jridgewell jridgewell approved these changes

@hanneslund hanneslund hanneslund approved these changes

Assignees
No one assigned
Labels
pr: automerge Kodiak will merge these automatically after checks pass
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@wbinnssmith @jridgewell @hanneslund