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

Include standard vite config in RSC build #8882

Merged
merged 1 commit into from
Jul 11, 2023
Merged

Include standard vite config in RSC build #8882

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
9 changes: 7 additions & 2 deletions packages/vite/src/buildRscFeServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ interface BuildOptions {

export const buildFeServer = async ({ verbose: _verbose }: BuildOptions) => {
const rwPaths = getPaths()
const viteConfig = rwPaths.web.viteConfig

if (!viteConfig) {
throw new Error('Vite config not found')
}

const clientEntryFileSet = new Set<string>()
const serverEntryFileSet = new Set<string>()
Expand All @@ -29,7 +34,7 @@ export const buildFeServer = async ({ verbose: _verbose }: BuildOptions) => {
* Doesn't output any files, only collects a list of RSCs and RSFs
*/
await viteBuild({
// ...configFileConfig,
configFile: viteConfig,
root: rwPaths.base,
plugins: [
react(),
Expand Down Expand Up @@ -85,7 +90,7 @@ export const buildFeServer = async ({ verbose: _verbose }: BuildOptions) => {
}

const clientBuildOutput = await viteBuild({
// ...configFileConfig,
configFile: viteConfig,
root: rwPaths.web.src,
plugins: [
// TODO (RSC) Update index.html to include the entry.client.js script
Expand Down