@jsenv/core 24.6.2 → 25.0.0-alpha.0

package/src/internal/building/html/parseHtmlRessource.js

@@ -16,12 +16,7 @@ Or be sure to also reference this url somewhere in the html file like
 
 */
 
-import {
-  urlToFilename,
-  urlToRelativeUrl,
-  resolveUrl,
-  urlToParentUrl,
-} from "@jsenv/filesystem"
+import { urlToFilename, urlToRelativeUrl, resolveUrl } from "@jsenv/filesystem"
 
 import {
   parseHtmlString,
@@ -255,7 +250,7 @@ const regularScriptTextNodeVisitor = (
   })
   return () => {
     const { bufferAfterBuild } = jsReference.ressource
-    textNode.value = bufferAfterBuild
+    textNode.value = String(bufferAfterBuild)
   }
 }
 
@@ -359,8 +354,6 @@ const moduleScriptTextNodeVisitor = (
     }
     const { bufferAfterBuild } = jsReference.ressource
     const jsText = String(bufferAfterBuild)
-    // ici on voudrait pouvoir ajouter le commentaire de la sourcemap
-    // sauf que cela se produit un poil plus tard je crois?
     textNode.value = jsText
   }
 }
@@ -386,23 +379,6 @@ const importmapScriptSrcVisitor = (
     contentTypeExpected: "application/importmap+json",
     ressourceSpecifier: srcAttribute.value,
     ...referenceLocationFromHtmlNode(script, "src"),
-    // here we want to force the fileName for the importmap
-    // so that we don't have to rewrite its content
-    // the goal is to put the importmap at the same relative path
-    // than in the project
-    fileNamePattern: () => {
-      const importmapReferenceUrl = importmapReference.referenceUrl
-      const importmapRessourceUrl = importmapReference.ressource.url
-      const importmapUrlRelativeToImporter = urlToRelativeUrl(
-        importmapRessourceUrl,
-        importmapReferenceUrl,
-      )
-      const importmapParentRelativeUrl = urlToRelativeUrl(
-        urlToParentUrl(resolveUrl(importmapUrlRelativeToImporter, "file://")),
-        "file://",
-      )
-      return `${importmapParentRelativeUrl}[name]-[hash][extname]`
-    },
   })
   return ({ getUrlRelativeToImporter }) => {
     const { ressource } = importmapReference

package/src/internal/building/js/parseJsRessource.js

@@ -103,9 +103,10 @@ export const parseJsRessource = async (
     map.file = urlToFilename(jsBuildUrl)
     if (map.sources) {
       map.sources = map.sources.map((source) => {
-        const sourceUrl = resolveUrl(source, jsOriginalUrl)
+        const sourceUrl = resolveUrl(source, jsUrl)
+        const sourceOriginalUrl = asOriginalUrl(sourceUrl)
         const sourceUrlRelativeToSourceMap = urlToRelativeUrl(
-          sourceUrl,
+          sourceOriginalUrl,
           sourcemapPrecomputedBuildUrl,
         )
         return sourceUrlRelativeToSourceMap

package/src/internal/building/json_module.js

@@ -0,0 +1,11 @@
+export const convertJsonTextToJavascriptModule = ({ code }) => {
+  // here we could do the following
+  // return export default jsonText
+  // This would return valid js, that would be minified later
+  // however we will prefer using JSON.parse because it's faster
+  // for js engine to parse JSON than JS
+
+  return {
+    code: `export default JSON.parse(${JSON.stringify(code.trim())})`,
+  }
+}

package/src/internal/building/parseRessource.js

@@ -22,7 +22,7 @@ import { parseJsRessource } from "./js/parseJsRessource.js"
 import { parseJsonRessource } from "./json/parseJsonRessource.js"
 import { parseWebmanifestRessource } from "./webmanifest/parseWebmanifestRessource.js"
 
-export const parseRessource = (
+export const parseRessource = async (
   ressource,
   notifiers,
   {