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(typedRoutes): fixed files from directories other than pages and app getting into Route #47184

Merged
merged 5 commits into from
Mar 16, 2023
Merged

Fix(typedRoutes): fixed files from directories other than pages and app getting into Route #47184

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a7d2b1
fixed invalid paths
DuCanhGH Mar 15, 2023
c9abd59
Merge branch 'canary' into fix-typed-routes
kodiakhq[bot] Mar 15, 2023
b1fa233
Merge branch 'canary' into fix-typed-routes
shuding Mar 15, 2023
b08af83
Merge branch 'canary' into fix-typed-routes
DuCanhGH Mar 16, 2023
8f902ab
Merge branch 'canary' into fix-typed-routes
kodiakhq[bot] Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/next/src/build/webpack/plugins/next-types-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,11 @@ export class NextTypesPlugin {
if (!this.typedRoutes) return

const isApp = filePath.startsWith(this.appDir + path.sep)
const isPages = !isApp && filePath.startsWith(this.pagesDir + path.sep)

if (!isApp && !isPages) {
return
}

// Filter out non-page files in app dir
if (isApp && !/[/\\]page\.[^.]+$/.test(filePath)) {
Expand All @@ -379,7 +384,7 @@ export class NextTypesPlugin {

// Filter out non-page files in pages dir
if (
!isApp &&
isPages &&
/[/\\](?:_app|_document|_error|404|500)\.[^.]+$/.test(filePath)
) {
return
Expand Down