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

Fix the router when Next.js returns no result #3741

Merged
merged 3 commits into from
Feb 14, 2023
Merged

Fix the router when Next.js returns no result #3741

merged 3 commits into from
Feb 14, 2023

Conversation

alexkirsz
Copy link
Contributor

I changed the return type of the Next.js router in vercel/next.js#45668 to account for cases where the router does and does not find a matching rewrite.

@alexkirsz alexkirsz requested a review from a team as a code owner February 10, 2023 15:24
@vercel
Copy link

vercel bot commented Feb 10, 2023 •
edited
Loading

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

Name Status Preview Comments Updated
examples-basic-web 🔄 Building (Inspect) Feb 14, 2023 at 0:15AM (UTC)
9 Ignored Deployments
Name Status Preview Comments Updated
examples-cra-web ⬜️ Ignored (Inspect) Feb 14, 2023 at 0:15AM (UTC)
examples-designsystem-docs ⬜️ Ignored (Inspect) Feb 14, 2023 at 0:15AM (UTC)
examples-kitchensink-blog ⬜️ Ignored (Inspect) Feb 14, 2023 at 0:15AM (UTC)
examples-native-web ⬜️ Ignored (Inspect) Feb 14, 2023 at 0:15AM (UTC)
examples-nonmonorepo ⬜️ Ignored (Inspect) Feb 14, 2023 at 0:15AM (UTC)
examples-svelte-web ⬜️ Ignored (Inspect) Feb 14, 2023 at 0:15AM (UTC)
examples-tailwind-web ⬜️ Ignored (Inspect) Feb 14, 2023 at 0:15AM (UTC)
examples-vite-web ⬜️ Ignored (Inspect) Feb 14, 2023 at 0:15AM (UTC)
turbo-site ⬜️ Ignored (Inspect) Visit Preview Feb 14, 2023 at 0:15AM (UTC)

@github-actions
Copy link
Contributor

github-actions bot commented Feb 10, 2023 •
edited
Loading

⚠️ CI failed ⚠️

The following steps have failed in CI:

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

See workflow summary for details

@alexkirsz alexkirsz added the pr: automerge Kodiak will merge these automatically after checks pass label Feb 13, 2023
@alexkirsz alexkirsz requested a review from a team as a code owner February 14, 2023 10:15
@github-actions
Copy link
Contributor

Benchmark for 4728250

Click to view benchmark
Test Base PR % Significant %
bench_hmr_to_commit/Turbopack CSR/1000 modules 10.58ms ± 0.07ms 10.43ms ± 0.08ms -1.41%
bench_hmr_to_commit/Turbopack RCC/1000 modules 12.86ms ± 0.29ms 13.04ms ± 0.09ms +1.35%
bench_hmr_to_commit/Turbopack RSC/1000 modules 554.11ms ± 3.21ms 559.35ms ± 5.45ms +0.95%
bench_hmr_to_commit/Turbopack SSR/1000 modules 10.68ms ± 0.07ms 10.74ms ± 0.09ms +0.55%
bench_hmr_to_eval/Turbopack CSR/1000 modules 9215.49µs ± 67.03µs 9449.18µs ± 193.89µs +2.54%
bench_hmr_to_eval/Turbopack RCC/1000 modules 11.75ms ± 0.16ms 12.58ms ± 0.34ms +7.03%
bench_hmr_to_eval/Turbopack SSR/1000 modules 9454.09µs ± 78.59µs 9443.95µs ± 121.42µs -0.11%
bench_hydration/Turbopack RCC/1000 modules 4625.07ms ± 24.59ms 4557.48ms ± 38.52ms -1.46%
bench_hydration/Turbopack RSC/1000 modules 4217.37ms ± 27.36ms 4181.77ms ± 31.67ms -0.84%
bench_hydration/Turbopack SSR/1000 modules 4020.40ms ± 25.39ms 3975.92ms ± 42.50ms -1.11%
bench_startup/Turbopack CSR/1000 modules 3025.88ms ± 18.29ms 3031.88ms ± 21.18ms +0.20%
bench_startup/Turbopack RCC/1000 modules 2840.81ms ± 12.86ms 2814.97ms ± 17.22ms -0.91%
bench_startup/Turbopack RSC/1000 modules 2719.70ms ± 35.84ms 2691.17ms ± 11.57ms -1.05%
bench_startup/Turbopack SSR/1000 modules 2322.05ms ± 19.43ms 2282.44ms ± 8.29ms -1.71%

@kodiakhq kodiakhq bot merged commit faa10dc into main Feb 14, 2023
@kodiakhq kodiakhq bot deleted the alexkirsz/fix-router branch February 14, 2023 12:33
@Brooooooklyn Brooooooklyn mentioned this pull request Feb 14, 2023
Merged
@github-actions
Copy link
Contributor

Benchmark for dfaed5c

