fix: remove path-exists (cache-utils) (#6600)

Co-authored-by: Mateusz Bocian <[email protected]>

Author: 43081j

package-lock.json

@@ -56,7 +56,6 @@
     "junk": "^4.0.0",
     "locate-path": "^7.0.0",
     "move-file": "^3.0.0",
-    "path-exists": "^5.0.0",
     "readdirp": "^4.0.0"
   },
   "devDependencies": {

packages/cache-utils/package.json

@@ -1,8 +1,7 @@
 import { mkdir, readFile, rm, writeFile } from 'fs/promises'
+import { existsSync } from 'fs'
 import { dirname } from 'path'
 
-import { pathExists } from 'path-exists'
-
 import { getExpires, checkExpires } from './expire.js'
 import { getHash } from './hash.js'
 
@@ -20,7 +19,7 @@ export const getManifestInfo = async function ({ cachePath, move, ttl, digests }
 
 // Whether the cache manifest has changed
 const isIdentical = async function ({ hash, manifestPath, manifestString }) {
-  if (hash === undefined || !(await pathExists(manifestPath))) {
+  if (hash === undefined || !existsSync(manifestPath)) {
     return false
   }
 
@@ -55,7 +54,7 @@ const CACHE_EXTENSION = '.netlify.cache.json'
 // Check whether a file/directory is expired by checking its cache manifest
 export const isExpired = async function (cachePath) {
   const manifestPath = getManifestPath(cachePath)
-  if (!(await pathExists(manifestPath))) {
+  if (!existsSync(manifestPath)) {
     return false
   }
 

packages/cache-utils/src/manifest.ts

@@ -1,20 +1,19 @@
 import { normalize } from 'path'
+import { existsSync } from 'fs'
 import process from 'process'
 
-import { pathExists } from 'path-exists'
-
 // Like `process.cwd()` but safer when current directory is wrong
-export const safeGetCwd = async function (cwdOpt?: string) {
+export const safeGetCwd = function (cwdOpt?: string) {
   try {
     const cwd = getCwdValue(cwdOpt)
 
-    if (!(await pathExists(cwd))) {
-      return ''
+    if (!existsSync(cwd)) {
+      return Promise.resolve('')
     }
 
-    return cwd
+    return Promise.resolve(cwd)
   } catch {
-    return ''
+    return Promise.resolve('')
   }
 }
 

packages/cache-utils/src/utils/cwd.ts

@@ -1,6 +1,5 @@
-import { promises as fs } from 'fs'
+import { promises as fs, existsSync } from 'fs'
 
-import { pathExists } from 'path-exists'
 import { MockInstance, afterEach, beforeEach, expect, test, vi } from 'vitest'
 
 import { restore, save } from '../src/main.js'
@@ -29,5 +28,5 @@ test('Should allow changing the cache directory', async () => {
   expect(cachedFiles.length).toBe(1)
   await removeFiles(srcFile)
   expect(await restore(srcFile, { cacheDir })).toBe(true)
-  expect(await pathExists(srcFile)).toBe(true)
+  expect(existsSync(srcFile)).toBe(true)
 })

packages/cache-utils/tests/dir.test.ts

@@ -1,4 +1,4 @@
-import { pathExists } from 'path-exists'
+import { existsSync } from 'node:fs'
 import { test, expect } from 'vitest'
 
 import { save, restore } from '../src/main.js'
@@ -9,9 +9,9 @@ test('Should allow moving files instead of copying them', async () => {
   const [cacheDir, [srcFile, srcDir]] = await Promise.all([createTmpDir(), createTmpFile()])
   try {
     expect(await save(srcFile, { cacheDir, move: true })).toBe(true)
-    expect(await pathExists(srcFile)).toBe(false)
+    expect(existsSync(srcFile)).toBe(false)
     expect(await restore(srcFile, { cacheDir, move: true })).toBe(true)
-    expect(await pathExists(srcFile)).toBe(true)
+    expect(existsSync(srcFile)).toBe(true)
   } finally {
     await removeFiles([cacheDir, srcDir])
   }

packages/cache-utils/tests/move.test.ts

@@ -1,7 +1,7 @@
 import { homedir } from 'os'
 import { platform } from 'process'
+import { existsSync } from 'fs'
 
-import { pathExists } from 'path-exists'
 import { test, expect } from 'vitest'
 
 import { save, restore } from '../src/main.js'
@@ -14,7 +14,7 @@ test('Should allow caching files in home directory', async () => {
     expect(await save(srcFile, { cacheDir })).toBe(true)
     await removeFiles(srcFile)
     expect(await restore(srcFile, { cacheDir })).toBe(true)
-    expect(await pathExists(srcFile)).toBe(true)
+    expect(existsSync(srcFile)).toBe(true)
   } finally {
     await removeFiles([cacheDir, srcDir])
   }
@@ -43,7 +43,7 @@ if (platform !== 'win32') {
       await save(srcFile, { cwd: tmpDir })
       await removeFiles(srcFile)
       await restore(srcFile, { cwd: tmpDir })
-      expect(await pathExists(srcFile)).toBe(true)
+      expect(existsSync(srcFile)).toBe(true)
     } finally {
       await removeFiles(srcDir)
     }

packages/cache-utils/tests/path.test.ts

@@ -1,6 +1,5 @@
-import { promises as fs } from 'fs'
+import { promises as fs, existsSync } from 'fs'
 
-import { pathExists } from 'path-exists'
 import { expect, test } from 'vitest'
 
 import { save, restore, bindOpts, getCacheDir } from '../src/main.js'
@@ -18,7 +17,7 @@ test('Should cache and restore one file', async () => {
     expect(await save(srcFile, { cacheDir })).toBe(true)
     await removeFiles(srcFile)
     expect(await restore(srcFile, { cacheDir })).toBe(true)
-    expect(await pathExists(srcFile)).toBe(true)
+    expect(existsSync(srcFile)).toBe(true)
   } finally {
     await removeFiles([cacheDir, srcDir])
   }
@@ -34,7 +33,7 @@ test('Should cache and restore several files', async () => {
     expect(await save([srcFile, otherSrcFile], { cacheDir })).toBe(true)
     await removeFiles(srcFile)
     expect(await restore([srcFile, otherSrcFile], { cacheDir })).toBe(true)
-    expect(await Promise.all([pathExists(srcFile), pathExists(otherSrcFile)])).toEqual([true, true])
+    expect([existsSync(srcFile), existsSync(otherSrcFile)]).toEqual([true, true])
   } finally {
     await removeFiles([cacheDir, srcDir, otherSrcDir])
   }
@@ -48,7 +47,7 @@ test('Should cache and restore one directory', async () => {
     expect(await save(srcDir, { cacheDir })).toBe(true)
     await removeFiles(srcDir)
     expect(await restore(srcDir, { cacheDir })).toBe(true)
-    expect(await pathExists(srcFile)).toBe(true)
+    expect(existsSync(srcFile)).toBe(true)
   } finally {
     await removeFiles([cacheDir, srcDir])
   }
@@ -61,7 +60,7 @@ test('Should keep file contents when caching files', async () => {
     expect(await save(srcFile, { cacheDir })).toBe(true)
     await removeFiles(srcFile)
     expect(await restore(srcFile, { cacheDir })).toBe(true)
-    expect(await pathExists(srcFile)).toBe(true)
+    expect(existsSync(srcFile)).toBe(true)
     expect(await fs.readFile(srcFile, 'utf8')).toBe('test')
   } finally {
     await removeFiles([cacheDir, srcDir])
@@ -75,7 +74,7 @@ test('Should overwrite files on restore', async () => {
     expect(await save(srcFile, { cacheDir })).toBe(true)
     await fs.writeFile(srcFile, 'newTest')
     expect(await restore(srcFile, { cacheDir })).toBe(true)
-    expect(await pathExists(srcFile)).toBe(true)
+    expect(existsSync(srcFile)).toBe(true)
     expect(await fs.readFile(srcFile, 'utf8')).toBe('test')
   } finally {
     await removeFiles([cacheDir, srcDir])