-
Notifications
You must be signed in to change notification settings - Fork 2
Replace glob scan with fs-based traversal in dev routes API #65
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
Open
remcostoeten
wants to merge
1
commit into
claude/fix-activity-responsive-ghTq5
Choose a base branch
from
codex/fix-build-error-due-to-missing-glob-module
base: claude/fix-activity-responsive-ghTq5
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
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 |
|---|---|---|
| @@ -1,11 +1,36 @@ | ||
| import { glob } from 'glob' | ||
| import { readdir } from 'fs/promises' | ||
| import { NextResponse } from 'next/server' | ||
| import path from 'path' | ||
| import { requireDevToolsAccess } from '@/lib/dev-access' | ||
|
|
||
|
|
||
| export const dynamic = 'force-dynamic' // Ensure this route is dynamic | ||
|
|
||
| const PAGE_EXTENSIONS = new Set(['.tsx', '.js', '.jsx']) | ||
|
|
||
| async function findPageFiles(rootDir: string, currentDir = rootDir): Promise<string[]> { | ||
| const entries = await readdir(currentDir, { withFileTypes: true }) | ||
| const files = await Promise.all(entries.map(async entry => { | ||
| if (entry.name.startsWith('.') || entry.name.startsWith('_')) return [] | ||
|
Contributor
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. underscore filtering differs from glob behavior - glob ignored |
||
|
|
||
| const fullPath = path.join(currentDir, entry.name) | ||
| const relativePath = path.relative(rootDir, fullPath) | ||
|
|
||
| if (entry.isDirectory()) { | ||
| if (entry.name === 'api') return [] | ||
| return findPageFiles(rootDir, fullPath) | ||
| } | ||
|
|
||
| if (!entry.isFile()) return [] | ||
|
|
||
| const parsed = path.parse(entry.name) | ||
| const isPageFile = parsed.name === 'page' && PAGE_EXTENSIONS.has(parsed.ext) | ||
| return isPageFile ? [relativePath] : [] | ||
| })) | ||
|
|
||
| return files.flat() | ||
| } | ||
|
|
||
| // Helper to format route label | ||
| function formatRouteLabel(routePath: string) { | ||
| if (routePath === '/') return 'Home' | ||
|
|
@@ -28,17 +53,7 @@ export async function GET() { | |
| const cwd = process.cwd() | ||
| const appDir = path.join(cwd, 'src/app') | ||
|
|
||
| // On Windows, glob returns forward slashes, but we should be careful with path joins | ||
| // We use fast-glob indirectly via glob, which supports forward slashes on Windows | ||
| const files = await glob('**/page.{tsx,js,jsx}', { | ||
| cwd: appDir, | ||
| ignore: [ | ||
| '**/api/**', // skip API routes | ||
| '**/_*/**', // skip private folders | ||
| '**/.*/**', // skip dotfiles/folders | ||
| ], | ||
| nodir: true | ||
| }) | ||
| const files = await findPageFiles(appDir) | ||
|
|
||
| const routes = files.map(file => { | ||
| // file is relative to appDir, e.g. "(marketing)/about/page.tsx" | ||
|
|
@@ -47,7 +62,7 @@ export async function GET() { | |
| const dirPath = path.dirname(file) | ||
|
|
||
| // Split by separator (handle both / and \ just in case, though glob usually returns /) | ||
| const segments = dirPath.split(/[/\\]/) | ||
| const segments = dirPath.split(path.sep) | ||
|
|
||
| const cleanSegments = segments.filter(segment => { | ||
| // Remove route groups like (marketing) | ||
|
|
||
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.
missing
.tsextension - Next.js app router supportspage.tsfilesNote: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!