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
8 changes: 8 additions & 0 deletions packages/plugin-rsc/e2e/basic.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -322,11 +322,19 @@ function defineTest(f: Fixture) {
await page.goto(f.url())
await waitForHydration(page)
await testCss(page)
await expect(page.locator('.test-dep-css-in-server')).toHaveCSS(
'color',
'rgb(255, 165, 0)',
)
})

testNoJs('css @nojs', async ({ page }) => {
await page.goto(f.url())
await testCss(page)
await expect(page.locator('.test-dep-css-in-server')).toHaveCSS(
'color',
'rgb(255, 165, 0)',
)
})

async function testCss(page: Page, color = 'rgb(255, 165, 0)') {
Expand Down
1 change: 1 addition & 0 deletions packages/plugin-rsc/examples/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"@vitejs/test-dep-client-in-server2": "file:./test-dep/client-in-server2",
"@vitejs/test-dep-server-in-client": "file:./test-dep/server-in-client",
"@vitejs/test-dep-server-in-server": "file:./test-dep/server-in-server",
"@vitejs/test-dep-css-in-server": "file:./test-dep/css-in-server",
"rsc-html-stream": "^0.0.7",
"tailwindcss": "^4.1.11",
"vite": "^7.0.5",
Expand Down
2 changes: 2 additions & 0 deletions packages/plugin-rsc/examples/basic/src/routes/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { TestUseCache } from './use-cache/server'
import { TestHydrationMismatch } from './hydration-mismatch/server'
import { TestBrowserOnly } from './browser-only/client'
import { TestTransitiveCjsClient } from './deps/transitive-cjs/client'
import TestDepCssInServer from '@vitejs/test-dep-css-in-server/server'

export function Root(props: { url: URL }) {
return (
Expand All @@ -51,6 +52,7 @@ export function Root(props: { url: URL }) {
<TestCssClientNoSsr url={props.url} />
<TestTailwindClient />
<TestTailwindServer />
<TestDepCssInServer />
<TestHydrationMismatch url={props.url} />
<TestHmrClientDep />
<TestTemporaryReference />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "@vitejs/test-dep-css-in-server",
"private": true,
"type": "module",
"exports": {
"./server": "./server.js"
},
"peerDependencies": {
"react": "*"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.test-dep-css-in-server {
color: rgb(255, 165, 0);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default function TestDepCssInServer(): import('react').ReactNode
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react'
import './server.css'

const h = React.createElement

export default function TestDepCssInServer() {
return h(
'div',
{ className: 'test-dep-css-in-server' },
`test-dep-css-in-server`,
)
}
11 changes: 8 additions & 3 deletions packages/plugin-rsc/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1646,7 +1646,7 @@ export function vitePluginRscCss(
id: string
code: string
}): false | TransformWrapExportFilter {
const { query } = parseIdQuery(id)
const { filename, query } = parseIdQuery(id)
if ('vite-rsc-css-export' in query) {
const value = query['vite-rsc-css-export']
if (value) {
Expand All @@ -1658,8 +1658,13 @@ export function vitePluginRscCss(

const options = rscCssOptions?.rscCssTransform
if (options === false) return false
if (options?.filter && !options.filter(id)) return false
if (id.includes('/node_modules/') || !/\.[tj]sx$/.test(id)) return false
if (options?.filter && !options.filter(filename)) return false
// https://github.com/vitejs/vite/blob/7979f9da555aa16bd221b32ea78ce8cb5292fac4/packages/vite/src/node/constants.ts#L95
if (
!/\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)\b/.test(code) ||
!/\.[tj]sx?$/.test(filename)
)
return false

// skip transform if no css imports
const result = esModuleLexer.parse(code)
Expand Down
12 changes: 12 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading