@jsenv/core 23.8.9 → 23.8.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "23.8.9",
+  "version": "23.8.10",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {

package/src/internal/compiling/createCompiledFileService.js

@@ -6,6 +6,9 @@ import {
   urlToMeta,
 } from "@jsenv/filesystem"
 
+import { featuresCompatMap } from "@jsenv/core/src/internal/generateGroupMap/featuresCompatMap.js"
+import { createRuntimeCompat } from "@jsenv/core/src/internal/generateGroupMap/runtime_compat.js"
+
 import { serverUrlToCompileInfo } from "@jsenv/core/src/internal/url_conversion.js"
 import { setUrlExtension } from "../url_utils.js"
 import {
@@ -52,6 +55,15 @@ export const createCompiledFileService = ({
   sourcemapMethod,
   sourcemapExcludeSources,
 }) => {
+  const moduleFormats = {}
+  Object.keys(groupMap).forEach((groupName) => {
+    moduleFormats[groupName] = canAvoidSystemJs({
+      runtimeSupport: groupMap[groupName].minRuntimeVersions,
+    })
+      ? "esmodule"
+      : "systemjs"
+  })
+
   Object.keys(customCompilers).forEach((key) => {
     const value = customCompilers[key]
     if (typeof value !== "function") {
@@ -171,7 +183,10 @@ export const createCompiledFileService = ({
           request,
 
           runtimeSupport,
-          moduleOutFormat,
+          moduleOutFormat:
+            moduleOutFormat === undefined
+              ? moduleFormats[compileId]
+              : moduleOutFormat,
           importMetaFormat,
           transformTopLevelAwait,
           babelPluginMap: babelPluginMapFromCompileId(compileId, {
@@ -189,6 +204,20 @@ export const createCompiledFileService = ({
   }
 }
 
+const canAvoidSystemJs = ({ runtimeSupport }) => {
+  const runtimeCompatMap = createRuntimeCompat({
+    runtimeSupport,
+    pluginMap: {
+      module: true,
+      importmap: true,
+      import_assertion_type_json: true,
+      import_assertion_type_css: true,
+    },
+    pluginCompatMap: featuresCompatMap,
+  })
+  return runtimeCompatMap.pluginRequiredNameArray.length === 0
+}
+
 const getCompiler = ({ originalFileUrl, compileMeta }) => {
   const { jsenvCompiler, customCompiler } = urlToMeta({
     url: originalFileUrl,

package/src/internal/compiling/js-compilation-service/jsenvTransform.js

@@ -24,7 +24,7 @@ export const jsenvTransform = async ({
 
   babelPluginMap,
   moduleOutFormat,
-  importMetaFormat,
+  importMetaFormat = moduleOutFormat,
 
   babelHelpersInjectionAsImport,
   allowTopLevelAwait,

package/src/internal/compiling/startCompileServer.js

@@ -29,12 +29,10 @@ import {
   createCallbackListNotifiedOnce,
 } from "@jsenv/abort"
 
+import { generateGroupMap } from "@jsenv/core/src/internal/generateGroupMap/generateGroupMap.js"
 import { isBrowserPartOfSupportedRuntimes } from "@jsenv/core/src/internal/generateGroupMap/runtime_support.js"
 import { loadBabelPluginMapFromFile } from "./load_babel_plugin_map_from_file.js"
 import { extractSyntaxBabelPluginMap } from "./babel_plugins.js"
-import { generateGroupMap } from "../generateGroupMap/generateGroupMap.js"
-import { featuresCompatMap } from "@jsenv/core/src/internal/generateGroupMap/featuresCompatMap.js"
-import { createRuntimeCompat } from "@jsenv/core/src/internal/generateGroupMap/runtime_compat.js"
 import {
   jsenvCompileProxyFileInfo,
   sourcemapMainFileInfo,
@@ -221,15 +219,6 @@ export const startCompileServer = async ({
     ...babelPluginMap,
   }
 
-  if (moduleOutFormat === undefined) {
-    moduleOutFormat = canAvoidSystemJs({ runtimeSupport })
-      ? "esmodule"
-      : "systemjs"
-  }
-  if (importMetaFormat === undefined) {
-    importMetaFormat = moduleOutFormat
-  }
-
   const serverStopCallbackList = createCallbackListNotifiedOnce()
 
   let projectFileRequestedCallback = () => {}
@@ -1060,20 +1049,6 @@ const createCompileProxyService = ({ projectDirectoryUrl }) => {
   }
 }
 
-const canAvoidSystemJs = ({ runtimeSupport }) => {
-  const runtimeCompatMap = createRuntimeCompat({
-    runtimeSupport,
-    pluginMap: {
-      module: true,
-      importmap: true,
-      import_assertion_type_json: true,
-      import_assertion_type_css: true,
-    },
-    pluginCompatMap: featuresCompatMap,
-  })
-  return runtimeCompatMap.pluginRequiredNameArray.length === 0
-}
-
 const readPackage = (packagePath) => {
   const buffer = readFileSync(packagePath)
   const string = String(buffer)

package/src/internal/generateGroupMap/runtime_compat.js

@@ -7,22 +7,30 @@ export const createRuntimeCompat = ({
 }) => {
   const minRuntimeVersions = {}
   const pluginRequiredNameArray = []
-  Object.keys(runtimeSupport).forEach((runtimeName) => {
-    const runtimeVersion = runtimeSupport[runtimeName]
-    const oneRuntimeCompat = createOneRuntimeCompat({
-      runtimeName,
-      runtimeVersion,
-      pluginMap,
-      pluginCompatMap,
+  const runtimeNames = Object.keys(runtimeSupport)
+  if (runtimeNames.length === 0) {
+    // when runtimes are unknown, everything is required
+    Object.keys(pluginMap).forEach((pluginName) => {
+      pluginRequiredNameArray.push(pluginName)
     })
+  } else {
+    runtimeNames.forEach((runtimeName) => {
+      const runtimeVersion = runtimeSupport[runtimeName]
+      const oneRuntimeCompat = createOneRuntimeCompat({
+        runtimeName,
+        runtimeVersion,
+        pluginMap,
+        pluginCompatMap,
+      })
 
-    minRuntimeVersions[runtimeName] = oneRuntimeCompat.minRuntimeVersion
-    oneRuntimeCompat.pluginRequiredNameArray.forEach((babelPluginName) => {
-      if (!pluginRequiredNameArray.includes(babelPluginName)) {
-        pluginRequiredNameArray.push(babelPluginName)
-      }
+      minRuntimeVersions[runtimeName] = oneRuntimeCompat.minRuntimeVersion
+      oneRuntimeCompat.pluginRequiredNameArray.forEach((babelPluginName) => {
+        if (!pluginRequiredNameArray.includes(babelPluginName)) {
+          pluginRequiredNameArray.push(babelPluginName)
+        }
+      })
     })
-  })
+  }
 
   return {
     pluginRequiredNameArray,