This repository was archived by the owner on May 10, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 67
strip file extension when checking if route is dynamic in setupRedirects #156
Merged
Merged
Changes from all commits
Commits
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
44 changes: 44 additions & 0 deletions
44
cypress/fixtures/pages-with-optionalCatchAll-at-root/[bar]/ssr.js
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| import Error from "next/error"; | ||
| import Link from "next/link"; | ||
|
|
||
| const Show = (props) => { | ||
| const { errorCode, show } = props; | ||
| // If show item was not found, render 404 page | ||
| if (errorCode) { | ||
| return <Error statusCode={errorCode} />; | ||
| } | ||
|
|
||
| // Otherwise, render show | ||
| return ( | ||
| <div> | ||
| <h1>Show #{show.id}</h1> | ||
| <p>{show.name}</p> | ||
|
|
||
| <hr /> | ||
|
|
||
| <Link href="/home"> | ||
| <a>Go back home to base page</a> | ||
| </Link> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export const getServerSideProps = async ({ params }) => { | ||
| // The ID to render | ||
| const { bar } = params; | ||
|
|
||
| const res = await fetch(`https://api.tvmaze.com/shows/${bar}`); | ||
| const data = await res.json(); | ||
|
|
||
| // Set error code if show item could not be found | ||
| const errorCode = res.status > 200 ? res.status : false; | ||
|
|
||
| return { | ||
| props: { | ||
| errorCode, | ||
| show: data, | ||
| }, | ||
| }; | ||
| }; | ||
|
|
||
| export default Show; |
22 changes: 22 additions & 0 deletions
22
cypress/fixtures/pages-with-optionalCatchAll-at-root/home.js
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| import Link from "next/link"; | ||
|
|
||
| const Home = () => ( | ||
| <div> | ||
| <h1>NextJS on Netlify</h1> | ||
|
|
||
| <ul> | ||
| <li> | ||
| <Link href="/[bar]/ssr" as="/1337/ssr"> | ||
| <a>1337/ssr</a> | ||
| </Link> | ||
| </li> | ||
| <li> | ||
| <Link href="/[bar]/ssr" as="/1338/ssr"> | ||
| <a>1338/ssr</a> | ||
| </Link> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| ); | ||
|
|
||
| export default Home; |
This file contains hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| // Remove the file extension form the route | ||
| const removeFileExtension = (route) => route.replace(/\.[a-zA-Z]+$/, ""); | ||
|
|
||
| module.exports = removeFileExtension; |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
prettier fix leftover from a ui-committed change