Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(build): support cssCodeSplit for cjs format #2621

Merged
merged 2 commits into from
Apr 4, 2021
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { findAssetFile, getColor, isBuild, readManifest } from '../../testUtils'

test('should load both stylesheets', async () => {
expect(await getColor('h1')).toBe('red')
expect(await getColor('h2')).toBe('blue')
})

if (isBuild) {
test('should remove empty chunk', async () => {
expect(findAssetFile(/style.*\.js$/)).toBe('')
expect(findAssetFile('main.*.js$')).toMatch(`/* empty css`)
expect(findAssetFile('other.*.js$')).toMatch(`/* empty css`)
})

test('should generate correct manifest', async () => {
const manifest = readManifest()
expect(manifest['index.html'].css.length).toBe(2)
expect(manifest['other.js'].css.length).toBe(1)
})
}
2 changes: 2 additions & 0 deletions packages/playground/css-codesplit-cjs/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<script type="module" src="/main.js"></script>
<div id="app"></div>
3 changes: 3 additions & 0 deletions packages/playground/css-codesplit-cjs/main.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
h1 {
Shinigami92 marked this conversation as resolved.
Show resolved Hide resolved
color: red;
}
6 changes: 6 additions & 0 deletions packages/playground/css-codesplit-cjs/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import './style.css'
import './main.css'

document.getElementById(
'app'
).innerHTML = `<h1>This should be red</h1><h2>This should be blue</h2>`
1 change: 1 addition & 0 deletions packages/playground/css-codesplit-cjs/other.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './style.css'
11 changes: 11 additions & 0 deletions packages/playground/css-codesplit-cjs/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "test-css-codesplit-cjs",
"private": true,
"version": "0.0.0",
"scripts": {
"dev": "vite",
"build": "vite build",
"debug": "node --inspect-brk ../../vite/bin/vite",
"serve": "vite preview"
}
}
3 changes: 3 additions & 0 deletions packages/playground/css-codesplit-cjs/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
h2 {
color: blue;
}
20 changes: 20 additions & 0 deletions packages/playground/css-codesplit-cjs/vite.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
const { resolve } = require('path')

module.exports = {
build: {
outDir: './dist',
manifest: true,
rollupOptions: {
input: {
main: resolve(__dirname, './index.html'),
other: resolve(__dirname, './other.js')
},
treeshake: false,
output: {
format: 'cjs',
freeze: false,
externalLiveBindings: false
}
}
}
}
6 changes: 4 additions & 2 deletions packages/vite/src/node/plugins/css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
// this is a shared CSS-only chunk that is empty.
pureCssChunks.add(chunk.fileName)
}
if (opts.format === 'es') {
if (opts.format === 'es' || opts.format === 'cjs') {
chunkCSS = await processChunkCSS(chunkCSS, {
inlined: false,
minify: true
Expand Down Expand Up @@ -383,7 +383,9 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
.join('|')
.replace(/\./g, '\\.')
const emptyChunkRE = new RegExp(
`\\bimport\\s*"[^"]*(?:${emptyChunkFiles})";\n?`,
opts.format === 'es'
? `\\bimport\\s*"[^"]*(?:${emptyChunkFiles})";\n?`
: `\\brequire\\(\\s*"[^"]*(?:${emptyChunkFiles})"\\);\n?`,
'g'
)
for (const file in bundle) {
Expand Down