@jsenv/core 24.1.0-alpha.0 → 24.2.0

package/src/dev_server.js

@@ -15,16 +15,21 @@ import {
   computeOutDirectoryRelativeUrl,
 } from "./internal/compiling/startCompileServer.js"
 import { jsenvExplorableConfig } from "./jsenvExplorableConfig.js"
+import {
+  redirectorHtmlFileInfo,
+  redirectorJsFileInfo,
+} from "./internal/dev_server/redirector/redirector_file_info.js"
+import {
+  exploringIndexHtmlFileInfo,
+  exploringIndexJsFileInfo,
+} from "@jsenv/core/src/internal/dev_server/exploring/exploring_file_info.js"
+import { toolbarJsFileInfo } from "@jsenv/core/src/internal/dev_server/toolbar/toolbar_file_info.js"
 import {
   sourcemapMainFileInfo,
   sourcemapMappingFileInfo,
-  jsenvExploringRedirectorHtmlFileInfo,
-  jsenvExploringRedirectorJsFileInfo,
-  jsenvExploringIndexHtmlFileInfo,
-  jsenvExploringIndexJsFileInfo,
-  jsenvToolbarJsFileInfo,
 } from "./internal/jsenvInternalFiles.js"
 import { jsenvRuntimeSupportDuringDev } from "./jsenvRuntimeSupportDuringDev.js"
