fix: import .css in SSR

vitejs · Jun 28, 2022 · fba2ba8 · fba2ba8
1 parent 10936cd
commit fba2ba8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
@@ -690,7 +690,7 @@ export function tryNodeResolve(
     // otherwise we may introduce duplicated modules for externalized files
     // from pre-bundled deps.
     if (!isBuild) {
-      const versionHash = depsOptimizer.metadata({ ssr }).browserHash
+      const versionHash = depsOptimizer.metadata({ ssr })?.browserHash
       if (versionHash && isJsType) {
         resolved = injectQuery(resolved, `v=${versionHash}`)
       }

diff --git a/packages/vite/src/node/ssr/ssrModuleLoader.ts b/packages/vite/src/node/ssr/ssrModuleLoader.ts
@@ -13,6 +13,7 @@ import type { InternalResolveOptions } from '../plugins/resolve'
 import { tryNodeResolve } from '../plugins/resolve'
 import { hookNodeResolve } from '../plugins/ssrRequireHook'
 import { NULL_BYTE_PLACEHOLDER } from '../constants'
+import { isCSSRequest } from '../plugins/css'
 import {
   ssrDynamicImportKey,
   ssrExportAllKey,
@@ -135,7 +136,10 @@ async function instantiateModule(
 
   const ssrImport = async (dep: string) => {
     if (dep[0] !== '.' && dep[0] !== '/') {
-      return nodeImport(dep, mod.file!, resolveOptions)
+      const imported = await nodeImport(dep, mod.file!, resolveOptions)
+      if (imported !== undefined) {
+        return imported
+      }
     }
     dep = unwrapId(dep)
     if (!isCircular(dep) && !pendingImports.get(dep)?.some(isCircular)) {
@@ -297,8 +301,10 @@ async function nodeImport(
   }
 
   try {
-    const mod = await dynamicImport(url)
-    return proxyESM(mod)
+    if (!isCSSRequest(url)) {
+      const mod = await dynamicImport(url)
+      return proxyESM(mod)
+    }
   } finally {
     unhookNodeResolve()
   }