@jsenv/core 27.6.0 → 27.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.6.0",
+  "version": "27.8.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -73,8 +73,8 @@
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "3.1.0",
     "@jsenv/node-esm-resolution": "0.1.0",
-    "@jsenv/server": "13.0.0",
-    "@jsenv/sourcemap": "1.0.3",
+    "@jsenv/server": "13.1.0",
+    "@jsenv/sourcemap": "1.0.4",
     "@jsenv/uneval": "1.6.0",
     "@jsenv/url-meta": "7.0.0",
     "@jsenv/urls": "1.2.7",
@@ -109,7 +109,7 @@
     "eslint-plugin-html": "7.0.0",
     "eslint-plugin-import": "2.26.0",
     "eslint-plugin-react": "7.30.1",
-    "playwright": "1.23.4",
+    "playwright": "1.24.1",
     "prettier": "2.7.1"
   }
 }

package/src/build/build.js

@@ -47,6 +47,20 @@ import { createVersionGenerator } from "./version_generator.js"
 import { injectServiceWorkerUrls } from "./inject_service_worker_urls.js"
 import { resyncRessourceHints } from "./resync_ressource_hints.js"
 
+// default runtimeCompat corresponds to
+// "we can keep <script type="module"> intact":
+// so script_type_module + dynamic_import + import_meta
+export const defaultRuntimeCompat = {
+  // android: "8",
+  chrome: "64",
+  edge: "79",
+  firefox: "67",
+  ios: "12",
+  opera: "51",
+  safari: "11.3",
+  samsung: "9.2",
+}
+
 /**
  * Generate an optimized version of source files into a directory
  * @param {Object} buildParameters
@@ -85,19 +99,7 @@ export const build = async ({
   entryPoints = {},
   baseUrl = "/",
 
-  // default runtimeCompat corresponds to
-  // "we can keep <script type="module"> intact":
-  // so script_type_module + dynamic_import + import_meta
-  runtimeCompat = {
-    // android: "8",
-    chrome: "64",
-    edge: "79",
-    firefox: "67",
-    ios: "12",
-    opera: "51",
-    safari: "11.3",
-    samsung: "9.2",
-  },
+  runtimeCompat = defaultRuntimeCompat,
   plugins = [],
   sourcemaps = false,
   sourcemapsSourcesContent,
@@ -173,7 +175,7 @@ build ${entryPointKeys.length} entry points`)
       logger,
       rootDirectoryUrl,
       urlGraph: rawGraph,
-      scenario: "build",
+      scenarios: { build: true },
       sourcemaps,
       sourcemapsSourcesContent,
       runtimeCompat,
@@ -200,7 +202,6 @@ build ${entryPointKeys.length} entry points`)
         ...getCorePlugins({
           rootDirectoryUrl,
           urlGraph: rawGraph,
-          scenario: "build",
           runtimeCompat,
 
           urlAnalysis,
@@ -421,7 +422,7 @@ build ${entryPointKeys.length} entry points`)
       logger,
       rootDirectoryUrl,
       urlGraph: finalGraph,
-      scenario: "build",
+      scenarios: { build: true },
       sourcemaps,
       sourcemapsSourcesContent,
       sourcemapsRelativeSources: !versioning,
@@ -1061,7 +1062,7 @@ const applyUrlVersioning = async ({
       logger,
       rootDirectoryUrl: buildDirectoryUrl,
       urlGraph: finalGraph,
-      scenario: "build",
+      scenarios: { build: true },
       sourcemaps,
       sourcemapsSourcesContent,
       sourcemapsRelativeSources: true,
@@ -1076,7 +1077,7 @@ const applyUrlVersioning = async ({
         }),
         {
           name: "jsenv:versioning",
-          appliesDuring: { build: true },
+          appliesDuring: "build",
           resolveUrl: (reference) => {
             const buildUrl = buildUrls[reference.specifier]
             if (buildUrl) {

package/src/dev/start_dev_server.js

@@ -7,6 +7,7 @@ import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
 import { createLogger, loggerToLevels, createTaskLog } from "@jsenv/log"
 import { getCallerPosition } from "@jsenv/urls"
 
+import { defaultRuntimeCompat } from "@jsenv/core/src/build/build.js"
 import { createReloadableWorker } from "@jsenv/core/src/helpers/worker_reload.js"
 import { startOmegaServer } from "@jsenv/core/src/omega/omega_server.js"
 
@@ -41,16 +42,10 @@ export const startDevServer = async ({
   devServerMainFile = getCallerPosition().url,
   cooldownBetweenFileEvents,
 
-  // 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",
-  },
+  // runtimeCompat is the runtimeCompat for the build
+  // when specified, dev server use it to warn in case
+  // code would be supported during dev but not after build
+  runtimeCompat = defaultRuntimeCompat,
   plugins = [],
   urlAnalysis = {},
   htmlSupervisor = true,
@@ -160,8 +155,9 @@ export const startDevServer = async ({
     services,
 
     rootDirectoryUrl,
-    scenario: "dev",
+    scenarios: { dev: true },
     runtimeCompat,
+
     plugins,
     urlAnalysis,
     htmlSupervisor,

package/src/execute/execute.js

@@ -24,7 +24,7 @@ export const execute = async ({
   runtime,
   runtimeParams,
 
-  scenario = "dev",
+  scenarios = { dev: true },
   plugins = [],
   nodeEsmResolution,
   fileSystemMagicResolution,
@@ -75,7 +75,7 @@ export const execute = async ({
       privateKey,
 
       rootDirectoryUrl,
-      scenario,
+      scenarios,
       runtimeCompat: { [runtime.name]: runtime.version },
 
       plugins,

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

@@ -2,7 +2,7 @@ import { createRuntimeFromPlaywright } from "./from_playwright.js"
 
 export const chromium = createRuntimeFromPlaywright({
   browserName: "chromium",
-  browserVersion: "104.0.5112.20", // to update, check https://github.com/microsoft/playwright/releases
+  browserVersion: "104.0.5112.48", // to update, check https://github.com/microsoft/playwright/releases
   coveragePlaywrightAPIAvailable: true,
 })
 export const chromiumIsolatedTab = chromium.isolatedTab

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

@@ -2,6 +2,6 @@ import { createRuntimeFromPlaywright } from "./from_playwright.js"
 
 export const firefox = createRuntimeFromPlaywright({
   browserName: "firefox",
-  browserVersion: "100.0.2", // to update, check https://github.com/microsoft/playwright/releases
+  browserVersion: "102.0", // to update, check https://github.com/microsoft/playwright/releases
 })
 export const firefoxIsolatedTab = firefox.isolatedTab

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

@@ -2,7 +2,7 @@ import { createRuntimeFromPlaywright } from "./from_playwright.js"
 
 export const webkit = createRuntimeFromPlaywright({
   browserName: "webkit",
-  browserVersion: "15.4", // to update, check https://github.com/microsoft/playwright/releases
+  browserVersion: "16.0", // to update, check https://github.com/microsoft/playwright/releases
   ignoreErrorHook: (error) => {
     // we catch error during execution but safari throw unhandled rejection
     // in a non-deterministic way.

package/src/omega/kitchen.js

@@ -28,18 +28,14 @@ export const createKitchen = ({
   logLevel,
 
   rootDirectoryUrl,
-  scenario,
+  scenarios,
   runtimeCompat,
   // during dev/test clientRuntimeCompat is a single runtime
   // during build clientRuntimeCompat is runtimeCompat
   clientRuntimeCompat = runtimeCompat,
   urlGraph,
   plugins,
-  sourcemaps = {
-    dev: "inline", // "programmatic" and "file" also allowed
-    test: "inline",
-    build: "none",
-  }[scenario],
+  sourcemaps = scenarios.dev ? "inline" : "none", // "programmatic" and "file" also allowed
   sourcemapsSourcesProtocol,
   sourcemapsSourcesContent,
   sourcemapsRelativeSources,
@@ -48,7 +44,7 @@ export const createKitchen = ({
   const logger = createLogger({ logLevel })
   const pluginController = createPluginController({
     plugins,
-    scenario,
+    scenarios,
   })
   const jsenvDirectoryUrl = new URL(".jsenv/", rootDirectoryUrl).href
   const kitchenContext = {
@@ -56,7 +52,7 @@ export const createKitchen = ({
     logger,
     rootDirectoryUrl,
     urlGraph,
-    scenario,
+    scenarios,
     runtimeCompat,
     clientRuntimeCompat,
     isSupportedOnCurrentClients: (feature) => {
@@ -769,12 +765,11 @@ const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
       column: reference.specifierColumn,
     }
     urlInfo.contentType = reference.contentType
-    urlInfo.originalContent =
-      context.scenario === "build"
-        ? urlInfo.originalContent === undefined
-          ? reference.content
-          : urlInfo.originalContent
-        : reference.content
+    urlInfo.originalContent = context.scenarios.build
+      ? urlInfo.originalContent === undefined
+        ? reference.content
+        : urlInfo.originalContent
+      : reference.content
     urlInfo.content = reference.content
   }
 }

package/src/omega/omega_server.js

@@ -5,6 +5,7 @@ import {
   jsenvServiceErrorHandler,
 } from "@jsenv/server"
 import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/internal/convertFileSystemErrorToResponseProperties.js"
+import { createServerEventsDispatcher } from "@jsenv/core/src/plugins/server_events/server_events_dispatcher.js"
 
 import { createFileService } from "./server/file_service.js"
 
@@ -24,7 +25,7 @@ export const startOmegaServer = async ({
   services = [],
 
   rootDirectoryUrl,
-  scenario,
+  scenarios,
   runtimeCompat,
 
   plugins,
@@ -43,6 +44,10 @@ export const startOmegaServer = async ({
   writeGeneratedFiles,
 }) => {
   const serverStopCallbacks = []
+  const serverEventsDispatcher = createServerEventsDispatcher()
+  serverStopCallbacks.push(() => {
+    serverEventsDispatcher.destroy()
+  })
   const server = await startServer({
     signal,
     stopOnExit: false,
@@ -79,9 +84,10 @@ export const startOmegaServer = async ({
           signal,
           logLevel,
           serverStopCallbacks,
+          serverEventsDispatcher,
 
           rootDirectoryUrl,
-          scenario,
+          scenarios,
           runtimeCompat,
 
           plugins,
@@ -99,6 +105,11 @@ export const startOmegaServer = async ({
           sourcemapsSourcesContent,
           writeGeneratedFiles,
         }),
+        handleWebsocket: (websocket, { request }) => {
+          if (request.headers["sec-websocket-protocol"] === "jsenv") {
+            serverEventsDispatcher.addWebsocket(websocket, request)
+          }
+        },
       },
       {
         name: "jsenv:omega_error_handler",

package/src/omega/server/file_service.js

@@ -10,7 +10,6 @@ import { URL_META } from "@jsenv/url-meta"
 import { getCorePlugins } from "@jsenv/core/src/plugins/plugins.js"
 import { createUrlGraph } from "@jsenv/core/src/omega/url_graph.js"
 import { createKitchen } from "@jsenv/core/src/omega/kitchen.js"
-import { createServerEventsDispatcher } from "@jsenv/core/src/plugins/server_events/server_events_dispatcher.js"
 import { jsenvPluginServerEventsClientInjection } from "@jsenv/core/src/plugins/server_events/jsenv_plugin_server_events_client_injection.js"
 import { parseUserAgentHeader } from "./user_agent.js"
 
@@ -18,9 +17,10 @@ export const createFileService = ({
   signal,
   logLevel,
   serverStopCallbacks,
+  serverEventsDispatcher,
 
   rootDirectoryUrl,
-  scenario,
+  scenarios,
   runtimeCompat,
 
   plugins,
@@ -53,7 +53,7 @@ export const createFileService = ({
     ".jsenv/": false,
   }
 
-  if (scenario === "dev") {
+  if (scenarios.dev) {
     const stopWatchingClientFiles = registerDirectoryLifecycle(
       rootDirectoryUrl,
       {
@@ -99,13 +99,13 @@ export const createFileService = ({
         })
         urlInfo.isValid = () => watch
       },
-      includeOriginalUrls: scenario === "dev",
+      includeOriginalUrls: scenarios.dev,
     })
     const kitchen = createKitchen({
       signal,
       logLevel,
       rootDirectoryUrl,
-      scenario,
+      scenarios,
       runtimeCompat,
       clientRuntimeCompat: {
         [runtimeName]: runtimeVersion,
@@ -115,7 +115,6 @@ export const createFileService = ({
         ...plugins,
         ...getCorePlugins({
           rootDirectoryUrl,
-          scenario,
           runtimeCompat,
 
           urlAnalysis,
@@ -152,15 +151,11 @@ export const createFileService = ({
       })
       const serverEventNames = Object.keys(allServerEvents)
       if (serverEventNames.length > 0) {
-        const serverEventsDispatcher = createServerEventsDispatcher()
-        serverStopCallbacks.push(() => {
-          serverEventsDispatcher.destroy()
-        })
         Object.keys(allServerEvents).forEach((serverEventName) => {
           allServerEvents[serverEventName]({
             rootDirectoryUrl,
             urlGraph,
-            scenario,
+            scenarios,
             sendServerEvent: (data) => {
               serverEventsDispatcher.dispatch({
                 type: serverEventName,
@@ -169,19 +164,7 @@ export const createFileService = ({
             },
           })
         })
-        // "unshift" because serve must come first to catch event source client request
-        kitchen.pluginController.unshiftPlugin({
-          name: "jsenv:provide_server_events",
-          serve: (request) => {
-            const { accept } = request.headers
-            if (accept && accept.includes("text/event-stream")) {
-              const room = serverEventsDispatcher.addRoom(request)
-              return room.join(request)
-            }
-            return null
-          },
-        })
-        // "push" so that event source client connection can be put as early as possible in html
+        // "pushPlugin" so that event source client connection can be put as early as possible in html
         kitchen.pluginController.pushPlugin(
           jsenvPluginServerEventsClientInjection(),
         )
@@ -190,7 +173,7 @@ export const createFileService = ({
 
     const context = {
       rootDirectoryUrl,
-      scenario,
+      scenarios,
       runtimeName,
       runtimeVersion,
       urlGraph,
@@ -276,10 +259,11 @@ export const createFileService = ({
       await kitchen.cook(urlInfo, {
         request,
         reference,
-        outDirectoryUrl:
-          scenario === "dev"
-            ? `${rootDirectoryUrl}.jsenv/${runtimeName}@${runtimeVersion}/`
-            : `${rootDirectoryUrl}.jsenv/${scenario}/${runtimeName}@${runtimeVersion}/`,
+        outDirectoryUrl: scenarios.dev
+          ? `${rootDirectoryUrl}.jsenv/${runtimeName}@${runtimeVersion}/`
+          : `${rootDirectoryUrl}.jsenv/${
+              scenarios.test ? "test" : "build"
+            }/${runtimeName}@${runtimeVersion}/`,
       })
       let { response } = urlInfo
       if (response) {

package/src/plugins/autoreload/client/autoreload.js

@@ -192,10 +192,9 @@ const applyHotReload = async ({ hotInstructions }) => {
 }
 
 window.__reloader__ = reloader
-window.__server_events__.addEventCallbacks({
-  reload: ({ data }) => {
-    const reloadMessage = JSON.parse(data)
-    reloader.addMessage(reloadMessage)
+window.__server_events__.listenEvents({
+  reload: (reloadServerEvent) => {
+    reloader.addMessage(reloadServerEvent.data)
   },
 })
 

package/src/plugins/autoreload/jsenv_plugin_autoreload.js

@@ -3,13 +3,9 @@ import { jsenvPluginAutoreloadClient } from "./jsenv_plugin_autoreload_client.js
 import { jsenvPluginAutoreloadServer } from "./jsenv_plugin_autoreload_server.js"
 
 export const jsenvPluginAutoreload = ({
-  scenario,
   clientFileChangeCallbackList,
   clientFilesPruneCallbackList,
 }) => {
-  if (scenario === "build") {
-    return []
-  }
   return [
     jsenvPluginHmr(),
     jsenvPluginAutoreloadClient(),

package/src/plugins/autoreload/jsenv_plugin_autoreload_client.js

@@ -13,7 +13,7 @@ export const jsenvPluginAutoreloadClient = () => {
 
   return {
     name: "jsenv:autoreload_client",
-    appliesDuring: { dev: true },
+    appliesDuring: { dev: true, test: false },
     transformUrlContent: {
       html: (htmlUrlInfo, context) => {
         const htmlAst = parseHtmlString(htmlUrlInfo.content)

package/src/plugins/autoreload/jsenv_plugin_autoreload_server.js

@@ -6,7 +6,7 @@ export const jsenvPluginAutoreloadServer = ({
 }) => {
   return {
     name: "jsenv:autoreload_server",
-    appliesDuring: { dev: true },
+    appliesDuring: { dev: true, test: false },
     serverEvents: {
       reload: ({ sendServerEvent, rootDirectoryUrl, urlGraph }) => {
         const formatUrlForClient = (url) => {

package/src/plugins/autoreload/jsenv_plugin_hmr.js

@@ -1,7 +1,7 @@
 export const jsenvPluginHmr = () => {
   return {
     name: "jsenv:hmr",
-    appliesDuring: { dev: true },
+    appliesDuring: { dev: true, test: false },
     redirectUrl: (reference) => {
       const urlObject = new URL(reference.url)
       if (!urlObject.searchParams.has("hmr")) {

package/src/plugins/bundling/jsenv_plugin_bundling.js

@@ -18,9 +18,7 @@ export const jsenvPluginBundling = (bundling) => {
 
   return {
     name: "jsenv:bundling",
-    appliesDuring: {
-      build: true,
-    },
+    appliesDuring: "build",
     bundle: {
       css: bundling.css
         ? (cssUrlInfos, context) => {

package/src/plugins/cache_control/jsenv_plugin_cache_control.js

@@ -1,12 +1,9 @@
 export const jsenvPluginCacheControl = () => {
   return {
     name: "jsenv:cache_control",
-    appliesDuring: {
-      dev: true,
-      test: true,
-    },
+    appliesDuring: "dev",
     augmentResponse: ({ reference }, context) => {
-      if (context.scenario === "test") {
+      if (context.scenarios.test) {
         // During dev, all files are put into browser cache for 1 hour because:
         // 1: Browser cache is a temporary directory created by playwright
         // 2: We assume source files won't be modified while tests are running

package/src/plugins/commonjs_globals/jsenv_plugin_commonjs_globals.js

@@ -11,7 +11,7 @@ import { createMagicSource } from "@jsenv/sourcemap"
 import { applyBabelPlugins } from "@jsenv/ast"
 
 export const jsenvPluginCommonJsGlobals = () => {
-  const transformCommonJsGlobals = async (urlInfo, { scenario }) => {
+  const transformCommonJsGlobals = async (urlInfo, context) => {
     if (
       !urlInfo.content.includes("process.env.NODE_ENV") &&
       !urlInfo.content.includes("__filename") &&
@@ -22,7 +22,7 @@ export const jsenvPluginCommonJsGlobals = () => {
     const isJsModule = urlInfo.type === "js_module"
     const replaceMap = {
       "process.env.NODE_ENV": `("${
-        scenario === "dev" || scenario === "test" ? "development" : "production"
+        context.scenarios.dev ? "development" : "production"
       }")`,
       "global": "globalThis",
       "__filename": isJsModule

package/src/plugins/file_urls/jsenv_plugin_file_urls.js

@@ -113,14 +113,10 @@ export const jsenvPluginFileUrls = ({
     },
     {
       name: "jsenv:@fs_resolution",
-      appliesDuring: {
-        // during dev and test it's a browser running the code
-        // so absolute file urls needs to be relativized
-        dev: true,
-        test: true,
-        // during build it's fine to use file:// urls
-        build: false,
-      },
+      // during dev and test it's a browser running the code
+      // so absolute file urls needs to be relativized
+      // during build it's fine to use file:// urls
+      appliesDuring: "dev",
       resolveUrl: (reference) => {
         if (reference.specifier.startsWith("/@fs/")) {
           const fsRootRelativeUrl = reference.specifier.slice("/@fs/".length)

package/src/plugins/html_supervisor/client/error_formatter.js

@@ -10,6 +10,9 @@ export const formatError = (
   const errorMeta = extractErrorMeta(error, { url, line, column })
 
   const resolveUrlSite = ({ url, line, column }) => {
+    if (typeof line === "string") line = parseInt(line)
+    if (typeof column === "string") column = parseInt(column)
+
     const inlineUrlMatch = url.match(
       /@L([0-9]+)C([0-9]+)\-L([0-9]+)C([0-9]+)(\.[\w]+)$/,
     )
@@ -21,7 +24,7 @@ export const formatError = (
       const tagColumnEnd = parseInt(inlineUrlMatch[4])
       const extension = inlineUrlMatch[5]
       url = htmlUrl
-      line = tagLineStart + (line === undefined ? 0 : parseInt(line))
+      line = tagLineStart + (typeof line === "number" ? line : 0)
       // stackTrace formatted by V8 (chrome)
       if (Error.captureStackTrace) {
         line--
@@ -35,7 +38,7 @@ export const formatError = (
           line -= 2
         }
       }
-      column = tagColumnStart + (column === undefined ? 0 : parseInt(column))
+      column = tagColumnStart + (typeof column === "number" ? column : 0)
       const fileUrl = resolveFileUrl(url)
       return {
         isInline: true,
@@ -120,42 +123,52 @@ export const formatError = (
   const onErrorLocated = (urlSite) => {
     errorUrlSite = urlSite
     errorDetailsPromiseReference.current = (async () => {
-      if (errorMeta.type === "dynamic_import_fetch_error") {
-        const response = await window.fetch(
-          `/__get_error_cause__/${
-            urlSite.isInline ? urlSite.originalUrl : urlSite.url
-          }`,
-        )
-        if (response.status !== 200) {
-          return null
-        }
-        const causeInfo = await response.json()
-        if (!causeInfo) {
-          return null
-        }
+      try {
+        if (errorMeta.type === "dynamic_import_fetch_error") {
+          const response = await window.fetch(
+            `/__get_error_cause__/${
+              urlSite.isInline ? urlSite.originalUrl : urlSite.url
+            }`,
+          )
 
-        const causeText =
-          causeInfo.code === "NOT_FOUND"
-            ? formatErrorText({
-                message: causeInfo.reason,
-                stack: causeInfo.codeFrame,
-              })
-            : formatErrorText({
-                message: causeInfo.stack,
-                stack: causeInfo.codeFrame,
-              })
-        return {
-          cause: causeText,
+          if (response.status !== 200) {
+            return null
+          }
+          const causeInfo = await response.json()
+          if (!causeInfo) {
+            return null
+          }
+
+          const causeText =
+            causeInfo.code === "NOT_FOUND"
+              ? formatErrorText({
+                  message: causeInfo.reason,
+                  stack: causeInfo.codeFrame,
+                })
+              : formatErrorText({
+                  message: causeInfo.stack,
+                  stack: causeInfo.codeFrame,
+                })
+          return {
+            cause: causeText,
+          }
         }
-      }
-      if (urlSite.line !== undefined) {
-        const response = await window.fetch(
-          `/__get_code_frame__/${formatUrlWithLineAndColumn(urlSite)}`,
-        )
-        const codeFrame = await response.text()
-        return {
-          codeFrame: formatErrorText({ message: codeFrame }),
+        if (urlSite.line !== undefined) {
+          let ressourceToFetch = `/__get_code_frame__/${formatUrlWithLineAndColumn(
+            urlSite,
+          )}`
+          if (!Error.captureStackTrace) {
+            ressourceToFetch += `?remap`
+          }
+          const response = await window.fetch(ressourceToFetch)
+          const codeFrame = await response.text()
+          return {
+            codeFrame: formatErrorText({ message: codeFrame }),
+          }
         }
+      } catch (e) {
+        // happens if server is closed for instance
+        return null
       }
       return null
     })()