@jsenv/core 27.0.0-alpha.44 → 27.0.0-alpha.47

package/dist/html_supervisor_setup.js.map

@@ -5,27 +5,24 @@
     "../src/plugins/html_supervisor/client/html_supervisor_setup.js"
   ],
   "sourcesContent": [
-    "window.__html_supervisor__ = {\n  // \"html_supervisor_installer.js\" will implement\n  // - \"addExecution\"\n  // - \"collectScriptResults\"\n  // - \"superviseScriptTypeModule\"\n  // and take all executions in \"executions\" and implement their supervision\n  executions: [],\n  addExecution: (execution) => {\n    window.__html_supervisor__.executions.push(execution)\n  },\n  collectScriptResults: () => {\n    throw new Error(\"htmlSupervisor not installed\")\n  },\n  superviseScriptTypeModule: () => {\n    throw new Error(\"htmlSupervisor not installed\")\n  },\n  superviseScript: ({ src, crossorigin, integrity }) => {\n    window.__html_supervisor__.addExecution({\n      type: \"js_classic\",\n      improveErrorWithFetch: true,\n      currentScript: document.currentScript,\n      src,\n      promise: new Promise((resolve, reject) => {\n        const script = document.createElement(\"script\")\n        if (crossorigin) {\n          script.crossorigin = crossorigin\n        }\n        if (integrity) {\n          script.integrity = integrity\n        }\n        script.src = src\n        const scriptUrl = new URL(src, window.location).href\n        let lastWindowErrorUrl\n        let lastWindowError\n        const windowErrorCallback = (e) => {\n          lastWindowErrorUrl = e.filename\n          lastWindowError = e.error\n        }\n        const cleanup = () => {\n          document.body.removeChild(script)\n          window.removeEventListener(\"error\", windowErrorCallback)\n        }\n        window.addEventListener(\"error\", windowErrorCallback)\n        script.addEventListener(\"error\", () => {\n          cleanup()\n          reject(src)\n        })\n        script.addEventListener(\"load\", () => {\n          cleanup()\n          if (lastWindowErrorUrl === scriptUrl) {\n            reject(lastWindowError)\n          } else {\n            resolve()\n          }\n        })\n        document.body.appendChild(script)\n      }),\n    })\n  },\n  getScriptExecutionResults: () => {\n    // wait for page to load before collecting script execution results\n    const htmlReadyPromise = new Promise((resolve) => {\n      if (document.readyState === \"complete\") {\n        resolve()\n        return\n      }\n      const loadCallback = () => {\n        window.removeEventListener(\"load\", loadCallback)\n        resolve()\n      }\n      window.addEventListener(\"load\", loadCallback)\n    })\n    return htmlReadyPromise.then(() => {\n      return window.__html_supervisor__.collectScriptResults()\n    })\n  },\n}\n"
+    "window.__html_supervisor__ = {\n  // \"html_supervisor_installer.js\" will implement\n  // - \"addScriptToExecute\"\n  // - \"superviseScriptTypeModule\"\n  // - \"collectScriptResults\"\n  // and take all executions in \"scriptsToExecute\" and implement their supervision\n  scriptsToExecute: [],\n  addScriptToExecute: (scriptToExecute) => {\n    window.__html_supervisor__.scriptsToExecute.push(scriptToExecute)\n  },\n  superviseScript: ({ src, isInline, crossorigin, integrity }) => {\n    window.__html_supervisor__.addScriptToExecute({\n      src,\n      type: \"js_classic\",\n      isInline,\n      currentScript: document.currentScript,\n      execute: () => {\n        return new Promise((resolve, reject) => {\n          const script = document.createElement(\"script\")\n          if (crossorigin) {\n            script.crossorigin = crossorigin\n          }\n          if (integrity) {\n            script.integrity = integrity\n          }\n          script.src = src\n          const scriptUrl = new URL(src, window.location).href\n          let lastWindowErrorUrl\n          let lastWindowError\n          const windowErrorCallback = (e) => {\n            lastWindowErrorUrl = e.filename\n            lastWindowError = e.error\n          }\n          const cleanup = () => {\n            document.body.removeChild(script)\n            window.removeEventListener(\"error\", windowErrorCallback)\n          }\n          window.addEventListener(\"error\", windowErrorCallback)\n          script.addEventListener(\"error\", () => {\n            cleanup()\n            reject(src)\n          })\n          script.addEventListener(\"load\", () => {\n            cleanup()\n            if (lastWindowErrorUrl === scriptUrl) {\n              reject(lastWindowError)\n            } else {\n              resolve()\n            }\n          })\n          document.body.appendChild(script)\n        })\n      },\n    })\n  },\n  superviseScriptTypeModule: () => {\n    throw new Error(\"htmlSupervisor not installed\")\n  },\n  getScriptExecutionResults: () => {\n    // wait for page to load before collecting script execution results\n    const htmlReadyPromise = new Promise((resolve) => {\n      if (document.readyState === \"complete\") {\n        resolve()\n        return\n      }\n      const loadCallback = () => {\n        window.removeEventListener(\"load\", loadCallback)\n        resolve()\n      }\n      window.addEventListener(\"load\", loadCallback)\n    })\n    return htmlReadyPromise.then(() => {\n      return window.__html_supervisor__.collectScriptResults()\n    })\n  },\n  collectScriptResults: () => {\n    throw new Error(\"htmlSupervisor not installed\")\n  },\n}\n"
   ],
   "names": [
     "window",
     "__html_supervisor__",
-    "executions",
-    "addExecution",
-    "execution",
+    "scriptsToExecute",
+    "addScriptToExecute",
+    "scriptToExecute",
     "push",
-    "collectScriptResults",
-    "Error",
-    "superviseScriptTypeModule",
     "superviseScript",
     "src",
+    "isInline",
     "crossorigin",
     "integrity",
     "type",
-    "improveErrorWithFetch",
     "currentScript",
     "document",
-    "promise",
+    "execute",
     "Promise",
     "resolve",
     "reject",
@@ -47,11 +44,14 @@
     "removeEventListener",
     "addEventListener",
     "appendChild",
+    "superviseScriptTypeModule",
+    "Error",
     "getScriptExecutionResults",
     "htmlReadyPromise",
     "readyState",
     "loadCallback",
-    "then"
+    "then",
+    "collectScriptResults"
   ],
-  "mappings": "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"
+  "mappings": "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"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.44",
+  "version": "27.0.0-alpha.47",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {
@@ -60,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.2",
     "@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",

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,11 +47,24 @@ 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,
     )
     try {
+      // urlInfo objects are reused, they must be "reset" before cooking then again
+      if (!urlInfo.isInline) {
+        urlGraph.resetUrlInfo(urlInfo)
+      }
       await kitchen.cook({
         reference: referenceFromGraph || reference,
         urlInfo,
@@ -60,7 +73,7 @@ export const createFileService = ({
           [runtimeName]: runtimeVersion,
         },
       })
-      let { response, contentType, content } = urlInfo
+      let { response, contentType, content, contentEtag } = urlInfo
       if (response) {
         return response
       }
@@ -71,6 +84,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 {