@jsenv/core 27.0.0-alpha.63 → 27.0.0-alpha.66

package/src/build/inject_global_version_mappings.js

@@ -41,7 +41,11 @@ const injectVersionMappings = async ({ urlInfo, kitchen, versionMappings }) => {
 
 const jsInjector = (urlInfo, { versionMappings }) => {
   const magicSource = createMagicSource(urlInfo.content)
-  magicSource.prepend(generateClientCodeForVersionMappings(versionMappings))
+  magicSource.prepend(
+    generateClientCodeForVersionMappings(versionMappings, {
+      globalName: urlInfo.data.isWebWorkerEntryPoint ? "self" : "window",
+    }),
+  )
   return magicSource.toContentAndSourcemap()
 }
 
@@ -57,7 +61,9 @@ const injectors = {
       htmlAst,
       createHtmlNode({
         "tagName": "script",
-        "textContent": generateClientCodeForVersionMappings(versionMappings),
+        "textContent": generateClientCodeForVersionMappings(versionMappings, {
+          globalName: "window",
+        }),
         "injected-by": "jsenv:versioning",
       }),
     )
@@ -69,12 +75,19 @@ const injectors = {
   js_module: jsInjector,
 }
 
-const generateClientCodeForVersionMappings = (versionMappings) => {
+const generateClientCodeForVersionMappings = (
+  versionMappings,
+  { globalName },
+) => {
   return `
+;(function() {
+
 var __versionMappings__ = ${JSON.stringify(versionMappings, null, "  ")};
-var __envGlobal__ = typeof self === 'undefined' ? global : self;
-__envGlobal__.__v__ = function (specifier) {
+${globalName}.__v__ = function (specifier) {
   return __versionMappings__[specifier] || specifier
 };
+
+})();
+
 `
 }

package/src/build/inject_service_worker_urls.js

@@ -22,7 +22,7 @@ export const injectServiceWorkerUrls = async ({
   }
   const serviceWorkerUrls = {}
   GRAPH.forEach(finalGraph, (urlInfo) => {
-    if (urlInfo.isInline || urlInfo.external) {
+    if (urlInfo.isInline || !urlInfo.shouldHandle) {
       return
     }
     if (!urlInfo.url.startsWith("file:")) {

package/src/build/resync_ressource_hints.js

@@ -16,9 +16,11 @@ import {
 import { GRAPH } from "./graph_utils.js"
 
 export const resyncRessourceHints = async ({
+  logger,
   finalGraphKitchen,
   finalGraph,
-  buildUrls,
+  rawUrls,
+  postBuildRedirections,
 }) => {
   const ressourceHintActions = []
   GRAPH.forEach(finalGraph, (urlInfo) => {
@@ -29,20 +31,62 @@ export const resyncRessourceHints = async ({
       const htmlAst = parseHtmlString(urlInfo.content, {
         storeOriginalPositions: false,
       })
+      const actions = []
       const visitLinkWithHref = (linkNode, hrefAttribute) => {
         const href = hrefAttribute.value
         if (!href || href.startsWith("data:")) {
           return
         }
-        const buildUrl = buildUrls[href]
+        const relAttribute = getHtmlNodeAttributeByName(linkNode, "rel")
+        const rel = relAttribute ? relAttribute.value : undefined
+        const isRessourceHint = [
+          "preconnect",
+          "dns-prefetch",
+          "prefetch",
+          "preload",
+          "modulepreload",
+        ].includes(rel)
+        if (!isRessourceHint) {
+          return
+        }
+
+        let buildUrl
+        for (const key of Object.keys(rawUrls)) {
+          if (rawUrls[key] === href) {
+            buildUrl = key
+            break
+          }
+        }
+        if (!buildUrl) {
+          logger.warn(`remove ressource hint because cannot find "${href}"`)
+          actions.push(() => {
+            removeHtmlNode(linkNode)
+          })
+          return
+        }
+        buildUrl = postBuildRedirections[buildUrl] || buildUrl
         const urlInfo = finalGraph.getUrlInfo(buildUrl)
         if (!urlInfo) {
+          logger.warn(
+            `remove ressource hint because cannot find "${buildUrl}" in the graph`,
+          )
+          actions.push(() => {
+            removeHtmlNode(linkNode)
+          })
           return
         }
         if (urlInfo.dependents.size === 0) {
-          removeHtmlNode(linkNode)
+          logger.warn(
+            `remove ressource hint because "${href}" not used anymore`,
+          )
+          actions.push(() => {
+            removeHtmlNode(linkNode)
+          })
           return
         }
+        actions.push(() => {
+          hrefAttribute.value = urlInfo.data.buildUrlSpecifier
+        })
       }
       visitHtmlAst(htmlAst, (node) => {
         if (node.nodeName !== "link") {
@@ -54,12 +98,15 @@ export const resyncRessourceHints = async ({
         }
         visitLinkWithHref(node, hrefAttribute)
       })
-      await finalGraphKitchen.urlInfoTransformer.applyFinalTransformations(
-        urlInfo,
-        {
-          content: stringifyHtmlAst(htmlAst),
-        },
-      )
+      if (actions.length) {
+        actions.forEach((action) => action())
+        await finalGraphKitchen.urlInfoTransformer.applyFinalTransformations(
+          urlInfo,
+          {
+            content: stringifyHtmlAst(htmlAst),
+          },
+        )
+      }
     })
   })
   await Promise.all(

package/src/build/start_build_server.js

@@ -21,6 +21,7 @@ import {
   pluginRequestWaitingCheck,
   pluginCORS,
   fetchFileSystem,
+  composeServices,
 } from "@jsenv/server"
 import {
   assertAndNormalizeDirectoryUrl,
@@ -44,6 +45,7 @@ export const startBuildServer = async ({
   listenAnyIp,
   ip,
   port = 9779,
+  services = {},
 
   rootDirectoryUrl,
   buildDirectoryUrl,
@@ -146,10 +148,7 @@ export const startBuildServer = async ({
         accessControlAllowRequestOrigin: true,
         accessControlAllowRequestMethod: true,
         accessControlAllowRequestHeaders: true,
-        accessControlAllowedRequestHeaders: [
-          ...jsenvAccessControlAllowedHeaders,
-          "x-jsenv-execution-id",
-        ],
+        accessControlAllowedRequestHeaders: jsenvAccessControlAllowedHeaders,
         accessControlAllowCredentials: true,
       }),
       ...pluginServerTiming(),
@@ -158,31 +157,13 @@ export const startBuildServer = async ({
       }),
     },
     sendErrorDetails: true,
-    requestToResponse: (request) => {
-      const urlIsVersioned = new URL(
-        request.ressource,
-        request.origin,
-      ).searchParams.has("v")
-      if (mainBuildFileUrl && request.ressource === "/") {
-        request = {
-          ...request,
-          ressource: mainBuildFileUrl,
-        }
-      }
-      return fetchFileSystem(
-        new URL(request.ressource.slice(1), buildDirectoryUrl),
-        {
-          headers: request.headers,
-          cacheControl: urlIsVersioned
-            ? `private,max-age=${SECONDS_IN_30_DAYS},immutable`
-            : "private,max-age=0,must-revalidate",
-          etagEnabled: true,
-          compressionEnabled: !request.pathname.endsWith(".mp4"),
-          rootDirectoryUrl: buildDirectoryUrl,
-          canReadDirectory: true,
-        },
-      )
-    },
+    requestToResponse: composeServices({
+      ...services,
+      build_files_service: createBuildFilesService({
+        buildDirectoryUrl,
+        mainBuildFileUrl,
+      }),
+    }),
   })
   startBuildServerTask.done()
   logger.info(``)
@@ -199,4 +180,32 @@ export const startBuildServer = async ({
   }
 }
 
+const createBuildFilesService = ({ buildDirectoryUrl, mainBuildFileUrl }) => {
+  return (request) => {
+    const urlIsVersioned = new URL(
+      request.ressource,
+      request.origin,
+    ).searchParams.has("v")
+    if (mainBuildFileUrl && request.ressource === "/") {
+      request = {
+        ...request,
+        ressource: mainBuildFileUrl,
+      }
+    }
+    return fetchFileSystem(
+      new URL(request.ressource.slice(1), buildDirectoryUrl),
+      {
+        headers: request.headers,
+        cacheControl: urlIsVersioned
+          ? `private,max-age=${SECONDS_IN_30_DAYS},immutable`
+          : "private,max-age=0,must-revalidate",
+        etagEnabled: true,
+        compressionEnabled: !request.pathname.endsWith(".mp4"),
+        rootDirectoryUrl: buildDirectoryUrl,
+        canReadDirectory: true,
+      },
+    )
+  }
+}
+
 const SECONDS_IN_30_DAYS = 60 * 60 * 24 * 30

package/src/dev/plugins/explorer/client/explorer.html

@@ -4,7 +4,7 @@
     <title>Exploring</title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta charset="utf-8" />
-    <link rel="icon" href="FAVICON_HREF" />
+    <link rel="icon" href="virtual:FAVICON_HREF" />
     <style>
       button:focus,
       a:focus,

package/src/dev/plugins/explorer/jsenv_plugin_explorer.js

@@ -41,7 +41,7 @@ export const jsenvPluginExplorer = ({ groups }) => {
       }))
       let html = String(readFileSync(new URL(htmlClientFileUrl)))
       html = html.replace(
-        "FAVICON_HREF",
+        "virtual:FAVICON_HREF",
         DataUrl.stringify({
           contentType: CONTENT_TYPE.fromUrlExtension(faviconClientFileUrl),
           base64Flag: true,

package/src/dev/start_dev_server.js

@@ -14,7 +14,7 @@ import { createKitchen } from "@jsenv/core/src/omega/kitchen.js"
 import { startOmegaServer } from "@jsenv/core/src/omega/omega_server.js"
 
 import { jsenvPluginExplorer } from "./plugins/explorer/jsenv_plugin_explorer.js"
-import { jsenvPluginToolbar } from "./plugins/toolbar/jsenv_plugin_toolbar.js"
+// import { jsenvPluginToolbar } from "./plugins/toolbar/jsenv_plugin_toolbar.js"
 
 export const startDevServer = async ({
   signal = new AbortController().signal,
@@ -53,7 +53,18 @@ export const startDevServer = async ({
   clientAutoreload = true,
 
   sourcemaps = "inline",
+  // default runtimeCompat assume dev server will be request by recent browsers
+  // Used by "jsenv_plugin_node_runtime.js" to deactivate itself
+  // If dev server can be requested by Node.js to exec files
+  // we would add "node" to the potential runtimes. For now it's out of the scope of the dev server
+  // and "jsenv_plugin_node_runtime.js" applies only during build made for node.js
+  runtimeCompat = {
+    chrome: "100",
+    firefox: "100",
+    safari: "15.5",
+  },
   plugins = [],
+  urlAnalysis = {},
   htmlSupervisor = true,
   injectedGlobals,
   nodeEsmResolution,
@@ -68,7 +79,7 @@ export const startDevServer = async ({
       "./test/**/*.test.html": true,
     },
   },
-  toolbar = false,
+  // toolbar = false,
   writeGeneratedFiles = true,
 }) => {
   const logger = createLogger({ logLevel })
@@ -164,6 +175,7 @@ export const startDevServer = async ({
     rootDirectoryUrl,
     urlGraph,
     scenario: "dev",
+    runtimeCompat,
     sourcemaps,
     writeGeneratedFiles,
     plugins: [
@@ -172,7 +184,9 @@ export const startDevServer = async ({
         rootDirectoryUrl,
         urlGraph,
         scenario: "dev",
+        runtimeCompat,
 
+        urlAnalysis,
         htmlSupervisor,
         injectedGlobals,
         nodeEsmResolution,
@@ -185,7 +199,7 @@ export const startDevServer = async ({
       jsenvPluginExplorer({
         groups: explorerGroups,
       }),
-      ...(toolbar ? [jsenvPluginToolbar(toolbar)] : []),
+      // ...(toolbar ? [jsenvPluginToolbar(toolbar)] : []),
     ],
   })
   const server = await startOmegaServer({
@@ -210,7 +224,7 @@ export const startDevServer = async ({
   logger.info(``)
   server.addEffect(() => {
     return () => {
-      kitchen.pluginController.callHooks("destroy")
+      kitchen.pluginController.callHooks("destroy", {})
     }
   })
   return {

package/src/execute/execute.js

@@ -68,6 +68,7 @@ export const execute = async ({
   }
   if (runtime.needsServer) {
     const urlGraph = createUrlGraph()
+    const runtimeCompat = { [runtime.name]: runtime.version }
     const kitchen = createKitchen({
       signal,
       logger,
@@ -75,6 +76,7 @@ export const execute = async ({
       urlGraph,
       scenario,
       sourcemaps,
+      runtimeCompat,
       writeGeneratedFiles,
       plugins: [
         ...plugins,
@@ -82,6 +84,7 @@ export const execute = async ({
           rootDirectoryUrl,
           urlGraph,
           scenario,
+          runtimeCompat,
 
           htmlSupervisor,
           injectedGlobals,

package/src/execute/runtimes/browsers/from_playwright.js

@@ -216,9 +216,14 @@ export const createRuntimeFromPlaywright = ({
       },
     })
     cleanupCallbackList.add(removeConsoleListener)
+    const actionOperation = Abort.startOperation()
+    actionOperation.addAbortSignal(signal)
     const winnerPromise = new Promise((resolve, reject) => {
       raceCallbacks(
         {
+          aborted: (cb) => {
+            return actionOperation.addAbortCallback(cb)
+          },
           // https://github.com/GoogleChrome/puppeteer/blob/v1.4.0/docs/api.md#event-error
           error: (cb) => {
             return registerEvent({
@@ -317,6 +322,11 @@ export const createRuntimeFromPlaywright = ({
 
     const getResult = async () => {
       const winner = await winnerPromise
+      if (winner.name === "aborted") {
+        return {
+          status: "aborted",
+        }
+      }
       if (winner.name === "error" || winner.name === "pageerror") {
         const error = winner.data
         return {

package/src/execute/runtimes/node/node_process.js

@@ -162,6 +162,9 @@ nodeProcess.run = async ({
   const winnerPromise = new Promise((resolve) => {
     raceCallbacks(
       {
+        aborted: (cb) => {
+          return actionOperation.addAbortCallback(cb)
+        },
         // https://nodejs.org/api/child_process.html#child_process_event_disconnect
         // disconnect: (cb) => {
         //   return onceProcessEvent(childProcess, "disconnect", cb)
@@ -194,6 +197,11 @@ nodeProcess.run = async ({
       },
     })
     const winner = await winnerPromise
+    if (winner.name === "aborted") {
+      return {
+        status: "aborted",
+      }
+    }
     if (winner.name === "error") {
       const error = winner.data
       removeOutputListener()

package/src/omega/errors.js

@@ -97,13 +97,16 @@ export const createTransformUrlContentError = ({
     ...details
   }) => {
     const transformError = new Error(
-      createDetailedMessage(`Failed to transform ${urlInfo.type} url content`, {
-        reason,
-        ...details,
-        "url": urlInfo.url,
-        "url reference trace": reference.trace,
-        ...detailsFromPluginController(pluginController),
-      }),
+      createDetailedMessage(
+        `Failed to transform url content of "${urlInfo.type}"`,
+        {
+          reason,
+          ...details,
+          "url": urlInfo.url,
+          "url reference trace": reference.trace,
+          ...detailsFromPluginController(pluginController),
+        },
+      ),
     )
     transformError.name = "TRANSFORM_URL_CONTENT_ERROR"
     transformError.code = code