perf: optimize joins

vitejs · Dec 9, 2023 · a98c9b4 · a98c9b4
1 parent b35aefa
commit a98c9b4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/packages/vite/src/node/fsUtils.ts b/packages/vite/src/node/fsUtils.ts
@@ -124,6 +124,12 @@ function ensureFileMaybeSymlinkIsResolved(
     isSymlink === undefined ? 'error' : isSymlink ? 'symlink' : 'file'
 }
 
+function pathUntilPart(root: string, parts: string[], i: number): string {
+  let p = root
+  for (let k = 0; k < i; k++) p += '/' + parts[k]
+  return p
+}
+
 export function createCachedFsUtils(config: ResolvedConfig): FsUtils {
   const { root } = config
   const rootDirPath = `${root}/`
@@ -135,7 +141,7 @@ export function createCachedFsUtils(config: ResolvedConfig): FsUtils {
       if (direntCache.type === 'directory') {
         let dirPath
         if (!direntCache.dirents) {
-          dirPath = path.posix.join(root, ...parts.slice(0, i))
+          dirPath = pathUntilPart(root, parts, i)
           const dirents = readDirCacheSync(dirPath)
           if (!dirents) {
             direntCache.type = 'error'
@@ -148,7 +154,7 @@ export function createCachedFsUtils(config: ResolvedConfig): FsUtils {
           return
         }
         if (nextDirentCache.type === 'directory_maybe_symlink') {
-          dirPath ??= path.posix.join(root, ...parts.slice(0, i))
+          dirPath ??= pathUntilPart(root, parts, i)
           const isSymlink = fs
             .lstatSync(dirPath, { throwIfNoEntry: false })
             ?.isSymbolicLink()
@@ -167,7 +173,7 @@ export function createCachedFsUtils(config: ResolvedConfig): FsUtils {
         if (direntCache.type === 'file_maybe_symlink') {
           ensureFileMaybeSymlinkIsResolved(
             direntCache,
-            path.posix.join(root, ...parts.slice(0, i)),
+            pathUntilPart(root, parts, i),
           )
           return direntCache
         } else if (direntCache.type === 'file') {
@@ -306,7 +312,7 @@ export function createCachedFsUtils(config: ResolvedConfig): FsUtils {
         const fileName = base + ext
         const fileDirentCache = direntCache.dirents.get(fileName)
         if (fileDirentCache) {
-          const filePath = path.posix.join(dirPath, fileName)
+          const filePath = dirPath + '/' + fileName
           ensureFileMaybeSymlinkIsResolved(fileDirentCache, filePath)
           if (fileDirentCache.type === 'symlink') {
             // fallback to built-in fs for symlinked files

diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
@@ -952,7 +952,7 @@ export function resolveServerOptions(
     strict: server.fs?.strict ?? true,
     allow: allowDirs,
     deny,
-    cachedChecks: server.fs?.cachedChecks ?? false,
+    cachedChecks: server.fs?.cachedChecks ?? true,
   }
 
   if (server.origin?.endsWith('/')) {