@jsenv/core 27.0.0-alpha.45 → 27.0.0-alpha.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.45",
+  "version": "27.0.0-alpha.46",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {
@@ -11,7 +11,8 @@
     "node": ">=16.13.0"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
   },
   "type": "module",
   "imports": {},
@@ -59,15 +60,15 @@
     "@financial-times/polyfill-useragent-normaliser": "2.0.1",
     "@jsenv/abort": "4.1.2",
     "@jsenv/babel-plugins": "1.0.2",
-    "@jsenv/filesystem": "3.1.0",
+    "@jsenv/filesystem": "3.2.1",
     "@jsenv/importmap": "1.2.0",
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "1.5.2",
     "@jsenv/logger": "4.0.1",
     "@jsenv/node-esm-resolution": "0.0.6",
-    "@jsenv/server": "12.6.1",
+    "@jsenv/server": "12.6.2",
     "@jsenv/uneval": "1.6.0",
-    "@jsenv/utils": "1.6.2",
+    "@jsenv/utils": "1.7.0",
     "construct-style-sheets-polyfill": "3.1.0",
     "cssnano": "5.1.7",
     "cssnano-preset-default": "5.2.7",
@@ -107,4 +108,4 @@
     "redux": "4.1.2",
     "rollup": "2.70.1"
   }
-}
+}

package/src/build/start_build_server.js

@@ -21,13 +21,15 @@ import {
   pluginCORS,
   fetchFileSystem,
 } from "@jsenv/server"
-import { assertAndNormalizeDirectoryUrl } from "@jsenv/filesystem"
+import {
+  assertAndNormalizeDirectoryUrl,
+  registerDirectoryLifecycle,
+} from "@jsenv/filesystem"
 import { createLogger } from "@jsenv/logger"
 import { Abort } from "@jsenv/abort"
 
-import { initProcessAutorestart } from "@jsenv/utils/file_watcher/process_auto_restart.js"
+import { initReloadableProcess } from "@jsenv/utils/process_reload/process_reload.js"
 import { createTaskLog } from "@jsenv/utils/logs/task_log.js"
