From 8b2855182e5f49946495157793fbfce600959a7a Mon Sep 17 00:00:00 2001 From: bluwy Date: Thu, 22 Aug 2024 17:09:26 +0800 Subject: [PATCH 1/4] fix(css): remove default import in ssr dev --- packages/vite/src/node/plugins/css.ts | 2 +- .../ssr/runtime/__tests__/server-runtime.spec.ts | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts index 848fb84fbf1cd1..45186d75e1eab9 100644 --- a/packages/vite/src/node/plugins/css.ts +++ b/packages/vite/src/node/plugins/css.ts @@ -503,7 +503,7 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin { } // server only if (options?.ssr) { - return modulesCode || `export default ${JSON.stringify(css)}` + return modulesCode || 'export {}' } if (inlined) { return `export default ${JSON.stringify(css)}` diff --git a/packages/vite/src/node/ssr/runtime/__tests__/server-runtime.spec.ts b/packages/vite/src/node/ssr/runtime/__tests__/server-runtime.spec.ts index bcf06bb91d4005..9836bfdc2f7e6f 100644 --- a/packages/vite/src/node/ssr/runtime/__tests__/server-runtime.spec.ts +++ b/packages/vite/src/node/ssr/runtime/__tests__/server-runtime.spec.ts @@ -32,12 +32,7 @@ describe('vite-runtime initialization', async () => { it('css is loaded correctly', async ({ runtime }) => { const css = await runtime.executeUrl('/fixtures/test.css') - expect(css.default).toMatchInlineSnapshot(` - ".test { - color: red; - } - " - `) + expect(css.default).toBe(undefined) const module = await runtime.executeUrl('/fixtures/test.module.css') expect(module).toMatchObject({ default: { @@ -68,12 +63,7 @@ describe('vite-runtime initialization', async () => { const url = await runtime.executeUrl('/fixtures/simple.js?url') expect(url.default).toMatchInlineSnapshot(`"/fixtures/simple.js"`) const inline = await runtime.executeUrl('/fixtures/test.css?inline') - expect(inline.default).toMatchInlineSnapshot(` - ".test { - color: red; - } - " - `) + expect(inline.default).toMatchInlineSnapshot(`undefined`) }) it('modules with query strings are treated as different modules', async ({ From b1a7eab1d48a62b9979c5b79a36c52b5341e8196 Mon Sep 17 00:00:00 2001 From: bluwy Date: Thu, 22 Aug 2024 17:17:16 +0800 Subject: [PATCH 2/4] fix: allow inline work in ssr --- packages/vite/src/node/plugins/css.ts | 6 +++--- .../src/node/ssr/runtime/__tests__/server-runtime.spec.ts | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts index 45186d75e1eab9..fc3d16cf84c46e 100644 --- a/packages/vite/src/node/plugins/css.ts +++ b/packages/vite/src/node/plugins/css.ts @@ -501,13 +501,13 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin { if (isDirectCSSRequest(id)) { return null } + if (inlined) { + return `export default ${JSON.stringify(css)}` + } // server only if (options?.ssr) { return modulesCode || 'export {}' } - if (inlined) { - return `export default ${JSON.stringify(css)}` - } const cssContent = await getContentWithSourcemap(css) const code = [ diff --git a/packages/vite/src/node/ssr/runtime/__tests__/server-runtime.spec.ts b/packages/vite/src/node/ssr/runtime/__tests__/server-runtime.spec.ts index 9836bfdc2f7e6f..cd81de0f185759 100644 --- a/packages/vite/src/node/ssr/runtime/__tests__/server-runtime.spec.ts +++ b/packages/vite/src/node/ssr/runtime/__tests__/server-runtime.spec.ts @@ -63,7 +63,12 @@ describe('vite-runtime initialization', async () => { const url = await runtime.executeUrl('/fixtures/simple.js?url') expect(url.default).toMatchInlineSnapshot(`"/fixtures/simple.js"`) const inline = await runtime.executeUrl('/fixtures/test.css?inline') - expect(inline.default).toMatchInlineSnapshot(`undefined`) + expect(inline.default).toMatchInlineSnapshot(` + ".test { + color: red; + } + " + `) }) it('modules with query strings are treated as different modules', async ({ From c1e277d801d0415803ddc96843733afad1557f99 Mon Sep 17 00:00:00 2001 From: bluwy Date: Thu, 24 Oct 2024 17:38:20 +0800 Subject: [PATCH 3/4] chroe: fix test --- .../vite/src/node/ssr/runtime/__tests__/server-runtime.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/node/ssr/runtime/__tests__/server-runtime.spec.ts b/packages/vite/src/node/ssr/runtime/__tests__/server-runtime.spec.ts index c28939bd095264..4c47558c210517 100644 --- a/packages/vite/src/node/ssr/runtime/__tests__/server-runtime.spec.ts +++ b/packages/vite/src/node/ssr/runtime/__tests__/server-runtime.spec.ts @@ -32,7 +32,7 @@ describe('module runner initialization', async () => { it('css is loaded correctly', async ({ runner }) => { const css = await runner.import('/fixtures/test.css') - expect(css.default).toMatchInlineSnapshot(undefined) + expect(css.default).toBe(undefined) const module = await runner.import('/fixtures/test.module.css') expect(module).toMatchObject({ default: { From f5bd7021f5ee5d52f823b6fc7f8c820e9257eeda Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Fri, 25 Oct 2024 00:58:41 +0800 Subject: [PATCH 4/4] Update packages/vite/src/node/plugins/css.ts Co-authored-by: patak <583075+patak-dev@users.noreply.github.com> --- packages/vite/src/node/plugins/css.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts index ec49b4dfba4a3d..5f8bae0ffcdc33 100644 --- a/packages/vite/src/node/plugins/css.ts +++ b/packages/vite/src/node/plugins/css.ts @@ -525,8 +525,7 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin { if (inlined) { return `export default ${JSON.stringify(css)}` } - // server only - if (this.environment.config.consumer !== 'client') { + if (this.environment.config.consumer === 'server') { return modulesCode || 'export {}' }