+import { eventSourceClientFileInfo } from "./internal/dev_server/event_source_client/event_source_client_file_info.js"
 
 export const startDevServer = async ({
   signal = new AbortController().signal,
@@ -41,7 +46,7 @@ export const startDevServer = async ({
   projectDirectoryUrl,
   explorableConfig = jsenvExplorableConfig,
   mainFileRelativeUrl = urlToRelativeUrl(
-    jsenvExploringIndexHtmlFileInfo.url,
+    exploringIndexHtmlFileInfo.sourceUrl,
     projectDirectoryUrl,
   ),
   jsenvDirectoryRelativeUrl,
@@ -59,6 +64,7 @@ export const startDevServer = async ({
   sourcemapMethod,
   customCompilers,
   livereloadWatchConfig,
+  livereloadLogLevel,
   jsenvDirectoryClean,
 }) => {
   projectDirectoryUrl = assertProjectDirectoryUrl({ projectDirectoryUrl })
@@ -70,23 +76,6 @@ export const startDevServer = async ({
     outDirectoryName,
   })
 
-  const redirectFiles = createRedirectFilesService({
-    projectDirectoryUrl,
-    outDirectoryRelativeUrl,
-    mainFileRelativeUrl,
-  })
-  const serveExploringData = createExploringDataService({
-    projectDirectoryUrl,
-    outDirectoryRelativeUrl,
-    explorableConfig,
-    livereloading,
-  })
-  const serveExplorableListAsJson = createExplorableListAsJsonService({
-    projectDirectoryUrl,
-    outDirectoryRelativeUrl,
-    explorableConfig,
-  })
-
   const compileServer = await startCompileServer({
     signal,
     handleSIGINT,
@@ -101,13 +90,35 @@ export const startDevServer = async ({
     plugins,
     customServices: {
       ...customServices,
-      "jsenv:redirector": redirectFiles,
-      "jsenv:exploring-data": serveExploringData,
-      "jsenv:explorables": serveExplorableListAsJson,
+      "jsenv:redirector": createRedirectorService({
+        projectDirectoryUrl,
+        mainFileRelativeUrl,
+      }),
+      "jsenv:event_source_client": createEventSourceClientService({
+        projectDirectoryUrl,
+      }),
+      "jsenv:exploring_index": createExploringIndexService({
+        projectDirectoryUrl,
+      }),
+      "jsenv:exploring_json": createExploringJsonService({
+        projectDirectoryUrl,
+        outDirectoryRelativeUrl,
+        explorableConfig,
+        livereloading,
+      }),
+      "jsenv:explorables_json": createExplorableJsonService({
+        projectDirectoryUrl,
+        outDirectoryRelativeUrl,
+        explorableConfig,
+      }),
+      "jsenv:toolbar": createToolbarService({
+        projectDirectoryUrl,
+      }),
     },
 
     projectDirectoryUrl,
     livereloadSSE: livereloading,
+    jsenvEventSourceClientInjection: true,
     jsenvToolbarInjection: jsenvToolbar,
     jsenvDirectoryRelativeUrl,
     outDirectoryName,
@@ -120,78 +131,95 @@ export const startDevServer = async ({
     babelPluginMap,
     runtimeSupport: runtimeSupportDuringDev,
     livereloadWatchConfig,
+    livereloadLogLevel,
     jsenvDirectoryClean,
   })
 
   return compileServer
 }
 
-const createRedirectFilesService = ({
+const createRedirectorService = ({
   projectDirectoryUrl,
   mainFileRelativeUrl,
 }) => {
-  const jsenvExploringRedirectorHtmlRelativeUrlForProject = urlToRelativeUrl(
-    jsenvExploringRedirectorHtmlFileInfo.url,
+  const jsenvRedirectorHtmlRelativeUrlForProject = urlToRelativeUrl(
+    redirectorHtmlFileInfo.sourceUrl,
     projectDirectoryUrl,
   )
-  const jsenvExploringRedirectorJsBuildRelativeUrlForProject = urlToRelativeUrl(
-    jsenvExploringRedirectorJsFileInfo.jsenvBuildUrl,
+  const jsenvRedirectorJsBuildRelativeUrlForProject = urlToRelativeUrl(
+    redirectorJsFileInfo.buildUrl,
     projectDirectoryUrl,
   )
-  const jsenvExploringJsBuildRelativeUrlForProject = urlToRelativeUrl(
-    jsenvExploringIndexJsFileInfo.jsenvBuildUrl,
-    projectDirectoryUrl,
-  )
-  const jsenvToolbarJsBuildRelativeUrlForProject = urlToRelativeUrl(
-    jsenvToolbarJsFileInfo.jsenvBuildUrl,
-    projectDirectoryUrl,
-  )
-
   return setupRoutes({
     "/": (request) => {
       const redirectTarget = mainFileRelativeUrl
-      const jsenvExploringRedirectorHtmlServerUrl = `${request.origin}/${jsenvExploringRedirectorHtmlRelativeUrlForProject}?redirect=${redirectTarget}`
       return {
         status: 307,
         headers: {
-          location: jsenvExploringRedirectorHtmlServerUrl,
+          location: `${request.origin}/${jsenvRedirectorHtmlRelativeUrlForProject}?redirect=${redirectTarget}`,
         },
       }
     },
     "/.jsenv/redirect/:rest*": (request) => {
       const redirectTarget = request.ressource.slice("/.jsenv/redirect/".length)
-      const jsenvExploringRedirectorHtmlServerUrl = `${request.origin}/${jsenvExploringRedirectorHtmlRelativeUrlForProject}?redirect=${redirectTarget}`
       return {
         status: 307,
         headers: {
-          location: jsenvExploringRedirectorHtmlServerUrl,
+          location: `${request.origin}/${jsenvRedirectorHtmlRelativeUrlForProject}?redirect=${redirectTarget}`,
         },
       }
     },
-    "/.jsenv/exploring.redirector.js": (request) => {
-      const jsenvExploringRedirectorBuildServerUrl = `${request.origin}/${jsenvExploringRedirectorJsBuildRelativeUrlForProject}`
+    "/.jsenv/redirector.js": (request) => {
       return {
         status: 307,
         headers: {
-          location: jsenvExploringRedirectorBuildServerUrl,
+          location: `${request.origin}/${jsenvRedirectorJsBuildRelativeUrlForProject}`,
         },
       }
     },
-    "/.jsenv/exploring.index.js": (request) => {
-      const jsenvExploringJsBuildServerUrl = `${request.origin}/${jsenvExploringJsBuildRelativeUrlForProject}`
+  })
+}
+
+const createEventSourceClientService = ({ projectDirectoryUrl }) => {
+  const eventSourceClientBuildRelativeUrlForProject = urlToRelativeUrl(
+    eventSourceClientFileInfo.buildUrl,
+    projectDirectoryUrl,
+  )
+  return setupRoutes({
+    "/.jsenv/event_source_client.js": (request) => {
       return {
         status: 307,
         headers: {
-          location: jsenvExploringJsBuildServerUrl,
+          location: `${request.origin}/${eventSourceClientBuildRelativeUrlForProject}`,
         },
       }
     },
-    "/.jsenv/toolbar.main.js": (request) => {
-      const jsenvToolbarJsBuildServerUrl = `${request.origin}/${jsenvToolbarJsBuildRelativeUrlForProject}`
+    // unfortunately browser resolves sourcemap to url before redirection (not after).
+    // It means browser tries to load source map from "/.jsenv/jsenv-toolbar.js.map"
+    // we could also inline sourcemap but it's not yet possible
+    // inside buildProject
+    "/.jsenv/event_source_client.js.map": (request) => {
       return {
         status: 307,
         headers: {
-          location: jsenvToolbarJsBuildServerUrl,
+          location: `${request.origin}/${eventSourceClientBuildRelativeUrlForProject}.map`,
+        },
+      }
+    },
+  })
+}
+
+const createExploringIndexService = ({ projectDirectoryUrl }) => {
+  const jsenvExploringJsBuildRelativeUrlForProject = urlToRelativeUrl(
+    exploringIndexJsFileInfo.buildUrl,
+    projectDirectoryUrl,
+  )
+  return setupRoutes({
+    "/.jsenv/exploring.index.js": (request) => {
+      return {
+        status: 307,
+        headers: {
+          location: `${request.origin}/${jsenvExploringJsBuildRelativeUrlForProject}`,
         },
       }
     },
@@ -207,18 +235,37 @@ const createRedirectFilesService = ({
         },
       }
     },
+  })
+}
+
+const createToolbarService = ({ projectDirectoryUrl }) => {
+  const toolbarJsBuildRelativeUrlForProject = urlToRelativeUrl(
+    toolbarJsFileInfo.buildUrl,
+    projectDirectoryUrl,
+  )
+
+  return setupRoutes({
+    "/.jsenv/toolbar.main.js": (request) => {
+      const jsenvToolbarJsBuildServerUrl = `${request.origin}/${toolbarJsBuildRelativeUrlForProject}`
+      return {
+        status: 307,
+        headers: {
+          location: jsenvToolbarJsBuildServerUrl,
+        },
+      }
+    },
     "/.jsenv/jsenv_toolbar.js.map": (request) => {
       return {
         status: 307,
         headers: {
-          location: `${request.origin}/${jsenvToolbarJsBuildRelativeUrlForProject}.map`,
+          location: `${request.origin}/${toolbarJsBuildRelativeUrlForProject}.map`,
         },
       }
     },
   })
 }
 
-const createExploringDataService = ({
+const createExploringJsonService = ({
   projectDirectoryUrl,
   outDirectoryRelativeUrl,
   explorableConfig,
@@ -237,7 +284,7 @@ const createExploringDataService = ({
           projectDirectoryUrl,
         ),
         exploringHtmlFileRelativeUrl: urlToRelativeUrl(
-          jsenvExploringIndexHtmlFileInfo.url,
+          exploringIndexHtmlFileInfo.sourceUrl,
           projectDirectoryUrl,
         ),
         sourcemapMainFileRelativeUrl: urlToRelativeUrl(
@@ -266,7 +313,7 @@ const createExploringDataService = ({
   }
 }
 
-const createExplorableListAsJsonService = ({
+const createExplorableJsonService = ({
   projectDirectoryUrl,
   outDirectoryRelativeUrl,
   explorableConfig,

package/src/internal/compiling/compile-directory/validateCache.js

@@ -20,11 +20,6 @@ export const validateCache = async ({
 }) => {
   const validity = { isValid: true }
 
-  // disable cahce for html files so that we always parse the importmap file
-  if (compiledFileUrl.endsWith(".html")) {
-    return { isValid: false }
-  }
-
   const metaJsonFileUrl = `${compiledFileUrl}__asset__meta.json`
   const metaValidity = await validateMetaFile(metaJsonFileUrl)
   mergeValidity(validity, "meta", metaValidity)

package/src/internal/compiling/compileFile.js

@@ -5,7 +5,6 @@ import {
   bufferToEtag,
   urlIsInsideOf,
 } from "@jsenv/filesystem"
-import { normalizeImportMap, resolveImport } from "@jsenv/importmap"
 import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/internal/convertFileSystemErrorToResponseProperties.js"
 
 import { getOrGenerateCompiledFile } from "./compile-directory/getOrGenerateCompiledFile.js"
@@ -109,15 +108,10 @@ export const compileFile = async ({
     })
 
     if (request.http2) {
-      // js resolution is special, we cannot just do resolveUrl of the import specifier
-      // because there can be importmap (bare specifier, import without extension, custom remapping, ...)
-      // And we would push 404 to the browser
-      // Until we implement import map resolution pushing ressource for js imports is disabled
       const dependencyResolver = getDependencyResolver({
         compileResult,
         importmapInfos,
         request,
-        projectDirectoryUrl,
       })
       if (dependencyResolver) {
         compileResult.dependencies.forEach((dependency) => {
@@ -236,61 +230,30 @@ export const compileFile = async ({
   }
 }
 
-const getDependencyResolver = ({
-  compileResult,
-  importmapInfos,
-  request,
-  projectDirectoryUrl,
-}) => {
+const getDependencyResolver = ({ compileResult, importmapInfos, request }) => {
   const importmapKeys = Object.keys(importmapInfos)
   const requestUrl = resolveUrl(request.ressource, request.origin)
 
   if (
-    compileResult.contentType !== "application/javascript" ||
-    importmapKeys.length === 0
+    compileResult.contentType === "application/javascript" &&
+    // we cannot trust importmapKeys because when html is restored from cache
+    // it would be empty
+    importmapKeys.length > 0
   ) {
-    return {
-      type: "url_resolution",
-      resolve: (dependency) => {
-        const dependencyUrl = resolveUrl(dependency, requestUrl)
-        return dependencyUrl
-      },
-    }
-  }
-
-  const firstImportmapInfo = importmapInfos[importmapKeys[0]]
-  if (!firstImportmapInfo.text) {
+    // js resolution is special, we cannot just do resolveUrl of the import specifier
+    // because there can be importmap (bare specifier, import without extension, custom remapping, ...)
+    // And we would push 404 to the browser
+    // BUT I tried to push everything to the browser and it was a big fail:
+    // server is trying to push streams but browser rejects most push streams
+    // either because main file is already fetched or an other file request the same ressource
     return null
   }
 
-  if (
-    // we are aware only of 1 importmap
-    importmapKeys.length === 1 ||
-    // all importmaps are the same
-    importmapKeys.slice(1).every(({ url }) => url === firstImportmapInfo.url)
-  ) {
-    const importMapBaseUrl = resolveUrl(
-      urlToRelativeUrl(firstImportmapInfo.url, projectDirectoryUrl),
-      `${request.origin}/`,
-    )
-    const importMap = normalizeImportMap(
-      JSON.parse(firstImportmapInfo.text),
-      importMapBaseUrl,
-    )
-    return {
-      type: "importmap_resolution",
-      resolve: (dependency) => {
-        const dependencyUrl = resolveImport({
-          specifier: dependency,
-          importer: requestUrl,
-          importMap,
-        })
-        return dependencyUrl
-      },
-    }
+  return {
+    type: "url_resolution",
+    resolve: (dependency) => {
+      const dependencyUrl = resolveUrl(dependency, requestUrl)
+      return dependencyUrl
+    },
   }
-
-  // there is more than 2 importmaps, we cannot know which one to pick
-  // (not supposed ot happen because during dev you usually use a single importmap)
-  return null
 }

package/src/internal/compiling/createCompiledFileService.js

@@ -48,6 +48,7 @@ export const createCompiledFileService = ({
   groupMap,
   customCompilers,
 
+  jsenvEventSourceClientInjection,
   jsenvToolbarInjection,
 
   projectFileRequestedCallback,
@@ -197,6 +198,7 @@ export const createCompiledFileService = ({
 
           sourcemapMethod,
           sourcemapExcludeSources,
+          jsenvEventSourceClientInjection,
           jsenvToolbarInjection,
           onHtmlImportmapInfo: ({ htmlUrl, importmapInfo }) => {
             importmapInfos[htmlUrl] = importmapInfo

package/src/internal/compiling/html_source_file_service.js

@@ -22,11 +22,13 @@ import { moveImportMap } from "@jsenv/importmap"
 import { createDetailedMessage } from "@jsenv/logger"
 
 import { fetchUrl } from "@jsenv/core/src/internal/fetchUrl.js"
+import { jsenvBrowserSystemFileInfo } from "@jsenv/core/src/internal/jsenvInternalFiles.js"
+import { redirectorHtmlFileInfo } from "@jsenv/core/src/internal/dev_server/redirector/redirector_file_info.js"
+import { eventSourceClientFileInfo } from "@jsenv/core/src/internal/dev_server/event_source_client/event_source_client_file_info.js"
 import {
-  jsenvToolbarHtmlFileInfo,
-  jsenvBrowserSystemFileInfo,
-  jsenvToolbarInjectorFileInfo,
-} from "@jsenv/core/src/internal/jsenvInternalFiles.js"
+  toolbarInjectorFileInfo,
+  toolbarHtmlFileInfo,
+} from "@jsenv/core/src/internal/dev_server/toolbar/toolbar_file_info.js"
 import { stringifyDataUrl } from "@jsenv/core/src/internal/dataUrl.utils.js"
 import {
   parseHtmlString,
@@ -45,8 +47,10 @@ import {
 export const createTransformHtmlSourceFileService = ({
   logger,
   projectDirectoryUrl,
+  projectFileRequestedCallback,
   inlineImportMapIntoHTML,
   jsenvScriptInjection,
+  jsenvEventSourceClientInjection,
   jsenvToolbarInjection,
 }) => {
   /**
@@ -93,6 +97,7 @@ export const createTransformHtmlSourceFileService = ({
       }
       throw e
     }
+    projectFileRequestedCallback(relativeUrl, request)
     htmlInlineScriptMap.forEach((inlineScript, inlineScriptUrl) => {
       if (inlineScript.htmlFileUrl === fileUrl) {
         htmlInlineScriptMap.delete(inlineScriptUrl)
@@ -107,6 +112,7 @@ export const createTransformHtmlSourceFileService = ({
       pushResponse,
       inlineImportMapIntoHTML,
       jsenvScriptInjection,
+      jsenvEventSourceClientInjection,
       jsenvToolbarInjection,
       onInlineModuleScript: ({ scriptContent, scriptIdentifier }) => {
         const inlineScriptUrl = resolveUrl(scriptIdentifier, fileUrl)
@@ -138,8 +144,11 @@ const transformHTMLSourceFile = async ({
   inlineImportMapIntoHTML,
   jsenvScriptInjection,
   jsenvToolbarInjection,
+  jsenvEventSourceClientInjection,
   onInlineModuleScript = () => {},
 }) => {
+  fileUrl = urlWithoutSearch(fileUrl)
+
   const htmlAst = parseHtmlString(fileContent)
   if (inlineImportMapIntoHTML) {
     await inlineImportmapScripts({
@@ -154,23 +163,42 @@ const transformHTMLSourceFile = async ({
     jsenvBrowserSystemFileInfo.jsenvBuildUrl,
     projectDirectoryUrl,
   )
-  const jsenvToolbarInjectorBuildRelativeUrlForProject = urlToRelativeUrl(
-    jsenvToolbarInjectorFileInfo.jsenvBuildUrl,
+  const eventSourceClientBuildRelativeUrlForProject = urlToRelativeUrl(
+    eventSourceClientFileInfo.buildUrl,
+    projectDirectoryUrl,
+  )
+  const toolbarInjectorBuildRelativeUrlForProject = urlToRelativeUrl(
+    toolbarInjectorFileInfo.buildUrl,
     projectDirectoryUrl,
   )
   manipulateHtmlAst(htmlAst, {
     scriptInjections: [
-      ...(fileUrl !== jsenvToolbarHtmlFileInfo.url && jsenvScriptInjection
+      ...(fileUrl !== toolbarHtmlFileInfo.sourceUrl &&
+      fileUrl !== redirectorHtmlFileInfo.sourceUrl &&
+      jsenvScriptInjection
         ? [
             {
               src: `/${jsenvBrowserBuildUrlRelativeToProject}`,
             },
           ]
         : []),
-      ...(fileUrl !== jsenvToolbarHtmlFileInfo.url && jsenvToolbarInjection
+      ...(fileUrl !== toolbarHtmlFileInfo.sourceUrl &&
+      fileUrl !== redirectorHtmlFileInfo.sourceUrl &&
+      jsenvEventSourceClientInjection
+        ? [
+            {
+              src: `/${eventSourceClientBuildRelativeUrlForProject}`,
+            },
+          ]
+        : []),
+      ...(fileUrl !== toolbarHtmlFileInfo.sourceUrl &&
+      fileUrl !== redirectorHtmlFileInfo.sourceUrl &&
+      jsenvToolbarInjection
         ? [
             {
-              src: `/${jsenvToolbarInjectorBuildRelativeUrlForProject}`,
+              src: `/${toolbarInjectorBuildRelativeUrlForProject}`,
+              defer: "",
+              async: "",
             },
           ]
         : []),
@@ -401,3 +429,9 @@ const getJsenvForceInlineAttribute = (htmlNode) => {
   )
   return jsenvForceInlineAttribute
 }
+
+const urlWithoutSearch = (url) => {
+  const urlObject = new URL(url)
+  urlObject.search = ""
+  return urlObject.href
+}

package/src/internal/compiling/jsenvCompilerForHtml.js

@@ -2,11 +2,12 @@ import { resolveUrl, urlToRelativeUrl } from "@jsenv/filesystem"
 import { moveImportMap, composeTwoImportMaps } from "@jsenv/importmap"
 import { createDetailedMessage } from "@jsenv/logger"
 
+import { jsenvBrowserSystemFileInfo } from "@jsenv/core/src/internal/jsenvInternalFiles.js"
+import { eventSourceClientFileInfo } from "@jsenv/core/src/internal/dev_server/event_source_client/event_source_client_file_info.js"
 import {
-  jsenvBrowserSystemFileInfo,
-  jsenvToolbarHtmlFileInfo,
-  jsenvToolbarInjectorFileInfo,
-} from "@jsenv/core/src/internal/jsenvInternalFiles.js"
+  toolbarInjectorFileInfo,
+  toolbarHtmlFileInfo,
+} from "@jsenv/core/src/internal/dev_server/toolbar/toolbar_file_info.js"
 import { fetchUrl } from "@jsenv/core/src/internal/fetchUrl.js"
 import { getDefaultImportMap } from "@jsenv/core/src/internal/import-resolution/importmap-default.js"
 import {
@@ -49,6 +50,7 @@ export const compileHtml = async ({
   sourcemapMethod,
 
   jsenvScriptInjection = true,
+  jsenvEventSourceClientInjection,
   jsenvToolbarInjection,
   onHtmlImportmapInfo,
 }) => {
@@ -56,8 +58,12 @@ export const compileHtml = async ({
     jsenvBrowserSystemFileInfo.jsenvBuildUrl,
     projectDirectoryUrl,
   )
-  const jsenvToolbarInjectorBuildRelativeUrlForProject = urlToRelativeUrl(
-    jsenvToolbarInjectorFileInfo.jsenvBuildUrl,
+  const eventSourceClientBuildRelativeUrlForProject = urlToRelativeUrl(
+    eventSourceClientFileInfo.buildUrl,
+    projectDirectoryUrl,
+  )
+  const toolbarInjectorBuildRelativeUrlForProject = urlToRelativeUrl(
+    toolbarInjectorFileInfo.buildUrl,
     projectDirectoryUrl,
   )
 
@@ -68,19 +74,31 @@ export const compileHtml = async ({
     await mutateRessourceHints(htmlAst)
   }
 
+  const urlNoSearch = urlWithoutSearch(url)
+
   manipulateHtmlAst(htmlAst, {
     scriptInjections: [
-      ...(url !== jsenvToolbarHtmlFileInfo.url && jsenvScriptInjection
+      ...(urlNoSearch !== toolbarHtmlFileInfo.sourceUrl && jsenvScriptInjection
         ? [
             {
               src: `/${jsenvBrowserBuildUrlRelativeToProject}`,
             },
           ]
         : []),
-      ...(url !== jsenvToolbarHtmlFileInfo.url && jsenvToolbarInjection
+      ...(urlNoSearch !== toolbarHtmlFileInfo.sourceUrl &&
+      jsenvEventSourceClientInjection
+        ? [
+            {
+              src: `/${eventSourceClientBuildRelativeUrlForProject}`,
+            },
+          ]
+        : []),
+      ...(urlNoSearch !== toolbarHtmlFileInfo.sourceUrl && jsenvToolbarInjection
         ? [
             {
-              src: `/${jsenvToolbarInjectorBuildRelativeUrlForProject}`,
+              src: `/${toolbarInjectorBuildRelativeUrlForProject}`,
+              defer: "",
+              async: "",
             },
           ]
         : []),
@@ -387,3 +405,9 @@ const mutateRessourceHints = async (htmlAst) => {
   )
   mutations.forEach((mutation) => mutation())
 }
+
+const urlWithoutSearch = (url) => {
+  const urlObject = new URL(url)
+  urlObject.search = ""
+  return urlObject.href
+}

package/src/internal/compiling/startCompileServer.js

@@ -104,8 +104,9 @@ export const startCompileServer = async ({
   plugins,
   livereloadSSE = false,
   transformHtmlSourceFiles = true,
-  jsenvToolbarInjection = false,
   jsenvScriptInjection = true,
+  jsenvEventSourceClientInjection = false,
+  jsenvToolbarInjection = false,
   inlineImportMapIntoHTML = true,
 }) => {
   assertArguments({
@@ -312,6 +313,7 @@ export const startCompileServer = async ({
       customCompilers,
       moduleOutFormat,
       importMetaFormat,
+      jsenvEventSourceClientInjection,
       jsenvToolbarInjection,
 
       projectFileRequestedCallback,
@@ -327,8 +329,10 @@ export const startCompileServer = async ({
             createTransformHtmlSourceFileService({
               logger,
               projectDirectoryUrl,
+              projectFileRequestedCallback,
               inlineImportMapIntoHTML,
               jsenvScriptInjection,
+              jsenvEventSourceClientInjection,
               jsenvToolbarInjection,
             }),
         }