@jsenv/core 20.0.1 → 20.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "20.0.1",
+  "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/buildProject.js

@@ -112,6 +112,11 @@ export const buildProject = async ({
         `unexpected format: ${format}. Must be "esmodule", "systemjs", "commonjs" or "global".`,
       )
     }
+    if (typeof runtimeSupport !== "object" || runtimeSupport === null) {
+      throw new TypeError(
+        `runtimeSupport must be an object, got ${runtimeSupport}`,
+      )
+    }
 
     projectDirectoryUrl = assertProjectDirectoryUrl({ projectDirectoryUrl })
     await assertProjectDirectoryExists({ projectDirectoryUrl })

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,6 +38,12 @@ import {
   parseSrcset,
   stringifySrcset,
 } from "@jsenv/core/src/internal/compiling/compileHtml.js"
+import {
+  getJavaScriptSourceMappingUrl,
+  setJavaScriptSourceMappingUrl,
+  getCssSourceMappingUrl,
+  setCssSourceMappingUrl,
+} from "@jsenv/core/src/internal/sourceMappingURLUtils.js"
 import {
   getTargetAsBase64Url,
   targetIsReferencedOnlyByRessourceHint,
@@ -145,7 +151,11 @@ export const parseHtmlAsset = async (
   }
 }
 
-const regularScriptSrcVisitor = (script, { notifyReferenceFound }) => {
+const regularScriptSrcVisitor = (
+  script,
+  { notifyReferenceFound },
+  htmlTarget,
+) => {
   const typeAttribute = getHtmlNodeAttributeByName(script, "type")
   if (
     typeAttribute &&
@@ -171,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
     }
 
@@ -258,8 +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 } = script.target
-      setHtmlNodeText(script, targetBuildBuffer)
+      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
     }
 
@@ -426,7 +460,11 @@ const importmapScriptTextNodeVisitor = (
   }
 }
 
