fix: inline entry css if modern bundle is skipped

vitejs · Oct 10, 2022 · a99eade · a99eade
1 parent 9c4daec
commit a99eade
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/packages/plugin-legacy/src/index.ts b/packages/plugin-legacy/src/index.ts
@@ -352,6 +352,17 @@ function viteLegacyPlugin(options: Options = {}): Plugin[] {
       }
     },
 
+    renderStart(opts) {
+      // @ts-ignore
+      // In the `renderChunk` hook,
+      // we skip inlining CSS for the entry chunk because a separate CSS file
+      // would've been already linked in index.html (see #9761).
+      // But if `genModern` is set to false, the CSS still should be inlined.
+      // If in the future vite doesn't inline CSS any more (as #9920 suggests),
+      // this flag can be safely deleted.
+      opts.__vite_inline_entry_css__ = !genModern
+    },
+
     async renderChunk(raw, chunk, opts) {
       if (config.build.ssr) {
         return null

diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts
@@ -569,7 +569,8 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
           // the legacy build should avoid inserting entry CSS modules here, they
           // will be collected into `chunk.viteMetadata.importedCss` and injected
           // later by the `'vite:build-html'` plugin into the `index.html`
-          if (chunk.isEntry && !config.build.lib) {
+          // @ts-ignore
+          if (chunk.isEntry && !config.build.lib && !opts.__vite_inline_entry_css__) {
             return null
           }
           chunkCSS = await finalizeCss(chunkCSS, true, config)