@jsenv/core 27.4.0 → 27.5.0

package/src/plugins/transpilation/import_assertions/jsenv_plugin_import_assertions.js

@@ -14,7 +14,11 @@ import { urlToFilename, injectQueryParams } from "@jsenv/urls"
 
 import { JS_QUOTES } from "@jsenv/utils/src/string/js_quotes.js"
 
-export const jsenvPluginImportAssertions = () => {
+export const jsenvPluginImportAssertions = ({
+  json = "auto",
+  css = "auto",
+  text = "auto",
+}) => {
   const updateReference = (reference, searchParam) => {
     reference.expectedType = "js_module"
     reference.filename = `${urlToFilename(reference.url)}.js`
@@ -33,42 +37,58 @@ export const jsenvPluginImportAssertions = () => {
   const importAssertions = {
     name: "jsenv:import_assertions",
     appliesDuring: "*",
+    init: (context) => {
+      // transpilation is forced during build so that
+      //   - avoid rollup to see import assertions
+      //     We would have to tell rollup to ignore import with assertion
+      //   - means rollup can bundle more js file together
+      //   - means url versioning can work for css inlined in js
+      if (context.scenario === "build") {
+        json = true
+        css = true
+        text = true
+      }
+    },
     redirectUrl: {
       js_import_export: (reference, context) => {
         if (!reference.assert) {
           return null
         }
-        // during build always replace import assertions with the js:
-        // - avoid rollup to see import assertions
-        //   We would have to tell rollup to ignore import with assertion
-        // - means rollup can bundle more js file together
-        // - means url versioning can work for css inlined in js
         if (reference.assert.type === "json") {
-          if (
-            context.scenario !== "build" &&
-            context.isSupportedOnCurrentClients("import_type_json")
-          ) {
-            return null
+          const shouldTranspileJsonImportAssertion =
+            json === true
+              ? true
+              : json === "auto"
+              ? !context.isSupportedOnCurrentClients("import_type_json")
+              : false
+          if (shouldTranspileJsonImportAssertion) {
+            return updateReference(reference, "as_json_module")
           }
-          return updateReference(reference, "as_json_module")
+          return null
         }
         if (reference.assert.type === "css") {
-          if (
-            context.scenario !== "build" &&
-            context.isSupportedOnCurrentClients("import_type_css")
-          ) {
-            return null
+          const shouldTranspileCssImportAssertion =
+            css === true
+              ? true
+              : css === "auto"
+              ? !context.isSupportedOnCurrentClients("import_type_css")
+              : false
+          if (shouldTranspileCssImportAssertion) {
+            return updateReference(reference, "as_css_module")
           }
-          return updateReference(reference, "as_css_module")
+          return null
         }
         if (reference.assert.type === "text") {
-          if (
-            context.scenario !== "build" &&
-            context.isSupportedOnCurrentClients("import_type_text")
-          ) {
-            return null
+          const shouldTranspileTextImportAssertion =
+            text === true
+              ? true
+              : text === "auto"
+              ? !context.isSupportedOnCurrentClients("import_type_text")
+              : false
+          if (shouldTranspileTextImportAssertion) {
+            return updateReference(reference, "as_text_module")
           }
-          return updateReference(reference, "as_text_module")
+          return null
         }
         return null
       },

package/src/plugins/transpilation/jsenv_plugin_transpilation.js

@@ -22,9 +22,14 @@ export const jsenvPluginTranspilation = ({
   babelHelpersAsImport = true,
   getCustomBabelPlugins,
 }) => {
+  if (importAssertions === true) {
+    importAssertions = {}
+  }
   return [
     // import assertions we want it all the time
-    ...(importAssertions ? [jsenvPluginImportAssertions()] : []),
+    ...(importAssertions
+      ? [jsenvPluginImportAssertions(importAssertions)]
+      : []),
     // babel also so that rollup can bundle babel helpers for instance
     jsenvPluginBabel({
       topLevelAwait,

package/src/plugins/url_analysis/html/html_urls.js

@@ -5,6 +5,7 @@ import {
   getHtmlNodePosition,
   setHtmlNodeAttributes,
   getHtmlNodeAttributePosition,
+  analyzeScriptNode,
   parseSrcSet,
   stringifyHtmlAst,
 } from "@jsenv/ast"
@@ -188,16 +189,15 @@ const visitHtmlUrls = ({ url, htmlAst, onUrl }) => {
     },
     // style: () => {},
     script: (node) => {
-      const type = getHtmlNodeAttribute(node, "type")
-      const expectedType = {
-        "undefined": "js_classic",
-        "text/javascript": "js_classic",
-        "module": "js_module",
-        "importmap": "importmap",
-      }[type]
+      const { type } = analyzeScriptNode(node)
+      if (type === "text") {
+        // ignore <script type="whatever" src="./file.js">
+        // per HTML spec https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script#attr-type
+        return
+      }
       visitAttributeAsUrlSpecifier({
         type: "script_src",
-        expectedType,
+        expectedType: type,
         node,
         attributeName: "src",
       })

package/src/test/execute_plan.js

@@ -16,9 +16,6 @@ import { ensureEmptyDirectory, writeFileSync } from "@jsenv/filesystem"
 
 import { babelPluginInstrument } from "./coverage/babel_plugin_instrument.js"
 import { reportToCoverage } from "./coverage/report_to_coverage.js"
-import { createUrlGraph } from "@jsenv/core/src/omega/url_graph.js"
-import { getCorePlugins } from "@jsenv/core/src/plugins/plugins.js"
-import { createKitchen } from "@jsenv/core/src/omega/kitchen.js"
 import { startOmegaServer } from "@jsenv/core/src/omega/omega_server.js"
 import { run } from "@jsenv/core/src/execute/run.js"
 
@@ -43,6 +40,7 @@ export const executePlan = async (
 
     rootDirectoryUrl,
     keepRunning,
+    services,
     defaultMsAllocatedPerExecution,
     maxExecutionsInParallel,
     failFast,
@@ -68,7 +66,7 @@ export const executePlan = async (
     protocol,
     privateKey,
     certificate,
-    ip,
+    host,
     port,
 
     beforeExecutionCallback = () => {},
@@ -198,64 +196,48 @@ export const executePlan = async (
       stopAfterAllSignal,
     }
     if (someNeedsServer) {
-      const urlGraph = createUrlGraph()
-      const kitchen = createKitchen({
-        signal,
-        logger,
-        rootDirectoryUrl,
-        urlGraph,
-        scenario,
-        sourcemaps,
-        runtimeCompat: runtimes,
-        writeGeneratedFiles,
-        plugins: [
-          ...plugins,
-          ...getCorePlugins({
-            rootDirectoryUrl,
-            urlGraph,
-            scenario,
-            runtimeCompat: runtimes,
-
-            htmlSupervisor: true,
-            nodeEsmResolution,
-            fileSystemMagicResolution,
-            transpilation: {
-              ...transpilation,
-              getCustomBabelPlugins: ({ clientRuntimeCompat }) => {
-                if (
-                  coverageEnabled &&
-                  (coverageMethodForBrowsers !== "playwright_api" ||
-                    Object.keys(clientRuntimeCompat)[0] !== "chrome")
-                ) {
-                  return {
-                    "transform-instrument": [
-                      babelPluginInstrument,
-                      {
-                        rootDirectoryUrl,
-                        coverageConfig,
-                      },
-                    ],
-                  }
-                }
-                return {}
-              },
-            },
-          }),
-        ],
-      })
       const server = await startOmegaServer({
         signal: multipleExecutionsOperation.signal,
         logLevel: "warn",
-        rootDirectoryUrl,
-        urlGraph,
-        kitchen,
-        scenario,
         keepProcessAlive: false,
         port,
-        ip,
+        host,
         protocol,
         certificate,
         privateKey,
+        services,
+
+        rootDirectoryUrl,
+        scenario,
+        runtimeCompat: runtimes,
+
+        plugins,
+        htmlSupervisor: true,
+        nodeEsmResolution,
+        fileSystemMagicResolution,
+        transpilation: {
+          ...transpilation,
+          getCustomBabelPlugins: ({ clientRuntimeCompat }) => {
+            if (
+              coverageEnabled &&
+              (coverageMethodForBrowsers !== "playwright_api" ||
+                Object.keys(clientRuntimeCompat)[0] !== "chrome")
+            ) {
+              return {
+                "transform-instrument": [
+                  babelPluginInstrument,
+                  {
+                    rootDirectoryUrl,
+                    coverageConfig,
+                  },
+                ],
+              }
+            }
+            return {}
+          },
+        },
+        sourcemaps,
+        writeGeneratedFiles,
       })
       multipleExecutionsOperation.addEndCallback(async () => {
         await server.stop()

package/src/test/execute_test_plan.js

@@ -90,7 +90,7 @@ export const executeTestPlan = async ({
   protocol,
   privateKey,
   certificate,
-  ip,
+  host,
   port,
 }) => {
   const logger = createLogger({ logLevel })
@@ -177,7 +177,7 @@ export const executeTestPlan = async ({
     protocol,
     privateKey,
     certificate,
-    ip,
+    host,
     port,
   })
   if (