Test Base PR % Significant %
bench_hydration/Turbopack SSR/1000 modules 3818.25ms ± 5.35ms 3738.80ms ± 24.23ms -2.08% -0.53%
Click to view full benchmark
Test Base PR % Significant %
bench_hmr_to_commit/Turbopack CSR/1000 modules 10.20ms ± 0.10ms 10.12ms ± 0.07ms -0.78%
bench_hmr_to_commit/Turbopack RCC/1000 modules 12.24ms ± 0.23ms 11.88ms ± 0.16ms -2.91%
bench_hmr_to_commit/Turbopack RSC/1000 modules 521.36ms ± 1.15ms 519.17ms ± 2.06ms -0.42%
bench_hmr_to_commit/Turbopack SSR/1000 modules 10.39ms ± 0.09ms 10.31ms ± 0.08ms -0.81%
bench_hmr_to_eval/Turbopack CSR/1000 modules 9145.19µs ± 57.19µs 9103.33µs ± 95.03µs -0.46%
bench_hmr_to_eval/Turbopack RCC/1000 modules 10.82ms ± 0.12ms 10.86ms ± 0.07ms +0.42%
bench_hmr_to_eval/Turbopack SSR/1000 modules 9169.38µs ± 96.51µs 9201.97µs ± 64.85µs +0.36%
bench_hydration/Turbopack RCC/1000 modules 4286.48ms ± 11.24ms 4296.91ms ± 15.82ms +0.24%
bench_hydration/Turbopack RSC/1000 modules 3949.83ms ± 26.56ms 3897.94ms ± 13.92ms -1.31%
bench_hydration/Turbopack SSR/1000 modules 3818.25ms ± 5.35ms 3738.80ms ± 24.23ms -2.08% -0.53%
bench_startup/Turbopack CSR/1000 modules 2828.95ms ± 5.06ms 2815.93ms ± 16.81ms -0.46%
bench_startup/Turbopack RCC/1000 modules 2631.59ms ± 8.00ms 2619.67ms ± 11.59ms -0.45%
bench_startup/Turbopack RSC/1000 modules 2518.02ms ± 9.51ms 2514.90ms ± 8.77ms -0.12%
bench_startup/Turbopack SSR/1000 modules 2171.57ms ± 3.05ms 2164.67ms ± 4.01ms -0.32%

timneutkens pushed a commit to vercel/next.js that referenced this pull request Feb 14, 2023
@Brooooooklyn
Upgrade turbopack (#45861)
e3843c9 
The `experimental.turbotrace.memoryLimit` is not actually working, we
need to use `turbo_malloc` as the global allocator to make it work.

~~Block by:~~
- swc-project/swc#6940
- vercel/turborepo#3772

## This PR also upgrades `turbopack-230213.2` to `turbopack-230214.1`

- vercel/turborepo#3767
- vercel/turborepo#3772
- vercel/turborepo#3762
- vercel/turborepo#3741
- vercel/turborepo#3796
jridgewell pushed a commit to vercel/next.js that referenced this pull request Mar 10, 2023
@alexkirsz
Fix the router when Next.js returns no result (vercel/turborepo#3741)
cac65f3 
I changed the return type of the Next.js router in #45668 to account for cases where the router does and does not find a matching rewrite.
sokra pushed a commit to vercel/next.js that referenced this pull request Mar 13, 2023
@alexkirsz
Fix the router when Next.js returns no result (vercel/turborepo#3741)
4460521 
I changed the return type of the Next.js router in #45668 to account for cases where the router does and does not find a matching rewrite.
@DuCanhGH DuCanhGH mentioned this pull request Mar 15, 2023
Merged
ForsakenHarmony pushed a commit to vercel/next.js that referenced this pull request Jul 25, 2024
@alexkirsz
Fix the router when Next.js returns no result (vercel/turborepo#3741)
8212d24 
I changed the return type of the Next.js router in #45668 to account for cases where the router does and does not find a matching rewrite.
ForsakenHarmony pushed a commit to vercel/next.js that referenced this pull request Jul 29, 2024
@alexkirsz
Fix the router when Next.js returns no result (vercel/turborepo#3741)
79bd442 
I changed the return type of the Next.js router in #45668 to account for cases where the router does and does not find a matching rewrite.
ForsakenHarmony pushed a commit to vercel/next.js that referenced this pull request Aug 1, 2024
@alexkirsz
Fix the router when Next.js returns no result (vercel/turborepo#3741)
1791c7f 
I changed the return type of the Next.js router in #45668 to account for cases where the router does and does not find a matching rewrite.
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

@mehulkar mehulkar Awaiting requested review from mehulkar mehulkar is a code owner automatically assigned from vercel/turbo-oss

@tknickman tknickman Awaiting requested review from tknickman tknickman is a code owner automatically assigned from vercel/turbo-oss

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.
2 participants
@alexkirsz @jridgewell