@jsenv/core 24.6.5 → 25.0.0-alpha.0

package/src/buildProject.js

@@ -22,7 +22,7 @@ export const buildProject = async ({
   logger,
 
   projectDirectoryUrl,
-  entryPointMap,
+  entryPoints,
   buildDirectoryRelativeUrl,
   buildDirectoryClean = true,
   assetManifestFile = false,
@@ -57,7 +57,6 @@ export const buildProject = async ({
   urlVersioning = format === "systemjs" ||
     format === "esmodule" ||
     format === "global",
-  urlVersionningForEntryPoints = false,
   lineBreakNormalization = process.platform === "win32",
   // when jsConcatenation is disabled rollup becomes almost useless
   // except it can still do tree shaking
@@ -81,6 +80,8 @@ export const buildProject = async ({
   workers = {},
   serviceWorkers = {},
   serviceWorkerFinalizer,
+  classicWorkers = {},
+  classicServiceWorkers = {},
 
   env = {},
   protocol,
@@ -117,10 +118,10 @@ export const buildProject = async ({
   projectDirectoryUrl = assertProjectDirectoryUrl({ projectDirectoryUrl })
   await assertProjectDirectoryExists({ projectDirectoryUrl })
 
-  assertEntryPointMap({ entryPointMap })
+  assertentryPoints({ entryPoints })
 
-  if (Object.keys(entryPointMap).length === 0) {
-    logger.error(`entryPointMap is an empty object`)
+  if (Object.keys(entryPoints).length === 0) {
+    logger.error(`entryPoints is an empty object`)
     return {
       rollupBuilds: {},
     }
@@ -197,7 +198,7 @@ export const buildProject = async ({
       buildOperation,
       logger,
 
-      entryPointMap,
+      entryPoints,
       projectDirectoryUrl,
       compileServerOrigin,
       compileDirectoryRelativeUrl: `${outDirectoryRelativeUrl}${COMPILE_ID_BEST}/`,
@@ -222,7 +223,6 @@ export const buildProject = async ({
       runtimeSupport,
 
       urlVersioning,
-      urlVersionningForEntryPoints,
       lineBreakNormalization,
       useImportMapToMaximizeCacheReuse,
       preserveEntrySignatures,
@@ -238,6 +238,8 @@ export const buildProject = async ({
       workers,
       serviceWorkers,
       serviceWorkerFinalizer,
+      classicWorkers,
+      classicServiceWorkers,
 
       writeOnFileSystem,
       sourcemapExcludeSources,
@@ -255,27 +257,27 @@ export const buildProject = async ({
   }
 }
 
-const assertEntryPointMap = ({ entryPointMap }) => {
-  if (typeof entryPointMap !== "object") {
-    throw new TypeError(`entryPointMap must be an object, got ${entryPointMap}`)
+const assertentryPoints = ({ entryPoints }) => {
+  if (typeof entryPoints !== "object") {
+    throw new TypeError(`entryPoints must be an object, got ${entryPoints}`)
   }
-  const keys = Object.keys(entryPointMap)
+  const keys = Object.keys(entryPoints)
   keys.forEach((key) => {
     if (!key.startsWith("./")) {
       throw new TypeError(
-        `unexpected key in entryPointMap, all keys must start with ./ but found ${key}`,
+        `unexpected key in entryPoints, all keys must start with ./ but found ${key}`,
       )
     }
 
-    const value = entryPointMap[key]
+    const value = entryPoints[key]
     if (typeof value !== "string") {
       throw new TypeError(
-        `unexpected value in entryPointMap, all values must be strings found ${value} for key ${key}`,
+        `unexpected value in entryPoints, all values must be strings found ${value} for key ${key}`,
       )
     }
-    if (!value.startsWith("./")) {
+    if (value.includes("/")) {
       throw new TypeError(
-        `unexpected value in entryPointMap, all values must starts with ./ but found ${value} for key ${key}`,
+        `unexpected value in entryPoints, all values must be plain strings (no "/") but found ${value} for key ${key}`,
       )
     }
   })

package/src/internal/building/buildUsingRollup.js

@@ -22,7 +22,7 @@ export const buildUsingRollup = async ({
   logger,
 
   projectDirectoryUrl,
-  entryPointMap,
+  entryPoints,
   compileServerOrigin,
   compileDirectoryRelativeUrl,
   buildDirectoryUrl,
@@ -49,9 +49,10 @@ export const buildUsingRollup = async ({
   workers,
   serviceWorkers,
   serviceWorkerFinalizer,
+  classicWorkers,
+  classicServiceWorkers,
 
   urlVersioning,
-  urlVersionningForEntryPoints,
   lineBreakNormalization,
   jsConcatenation,
   cssConcatenation,
@@ -99,7 +100,7 @@ export const buildUsingRollup = async ({
     logger,
 
     projectDirectoryUrl,
-    entryPointMap,
+    entryPoints,
     compileServerOrigin,
     compileDirectoryRelativeUrl,
     buildDirectoryUrl,
@@ -121,9 +122,10 @@ export const buildUsingRollup = async ({
     workers,
     serviceWorkers,
     serviceWorkerFinalizer,
+    classicWorkers,
+    classicServiceWorkers,
 
     urlVersioning,
-    urlVersionningForEntryPoints,
     lineBreakNormalization,
     jsConcatenation,
     cssConcatenation,
@@ -204,7 +206,7 @@ export const buildUsingRollup = async ({
     buildFileContents,
     buildInlineFileContents,
     buildStats,
-  } = getResult()
+  } = await getResult()
 
   if (writeOnFileSystem) {
     if (buildDirectoryClean) {
@@ -264,7 +266,7 @@ const useRollup = async ({
 
   const rollupInputOptions = {
     // about cache here, we should/could reuse previous rollup call
-    // to get the cache from the entryPointMap
+    // to get the cache from the entryPoints
     // as shown here: https://rollupjs.org/guide/en#cache
     // it could be passed in arguments to this function
     // however parallelism and having different rollup options per
@@ -307,7 +309,7 @@ const useRollup = async ({
       logger.warn(String(warning))
     },
     // on passe input: [] car c'est le plugin jsenv qui se chargera d'emit des chunks
-    // en fonction de entryPointMap
+    // en fonction de entryPoints
     // on fait cela car sinon rollup est pénible si on passe un input de type html
     input: [],
     preserveEntrySignatures,

package/src/internal/building/build_logs.js

@@ -5,8 +5,8 @@ import { byteAsFileSize } from "../logs/byteAsFileSize.js"
 import { msAsDuration } from "../logs/msAsDuration.js"
 import { stringifyUrlSite } from "./url_trace.js"
 
-export const formatBuildStartLog = ({ entryPointMap }) => {
-  const entryFileRelativeUrls = Object.keys(entryPointMap)
+export const formatBuildStartLog = ({ entryPoints }) => {
+  const entryFileRelativeUrls = Object.keys(entryPoints)
   if (entryFileRelativeUrls.length === 1) {
     return `
 building ${entryFileRelativeUrls[0]}...`

package/src/internal/building/build_stats.js

@@ -59,7 +59,13 @@ const getProjectFileContents = (ressourceBuilder) => {
 
   Object.keys(ressourceMap).forEach((url) => {
     const ressource = ressourceMap[url]
-    const { isInline, isExternal, isPlaceholder, bufferBeforeBuild } = ressource
+    const {
+      isInline,
+      isExternal,
+      isPlaceholder,
+      isSourcemap,
+      bufferBeforeBuild,
+    } = ressource
     if (isInline) {
       // inline ressources are not files
       return
@@ -80,6 +86,10 @@ const getProjectFileContents = (ressourceBuilder) => {
       // to generate it in the build
       return
     }
+    if (isSourcemap && !bufferBeforeBuild) {
+      // sourcemap generated by rollup do not have bufferBeforeBuild
+      return
+    }
     projectFileContents[url] = bufferBeforeBuild
   })
   return projectFileContents

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,
   {