Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 5 additions & 11 deletions packages/react/src/plugin-pages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,9 @@ const RENDERER_ID = 'virtual:void-pages-renderer';
const CLIENT_ENTRY_ID = 'virtual:void-pages-client';
const WORKER_ENVIRONMENT_NAME = 'void_worker';
const REACT_DEDUPE = ['react', 'react-dom'];
const REACT_OPTIMIZE_DEPS = [
'react',
'react/jsx-runtime',
'react/jsx-dev-runtime',
'react-dom',
'react-dom/client',
'react-dom/server',
];
const WORKER_OPTIMIZE_DEPS = [...REACT_OPTIMIZE_DEPS, 'void/live/client'];
const REACT_OPTIMIZE_DEPS = ['react', 'react/jsx-runtime', 'react/jsx-dev-runtime', 'react-dom'];
const CLIENT_OPTIMIZE_DEPS = [...REACT_OPTIMIZE_DEPS, 'react-dom/client'];
const WORKER_OPTIMIZE_DEPS = [...REACT_OPTIMIZE_DEPS, 'react-dom/server', 'void/live/client'];

// SSR HTML bypasses transformIndexHtml, so @vitejs/plugin-react cannot inject
// its Fast Refresh preamble. Without it, the dev client entry fails to load.
Expand Down Expand Up @@ -193,11 +187,11 @@ export function pagesPlugin(pagesDir: string, options?: PagesPluginOptions): Plu
// 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: REACT_OPTIMIZE_DEPS,
include: CLIENT_OPTIMIZE_DEPS,
},
ssr: {
optimizeDeps: {
include: REACT_OPTIMIZE_DEPS,
include: [...CLIENT_OPTIMIZE_DEPS, 'react-dom/server'],
},
},
environments: {
Expand Down
23 changes: 23 additions & 0 deletions packages/react/test/unit/plugin-pages.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,29 @@ describe('pagesPlugin dev config', () => {
});
});

it('includes only the React entry points needed by each environment', () => {
const config = loadServeConfig() as {
optimizeDeps: { include: Array<string> };
ssr?: { optimizeDeps?: { include?: Array<string> } };
environments: {
void_worker: { optimizeDeps: { include: Array<string> } };
};
};

expect(config.optimizeDeps.include).toContain('react-dom/client');
expect(config.optimizeDeps.include).not.toContain('react-dom/server');
expect(config.environments.void_worker.optimizeDeps.include).toContain('react-dom/server');
expect(config.environments.void_worker.optimizeDeps.include).not.toContain('react-dom/client');
expect(config.ssr?.optimizeDeps?.include).toEqual([
'react',
'react/jsx-runtime',
'react/jsx-dev-runtime',
'react-dom',
'react-dom/client',
'react-dom/server',
]);
});

it('rescans dev renderer loads after adding a page file', async () => {
writePage('index.tsx', 'export default function Index() { return <h1>Home</h1>; }\n');

Expand Down