Skip to content

Commit

Permalink
Revert "fix: allow css to be written for systemjs output (vitejs#5902)"
Browse files Browse the repository at this point in the history
This reverts commit 780b4f5.
  • Loading branch information
sapphi-red committed Jun 19, 2022
1 parent 9a1c1ae commit d2970da
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 70 deletions.
8 changes: 2 additions & 6 deletions packages/vite/src/node/plugins/css.ts
Expand Up @@ -492,11 +492,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' ||
opts.format === 'cjs' ||
opts.format === 'system'
) {
if (opts.format === 'es' || opts.format === 'cjs') {
const cssAssetName = chunk.name + '.css'

chunkCSS = resolveAssetUrlsInCss(chunkCSS, cssAssetName)
Expand Down Expand Up @@ -558,7 +554,7 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
.join('|')
.replace(/\./g, '\\.')
const emptyChunkRE = new RegExp(
opts.format === 'es' || opts.format === 'system'
opts.format === 'es'
? `\\bimport\\s*["'][^"']*(?:${emptyChunkFiles})["'];\n?`
: `\\brequire\\(\\s*["'][^"']*(?:${emptyChunkFiles})["']\\);\n?`,
'g'
Expand Down
11 changes: 0 additions & 11 deletions playground/legacy/__tests__/legacy.spec.ts
Expand Up @@ -57,17 +57,6 @@ test('correctly emits styles', async () => {
expect(await getColor('#app')).toBe('red')
})

// dynamic import css
test('should load dynamic import with css', async () => {
await page.click('#dynamic-css-button')
await untilUpdated(
() =>
page.$eval('#dynamic-css', (node) => window.getComputedStyle(node).color),
'rgb(255, 0, 0)',
true
)
})

describe.runIf(isBuild)('build', () => {
test('should generate correct manifest', async () => {
const manifest = readManifest()
Expand Down
3 changes: 0 additions & 3 deletions playground/legacy/dynamic.css

This file was deleted.

2 changes: 0 additions & 2 deletions playground/legacy/index.html
Expand Up @@ -4,6 +4,4 @@ <h1 id="app"></h1>
<div id="features-after-corejs-3"></div>
<div id="babel-helpers"></div>
<div id="assets"></div>
<button id="dynamic-css-button">dynamic css</button>
<div id="dynamic-css"></div>
<script type="module" src="./main.js"></script>
8 changes: 0 additions & 8 deletions playground/legacy/main.js
Expand Up @@ -43,14 +43,6 @@ import('./immutable-chunk.js')
text('#assets', assets.join('\n'))
})

// dynamic css
document
.querySelector('#dynamic-css-button')
.addEventListener('click', async () => {
await import('./dynamic.css')
text('#dynamic-css', 'dynamic import css')
})

function text(el, text) {
document.querySelector(el).textContent = text
}
1 change: 0 additions & 1 deletion playground/legacy/package.json
Expand Up @@ -6,7 +6,6 @@
"dev": "vite",
"build": "vite build --debug legacy",
"build:custom-filename": "vite --config ./vite.config-custom-filename.js build --debug legacy",
"build:dynamic-css": "vite --config ./vite.config-dynamic-css.js build --debug legacy",
"build:multiple-output": "vite --config ./vite.config-multiple-output.js build",
"debug": "node --inspect-brk ../../packages/vite/bin/vite",
"preview": "vite preview"
Expand Down
39 changes: 0 additions & 39 deletions playground/legacy/vite.config-dynamic-css.js

This file was deleted.

0 comments on commit d2970da

Please sign in to comment.