modernize package and dependencies

Author: dcastil

package.json

@@ -1,7 +1,7 @@
 {
     "name": "cache-cmd",
     "version": "0.2.0",
-    "description": "Cache a command based on various factors",
+    "description": "Run and cache a command based on various factors",
     "keywords": [
         "cache",
         "debounce",
@@ -23,39 +23,39 @@
         "dist",
         "src"
     ],
-    "bin": "dist/cli.cjs",
+    "bin": "dist/cli.js",
     "type": "module",
     "source": "src/cli.ts",
     "repository": {
         "type": "git",
         "url": "https://github.com/dcastil/cache-cmd.git"
     },
     "scripts": {
-        "cache-cmd": "node ./dist/cli.cjs",
-        "build": "rm -rf dist/* && microbundle --strict --target node --output dist/cli.ts --format cjs --generateTypes false",
+        "cache-cmd": "node ./dist/cli.js",
+        "build": "rm -rf dist/* && esbuild src/cli.ts --bundle --platform=node --target=node20 --packages=external --format=esm --sourcemap --outfile=dist/cli.js",
         "type-check": "tsc --build",
         "preversion": "if [ -n \"$DANYS_MACHINE\" ]; then git checkout main && git pull; fi",
         "postversion": "if [ -n \"$DANYS_MACHINE\" ]; then git push --follow-tags && open https://github.com/dcastil/cache-cmd/releases; fi"
     },
     "dependencies": {
-        "date-fns": "^2.25.0",
-        "del": "^6.0.0",
+        "date-fns": "^4.1.0",
+        "del": "^8.0.0",
         "exec-sh": "^0.4.0",
-        "find-cache-dir": "^3.3.2",
-        "flat-cache": "^3.0.4",
+        "find-cache-dir": "^5.0.0",
+        "flat-cache": "^6.1.3",
         "hard-rejection": "^2.1.0",
-        "hasha": "^5.2.2",
-        "lodash": "^4.17.21",
-        "make-dir": "^3.1.0",
-        "sade": "^1.7.4"
+        "hasha": "^6.0.0",
+        "lodash-es": "^4.17.21",
+        "sade": "^1.8.1"
     },
     "devDependencies": {
-        "@types/find-cache-dir": "^3.2.1",
-        "@types/flat-cache": "^2.0.0",
-        "@types/lodash": "^4.14.175",
-        "@types/sade": "^1.7.3",
-        "microbundle": "^0.14.1",
-        "prettier": "^2.4.1",
-        "typescript": "^4.4.4"
+        "@types/find-cache-dir": "^5.0.2",
+        "@types/flat-cache": "^2.0.2",
+        "@types/lodash-es": "^4.17.12",
+        "@types/node": "^22.10.1",
+        "@types/sade": "^1.8.0",
+        "esbuild": "^0.24.0",
+        "prettier": "^3.4.2",
+        "typescript": "^5.7.2"
     }
 }

src/cache-clear.ts

@@ -1,9 +1,9 @@
-import del from 'del'
+import { deleteSync } from 'del'
 
 import { getCacheDirectoryPath } from './utils/get-cache-dir'
 
 export function clearCacheDirectory(relativeCacheDirectory: string | undefined) {
-    const deletedPaths = del.sync(getCacheDirectoryPath(relativeCacheDirectory))
+    const deletedPaths = deleteSync(getCacheDirectoryPath(relativeCacheDirectory))
 
     if (deletedPaths.length === 0) {
         console.log('No cache to clear')

src/run.ts

@@ -1,9 +1,9 @@
 import { add, isAfter } from 'date-fns'
 import execSh from 'exec-sh'
-import flatCache from 'flat-cache'
-import { isEqual } from 'lodash'
+import { create } from 'flat-cache'
+import { isEqual } from 'lodash-es'
 
-import { createCache } from './utils/get-cache-dir'
+import { getCacheDirectoryPath } from './utils/get-cache-dir'
 import { getCacheKey } from './utils/get-cache-key'
 import { getDuration } from './utils/get-duration'
 import { getFileHashes } from './utils/get-file-hashes'
@@ -30,7 +30,11 @@ export async function runCommand({
         return
     }
 
-    const cache = flatCache.load('commands-cache.json', createCache(relativeCacheDirectory))
+    const cache = create({
+        cacheId: 'commands-cache.json',
+        cacheDir: getCacheDirectoryPath(relativeCacheDirectory),
+        lruSize: 10_000,
+    })
     const filePaths = getFilePaths(cacheByFiles)
     const duration = cacheByTime ? getDuration(cacheByTime) : undefined
 
@@ -63,7 +67,7 @@ export async function runCommand({
                 [fileHashes && 'unchanged files', duration && 'being within cache time']
                     .filter(Boolean)
                     .join(' and '),
-            ].join(' ')
+            ].join(' '),
         )
         return
     }
@@ -74,7 +78,7 @@ export async function runCommand({
             [fileHashes && 'changed files', duration && 'cache time passing']
                 .filter(Boolean)
                 .join(' and '),
-        ].join(' ')
+        ].join(' '),
     )
     let execPromise = execSh.promise(command)
 

src/utils/get-cache-dir.ts

@@ -1,7 +1,6 @@
 import path from 'path'
 
 import findCacheDir from 'find-cache-dir'
-import makeDir from 'make-dir'
 
 import { name } from '../../package.json'
 
@@ -18,19 +17,3 @@ export function getCacheDirectoryPath(relativeCacheDirectoryPath: string | undef
 
     return resolvedCacheDirectory
 }
-
-export function createCache(relativeCacheDirectoryPath: string | undefined) {
-    if (relativeCacheDirectoryPath) {
-        const absoluteCacheDirectoryPath = makeDir.sync(relativeCacheDirectoryPath)
-
-        return absoluteCacheDirectoryPath
-    }
-
-    const resolvedCachePath = findCacheDir({ name, create: true })
-
-    if (!resolvedCachePath) {
-        throw Error('Could not find cache directory. Please provide a cache directory manually.')
-    }
-
-    return resolvedCachePath
-}

src/utils/get-file-hashes.ts

@@ -1,13 +1,11 @@
-import hasha from 'hasha'
+import { hashFile } from 'hasha'
 
 export async function getFileHashes(filePaths: string[]) {
     return Object.fromEntries(
         await Promise.all(
             filePaths.map((filePath) =>
-                hasha
-                    .fromFile(filePath, { algorithm: 'md5' })
-                    .then((hash) => [filePath, hash] as const)
-            )
-        )
+                hashFile(filePath, { algorithm: 'md5' }).then((hash) => [filePath, hash] as const),
+            ),
+        ),
     )
 }

tsconfig.json

@@ -8,8 +8,8 @@
         "noUncheckedIndexedAccess": true,
         "strict": true,
         // Modules
-        "module": "CommonJS",
-        "moduleResolution": "Node",
+        "module": "ESNext",
+        "moduleResolution": "bundler",
         // Emit
         "declaration": true,
         "noEmit": true,
@@ -19,7 +19,7 @@
         "esModuleInterop": true,
         "forceConsistentCasingInFileNames": true,
         // Language and Environment
-        "target": "ES2020",
+        "target": "ESNext",
         "resolveJsonModule": true
     },
     "include": ["src/**/*"]