-import { watchFiles } from "@jsenv/utils/file_watcher/file_watcher.js"
 import { executeCommand } from "@jsenv/utils/command/command.js"
 
 export const startBuildServer = async ({
@@ -45,43 +47,80 @@ export const startBuildServer = async ({
 
   rootDirectoryUrl,
   buildDirectoryUrl,
+  buildServerFiles = {
+    "./package.json": true,
+    "./jsenv.config.mjs": true,
+  },
+  buildServerMainFile,
+  buildServerAutoreload = false,
+  clientFiles = {
+    "./**": true,
+    "./**/.*/": false, // any folder starting with a dot is ignored (includes .git,.jsenv for instance)
+    "./dist/": false,
+    "./**/node_modules/": false,
+  },
+  cooldownBetweenFileEvents,
   buildCommand,
   mainBuildFileUrl = "/index.html",
-  watchedFilePatterns,
-  cooldownBetweenFileEvents,
-  autorestart,
 }) => {
+  const logger = createLogger({ logLevel })
   rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl)
   buildDirectoryUrl = assertAndNormalizeDirectoryUrl(buildDirectoryUrl)
 
-  const autorestartProcess = await initProcessAutorestart({
-    signal,
+  const reloadableProcess = await initReloadableProcess({
     handleSIGINT,
-    ...(autorestart
+    ...(buildServerAutoreload
       ? {
           enabled: true,
-          logLevel: autorestart.logLevel,
-          urlToRestart: autorestart.url,
-          urlsToWatch: [
-            ...(autorestart.urlsToWatch || []),
-            new URL("package.json", rootDirectoryUrl),
-            new URL("jsenv.config.mjs", rootDirectoryUrl),
-          ],
+          logLevel: "info",
+          fileToRestart: buildServerMainFile,
         }
       : {
           enabled: false,
         }),
   })
-  if (autorestartProcess.isPrimary) {
+  if (reloadableProcess.isPrimary) {
+    const buildServerFileChangeCallback = ({ relativeUrl, event }) => {
+      const url = new URL(relativeUrl, rootDirectoryUrl).href
+      if (buildServerAutoreload) {
+        logger.info(`file ${event} ${url} -> restarting server...`)
+        reloadableProcess.reload()
+      }
+    }
+    const stopWatchingBuildServerFiles = registerDirectoryLifecycle(
+      rootDirectoryUrl,
+      {
+        watchPatterns: {
+          [buildServerMainFile]: true,
+          ...buildServerFiles,
+        },
+        cooldownBetweenFileEvents,
+        keepProcessAlive: false,
+        recursive: true,
+        added: ({ relativeUrl }) => {
+          buildServerFileChangeCallback({ relativeUrl, event: "added" })
+        },
+        updated: ({ relativeUrl }) => {
+          buildServerFileChangeCallback({ relativeUrl, event: "modified" })
+        },
+        removed: ({ relativeUrl }) => {
+          buildServerFileChangeCallback({ relativeUrl, event: "removed" })
+        },
+      },
+    )
+    signal.addEventListener("abort", () => {
+      stopWatchingBuildServerFiles()
+    })
     return {
       origin: `${protocol}://127.0.0.1:${port}`,
       stop: () => {
-        autorestartProcess.stop()
+        stopWatchingBuildServerFiles()
+
+        reloadableProcess.stop()
       },
     }
   }
-  signal = autorestartProcess.signal
-  const logger = createLogger({ logLevel })
+  signal = reloadableProcess.signal
 
   let buildPromise
   let buildAbortController
@@ -177,28 +216,39 @@ export const startBuildServer = async ({
   })
   logger.info(``)
 
-  const unregisterDirectoryLifecyle = watchFiles({
-    rootDirectoryUrl,
-    watchedFilePatterns,
+  runBuild()
+  const clientFileChangeCallback = ({ relativeUrl, event }) => {
+    const url = new URL(relativeUrl, rootDirectoryUrl).href
+    buildAbortController.abort()
+    // setTimeout is to ensure the abortController.abort() above
+    // is properly taken into account so that logs about abort comes first
+    // then logs about re-running the build happens
+    setTimeout(() => {
+      logger.info(`${url.slice(rootDirectoryUrl.length)} ${event} -> rebuild`)
+      runBuild()
+    })
+  }
+  const stopWatchingClientFiles = registerDirectoryLifecycle(rootDirectoryUrl, {
+    watchPatterns: clientFiles,
     cooldownBetweenFileEvents,
-    fileChangeCallback: ({ url, event }) => {
-      buildAbortController.abort()
-      // setTimeout is to ensure the abortController.abort() above
-      // is properly taken into account so that logs about abort comes first
-      // then logs about re-running the build happens
-      setTimeout(() => {
-        logger.info(`${url.slice(rootDirectoryUrl.length)} ${event} -> rebuild`)
-        runBuild()
-      })
+    keepProcessAlive: false,
+    recursive: true,
+    added: ({ relativeUrl }) => {
+      clientFileChangeCallback({ relativeUrl, event: "added" })
+    },
+    updated: ({ relativeUrl }) => {
+      clientFileChangeCallback({ relativeUrl, event: "modified" })
+    },
+    removed: ({ relativeUrl }) => {
+      clientFileChangeCallback({ relativeUrl, event: "removed" })
     },
   })
-  signal.addEventListener("abort", () => {
-    unregisterDirectoryLifecyle()
-  })
-  runBuild()
   return {
     origin: server.origin,
-    stop: () => server.stop(),
+    stop: () => {
+      stopWatchingClientFiles()
+      server.stop()
+    },
   }
 }
 

package/src/dev/start_dev_server.js

@@ -1,7 +1,10 @@
-import { assertAndNormalizeDirectoryUrl } from "@jsenv/filesystem"
+import {
+  assertAndNormalizeDirectoryUrl,
+  registerDirectoryLifecycle,
+} from "@jsenv/filesystem"
 import { createLogger } from "@jsenv/logger"
 
-import { initProcessAutorestart } from "@jsenv/utils/file_watcher/process_auto_restart.js"
+import { initReloadableProcess } from "@jsenv/utils/process_reload/process_reload.js"
 import { createTaskLog } from "@jsenv/utils/logs/task_log.js"
 import { getCorePlugins } from "@jsenv/core/src/plugins/plugins.js"
 import { createUrlGraph } from "@jsenv/core/src/omega/url_graph.js"
@@ -14,7 +17,8 @@ import { jsenvPluginToolbar } from "./plugins/toolbar/jsenv_plugin_toolbar.js"
 export const startDevServer = async ({
   signal = new AbortController().signal,
   handleSIGINT,
-  logLevel,
+  logLevel = "info",
+  omegaServerLogLevel = "warn",
   port = 3456,
   protocol = "http",
   listenAnyIp,
@@ -25,6 +29,20 @@ export const startDevServer = async ({
   privateKey,
   keepProcessAlive = true,
   rootDirectoryUrl,
+  devServerFiles = {
+    "./package.json": true,
+    "./jsenv.config.mjs": true,
+  },
+  devServerMainFile,
+  devServerAutoreload = false,
+  clientFiles = {
+    "./**": true,
+    "./**/.*/": false, // any folder starting with a dot is ignored (includes .git,.jsenv for instance)
+    "./dist/": false,
+    "./**/node_modules/": false,
+  },
+  cooldownBetweenFileEvents,
+  clientAutoreload = true,
 
   sourcemaps = "inline",
   plugins = [],
@@ -33,7 +51,6 @@ export const startDevServer = async ({
   nodeEsmResolution,
   fileSystemMagicResolution,
   transpilation,
-  autoreload = true,
   explorerGroups = {
     source: {
       "./*.html": true,
@@ -44,40 +61,92 @@ export const startDevServer = async ({
     },
   },
   toolbar = false,
-  autorestart,
 }) => {
+  const logger = createLogger({ logLevel })
   rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl)
-  const autorestartProcess = await initProcessAutorestart({
+  const reloadableProcess = await initReloadableProcess({
     signal,
     handleSIGINT,
-    ...(autorestart
+    ...(devServerAutoreload
       ? {
           enabled: true,
-          logLevel: autorestart.logLevel,
-          urlToRestart: autorestart.url,
-          urlsToWatch: [
-            ...(autorestart.urlsToWatch || []),
-            new URL("package.json", rootDirectoryUrl),
-            new URL("jsenv.config.mjs", rootDirectoryUrl),
-          ],
+          logLevel: "warn",
+          fileToRestart: devServerMainFile,
         }
       : {
           enabled: false,
         }),
   })
-  if (autorestartProcess.isPrimary) {
+  if (reloadableProcess.isPrimary) {
+    const devServerFileChangeCallback = ({ relativeUrl, event }) => {
+      const url = new URL(relativeUrl, rootDirectoryUrl).href
+      if (devServerAutoreload) {
+        logger.info(`file ${event} ${url} -> restarting server...`)
+        reloadableProcess.reload()
+      }
+    }
+    const unregisterDevServerFilesWatcher = registerDirectoryLifecycle(
+      rootDirectoryUrl,
+      {
+        watchPatterns: {
+          [devServerMainFile]: true,
+          ...devServerFiles,
+        },
+        cooldownBetweenFileEvents,
+        keepProcessAlive: false,
+        recursive: true,
+        added: ({ relativeUrl }) => {
+          devServerFileChangeCallback({ relativeUrl, event: "added" })
+        },
+        updated: ({ relativeUrl }) => {
+          devServerFileChangeCallback({ relativeUrl, event: "modified" })
+        },
+        removed: ({ relativeUrl }) => {
+          devServerFileChangeCallback({ relativeUrl, event: "removed" })
+        },
+      },
+    )
+    signal.addEventListener("abort", () => {
+      unregisterDevServerFilesWatcher()
+    })
     return {
       origin: `${protocol}://127.0.0.1:${port}`,
       stop: () => {
-        autorestartProcess.stop()
+        unregisterDevServerFilesWatcher()
+        reloadableProcess.stop()
       },
     }
   }
 
-  const logger = createLogger({ logLevel })
   const startServerTask = createTaskLog(logger, "start server")
 
-  const urlGraph = createUrlGraph()
+  const clientFileChangeCallbackList = []
+  const clientFilesPruneCallbackList = []
+  const clientFileChangeCallback = ({ relativeUrl, event }) => {
+    const url = new URL(relativeUrl, rootDirectoryUrl).href
+    clientFileChangeCallbackList.forEach((callback) => {
+      callback({ url, event })
+    })
+  }
+  const stopWatchingClientFiles = registerDirectoryLifecycle(rootDirectoryUrl, {
+    watchPatterns: clientFiles,
+    cooldownBetweenFileEvents,
+    keepProcessAlive: false,
+    recursive: true,
+    added: ({ relativeUrl }) => {
+      clientFileChangeCallback({ event: "added", relativeUrl })
+    },
+    updated: ({ relativeUrl }) => {
+      clientFileChangeCallback({ event: "modified", relativeUrl })
+    },
+    removed: ({ relativeUrl }) => {
+      clientFileChangeCallback({ event: "removed", relativeUrl })
+    },
+  })
+  const urlGraph = createUrlGraph({
+    clientFileChangeCallbackList,
+    clientFilesPruneCallbackList,
+  })
   const kitchen = createKitchen({
     signal,
     logger,
@@ -97,7 +166,9 @@ export const startDevServer = async ({
         nodeEsmResolution,
         fileSystemMagicResolution,
         transpilation,
-        autoreload,
+        clientAutoreload,
+        clientFileChangeCallbackList,
+        clientFilesPruneCallbackList,
       }),
       jsenvPluginExplorer({
         groups: explorerGroups,
@@ -106,7 +177,7 @@ export const startDevServer = async ({
     ],
   })
   const server = await startOmegaServer({
-    logger,
+    logLevel: omegaServerLogLevel,
     keepProcessAlive,
     listenAnyIp,
     port,
@@ -132,6 +203,9 @@ export const startDevServer = async ({
   })
   return {
     origin: server.origin,
-    stop: server.stop,
+    stop: () => {
+      stopWatchingClientFiles()
+      server.stop()
+    },
   }
 }

package/src/execute/execute.js

@@ -89,10 +89,9 @@ export const execute = async ({
         }),
       ],
     })
-    const serverLogger = createLogger({ logLevel: "warn" })
     const server = await startOmegaServer({
       signal: executeOperation.signal,
-      logger: serverLogger,
+      logLevel: "warn",
       rootDirectoryUrl,
       urlGraph,
       kitchen,

package/src/omega/kitchen.js

@@ -619,7 +619,7 @@ export const createKitchen = ({
       },
     )
   }
-  const cook = async ({ urlInfo, outDirectoryUrl, ...rest }) => {
+  const cook = memoizeCook(async ({ urlInfo, outDirectoryUrl, ...rest }) => {
     outDirectoryUrl = outDirectoryUrl ? String(outDirectoryUrl) : undefined
 
     const writeFiles = ({ gotError }) => {
@@ -654,7 +654,7 @@ export const createKitchen = ({
       writeFiles({ gotError: true })
       throw e
     }
-  }
+  })
 
   baseContext.cook = cook
 
@@ -684,6 +684,37 @@ export const createKitchen = ({
   }
 }
 
+const memoizeCook = (cook) => {
+  const pendingDishes = new Map()
+  return async (params) => {
+    const { urlInfo } = params
+    const { url, modifiedTimestamp } = urlInfo
+    const pendingDish = pendingDishes.get(url)
+    if (pendingDish) {
+      if (!modifiedTimestamp) {
+        await pendingDish.promise
+        return
+      }
+      if (pendingDish.timestamp > modifiedTimestamp) {
+        await pendingDish.promise
+        return
+      }
+      pendingDishes.delete(url)
+    }
+    const timestamp = Date.now()
+    const promise = cook(params)
+    pendingDishes.set(url, {
+      timestamp,
+      promise,
+    })
+    try {
+      await promise
+    } finally {
+      pendingDishes.delete(url)
+    }
+  }
+}
+
 const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
   Object.assign(urlInfo.data, reference.data)
   Object.assign(urlInfo.timing, reference.timing)

package/src/omega/omega_server.js

@@ -8,14 +8,13 @@ import {
 } from "@jsenv/server"
 import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/internal/convertFileSystemErrorToResponseProperties.js"
 import { createCallbackListNotifiedOnce } from "@jsenv/abort"
-import { loggerToLogLevel } from "@jsenv/logger"
 
 import { createFileService } from "./server/file_service.js"
 
 export const startOmegaServer = async ({
   signal,
   handleSIGINT,
-  logger,
+  logLevel,
   protocol = "http",
   http2 = protocol === "https",
   privateKey,
@@ -48,7 +47,7 @@ export const startOmegaServer = async ({
     stopOnSIGINT: handleSIGINT,
     stopOnInternalError: false,
     keepProcessAlive,
-    logLevel: loggerToLogLevel(logger),
+    logLevel,
     startLog: false,
 
     protocol,

package/src/omega/server/file_service.js

@@ -47,6 +47,15 @@ export const createFileService = ({
       type: "entry_point",
       specifier: request.ressource,
     })
+    const ifNoneMatch = request.headers["if-none-match"]
+    if (ifNoneMatch && urlInfo.contentEtag === ifNoneMatch) {
+      return {
+        status: 304,
+        headers: {
+          "cache-control": `private,max-age=0,must-revalidate`,
+        },
+      }
+    }
     const referenceFromGraph = urlGraph.inferReference(
       reference.url,
       reference.parentUrl,
@@ -60,7 +69,7 @@ export const createFileService = ({
           [runtimeName]: runtimeVersion,
         },
       })
-      let { response, contentType, content } = urlInfo
+      let { response, contentType, content, contentEtag } = urlInfo
       if (response) {
         return response
       }
@@ -71,6 +80,7 @@ export const createFileService = ({
           "content-type": contentType,
           "content-length": Buffer.byteLength(content),
           "cache-control": `private,max-age=0,must-revalidate`,
+          "eTag": contentEtag,
         },
         body: content,
         timing: urlInfo.timing,

package/src/omega/url_graph/url_info_transformations.js

@@ -1,4 +1,5 @@
-import { urlToRelativeUrl } from "@jsenv/filesystem"
+import { bufferToEtag, urlToRelativeUrl } from "@jsenv/filesystem"
+
 import { composeTwoSourcemaps } from "@jsenv/utils/sourcemap/sourcemap_composition_v3.js"
 import {
   SOURCEMAP,
@@ -163,6 +164,7 @@ export const createUrlInfoTransformer = ({
         })
       }
     }
+    urlInfo.contentEtag = bufferToEtag(Buffer.from(urlInfo.content))
   }
 
   return {

package/src/omega/url_graph.js

@@ -1,7 +1,9 @@
-import { createCallbackList } from "@jsenv/abort"
 import { urlToRelativeUrl } from "@jsenv/filesystem"
 
-export const createUrlGraph = () => {
+export const createUrlGraph = ({
+  clientFileChangeCallbackList,
+  clientFilesPruneCallbackList,
+} = {}) => {
   const urlInfos = {}
   const getUrlInfo = (url) => urlInfos[url]
   const deleteUrlInfo = (url) => {
@@ -49,7 +51,6 @@ export const createUrlGraph = () => {
     return visitDependents(urlInfo)
   }
 
-  const prunedCallbackList = createCallbackList()
   const updateReferences = (urlInfo, references) => {
     const dependencyUrls = []
     references.forEach((reference) => {
@@ -101,7 +102,47 @@ export const createUrlGraph = () => {
     if (prunedUrlInfos.length === 0) {
       return
     }
-    prunedCallbackList.notify({ prunedUrlInfos, firstUrlInfo })
+    prunedUrlInfos.forEach((prunedUrlInfo) => {
+      prunedUrlInfo.modifiedTimestamp = Date.now()
+      // should we delete?
+      // delete urlInfos[prunedUrlInfo.url]
+    })
+    if (clientFilesPruneCallbackList) {
+      clientFilesPruneCallbackList.forEach((callback) => {
+        callback({
+          firstUrlInfo,
+          prunedUrlInfos,
+        })
+      })
+    }
+  }
+
+  if (clientFileChangeCallbackList) {
+    const updateModifiedTimestamp = (urlInfo, modifiedTimestamp) => {
+      const seen = []
+      const iterate = (urlInfo) => {
+        if (seen.includes(urlInfo.url)) {
+          return
+        }
+        seen.push(urlInfo.url)
+        urlInfo.modifiedTimestamp = modifiedTimestamp
+        urlInfo.dependents.forEach((dependentUrl) => {
+          const dependentUrlInfo = urlInfos[dependentUrl]
+          const { hotAcceptDependencies = [] } = dependentUrlInfo.data
+          if (!hotAcceptDependencies.includes(urlInfo.url)) {
+            iterate(dependentUrlInfo)
+          }
+        })
+      }
+      iterate(urlInfo)
+    }
+    clientFileChangeCallbackList.push(({ url }) => {
+      const urlInfo = urlInfos[url]
+      if (urlInfo) {
+        updateModifiedTimestamp(urlInfo, Date.now())
+        urlInfo.contentEtag = null
+      }
+    })
   }
 
   return {
@@ -111,8 +152,6 @@ export const createUrlGraph = () => {
     deleteUrlInfo,
     inferReference,
     findDependent,
-
-    prunedCallbackList,
     updateReferences,
 
     toJSON: (rootDirectoryUrl) => {
@@ -133,6 +172,7 @@ export const createUrlGraph = () => {
 
 const createUrlInfo = (url) => {
   return {
+    modifiedTimestamp: 0,
     data: {}, // plugins can put whatever they want here
     references: [],
     dependencies: new Set(),
@@ -148,6 +188,7 @@ const createUrlInfo = (url) => {
     external: false,
     originalContent: undefined,
     content: undefined,
+    contentEtag: null,
     sourcemap: null,
     sourcemapReference: null,
     timing: {},

package/src/plugins/autoreload/dev_sse/jsenv_plugin_dev_sse_server.js

@@ -6,10 +6,12 @@ import { createSSEService } from "@jsenv/utils/event_source/sse_service.js"
 export const jsenvPluginDevSSEServer = ({
   rootDirectoryUrl,
   urlGraph,
-  watchedFilePatterns,
-  cooldownBetweenFileEvents,
+  clientFileChangeCallbackList,
+  clientFilesPruneCallbackList,
 }) => {
   const serverEventCallbackList = createCallbackList()
+  const sseService = createSSEService({ serverEventCallbackList })
+
   const notifyDeclined = ({ cause, reason, declinedBy }) => {
     serverEventCallbackList.notify({
       type: "reload",
@@ -32,25 +34,6 @@ export const jsenvPluginDevSSEServer = ({
       }),
     })
   }
-  const updateHmrTimestamp = (urlInfo, hmrTimestamp) => {
-    const urlInfos = urlGraph.urlInfos
-    const seen = []
-    const iterate = (urlInfo) => {
-      if (seen.includes(urlInfo.url)) {
-        return
-      }
-      seen.push(urlInfo.url)
-      urlInfo.data.hmrTimestamp = hmrTimestamp
-      urlInfo.dependents.forEach((dependentUrl) => {
-        const dependentUrlInfo = urlInfos[dependentUrl]
-        const { hotAcceptDependencies = [] } = dependentUrlInfo.data
-        if (!hotAcceptDependencies.includes(urlInfo.url)) {
-          iterate(dependentUrlInfo, hmrTimestamp)
-        }
-      })
-    }
-    iterate(urlInfo)
-  }
   const propagateUpdate = (firstUrlInfo) => {
     const urlInfos = urlGraph.urlInfos
     const iterate = (urlInfo, trace) => {
@@ -129,41 +112,29 @@ export const jsenvPluginDevSSEServer = ({
     const trace = []
     return iterate(firstUrlInfo, trace)
   }
-  const sseService = createSSEService({
-    rootDirectoryUrl,
-    watchedFilePatterns,
-    cooldownBetweenFileEvents,
-    serverEventCallbackList,
-    onFileChange: ({ url, event }) => {
-      const relativeUrl = urlToRelativeUrl(url, rootDirectoryUrl)
-      const urlInfo = urlGraph.urlInfos[url]
-      // file not part of dependency graph
-      if (!urlInfo) {
-        return
-      }
-      updateHmrTimestamp(urlInfo, Date.now())
-      const hotUpdate = propagateUpdate(urlInfo)
-      if (hotUpdate.declined) {
-        notifyDeclined({
-          cause: `${relativeUrl} ${event}`,
-          reason: hotUpdate.reason,
-          declinedBy: hotUpdate.declinedBy,
-        })
-      } else {
-        notifyAccepted({
-          cause: `${relativeUrl} ${event}`,
-          reason: hotUpdate.reason,
-          instructions: hotUpdate.instructions,
-        })
-      }
-    },
+  clientFileChangeCallbackList.push(({ url, event }) => {
+    const urlInfo = urlGraph.urlInfos[url]
+    // file not part of dependency graph
+    if (!urlInfo) {
+      return
+    }
+    const relativeUrl = urlToRelativeUrl(url, rootDirectoryUrl)
+    const hotUpdate = propagateUpdate(urlInfo)
+    if (hotUpdate.declined) {
+      notifyDeclined({
+        cause: `${relativeUrl} ${event}`,
+        reason: hotUpdate.reason,
+        declinedBy: hotUpdate.declinedBy,
+      })
+    } else {
+      notifyAccepted({
+        cause: `${relativeUrl} ${event}`,
+        reason: hotUpdate.reason,
+        instructions: hotUpdate.instructions,
+      })
+    }
   })
-  urlGraph.prunedCallbackList.add(({ prunedUrlInfos, firstUrlInfo }) => {
-    prunedUrlInfos.forEach((prunedUrlInfo) => {
-      prunedUrlInfo.data.hmrTimestamp = Date.now()
-      // should we delete instead?
-      // delete urlGraph.urlInfos[prunedUrlInfo.url]
-    })
+  clientFilesPruneCallbackList.push(({ prunedUrlInfos, firstUrlInfo }) => {
     const mainHotUpdate = propagateUpdate(firstUrlInfo)
     const cause = `following files are no longer referenced: ${prunedUrlInfos.map(
       (prunedUrlInfo) => urlToRelativeUrl(prunedUrlInfo.url, rootDirectoryUrl),
@@ -207,7 +178,7 @@ export const jsenvPluginDevSSEServer = ({
   return {
     name: "jsenv:sse_server",
     appliesDuring: { dev: true },
-    serve: (request, { urlGraph, rootDirectoryUrl }) => {
+    serve: (request) => {
       if (request.ressource === "/__graph__") {
         const graphJson = JSON.stringify(urlGraph.toJSON(rootDirectoryUrl))
         return {

package/src/plugins/autoreload/jsenv_plugin_autoreload.js

@@ -6,8 +6,8 @@ export const jsenvPluginAutoreload = ({
   rootDirectoryUrl,
   urlGraph,
   scenario,
-  watchedFilePatterns,
-  cooldownBetweenFileEvents,
+  clientFileChangeCallbackList,
+  clientFilesPruneCallbackList,
 }) => {
   if (scenario === "build") {
     return []
@@ -20,8 +20,8 @@ export const jsenvPluginAutoreload = ({
     jsenvPluginDevSSEServer({
       rootDirectoryUrl,
       urlGraph,
-      watchedFilePatterns,
-      cooldownBetweenFileEvents,
+      clientFileChangeCallbackList,
+      clientFilesPruneCallbackList,
     }),
   ]
 }

package/src/plugins/autoreload/jsenv_plugin_hmr.js

@@ -23,12 +23,12 @@ export const jsenvPluginHmr = () => {
         return null
       }
       const urlInfo = context.urlGraph.getUrlInfo(reference.url)
-      if (!urlInfo.data.hmrTimestamp) {
+      if (!urlInfo.modifiedTimestamp) {
         return null
       }
       return {
         hmr: "",
-        v: urlInfo.data.hmrTimestamp,
+        v: urlInfo.modifiedTimestamp,
       }
     },
   }

package/src/plugins/plugins.js

@@ -31,14 +31,13 @@ export const getCorePlugins = ({
   minification = false,
   bundling = false,
 
-  autoreload = false,
+  clientAutoreload = false,
+  clientFileChangeCallbackList,
+  clientFilesPruneCallbackList,
 } = {}) => {
   if (htmlSupervisor === true) {
     htmlSupervisor = {}
   }
-  if (autoreload === true) {
-    autoreload = {}
-  }
   if (nodeEsmResolution === true) {
     nodeEsmResolution = {}
   }
@@ -75,13 +74,14 @@ export const getCorePlugins = ({
     jsenvPluginMinification(minification),
 
     jsenvPluginImportMetaHot(),
-    ...(autoreload
+    ...(clientAutoreload
       ? [
           jsenvPluginAutoreload({
             rootDirectoryUrl,
             urlGraph,
             scenario,
-            ...autoreload,
+            clientFileChangeCallbackList,
+            clientFilesPruneCallbackList,
           }),
         ]
       : []),

package/src/test/execute_plan.js

@@ -11,11 +11,7 @@ import {
   urlToMeta,
   writeFileSync,
 } from "@jsenv/filesystem"
-import {
-  createLogger,
-  createDetailedMessage,
-  loggerToLevels,
-} from "@jsenv/logger"
+import { createDetailedMessage, loggerToLevels } from "@jsenv/logger"
 import { createLog, startSpinner } from "@jsenv/log"
 import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
 
@@ -173,10 +169,9 @@ export const executePlan = async (
           }),
         ],
       })
-      const serverLogger = createLogger({ logLevel: "warn" })
       const server = await startOmegaServer({
         signal: multipleExecutionsOperation.signal,
-        logger: serverLogger,
+        logLevel: "warn",
         rootDirectoryUrl,
         urlGraph,
         kitchen,