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
25 changes: 21 additions & 4 deletions src/cssModules.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
export function genInitCSSModulesCode() {
return `
const cssModules = {}
const cssModulesStore = {}
const getCssModules = (name) => {
return Object.values(cssModulesStore[name]).reduce((acc, style) => Object.assign(acc, style), {})
}
`
}

export function genCSSModulesCode(
id: string,
index: number,
Expand All @@ -6,17 +16,24 @@ export function genCSSModulesCode(
needsHotReload: boolean
): string {
const styleVar = `style${index}`
let code = `\nimport ${styleVar} from ${request}`

// inject variable
const name = typeof moduleName === 'string' ? moduleName : '$style'
code += `\ncssModules["${name}"] = ${styleVar}`
let code = `
import ${styleVar} from ${request}

if (!cssModulesStore["${name}"]) {
cssModulesStore["${name}"] = {}
}
cssModulesStore["${name}"]["${styleVar}"] = ${styleVar}
cssModules["${name}"] = getCssModules("${name}")
`

if (needsHotReload) {
code += `
if (module.hot) {
module.hot.accept(${request}, () => {
cssModules["${name}"] = ${styleVar}
cssModulesStore["${name}"]["${styleVar}"] = ${styleVar}
cssModules["${name}"] = getCssModules("${name}")
__VUE_HMR_RUNTIME__.rerender("${id}")
})
}`
Expand Down
4 changes: 2 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type {
} from 'vue/compiler-sfc'
import { selectBlock } from './select'
import { genHotReloadCode } from './hotReload'
import { genCSSModulesCode } from './cssModules'
import { genCSSModulesCode, genInitCSSModulesCode } from './cssModules'
import { formatError } from './formatError'

import VueLoaderPlugin from './plugin'
Expand Down Expand Up @@ -273,7 +273,7 @@ export default function loader(
)
}
if (!hasCSSModules) {
stylesCode += `\nconst cssModules = {}`
stylesCode += genInitCSSModulesCode()
propsToAttach.push([`__cssModules`, `cssModules`])
hasCSSModules = true
}
Expand Down
14 changes: 14 additions & 0 deletions test/fixtures/css-modules-multiple.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<style module>
.red {
color: red;
}
</style>
<style module>
.green {
color: green;
}
</style>

<script>
export default {}
</script>
31 changes: 31 additions & 0 deletions test/style.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,37 @@ test('CSS Modules Extend', async () => {
expect(style).toContain(`.${escapedClassName} {\n color: #FF0000;\n}`)
})

test('Multiple CSS Modules', async () => {
const baseLoaders = [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
},
},
]

const { instance } = await mockBundleAndRun({
entry: 'css-modules-multiple.vue',
modify: (config: any) => {
config!.module!.rules = [
{
test: /\.vue$/,
use: [DEFAULT_VUE_USE],
},
{
test: /\.css$/,
use: baseLoaders,
},
]
},
})

expect(instance.$style.red).toBeDefined()
expect(instance.$style.green).toBeDefined()
})

test('v-bind() in CSS', async () => {
const { window, instance } = await mockBundleAndRun({
entry: 'style-v-bind.vue',
Expand Down