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
11 changes: 10 additions & 1 deletion packages/vite/src/node/plugins/css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,15 @@ export function cssPlugin(config: ResolvedConfig): Plugin {
)
},

configureServer() {
// Initialize module cache for dev mode in case buildStart is not called
// (e.g. when using createServerModuleRunner)
if (!cssModulesCache.has(config)) {
moduleCache = new Map<string, Record<string, string>>()
cssModulesCache.set(config, moduleCache)
}
},

buildEnd() {
preprocessorWorkerController?.close()
},
Expand Down Expand Up @@ -552,7 +561,7 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
}

const inlined = inlineRE.test(id)
const modules = cssModulesCache.get(config)!.get(id)
const modules = cssModulesCache.get(config)?.get(id)

// #6984, #7552
// `foo.module.css` => modulesCode
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { existsSync, readdirSync } from 'node:fs'
import { posix, win32 } from 'node:path'
import { fileURLToPath } from 'node:url'
import { describe, expect, vi } from 'vitest'
import { describe, expect, it, vi } from 'vitest'
import { isWindows } from '../../../../shared/utils'
import type { ExternalFetchResult } from '../../../../shared/invokeMethods'
import { createServer } from '../../../server'
import { createServerModuleRunner } from '../serverModuleRunner'
import { createModuleRunnerTester } from './utils'

const _URL = URL
Expand Down Expand Up @@ -537,3 +539,39 @@ describe('invalid package', async () => {
`)
})
})

describe('css without middlewareMode', () => {
it('css is loaded correctly without middlewareMode', async () => {
const server = await createServer({
root: import.meta.dirname,
logLevel: 'error',
server: {
watch: null,
ws: false,
},
optimizeDeps: {
disabled: true,
noDiscovery: true,
include: [],
},
})
const runner = createServerModuleRunner(server.environments.ssr, {
hmr: { logger: false },
sourcemapInterceptor: false,
})
try {
const css = await runner.import('/fixtures/test.css')
expect(css.default).toBe(undefined)
const module = await runner.import('/fixtures/test.module.css')
expect(module).toMatchObject({
default: {
test: expect.stringMatching(/^_test_/),
},
test: expect.stringMatching(/^_test_/),
})
} finally {
await runner.close()
await server.close()
}
})
})