Skip to content
Open
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
28 changes: 25 additions & 3 deletions packages/plugin-rsc/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,12 @@ export type RscPluginOptions = {
/** server chunk which includes a corresponding client reference proxy module */
serverChunk: string
}) => string | undefined

/**
* Controls whether CSS links use React's `precedence` attribute.
* @default true
*/
cssLinkPrecedence?: boolean
}

export type PluginApi = {
Expand Down Expand Up @@ -1014,6 +1020,7 @@ export function createRpcClient(params) {
const manifest: AssetsManifest = {
bootstrapScriptContent: `import(${serializeValueWithRuntime(entryUrl)})`,
clientReferenceDeps: {},
cssLinkPrecedence: rscPluginOptions.cssLinkPrecedence,
}
return `export default ${JSON.stringify(manifest, null, 2)}`
}
Expand Down Expand Up @@ -1087,6 +1094,7 @@ export function createRpcClient(params) {
bootstrapScriptContent,
clientReferenceDeps,
serverResources,
cssLinkPrecedence: rscPluginOptions.cssLinkPrecedence,
}
}
},
Expand Down Expand Up @@ -1981,6 +1989,7 @@ export type AssetsManifest = {
bootstrapScriptContent: string | RuntimeAsset
clientReferenceDeps: Record<string, AssetDeps>
serverResources?: Record<string, Pick<AssetDeps, 'css'>>
cssLinkPrecedence?: boolean
}

export type AssetDeps = {
Expand All @@ -1992,6 +2001,7 @@ export type ResolvedAssetsManifest = {
bootstrapScriptContent: string
clientReferenceDeps: Record<string, ResolvedAssetDeps>
serverResources?: Record<string, Pick<ResolvedAssetDeps, 'css'>>
cssLinkPrecedence?: boolean
}

export type ResolvedAssetDeps = {
Expand Down Expand Up @@ -2060,7 +2070,10 @@ function collectAssetDepsInner(
//

function vitePluginRscCss(
rscCssOptions: Pick<RscPluginOptions, 'rscCssTransform'> = {},
rscCssOptions: Pick<
RscPluginOptions,
'rscCssTransform' | 'cssLinkPrecedence'
> = {},
manager: RscPluginManager,
): Plugin[] {
function hasSpecialCssQuery(id: string): boolean {
Expand Down Expand Up @@ -2320,6 +2333,7 @@ function vitePluginRscCss(
return generateResourcesCode(
serializeValueWithRuntime(deps),
manager,
{ cssLinkPrecedence: rscCssOptions.cssLinkPrecedence },
)
} else {
const key = manager.toRelativeId(importer)
Expand All @@ -2331,6 +2345,7 @@ function vitePluginRscCss(
key,
)}]`,
manager,
{ cssLinkPrecedence: rscCssOptions.cssLinkPrecedence },
)}
`
}
Expand Down Expand Up @@ -2370,19 +2385,25 @@ export default function RemoveDuplicateServerCss() {
]
}

function generateResourcesCode(depsCode: string, manager: RscPluginManager) {
function generateResourcesCode(
depsCode: string,
manager: RscPluginManager,
options: { cssLinkPrecedence?: boolean } = {},
) {
const usePrecedence = options.cssLinkPrecedence !== false
const ResourcesFn = (
React: typeof import('react'),
deps: ResolvedAssetDeps,
RemoveDuplicateServerCss?: React.FC,
precedence?: string,
) => {
return function Resources() {
return React.createElement(React.Fragment, null, [
...deps.css.map((href: string) =>
React.createElement('link', {
key: 'css:' + href,
rel: 'stylesheet',
precedence: 'vite-rsc/importer-resources',
...(precedence ? { precedence } : {}),
href: href,
'data-rsc-css-href': href,
}),
Expand All @@ -2408,6 +2429,7 @@ export const Resources = (${ResourcesFn.toString()})(
__vite_rsc_react__,
${depsCode},
RemoveDuplicateServerCss,
${usePrecedence ? `"vite-rsc/importer-resources"` : `undefined`},
);
`
}
Expand Down
5 changes: 4 additions & 1 deletion packages/plugin-rsc/src/ssr.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ function preloadDeps(deps: ResolvedAssetDeps) {
for (const href of deps.css) {
ReactDOM.preinit(href, {
as: 'style',
precedence: 'vite-rsc/client-reference',
precedence:
assetsManifest.cssLinkPrecedence !== false
? 'vite-rsc/client-reference'
: undefined,
})
}
}
Loading