Skip to content

fix(react): pre-scan client page deps in Pages dev #620

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

Open
0froq wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(react): pre-scan client page deps in Pages dev #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions packages/react/src/plugin-pages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,12 @@ export function pagesPlugin(pagesDir: string, options?: PagesPluginOptions): Plu
let viteConfig: ResolvedConfig | undefined;
const root = options?.root ?? dirname(pagesDir);
const normalizedPagesDir = normalizePath(pagesDir);
const pagesOptimizeEntries = `${relative(root, pagesDir)}/**/*.{js,jsx,ts,tsx}`;
const pagesDirRelative = relative(root, pagesDir);
const pagesOptimizeEntries = `${pagesDirRelative}/**/*.{js,jsx,ts,tsx}`;
const pagesClientOptimizeEntries = [
pagesOptimizeEntries,
`!${pagesDirRelative}/**/*.server.{js,jsx,ts,tsx}`,
];
let pendingRescan: Promise<void> | null = null;
const rescanPages = async () => {
pageScan = existsSync(pagesDir)
Expand Down Expand Up @@ -166,10 +171,14 @@ export function pagesPlugin(pagesDir: string, options?: PagesPluginOptions): Plu
},
optimizeDeps: {
exclude: ['@void/react'],
// Crawl page modules before the first client request so third-party
// imports are pre-bundled instead of triggering a full reload.
entries: pagesClientOptimizeEntries,
// Pre-include React entries that are discovered late via dynamic
// imports during SPA navigation, avoiding a full-page reload
// from Vite's dep optimizer.
include: CLIENT_OPTIMIZE_DEPS,
// from Vite's dep optimizer. void/pages-prefetch is imported only
// from the virtual client entry, so the scanner cannot see it.
include: [...CLIENT_OPTIMIZE_DEPS, 'void/pages-prefetch'],
},
ssr: {
optimizeDeps: {
Expand Down
7 changes: 7 additions & 0 deletions packages/react/test/unit/plugin-pages.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,13 @@ describe('pagesPlugin dev config', () => {
const config = await loadServeConfig();

expect(config).toMatchObject({
optimizeDeps: {
entries: [
'pages/**/*.{js,jsx,ts,tsx}',
'!pages/**/*.server.{js,jsx,ts,tsx}',
],
include: expect.arrayContaining(['void/pages-prefetch']),
},
environments: {
void_worker: {
optimizeDeps: {
Expand Down