fix: revert #5902, fix #8243 (#8654)

vitejs · Jun 19, 2022 · 1b820da · 1b820da
1 parent 9a1c1ae
commit 1b820da
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 52 deletions.
diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts
@@ -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)
@@ -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'

diff --git a/playground/legacy/__tests__/legacy.spec.ts b/playground/legacy/__tests__/legacy.spec.ts
@@ -60,12 +60,7 @@ test('correctly emits styles', async () => {
 // 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
-  )
+  await untilUpdated(() => getColor('#dynamic-css'), 'red', true)
 })
 
 describe.runIf(isBuild)('build', () => {

diff --git a/playground/legacy/package.json b/playground/legacy/package.json
@@ -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"

diff --git a/playground/legacy/vite.config-dynamic-css.js b/playground/legacy/vite.config-dynamic-css.js