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

RSC: Be consistent about inlining rollup input #10472

Merged
merged 2 commits into from
Apr 17, 2024
Merged

RSC: Be consistent about inlining rollup input #10472

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
556b719
RSC: Be consistent about inlining rollup input
Tobbe Apr 17, 2024
1cd2f0b
remove blank line
Tobbe Apr 17, 2024
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
14 changes: 6 additions & 8 deletions packages/vite/src/rsc/rscBuildForServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,6 @@ export async function rscBuildForServer(
throw new Error('RSC entries file not found')
}

const input = {
entries: rwPaths.web.entries,
...clientEntryFiles,
...serverEntryFiles,
...customModules,
}

// TODO (RSC): No redwood-vite plugin, add it in here
const rscServerBuildOutput = await viteBuild({
envFile: false,
Expand Down Expand Up @@ -81,7 +74,12 @@ export async function rscBuildForServer(
manifest: 'server-build-manifest.json',
rollupOptions: {
onwarn: onWarn,
input,
input: {
entries: rwPaths.web.entries,
...clientEntryFiles,
...serverEntryFiles,
...customModules,
},
output: {
banner: (chunk) => {
// HACK to bring directives to the front
Expand Down
Loading