fix: scan on windows

vitejs · Jan 27, 2021 · 5f7698b · 5f7698b
1 parent fd5e7c0
commit 5f7698b
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 61 deletions.
diff --git a/packages/vite/src/node/optimizer/scan.ts b/packages/vite/src/node/optimizer/scan.ts
@@ -4,9 +4,14 @@ import glob from 'fast-glob'
 import { ResolvedConfig } from '..'
 import { build, Loader, Plugin } from 'esbuild'
 import { knownAssetTypes } from '../constants'
-import { createDebugger, emptyDir, isDataUrl, isExternalUrl } from '../utils'
+import {
+  createDebugger,
+  emptyDir,
+  isDataUrl,
+  isExternalUrl,
+  normalizePath
+} from '../utils'
 import { browserExternalId } from '../plugins/resolve'
-import { isCSSRequest } from '../plugins/css'
 import chalk from 'chalk'
 import {
   createPluginContainer,
@@ -84,7 +89,10 @@ function esbuildScanPlugin(
       return seen.get(key)
     }
     container = container || (container = await createPluginContainer(config))
-    const resolved = await container.resolveId(id, importer)
+    const resolved = await container.resolveId(
+      id,
+      importer && normalizePath(importer)
+    )
     const res = resolved?.id
     seen.set(key, res)
     return res
@@ -96,63 +104,6 @@ function esbuildScanPlugin(
   return {
     name: 'vite:dep-scan',
     setup(build) {
-      // bare imports: record and externalize
-      build.onResolve(
-        {
-          filter: /^[\w@]/
-        },
-        async ({ path: id, importer }) => {
-          if (depImports[id]) {
-            return {
-              path: id,
-              external: true
-            }
-          }
-
-          if (
-            isExternalUrl(id) ||
-            isDataUrl(id) ||
-            isCSSRequest(id) ||
-            config.assetsInclude(id)
-          ) {
-            return {
-              path: id,
-              external: true
-            }
-          }
-
-          const resolved = await resolve(id, importer)
-          if (resolved) {
-            // virtual id or browser external
-            if (id === resolved || resolved.startsWith(browserExternalId)) {
-              return { path: id, external: true }
-            }
-            // dep or force included, externalize and stop crawling
-            if (resolved.includes('node_modules') || include?.includes(id)) {
-              if (!exclude?.includes(id)) {
-                depImports[id] = resolved
-              }
-              return {
-                path: id,
-                external: true
-              }
-            } else {
-              // linked package, keep crawling
-              return {
-                path: path.resolve(resolved)
-              }
-            }
-          } else {
-            config.logger.error(
-              chalk.red(
-                `Dependency ${id} not found. Is it installed? (imported by ${importer})`
-              )
-            )
-            missing.add(id)
-          }
-        }
-      )
-
       const htmlTypesRe = /\.(html|vue|svelte)$/
       // html types: extract script contents
       build.onResolve({ filter: htmlTypesRe }, async ({ path, importer }) => {
@@ -161,6 +112,7 @@ function esbuildScanPlugin(
           namespace: 'html'
         }
       })
+
       build.onLoad(
         { filter: htmlTypesRe, namespace: 'html' },
         async ({ path }) => {
@@ -210,6 +162,63 @@ function esbuildScanPlugin(
         ({ path }) => ({ path, external: true })
       )
 
+      // bare imports: record and externalize
+      build.onResolve(
+        {
+          // avoid matching windows volume
+          filter: /^[\w@][^:]/
+        },
+        async ({ path: id, importer }) => {
+          if (depImports[id]) {
+            return {
+              path: id,
+              external: true
+            }
+          }
+
+          if (isExternalUrl(id) || isDataUrl(id)) {
+            return {
+              path: id,
+              external: true
+            }
+          }
+
+          const resolved = await resolve(id, importer)
+          if (resolved) {
+            // browser external
+            if (resolved.startsWith(browserExternalId)) {
+              return { path: id, external: true }
+            }
+            // virtual id
+            if (id === resolved) {
+              return { path: id, external: true }
+            }
+            // dep or force included, externalize and stop crawling
+            if (resolved.includes('node_modules') || include?.includes(id)) {
+              if (!exclude?.includes(id)) {
+                depImports[id] = resolved
+              }
+              return {
+                path: id,
+                external: true
+              }
+            } else {
+              // linked package, keep crawling
+              return {
+                path: path.resolve(resolved)
+              }
+            }
+          } else {
+            config.logger.error(
+              chalk.red(
+                `Dependency ${id} not found. Is it installed? (imported by ${importer})`
+              )
+            )
+            missing.add(id)
+          }
+        }
+      )
+
       // catch all
       build.onResolve(
         {

diff --git a/packages/vite/src/node/ssr/ssrTransform.ts b/packages/vite/src/node/ssr/ssrTransform.ts
@@ -94,7 +94,7 @@ export async function ssrTransform(
         } else {
           // export const foo = 1, bar = 2
           for (const decl of node.declaration.declarations) {
-            const names = extractNames(decl.id)
+            const names = extractNames(decl.id as any)
             for (const name of names) {
               defineExport(name)
             }