fix: css order problem in async chunk

vitejs · Sep 1, 2022 · 4df9062 · 4df9062
1 parent 091537c
commit 4df9062
Show file tree

Hide file tree

Showing 13 changed files with 96 additions and 1 deletion.
diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts
@@ -418,10 +418,12 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
                   const chunk = bundle[filename] as OutputChunk | undefined
                   if (chunk) {
                     deps.add(chunk.fileName)
+                    chunk.imports.forEach(addDeps)
+                    // Ensure that the css imported by current chunk is loaded after the dependencies.
+                    // So the style of current chunk won't be overwritten unexpectedly.
                     chunk.viteMetadata.importedCss.forEach((file) => {
                       deps.add(file)
                     })
-                    chunk.imports.forEach(addDeps)
                   } else {
                     const removedPureCssFiles =
                       removedPureCssFilesCache.get(config)!

diff --git a/playground/async-chunk-css-order/__tests__/async-chunk-css-order.spec.ts b/playground/async-chunk-css-order/__tests__/async-chunk-css-order.spec.ts
@@ -0,0 +1,11 @@
+import { describe, expect, test } from 'vitest'
+import { getColor, isBuild, page } from '~utils'
+
+describe.runIf(isBuild)('build', () => {
+  test('should apply correct style', async () => {
+    const greenButton = await page.$('.green')
+    const blueButton = await page.$('.blue')
+    expect(await getColor(greenButton)).toBe('green')
+    expect(await getColor(blueButton)).toBe('blue')
+  })
+})
diff --git a/playground/async-chunk-css-order/components/BlueButton.css b/playground/async-chunk-css-order/components/BlueButton.css
@@ -0,0 +1,3 @@
+.blue {
+  color: blue;
+}
diff --git a/playground/async-chunk-css-order/components/BlueButton.jsx b/playground/async-chunk-css-order/components/BlueButton.jsx
@@ -0,0 +1,7 @@
+import React from 'react'
+import { Button } from './Button'
+import './BlueButton.css'
+
+export function BlueButton() {
+  return <Button className="blue">I'm a blue button</Button>
+}
diff --git a/playground/async-chunk-css-order/components/Button.css b/playground/async-chunk-css-order/components/Button.css
@@ -0,0 +1,3 @@
+.btn {
+  color: black;
+}
diff --git a/playground/async-chunk-css-order/components/Button.jsx b/playground/async-chunk-css-order/components/Button.jsx
@@ -0,0 +1,10 @@
+import React from 'react'
+import './Button.css'
+
+export function Button({ children, className }) {
+  return (
+    <button className={`btn ${className}`} type="button">
+      {children}
+    </button>
+  )
+}
diff --git a/playground/async-chunk-css-order/components/GreenButton.css b/playground/async-chunk-css-order/components/GreenButton.css
@@ -0,0 +1,3 @@
+.green {
+  color: green;
+}
diff --git a/playground/async-chunk-css-order/components/GreenButton.jsx b/playground/async-chunk-css-order/components/GreenButton.jsx
@@ -0,0 +1,7 @@
+import React from 'react'
+import { Button } from './Button'
+import './GreenButton.css'
+
+export function GreenButton() {
+  return <Button className="green">I'm a green button</Button>
+}
diff --git a/playground/async-chunk-css-order/index.html b/playground/async-chunk-css-order/index.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite App</title>
+  </head>
+
+  <body>
+    <div id="green"></div>
+    <div id="blue"></div>
+    <script type="module" src="/main.jsx"></script>
+  </body>
+</html>
diff --git a/playground/async-chunk-css-order/main.jsx b/playground/async-chunk-css-order/main.jsx
@@ -0,0 +1,10 @@
+import { render } from 'react-dom'
+import React from 'react'
+
+import('./components/GreenButton').then(({ GreenButton }) => {
+  render(<GreenButton />, document.querySelector('#green'))
+})
+
+import('./components/BlueButton').then(({ BlueButton }) => {
+  render(<BlueButton />, document.querySelector('#blue'))
+})
diff --git a/playground/async-chunk-css-order/package.json b/playground/async-chunk-css-order/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "test-async-chunk-css-order",
+  "private": true,
+  "version": "0.0.0",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "debug": "node --inspect-brk ../../packages/vite/bin/vite",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  }
+}
diff --git a/playground/async-chunk-css-order/vite.config.js b/playground/async-chunk-css-order/vite.config.js
@@ -0,0 +1 @@
+module.exports = {}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml