@jsenv/core 25.4.2 → 25.4.3

package/package.json

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

package/src/internal/compiling/jsenvCompilerForHtml.js

@@ -139,7 +139,7 @@ export const compileHtml = async ({
       addHtmlMutation,
     })
   }
-  await visitImportmapScript({
+  await visitImportmapScripts({
     logger,
     url,
     compiledUrl,
@@ -245,7 +245,7 @@ const visitRessourceHints = async ({ ressourceHints, addHtmlMutation }) => {
   )
 }
 
-const visitImportmapScript = async ({
+const visitImportmapScripts = async ({
   logger,
   url,
   compiledUrl,
@@ -265,14 +265,15 @@ const visitImportmapScript = async ({
     const type = typeAttribute ? typeAttribute.value : "application/javascript"
     return type === "importmap"
   })
+  const jsenvImportmap = getDefaultImportmap(compiledUrl, {
+    projectDirectoryUrl,
+    compileDirectoryUrl,
+  })
+
   // in case there is no importmap, force the presence
   // so that '@jsenv/core/' are still remapped
   if (importmapScripts.length === 0) {
-    const defaultImportMap = getDefaultImportmap(compiledUrl, {
-      projectDirectoryUrl,
-      compileDirectoryUrl,
-    })
-    const defaultImportMapAsText = JSON.stringify(defaultImportMap, null, "  ")
+    const defaultImportMapAsText = JSON.stringify(jsenvImportmap, null, "  ")
     onHtmlImportmapInfo({
       url: compiledUrl,
       text: defaultImportMapAsText,
@@ -324,6 +325,7 @@ const visitImportmapScript = async ({
       )
       importmap = {}
     }
+    importmap = composeTwoImportMaps(jsenvImportmap, importmap)
     const importmapAsText = JSON.stringify(importmap, null, "  ")
     onHtmlImportmapInfo({
       url: importmapUrl,
@@ -343,10 +345,6 @@ const visitImportmapScript = async ({
     return
   }
 
-  const jsenvImportmap = getDefaultImportmap(compiledUrl, {
-    projectDirectoryUrl,
-    compileDirectoryUrl,
-  })
   const htmlImportmap = JSON.parse(
     getHtmlNodeTextNode(firstImportmapScript).value,
   )

package/src/internal/import-resolution/importmap_default.js

@@ -18,7 +18,6 @@ export const getDefaultImportmap = (
     jsenvCoreDirectoryUrl,
     projectDirectoryUrl,
   )
-
   let jsenvCoreUrl
   if (compileDirectoryUrl && urlIsInsideOf(url, compileDirectoryUrl)) {
     jsenvCoreUrl = resolveUrl(
@@ -28,25 +27,11 @@ export const getDefaultImportmap = (
   } else {
     jsenvCoreUrl = jsenvCoreDirectoryUrl
   }
-
+  const jsenvCoreRelativeUrl = urlToRelativeUrl(jsenvCoreUrl, url)
   const importmap = {
     imports: {
-      "@jsenv/core/": makeRelativeMapping(jsenvCoreUrl, url),
+      "@jsenv/core/": `./${jsenvCoreRelativeUrl}`,
     },
   }
   return importmap
 }
-
-// this function just here to ensure relative urls starts with './'
-// so that importmap do not consider them as bare specifiers
-const makeRelativeMapping = (url, baseUrl) => {
-  const relativeUrl = urlToRelativeUrl(url, baseUrl)
-
-  if (urlIsInsideOf(url, baseUrl)) {
-    if (relativeUrl.startsWith("../")) return relativeUrl
-    if (relativeUrl.startsWith("./")) return relativeUrl
-    return `./${relativeUrl}`
-  }
-
-  return relativeUrl
-}