Skip to content

fix(rsc): remove duplicate server css on initial render #702

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

Merged
Merged
Changes from 1 commit
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
48 changes: 45 additions & 3 deletions packages/plugin-rsc/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1910,6 +1910,34 @@ export function vitePluginRscCss(
}
},
},
createVirtualPlugin(
'vite-rsc/remove-duplicate-server-css',
async function () {
assert.equal(this.environment.mode, 'dev')
function removeFn() {
document
.querySelectorAll("link[rel='stylesheet']")
.forEach((node) => {
if (
node instanceof HTMLElement &&
node.dataset.precedence?.startsWith('vite-rsc/')
) {
node.remove()
}
})
}
return `\
"use client"
import React from "react";
export default function RemoveDuplicateServerCss() {
React.useEffect(() => {
(${removeFn.toString()})();
}, []);
return null;
}
`
},
),
]
}

Expand Down Expand Up @@ -1940,6 +1968,7 @@ function generateResourcesCode(depsCode: string) {
const ResourcesFn = (
React: typeof import('react'),
deps: ResolvedAssetDeps,
RemoveDuplicateServerCss?: React.FC,
) => {
return function Resources() {
return React.createElement(React.Fragment, null, [
Expand All @@ -1960,14 +1989,27 @@ function generateResourcesCode(depsCode: string) {
src: href,
}),
),
RemoveDuplicateServerCss &&
React.createElement(RemoveDuplicateServerCss, { key: '' }),
])
}
}

return `
import __vite_rsc_react__ from "react";
export const Resources = (${ResourcesFn.toString()})(__vite_rsc_react__, ${depsCode});
`
import __vite_rsc_react__ from "react";

${
config.mode === 'serve'
? `import RemoveDuplicateServerCss from "virtual:vite-rsc/remove-duplicate-server-css"`
: `const RemoveDuplicateServerCss = undefined;`
}

export const Resources = (${ResourcesFn.toString()})(
__vite_rsc_react__,
${depsCode},
RemoveDuplicateServerCss,
);
`
}

export async function transformRscCssExport(options: {
Expand Down
Loading