-const linkStylesheetHrefVisitor = (link, { notifyReferenceFound }) => {
+const linkStylesheetHrefVisitor = (
+  link,
+  { notifyReferenceFound },
+  htmlTarget,
+) => {
   const hrefAttribute = getHtmlNodeAttributeByName(link, "href")
   if (!hrefAttribute) {
     return null
@@ -450,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
     }
 
@@ -669,6 +718,10 @@ const shouldInline = ({ reference, htmlNode }) => {
     return true
   }
 
+  return readAndRemoveForceInline(htmlNode)
+}
+
+const readAndRemoveForceInline = (htmlNode) => {
   const jsenvForceInlineAttribute = getHtmlNodeAttributeByName(
     htmlNode,
     "data-jsenv-force-inline",

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
+}

package/src/internal/compiling/compileHtml.js

@@ -286,9 +286,13 @@ export const replaceHtmlNode = (
 
   if (inheritAttributes) {
     newNode.attrs = [
-      // inherit script attributes except src, type, href
+      // inherit script attributes except src, type, href, rel
       ...node.attrs.filter(
-        ({ name }) => name !== "type" && name !== "src" && name !== "href",
+        ({ name }) =>
+          name !== "type" &&
+          name !== "src" &&
+          name !== "href" &&
+          name !== "rel",
       ),
       ...newNode.attrs,
     ]

package/src/internal/compiling/createCompiledFileService.js

@@ -9,13 +9,11 @@ import {
   COMPILE_ID_BUILD_COMMONJS_FILES,
 } from "../CONSTANTS.js"
 import { compileFile } from "./compileFile.js"
-import { jsenvCompilerForDynamicBuild } from "./jsenvCompilerForDynamicBuild.js"
 import { jsenvCompilerForHtml } from "./jsenvCompilerForHtml.js"
 import { jsenvCompilerForImportmap } from "./jsenvCompilerForImportmap.js"
 import { jsenvCompilerForJavaScript } from "./jsenvCompilerForJavaScript.js"
 
 const jsenvCompilers = {
-  ...jsenvCompilerForDynamicBuild,
   ...jsenvCompilerForJavaScript,
   ...jsenvCompilerForHtml,
   ...jsenvCompilerForImportmap,
@@ -28,6 +26,7 @@ export const createCompiledFileService = ({
   projectDirectoryUrl,
   outDirectoryRelativeUrl,
 
+  runtimeSupport,
   transformTopLevelAwait,
   moduleOutFormat,
   importMetaFormat,
@@ -35,6 +34,8 @@ export const createCompiledFileService = ({
   groupMap,
   convertMap,
   customCompilers,
+  urlMappings,
+
   jsenvToolbarInjection,
 
   projectFileRequestedCallback,
@@ -113,15 +114,18 @@ export const createCompiledFileService = ({
       compileId,
       outDirectoryRelativeUrl,
 
+      urlMappings,
+
       moduleOutFormat,
       importMetaFormat,
       groupMap,
       babelPluginMap,
       convertMap,
       transformTopLevelAwait,
+      runtimeSupport,
+
       writeOnFilesystem,
       sourcemapExcludeSources,
-
       jsenvToolbarInjection,
     }
     const compilerCandidates = { ...jsenvCompilers, ...customCompilers }

package/src/internal/compiling/startCompileServer.js

@@ -242,6 +242,7 @@ export const startCompileServer = async ({
 
       importDefaultExtension,
 
+      runtimeSupport,
       transformTopLevelAwait,
       groupMap: compileServerGroupMap,
       babelPluginMap,

package/src/internal/toolbar/toolbar.html

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
   <head>
     <title>Jsenv toolbar</title>

package/src/startExploring.js

@@ -37,7 +37,7 @@ export const startExploring = async ({
   explorableConfig = jsenvExplorableConfig,
   projectDirectoryUrl,
   jsenvDirectoryRelativeUrl,
-  outDirectoryName = 'out-dev',
+  outDirectoryName = "out-dev",
   jsenvToolbar = true,
   livereloading = true,
   inlineImportMapIntoHTML = true,
@@ -47,11 +47,12 @@ export const startExploring = async ({
   compileServerLogLevel,
   compileServerCanReadFromFilesystem,
   compileServerCanWriteOnFilesystem,
-  // ideally instead of rest, we should enumerate all
-  // params to help vscode autocompletion.
-  // it also helps to see what is available wihout having to open
-  // startCompileServer
-  ...rest
+  compileServerPort,
+  compileServerProtocol,
+  compileServerCertificate,
+  compileServerPrivateKey,
+  customCompilers,
+  livereloadWatchConfig,
 }) => {
   const jsenvStartExploringFunction = async ({ jsenvCancellationToken }) => {
     cancellationToken = composeCancellationToken(
@@ -100,6 +101,7 @@ export const startExploring = async ({
         "service:exploring-data": (request) => serveExploringData(request),
         "service:explorables": (request) => serveExplorableListAsJson(request),
       },
+      customCompilers,
       jsenvDirectoryRelativeUrl,
       outDirectoryName,
       inlineImportMapIntoHTML,
@@ -107,8 +109,12 @@ export const startExploring = async ({
       compileServerLogLevel,
       compileServerCanReadFromFilesystem,
       compileServerCanWriteOnFilesystem,
+      compileServerPort,
+      compileServerProtocol,
+      compileServerCertificate,
+      compileServerPrivateKey,
       runtimeSupport: runtimeSupportDuringDev,
-      ...rest,
+      livereloadWatchConfig,
     })
 
     return compileServer

package/src/internal/compiling/jsenvCompilerForDynamicBuild.js

@@ -1,204 +0,0 @@
-import {
-  resolveDirectoryUrl,
-  resolveUrl,
-  urlIsInsideOf,
-  urlToRelativeUrl,
-  urlToBasename,
-  urlToFilename,
-} from "@jsenv/filesystem"
-import { urlToContentType } from "@jsenv/server"
-
-import { jsenvCoreDirectoryUrl } from "../jsenvCoreDirectoryUrl.js"
-import {
-  COMPILE_ID_BUILD_GLOBAL,
-  COMPILE_ID_BUILD_GLOBAL_FILES,
-  COMPILE_ID_BUILD_COMMONJS,
-  COMPILE_ID_BUILD_COMMONJS_FILES,
-  COMPILE_ID_OTHERWISE,
-} from "../CONSTANTS.js"
-import { buildUsingRollup } from "../building/buildUsingRollup.js"
-import { buildToCompilationResult } from "../building/buildToCompilationResult.js"
-import { transformResultToCompilationResult } from "./transformResultToCompilationResult.js"
-import { transformJs } from "./js-compilation-service/transformJs.js"
-import { compileIdToBabelPluginMap } from "./jsenvCompilerForJavaScript.js"
-
-const compileDynamicBuildFile = ({ compileId, originalFileUrl, ...rest }) => {
-  const contentType = urlToContentType(originalFileUrl)
-
-  if (
-    contentType !== "application/javascript" &&
-    contentType !== "text/javascript"
-  ) {
-    return null
-  }
-
-  if (
-    compileId === COMPILE_ID_BUILD_GLOBAL ||
-    compileId === COMPILE_ID_BUILD_COMMONJS
-  ) {
-    return handleDynamicBuild({
-      compileId,
-      originalFileUrl,
-      ...rest,
-    })
-  }
-
-  if (
-    compileId === COMPILE_ID_BUILD_GLOBAL_FILES ||
-    compileId === COMPILE_ID_BUILD_COMMONJS_FILES
-  ) {
-    return handleDynamicBuildFile({
-      compileId,
-      originalFileUrl,
-      ...rest,
-    })
-  }
-
-  return null
-}
-
-export const jsenvCompilerForDynamicBuild = {
-  "jsenv-compiler-dynamic-build": compileDynamicBuildFile,
-}
-
-const handleDynamicBuild = ({
-  cancellationToken,
-  logger,
-
-  projectDirectoryUrl,
-  compileId,
-  originalFileUrl,
-  compiledFileUrl,
-  outDirectoryRelativeUrl,
-  compileServerOrigin,
-
-  babelPluginMap,
-}) => {
-  const format = compileId === COMPILE_ID_BUILD_GLOBAL ? "global" : "commonjs"
-
-  // might want to put this to false while working on jsenv
-  // to that cache gets verified
-  const isJenvInternalFile =
-    false &&
-    urlIsInsideOf(
-      originalFileUrl,
-      resolveUrl("./src/internal/", jsenvCoreDirectoryUrl),
-    )
-
-  return {
-    writeOnFilesystem: true,
-    useFilesystemAsCache: true,
-    compileCacheSourcesValidation: !isJenvInternalFile,
-    compileCacheAssetsValidation: !isJenvInternalFile,
-    compile: async () => {
-      const compileIdForFiles =
-        format === "global"
-          ? COMPILE_ID_BUILD_GLOBAL_FILES
-          : COMPILE_ID_BUILD_COMMONJS_FILES
-
-      const originalFileRelativeUrl = urlToRelativeUrl(
-        originalFileUrl,
-        projectDirectoryUrl,
-      )
-      const buildRelativeUrl =
-        format === "commonjs"
-          ? `${urlToBasename(originalFileUrl)}.cjs`
-          : urlToFilename(originalFileUrl)
-
-      const entryPointMap = {
-        [`./${originalFileRelativeUrl}`]: `./${buildRelativeUrl}`,
-      }
-
-      const compileDirectoryRelativeUrl = `${outDirectoryRelativeUrl}${compileIdForFiles}/`
-
-      const build = await buildUsingRollup({
-        cancellationToken,
-        logger,
-
-        entryPointMap,
-        projectDirectoryUrl,
-        compileDirectoryRelativeUrl,
-        compileServerOrigin,
-        externalImportSpecifiers: [],
-        babelPluginMap,
-
-        format,
-        node: format === "commonjs",
-        browser: format !== "commonjs",
-        // buildDirectoryUrl is just theorical because of writeOnFileSystem: false
-        // but still important to know where the files will be written
-        buildDirectoryUrl: resolveDirectoryUrl("./", compiledFileUrl),
-        writeOnFileSystem: false,
-        sourcemapExcludeSources: true,
-        assetManifestFile: false,
-      })
-
-      const sourcemapFileUrl = `${compiledFileUrl}.map`
-
-      return buildToCompilationResult(build, {
-        mainFileName: buildRelativeUrl,
-        projectDirectoryUrl,
-        originalFileUrl,
-        compiledFileUrl,
-        sourcemapFileUrl,
-      })
-    },
-  }
-}
-
-const handleDynamicBuildFile = ({
-  projectDirectoryUrl,
-  originalFileUrl,
-  compiledFileUrl,
-  compileId,
-  groupMap,
-  babelPluginMap,
-  convertMap,
-  transformTopLevelAwait,
-  writeOnFilesystem,
-  sourcemapExcludeSources,
-}) => {
-  return {
-    compile: async (originalFileContent) => {
-      const transformResult = await transformJs({
-        projectDirectoryUrl,
-        code: originalFileContent,
-        url: originalFileUrl,
-        urlAfterTransform: compiledFileUrl,
-        babelPluginMap: compileIdToBabelPluginMap(getWorstCompileId(groupMap), {
-          groupMap,
-          babelPluginMap,
-        }),
-        convertMap,
-        transformTopLevelAwait,
-        // we are compiling for rollup, do not transform into systemjs format
-        moduleOutFormat: "esmodule",
-        importMetaFormat:
-          // eslint-disable-next-line no-nested-ternary
-          compileId === COMPILE_ID_BUILD_GLOBAL_FILES
-            ? "global"
-            : compileId === COMPILE_ID_BUILD_COMMONJS_FILES
-            ? "commonjs"
-            : "esmodule",
-      })
-      const sourcemapFileUrl = `${compiledFileUrl}.map`
-
-      return transformResultToCompilationResult(transformResult, {
-        projectDirectoryUrl,
-        originalFileContent,
-        originalFileUrl,
-        compiledFileUrl,
-        sourcemapFileUrl,
-        sourcemapMethod: writeOnFilesystem ? "comment" : "inline",
-        sourcemapExcludeSources,
-      })
-    },
-  }
-}
-
-const getWorstCompileId = (groupMap) => {
-  if (COMPILE_ID_OTHERWISE in groupMap) {
-    return COMPILE_ID_OTHERWISE
-  }
-  return Object.keys(groupMap)[Object.keys(groupMap).length - 1]
-}