esm.dev 2.0.3 → 2.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esm.dev",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "TypeScript library template",
   "type": "module",
   "sideEffects": false,
@@ -35,7 +35,6 @@
     "@commitlint/config-conventional": "19.8.1",
     "@commitlint/types": "19.8.1",
     "@types/http-proxy": "^1.17.16",
-    "@types/lodash.debounce": "^4.0.9",
     "@types/mustache": "^4.2.6",
     "@types/node": "^22.15.27",
     "@types/ramda": "^0.31.0",
@@ -44,7 +43,7 @@
     "prettier": "3.6.2",
     "rimraf": "6.0.1",
     "semantic-release": "^24.2.4",
-    "typescript": "5.8.3",
+    "typescript": "~5.8.3",
     "vitest": "^3.1.4"
   },
   "lint-staged": {
@@ -55,17 +54,16 @@
   "dependencies": {
     "clipanion": "^4.0.0-rc.4",
     "clipanion-generator-command": "^1.3.1",
+    "es-toolkit": "^1.39.10",
     "escape-string-regexp": "^5.0.0",
     "glob": "^11.0.2",
     "http-proxy": "^1.18.1",
     "ignore": "^7.0.4",
-    "lodash.debounce": "^4.0.8",
     "minimatch": "^10.0.1",
     "minipass": "^7.1.2",
     "mustache": "^4.2.0",
     "npm": "^11.4.1",
     "ramda": "^0.31.0",
-    "throat": "^6.0.2",
     "tslib": "^2.8.1",
     "typanion": "^3.14.0",
     "zx": "^8.5.4"

package/src/commands/InitCommand.ts

@@ -25,7 +25,7 @@ export class InitCommand extends PackagePathSpecific(MustacheGeneratorCommand) {
 
   readonly esmStoragePath = Option.String(
     '-s,--esm-storage-path',
-    './docker-storage/esm/esmd',
+    './docker-storage/esm',
     {
       description: "Path to ESM.sh's storage",
     },

package/src/lib/queue.ts

@@ -1,18 +1,20 @@
-import debounce from 'lodash.debounce'
-import throat from 'throat'
+import { debounce, Mutex } from 'es-toolkit'
 
-export async function queue<TResult, TArgs extends any[] = []>(
-  fn: (...args: TArgs) => Promise<TResult>,
+const mutex = new Mutex()
+
+export async function queue<TResult>(
+  fn: () => Promise<TResult>,
   signal?: AbortSignal,
 ): Promise<TResult> {
-  return _queue((...args) => {
+  await mutex.acquire()
+  try {
     signal?.throwIfAborted()
-    return fn(...(args as any))
-  })
+    return await fn()
+  } finally {
+    mutex.release()
+  }
 }
 
-const _queue = throat.default(1)
-
 /**
  * Just like debounce, but the first call will add a promise to the queue
  * and that promise won't resolve until the debounced function is finally called.
@@ -30,16 +32,20 @@ export function queuedDebounce<Args extends unknown[], R>(
     promiseWithResolvers?.reject(reason)
   })
 
-  const debounced = debounce(async (...args: Args) => {
-    try {
-      const result = await fn(...args)
-      promiseWithResolvers?.resolve(result)
-    } catch (error: any) {
-      promiseWithResolvers?.reject(error)
-    } finally {
-      promiseWithResolvers = undefined
-    }
-  }, delay)
+  const debounced = debounce(
+    async (...args: Args) => {
+      try {
+        const result = await fn(...args)
+        promiseWithResolvers?.resolve(result)
+      } catch (error: any) {
+        promiseWithResolvers?.reject(error)
+      } finally {
+        promiseWithResolvers = undefined
+      }
+    },
+    delay,
+    { signal },
+  )
 
   return (...args: Args) => {
     const promise = start()

package/src/lib/server.ts

@@ -2,8 +2,12 @@ import { queue } from './queue.ts'
 import { createServer } from 'node:http'
 import httpProxy from 'http-proxy'
 
-export function serve(port: number, esmOrigin: string): () => void {
+export async function serve(
+  port: number,
+  esmOrigin: string,
+): Promise<() => Promise<void>> {
   const proxy = httpProxy.createProxyServer()
+  const { promise, resolve } = Promise.withResolvers<void>()
 
   const server = createServer((req, res) => {
     queue(
@@ -13,7 +17,7 @@ export function serve(port: number, esmOrigin: string): () => void {
           req.on('error', reject)
           res.on('error', reject)
           res.on('close', resolve)
-          proxy.web(req, res, { target: esmOrigin })
+          proxy.web(req, res, { followRedirects: true, target: esmOrigin })
         }),
     ).catch((error) => {
       res.statusCode = 500
@@ -23,11 +27,17 @@ export function serve(port: number, esmOrigin: string): () => void {
     })
   }).listen(port, () => {
     console.info('ESM proxy server listining on', server.address())
+    resolve()
   })
 
-  return () => {
-    console.info('closing the server')
-    server.closeAllConnections()
-    server.close()
-  }
+  await promise
+
+  return () =>
+    new Promise<void>((resolve, reject) => {
+      console.info('closing the server')
+      server.close((error) => {
+        if (error) reject(error)
+        else resolve()
+      })
+    })
 }

package/src/lib/watch.ts

@@ -62,11 +62,15 @@ async function modernWatch(
   const ignorer = await getWatchIgnorer(dirname)
   const watcher = fsWatch(
     dirname,
-    { recursive: true /*, signal: abortController.signal */ },
+    { recursive: true, signal: abortController.signal },
     (_, filename) =>
       (filename && ignorer.ignores(filename)) ||
       republish(filename ?? '').catch((error) => {
-        if (error.name !== 'AbortError') throw error
+        if (
+          !(error instanceof Event && error.target instanceof AbortSignal) &&
+          error.name !== 'AbortError'
+        )
+          throw error
       }),
   )
 
@@ -76,7 +80,7 @@ async function modernWatch(
 async function legacyWatch(
   abortController: AbortController,
   dirname: string,
-  republish: (filename?: string | undefined) => Promise<void>,
+  republish: (filename?: string) => Promise<void>,
 ) {
   const ignorer = await getWatchIgnorer(dirname)
   const filename = tempfile()

package/src/lib/watchIgnoreList.ts

@@ -51,7 +51,7 @@ async function getIgnoreList(dirname: string) {
     })
 
     const ignoreList: string[] = []
-    for await (const line of rl) if (line) ignoreList.push(line.trim())
+    for await (const line of rl) if (line.trim()) ignoreList.push(line.trim())
 
     return {
       basename,