-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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.
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
fix(remix-dev): allow defining multiple routes for the same route module file #3970
Merged
Merged
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
f80267d
Allow multiple routes for same route module
lucasferreira 3e93d21
Update packages/remix-dev/config/routes.ts
lucasferreira 2b86094
Update routes.ts
lucasferreira ed5148e
- Removing redundant IF
lucasferreira 9228db0
Update routes.ts
lucasferreira 3738662
Non unique custom routes ID error and test
lucasferreira 2064c57
Update assets.ts
lucasferreira 9318a4e
Revert "Update assets.ts"
lucasferreira aaeadbb
Merge remote-tracking branch 'upstream/dev' into dev
lucasferreira 1b554a2
Error on collisions with non-custom routeIds
brophdawg11 e7fd378
Merge branch 'dev' into dev
lucasferreira ee48538
Merge branch 'remix-run:dev' into dev
lucasferreira 86b8720
Create big-spoons-grab.md
lucasferreira File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -155,10 +155,9 @@ export function defineRoutes( | |
file, | ||
}; | ||
|
||
if (!!options.id && options.id in routes) { | ||
if (route.id in routes) { | ||
throw new Error( | ||
`You tried to define a route with custom id "${options.id}" but one ` + | ||
"already exists. Custom route ids must be unique" | ||
`Unable to define routes with duplicate route id: "${route.id}"` | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I adjusted this to account for the (very edge-case) scenario that an auto-generated route id collies with a previously-defined custom id and expanded the tests above to assert the new behavior |
||
); | ||
} | ||
|
||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Made this test a bit stronger by asserting that we're getting the right paths, files, and IDs on defined routes 👍