@jsenv/core 20.0.4 → 20.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "20.0.4",
+  "version": "20.0.5",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {
@@ -11,8 +11,7 @@
     "node": ">=14.9.0"
   },
   "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org"
+    "access": "public"
   },
   "type": "module",
   "exports": {

package/src/internal/building/asset-builder.js

@@ -387,7 +387,7 @@ export const createAssetBuilder = (
           return
         }
 
-        const targetBuildBuffer = buildFileInfo.code
+        const targetBuildBuffer = Buffer.from(buildFileInfo.code)
         const targetFileName = buildFileInfo.fileName
         const targetBuildRelativeUrl =
           buildManifest[targetFileName] || targetFileName
@@ -543,7 +543,7 @@ export const createAssetBuilder = (
       const transform = assetTransformMap[targetUrl]
       if (typeof transform !== "function") {
         target.targetBuildEnd(
-          target.targetBuffer,
+          target.targetBuildBuffer || target.targetBuffer,
           target.targetBuildRelativeUrl,
         )
         return

package/src/internal/building/build_file_contents.js

@@ -1,49 +1,9 @@
-import { resolveUrl, urlToRelativeUrl } from "@jsenv/filesystem"
-
-import { setJavaScriptSourceMappingUrl } from "@jsenv/core/src/internal/sourceMappingURLUtils.js"
-
-export const createBuildFileContents = ({ rollupBuild, buildDirectoryUrl }) => {
+export const createBuildFileContents = ({ rollupBuild }) => {
   const buildFileContents = {}
   Object.keys(rollupBuild).forEach((buildRelativeUrl) => {
-    const rollupFileInfo = rollupBuild[buildRelativeUrl]
-    const fileBuildUrl = resolveUrl(buildRelativeUrl, buildDirectoryUrl)
-
-    if (rollupFileInfo.type === "asset") {
-      buildFileContents[buildRelativeUrl] = rollupFileInfo.source
-      return
-    }
-
-    const { code, map } = rollupFileInfo
-
-    if (!map) {
-      buildFileContents[buildRelativeUrl] = code
-      return
-    }
-
-    const sourcemapBuildRelativeUrl = `${buildRelativeUrl}.map`
-    const sourcemapRollupFileInfo = rollupBuild[sourcemapBuildRelativeUrl]
-    if (sourcemapRollupFileInfo) {
-      // already in rollup build, sourcemap will be found
-      buildFileContents[buildRelativeUrl] = code
-      return
-    }
-
-    const sourcemapBuildUrl = resolveUrl(
-      sourcemapBuildRelativeUrl,
-      buildDirectoryUrl,
-    )
-    const fileSourcemapString = JSON.stringify(map, null, "  ")
-    buildFileContents[sourcemapBuildRelativeUrl] = fileSourcemapString
+    const { type, source, code } = rollupBuild[buildRelativeUrl]
 
-    const sourcemapBuildUrlRelativeToFileBuildUrl = urlToRelativeUrl(
-      sourcemapBuildUrl,
-      fileBuildUrl,
-    )
-    const codeWithSourcemapComment = setJavaScriptSourceMappingUrl(
-      code,
-      sourcemapBuildUrlRelativeToFileBuildUrl,
-    )
-    buildFileContents[buildRelativeUrl] = codeWithSourcemapComment
+    buildFileContents[buildRelativeUrl] = type === "asset" ? source : code
   })
   return buildFileContents
 }

package/src/internal/building/createJsenvRollupPlugin.js

@@ -44,6 +44,7 @@ import { minifyJs } from "./js/minifyJs.js"
 import { createImportResolverForNode } from "../import-resolution/import-resolver-node.js"
 import { createImportResolverForImportmap } from "../import-resolution/import-resolver-importmap.js"
 import { getDefaultImportMap } from "../import-resolution/importmap-default.js"
+import { injectSourcemapInRollupBuild } from "./rollup_build_sourcemap.js"
 import { createBuildFileContents } from "./build_file_contents.js"
 import { createBuildStats } from "./build_stats.js"
 
@@ -901,12 +902,14 @@ building ${entryFileRelativeUrls.length} entry files...`)
         ...jsModuleBuild,
         ...assetBuild,
       }
+      rollupBuild = injectSourcemapInRollupBuild(rollupBuild, {
+        buildDirectoryUrl,
+      })
       rollupBuild = sortObjectByPathnames(rollupBuild)
       buildManifest = sortObjectByPathnames(buildManifest)
       buildMappings = sortObjectByPathnames(buildMappings)
       buildFileContents = createBuildFileContents({
         rollupBuild,
-        buildDirectoryUrl,
       })
       const buildDuration = Date.now() - buildStartMs
       buildStats = createBuildStats({

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

@@ -38,7 +38,12 @@ import {
   parseSrcset,
   stringifySrcset,
 } from "@jsenv/core/src/internal/compiling/compileHtml.js"
-import { setJavaScriptSourceMappingUrl } from "@jsenv/core/src/internal/sourceMappingURLUtils.js"
+import {
+  getJavaScriptSourceMappingUrl,
+  setJavaScriptSourceMappingUrl,
+  getCssSourceMappingUrl,
+  setCssSourceMappingUrl,
+} from "@jsenv/core/src/internal/sourceMappingURLUtils.js"
 import {
   getTargetAsBase64Url,
   targetIsReferencedOnlyByRessourceHint,
@@ -146,7 +151,11 @@ export const parseHtmlAsset = async (
   }
 }
 
-const regularScriptSrcVisitor = (script, { notifyReferenceFound }) => {
+const regularScriptSrcVisitor = (
+  script,
+  { notifyReferenceFound },
+  htmlTarget,
+) => {
   const typeAttribute = getHtmlNodeAttributeByName(script, "type")
   if (
     typeAttribute &&
@@ -172,8 +181,21 @@ const regularScriptSrcVisitor = (script, { notifyReferenceFound }) => {
 
     if (shouldInline({ reference: remoteScriptReference, htmlNode: script })) {
       removeHtmlNodeAttribute(script, srcAttribute)
-      const { targetBuildBuffer } = remoteScriptReference.target
-      setHtmlNodeText(script, targetBuildBuffer)
+      const { target } = remoteScriptReference
+      const { targetBuildBuffer } = target
+      let jsString = String(targetBuildBuffer)
+
+      const sourcemapRelativeUrl = getJavaScriptSourceMappingUrl(jsString)
+      if (sourcemapRelativeUrl) {
+        const { targetBuildRelativeUrl } = target
+        const jsBuildUrl = resolveUrl(targetBuildRelativeUrl, "file:///")
+        const sourcemapBuildUrl = resolveUrl(sourcemapRelativeUrl, jsBuildUrl)
+        const htmlUrl = resolveUrl(htmlTarget.targetFileNamePattern, "file:///")
+        const sourcemapInlineUrl = urlToRelativeUrl(sourcemapBuildUrl, htmlUrl)
+        jsString = setJavaScriptSourceMappingUrl(jsString, sourcemapInlineUrl)
+      }
+
+      setHtmlNodeText(script, jsString)
       return
     }
 
@@ -259,14 +281,19 @@ const moduleScriptSrcVisitor = (script, { format, notifyReferenceFound }) => {
       // here put a warning if we cannot inline importmap because it would mess
       // the remapping (note that it's feasible) but not yet supported
       removeHtmlNodeAttribute(script, srcAttribute)
-      const { targetBuildBuffer } = remoteScriptReference.target
-      const jsString = String(targetBuildBuffer)
-
-      const codeWithSourcemapComment = setJavaScriptSourceMappingUrl(
-        jsString,
-        `${remoteScriptReference.target.targetFileName}.map`
-      )
-      setHtmlNodeText(script, codeWithSourcemapComment)
+      const { target } = remoteScriptReference
+      const { targetBuildBuffer } = target
+      let jsString = String(targetBuildBuffer)
+
+      // at this stage, for some reason the sourcemap url is not in the js
+      // (it will be added sshortly after by "injectSourcemapInRollupBuild")
+      // but we know that a script type module have a sourcemap
+      // and will be next to html file
+      // with these assumptions we can force the sourcemap url
+      const sourcemapUrl = `${target.targetBuildRelativeUrl}.map`
+      jsString = setJavaScriptSourceMappingUrl(jsString, sourcemapUrl)
+
+      setHtmlNodeText(script, jsString)
       return
     }
 
@@ -433,7 +460,11 @@ const importmapScriptTextNodeVisitor = (
   }
 }
 
-const linkStylesheetHrefVisitor = (link, { notifyReferenceFound }) => {
+const linkStylesheetHrefVisitor = (
+  link,
+  { notifyReferenceFound },
+  htmlTarget,
+) => {
   const hrefAttribute = getHtmlNodeAttributeByName(link, "href")
   if (!hrefAttribute) {
     return null
@@ -457,8 +488,19 @@ const linkStylesheetHrefVisitor = (link, { notifyReferenceFound }) => {
     }
 
     if (shouldInline({ reference: cssReference, htmlNode: link })) {
-      const { targetBuildBuffer } = cssReference.target
-      replaceHtmlNode(link, `<style>${targetBuildBuffer}</style>`)
+      const { target } = cssReference
+      const { targetBuildBuffer } = target
+      let cssString = String(targetBuildBuffer)
+      const sourcemapRelativeUrl = getCssSourceMappingUrl(cssString)
+      if (sourcemapRelativeUrl) {
+        const { targetBuildRelativeUrl } = target
+        const cssBuildUrl = resolveUrl(targetBuildRelativeUrl, "file:///")
+        const sourcemapBuildUrl = resolveUrl(sourcemapRelativeUrl, cssBuildUrl)
+        const htmlUrl = resolveUrl(htmlTarget.targetFileNamePattern, "file:///")
+        const sourcemapInlineUrl = urlToRelativeUrl(sourcemapBuildUrl, htmlUrl)
+        cssString = setCssSourceMappingUrl(cssString, sourcemapInlineUrl)
+      }
+      replaceHtmlNode(link, `<style>${cssString}</style>`)
       return
     }
 

package/src/internal/building/rollup_build_sourcemap.js

@@ -0,0 +1,54 @@
+import { resolveUrl, urlToRelativeUrl } from "@jsenv/filesystem"
+
+import { setJavaScriptSourceMappingUrl } from "@jsenv/core/src/internal/sourceMappingURLUtils.js"
+
+export const injectSourcemapInRollupBuild = (
+  rollupBuild,
+  { buildDirectoryUrl },
+) => {
+  const rollupBuildWithSourcemap = {}
+
+  Object.keys(rollupBuild).forEach((buildRelativeUrl) => {
+    const rollupFileInfo = rollupBuild[buildRelativeUrl]
+    const { type, code, map } = rollupFileInfo
+
+    if (type === "asset" || !map) {
+      rollupBuildWithSourcemap[buildRelativeUrl] = rollupFileInfo
+      return
+    }
+
+    const sourcemapBuildRelativeUrl = `${buildRelativeUrl}.map`
+    const sourcemapRollupFileInfo = rollupBuild[sourcemapBuildRelativeUrl]
+    if (sourcemapRollupFileInfo) {
+      rollupBuildWithSourcemap[buildRelativeUrl] = rollupFileInfo
+      return
+    }
+
+    const fileBuildUrl = resolveUrl(buildRelativeUrl, buildDirectoryUrl)
+    const sourcemapBuildUrl = resolveUrl(
+      sourcemapBuildRelativeUrl,
+      buildDirectoryUrl,
+    )
+    const fileSourcemapString = JSON.stringify(map, null, "  ")
+    const sourcemapBuildUrlRelativeToFileBuildUrl = urlToRelativeUrl(
+      sourcemapBuildUrl,
+      fileBuildUrl,
+    )
+    const codeWithSourcemapComment = setJavaScriptSourceMappingUrl(
+      code,
+      sourcemapBuildUrlRelativeToFileBuildUrl,
+    )
+
+    rollupBuildWithSourcemap[sourcemapBuildRelativeUrl] = {
+      type: "asset",
+      fileName: sourcemapBuildRelativeUrl,
+      source: fileSourcemapString,
+    }
+    rollupBuildWithSourcemap[buildRelativeUrl] = {
+      ...rollupFileInfo,
+      code: codeWithSourcemapComment,
+    }
+  })
+
+  return rollupBuildWithSourcemap
+}