Prepare RouterContentSource for basePath #5218
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
|
✅ This change can build |
|
Linux Benchmark for adb3170Click to view benchmark
|
MacOS Benchmark for adb3170
Click to view full benchmark
|
alexkirsz
approved these changes
Jun 6, 2023
Comment on lines
+36
to
+40
| if cfg!(debug_assertions) { | ||
| let prefix_string = prefix.await?; | ||
| debug_assert!(prefix_string.is_empty() || prefix_string.ends_with('/')); | ||
| debug_assert!(prefix_string.starts_with('/')); | ||
| } |
There was a problem hiding this comment.
This could also be achieved with a BasePath newtype (BasePathVc), which would make these assertions in its String -> BasePath constructor.
But I don't think the newtype Vc story is good enough to warrant this for now.
There was a problem hiding this comment.
I think we could generalize this to a PathStr type, which would have match these same rules. All ContentSource's would receive this as the path param. PrefixedRouterContentSource and StaticAssetsContentSource could receive them as the prefix as well.
jridgewell
added
the
pr: automerge
Linux Benchmark for 53f59af
Click to view full benchmark
|
MacOS Benchmark for 53f59af
Click to view full benchmark
|
kodiakhq bot
pushed a commit
to vercel/next.js
that referenced
this pull request
Jun 8, 2023
### Turbopack Updates * vercel/turborepo#5156 * vercel/turborepo#5159 * vercel/turborepo#5162 * vercel/turborepo#5161 * vercel/turborepo#5174 * vercel/turborepo#5178 * vercel/turborepo#5121 * vercel/turborepo#5200 * vercel/turborepo#5207 * vercel/turborepo#5211 * vercel/turborepo#5210 * vercel/turborepo#5221 * vercel/turborepo#5218 * vercel/turborepo#5226 * vercel/turborepo#5139 * vercel/turborepo#5227 * vercel/turborepo#5189
hydRAnger
pushed a commit
to hydRAnger/next.js
that referenced
this pull request
Jun 12, 2023
### Turbopack Updates * vercel/turborepo#5156 * vercel/turborepo#5159 * vercel/turborepo#5162 * vercel/turborepo#5161 * vercel/turborepo#5174 * vercel/turborepo#5178 * vercel/turborepo#5121 * vercel/turborepo#5200 * vercel/turborepo#5207 * vercel/turborepo#5211 * vercel/turborepo#5210 * vercel/turborepo#5221 * vercel/turborepo#5218 * vercel/turborepo#5226 * vercel/turborepo#5139 * vercel/turborepo#5227 * vercel/turborepo#5189
ForsakenHarmony
pushed a commit
to vercel/next.js
that referenced
this pull request
Jul 25, 2024
### Description This is part 2 of [WEB-993](https://linear.app/vercel/issue/WEB-993) basePath support. A few of our next-specific content sources will need to be scoped under the `basePath` (like `_next/image` and `__nextjs_original-stack-frame`). These are currently served with a `RouterContentSource`, but it didn't have support for arbitrary prefixes. We _could_ have changed the subpath for these sources to include the `basePath`, but that would require reading the `next_config.base_path()` in the [source](https://github.com/vercel/next.js/blob/2b1f0d9351610b04d01638efed19252ca81d0023/packages/next-swc/crates/next-dev/src/lib.rs#L413-L423) method, and it would invalidate our entire call graph whenever the `next.config.js` changed. Not a good choice. ### Testing Instructions <!-- Give a quick description of steps to test your changes. -->
ForsakenHarmony
pushed a commit
to vercel/next.js
that referenced
this pull request
Jul 29, 2024
### Description This is part 2 of [WEB-993](https://linear.app/vercel/issue/WEB-993) basePath support. A few of our next-specific content sources will need to be scoped under the `basePath` (like `_next/image` and `__nextjs_original-stack-frame`). These are currently served with a `RouterContentSource`, but it didn't have support for arbitrary prefixes. We _could_ have changed the subpath for these sources to include the `basePath`, but that would require reading the `next_config.base_path()` in the [source](https://github.com/vercel/next.js/blob/2b1f0d9351610b04d01638efed19252ca81d0023/packages/next-swc/crates/next-dev/src/lib.rs#L413-L423) method, and it would invalidate our entire call graph whenever the `next.config.js` changed. Not a good choice. ### Testing Instructions <!-- Give a quick description of steps to test your changes. -->
ForsakenHarmony
pushed a commit
to vercel/next.js
that referenced
this pull request
Aug 1, 2024
### Description This is part 2 of [WEB-993](https://linear.app/vercel/issue/WEB-993) basePath support. A few of our next-specific content sources will need to be scoped under the `basePath` (like `_next/image` and `__nextjs_original-stack-frame`). These are currently served with a `RouterContentSource`, but it didn't have support for arbitrary prefixes. We _could_ have changed the subpath for these sources to include the `basePath`, but that would require reading the `next_config.base_path()` in the [source](https://github.com/vercel/next.js/blob/2b1f0d9351610b04d01638efed19252ca81d0023/packages/next-swc/crates/next-dev/src/lib.rs#L413-L423) method, and it would invalidate our entire call graph whenever the `next.config.js` changed. Not a good choice. ### Testing Instructions <!-- Give a quick description of steps to test your changes. -->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This is part 2 of WEB-993 basePath support. A few of our next-specific content sources will need to be scoped under the
basePath(like_next/imageand__nextjs_original-stack-frame). These are currently served with aRouterContentSource, but it didn't have support for arbitrary prefixes.We could have changed the subpath for these sources to include the
basePath, but that would require reading thenext_config.base_path()in the source method, and it would invalidate our entire call graph whenever thenext.config.jschanged. Not a good choice.Testing Instructions