@jsenv/core 29.1.6 → 29.1.8

package/src/build/build.js

@@ -242,8 +242,8 @@ build ${entryPointKeys.length} entry points`)
     const buildUrlsGenerator = createBuilUrlsGenerator({
       buildDirectoryUrl,
     })
-    const buildToRawUrls = {}
-    // rename "buildDirectoryRedirections"?
+    const buildDirectoryRedirections = new Map()
+
     const associateBuildUrlAndRawUrl = (buildUrl, rawUrl, reason) => {
       if (urlIsInsideOf(rawUrl, buildDirectoryUrl)) {
         throw new Error(`raw url must be inside rawGraph, got ${rawUrl}`)
@@ -252,7 +252,7 @@ build ${entryPointKeys.length} entry points`)
 ${ANSI.color(rawUrl, ANSI.GREY)} ->
 ${ANSI.color(buildUrl, ANSI.MAGENTA)}
 `)
-      buildToRawUrls[buildUrl] = rawUrl
+      buildDirectoryRedirections.set(buildUrl, rawUrl)
     }
     const buildUrls = new Map()
     const bundleUrlInfos = {}
@@ -284,7 +284,9 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           resolveUrl: (reference) => {
             const getUrl = () => {
               if (reference.type === "filesystem") {
-                const parentRawUrl = buildToRawUrls[reference.parentUrl]
+                const parentRawUrl = buildDirectoryRedirections.get(
+                  reference.parentUrl,
+                )
                 const baseUrl = ensurePathnameTrailingSlash(parentRawUrl)
                 return new URL(reference.specifier, baseUrl).href
               }
@@ -314,7 +316,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               return reference.original ? reference.original.url : null
             }
             // already a build url
-            const rawUrl = buildToRawUrls[reference.url]
+            const rawUrl = buildDirectoryRedirections.get(reference.url)
             if (rawUrl) {
               return reference.url
             }
@@ -493,14 +495,14 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                 // logger.debug(`fetching from bundle ${url}`)
                 return bundleUrlInfo
               }
-              const rawUrl = buildToRawUrls[url] || url
+              const rawUrl = buildDirectoryRedirections.get(url) || url
               const rawUrlInfo = rawGraph.getUrlInfo(rawUrl)
               if (!rawUrlInfo) {
                 throw new Error(
                   createDetailedMessage(`Cannot find url`, {
                     url,
-                    "raw urls": Object.values(buildToRawUrls),
-                    "build urls": Object.keys(buildToRawUrls),
+                    "raw urls": Array.from(buildDirectoryRedirections.values()),
+                    "build urls": Array.from(buildDirectoryRedirections.keys()),
                   }),
                 )
               }
@@ -526,7 +528,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             if (reference.injected) {
               const [ref, rawUrlInfo] = rawGraphKitchen.injectReference({
                 ...reference,
-                parentUrl: buildToRawUrls[reference.parentUrl],
+                parentUrl: buildDirectoryRedirections.get(reference.parentUrl),
               })
               await rawGraphKitchen.cook(rawUrlInfo, { reference: ref })
               return rawUrlInfo
@@ -562,7 +564,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       ],
       sourcemaps,
       sourcemapsSourcesContent,
-      sourcemapsRelativeSources: !versioning,
+      sourcemapsSourcesRelative: !versioning,
       writeGeneratedFiles,
       outDirectoryUrl: new URL(".jsenv/postbuild/", rootDirectoryUrl),
     })
@@ -740,9 +742,9 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               }
               if (bundlerGeneratedUrlInfo.sourceUrls) {
                 bundlerGeneratedUrlInfo.sourceUrls.forEach((sourceUrl) => {
-                  const rawUrlInfo = rawGraph.getUrlInfo(sourceUrl)
-                  if (rawUrlInfo) {
-                    rawUrlInfo.data.bundled = true
+                  const sourceRawUrlInfo = rawGraph.getUrlInfo(sourceUrl)
+                  if (sourceRawUrlInfo) {
+                    sourceRawUrlInfo.data.bundled = true
                   }
                 })
               }
@@ -751,7 +753,23 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               })
               bundleRedirections.set(url, buildUrl)
               if (urlIsInsideOf(url, buildDirectoryUrl)) {
-                // chunk generated by rollup to share code
+                if (bundlerGeneratedUrlInfo.data.isDynamicEntry) {
+                  const rawUrlInfo = rawGraph.getUrlInfo(
+                    bundlerGeneratedUrlInfo.originalUrl,
+                  )
+                  rawUrlInfo.data.bundled = false
+                  bundleRedirections.set(
+                    bundlerGeneratedUrlInfo.originalUrl,
+                    buildUrl,
+                  )
+                  associateBuildUrlAndRawUrl(
+                    buildUrl,
+                    bundlerGeneratedUrlInfo.originalUrl,
+                    "bundle",
+                  )
+                } else {
+                  // chunk generated by rollup to share code
+                }
               } else {
                 associateBuildUrlAndRawUrl(buildUrl, url, "bundle")
               }
@@ -1018,7 +1036,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                 fetchUrlContent: (versionedUrlInfo) => {
                   if (versionedUrlInfo.isInline) {
                     const rawUrlInfo = rawGraph.getUrlInfo(
-                      buildToRawUrls[versionedUrlInfo.url],
+                      buildDirectoryRedirections.get(versionedUrlInfo.url),
                     )
                     const finalUrlInfo = finalGraph.getUrlInfo(
                       versionedUrlInfo.url,
@@ -1040,7 +1058,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             ],
             sourcemaps,
             sourcemapsSourcesContent,
-            sourcemapsRelativeSources: true,
+            sourcemapsSourcesRelative: true,
             writeGeneratedFiles,
             outDirectoryUrl: new URL(
               ".jsenv/postbuild/",
@@ -1109,7 +1127,8 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       /*
        * Update <link rel="preload"> and friends after build (once we know everything)
        * - Used to remove resource hint targeting an url that is no longer used:
-       *   - Happens because of import assertions transpilation (file is inlined into JS)
+       *   - because of bundlings
+       *   - because of import assertions transpilation (file is inlined into JS)
        */
       resync_resource_hints: {
         const actions = []
@@ -1153,7 +1172,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                     return
                   }
                   if (buildUrlInfo.dependents.size === 0) {
-                    logger.info(
+                    logger.warn(
                       `remove resource hint because "${href}" not used anymore`,
                     )
                     mutations.push(() => {
@@ -1180,7 +1199,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                   url = rawRedirections.get(url) || url
                   const rawUrlInfo = rawGraph.getUrlInfo(url)
                   if (rawUrlInfo && rawUrlInfo.data.bundled) {
-                    logger.info(
+                    logger.warn(
                       `remove resource hint on "${href}" because it was bundled`,
                     )
                     mutations.push(() => {
@@ -1190,6 +1209,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                     url = bundleRedirections.get(url) || url
                     url = bundleInternalRedirections.get(url) || url
                     url = finalRedirections.get(url) || url
+                    url = findKey(buildDirectoryRedirections, url) || url
                     onBuildUrl(url)
                   }
                 } else {

package/src/build/start_build_server.js

@@ -190,6 +190,10 @@ export const startBuildServer = async ({
     ],
   })
   startBuildServerTask.done()
+  if (hostname) {
+    delete server.origins.localip
+    delete server.origins.externalip
+  }
   logger.info(``)
   Object.keys(server.origins).forEach((key) => {
     logger.info(`- ${server.origins[key]}`)

package/src/dev/file_service.js

@@ -167,7 +167,15 @@ export const createFileService = ({
           return false
         }
         if (!watch) {
-          const fileContentAsBuffer = readFileSync(new URL(urlInfo.url))
+          let fileContentAsBuffer
+          try {
+            fileContentAsBuffer = readFileSync(new URL(urlInfo.url))
+          } catch (e) {
+            if (e.code === "ENOENT") {
+              return false
+            }
+            return false
+          }
           const fileContentEtag = bufferToEtag(fileContentAsBuffer)
           if (fileContentEtag !== urlInfo.originalContentEtag) {
             return false
@@ -273,30 +281,31 @@ export const createFileService = ({
     const ifNoneMatch = request.headers["if-none-match"]
     const urlInfoTargetedByCache = urlGraph.getParentIfInline(urlInfo)
 
-    if (ifNoneMatch) {
-      const [clientOriginalContentEtag, clientContentEtag] =
-        ifNoneMatch.split("_")
-      if (
-        urlInfoTargetedByCache.originalContentEtag ===
-          clientOriginalContentEtag &&
-        urlInfoTargetedByCache.contentEtag === clientContentEtag &&
-        urlInfoTargetedByCache.isValid()
-      ) {
-        const headers = {
-          "cache-control": `private,max-age=0,must-revalidate`,
-        }
-        Object.keys(urlInfo.headers).forEach((key) => {
-          if (key !== "content-length") {
-            headers[key] = urlInfo.headers[key]
+    try {
+      if (ifNoneMatch) {
+        const [clientOriginalContentEtag, clientContentEtag] =
+          ifNoneMatch.split("_")
+        if (
+          urlInfoTargetedByCache.originalContentEtag ===
+            clientOriginalContentEtag &&
+          urlInfoTargetedByCache.contentEtag === clientContentEtag &&
+          urlInfoTargetedByCache.isValid()
+        ) {
+          const headers = {
+            "cache-control": `private,max-age=0,must-revalidate`,
+          }
+          Object.keys(urlInfo.headers).forEach((key) => {
+            if (key !== "content-length") {
+              headers[key] = urlInfo.headers[key]
+            }
+          })
+          return {
+            status: 304,
+            headers,
           }
-        })
-        return {
-          status: 304,
-          headers,
         }
       }
-    }
-    try {
+
       // urlInfo objects are reused, they must be "reset" before cooking them again
       if (
         (urlInfo.error || urlInfo.contentEtag) &&

package/src/kitchen/kitchen.js

@@ -38,7 +38,7 @@ export const createKitchen = ({
   sourcemaps = scenarios.dev ? "inline" : "none", // "programmatic" and "file" also allowed
   sourcemapsSourcesProtocol,
   sourcemapsSourcesContent,
-  sourcemapsRelativeSources,
+  sourcemapsSourcesRelative,
   writeGeneratedFiles,
   outDirectoryUrl,
 }) => {
@@ -263,7 +263,7 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
     sourcemaps,
     sourcemapsSourcesProtocol,
     sourcemapsSourcesContent,
-    sourcemapsRelativeSources,
+    sourcemapsSourcesRelative,
     clientRuntimeCompat,
     injectSourcemapPlaceholder: ({ urlInfo, specifier }) => {
       const [sourcemapReference, sourcemapUrlInfo] = resolveReference(
@@ -652,6 +652,10 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
       if (generatedUrl && generatedUrl.startsWith("file:")) {
         if (urlInfo.type === "directory") {
           // no need to write the directory
+        } else if (urlInfo.content === null) {
+          // Some error might lead to urlInfo.content to be null
+          // (error hapenning before urlInfo.content can be set, or 404 for instance)
+          // in that case we can't write anything
         } else {
           writeFileSync(new URL(generatedUrl), urlInfo.content)
           const { sourcemapGeneratedUrl, sourcemap } = urlInfo
@@ -847,8 +851,14 @@ const adjustUrlSite = (urlInfo, { urlGraph, url, line, column }) => {
         isOriginal: true,
         url: inlineUrlSite.url,
         content: inlineUrlSite.content,
-        line: inlineUrlSite.line + urlSite.line,
-        column: inlineUrlSite.column + urlSite.column,
+        line:
+          inlineUrlSite.line === undefined
+            ? urlSite.line
+            : inlineUrlSite.line + urlSite.line,
+        column:
+          inlineUrlSite.column === undefined
+            ? urlSite.column
+            : inlineUrlSite.column + urlSite.column,
       },
       parentUrlInfo,
     )

package/src/kitchen/url_graph/url_info_transformations.js

@@ -13,7 +13,7 @@ export const createUrlInfoTransformer = ({
   sourcemaps,
   sourcemapsSourcesProtocol,
   sourcemapsSourcesContent,
-  sourcemapsRelativeSources,
+  sourcemapsSourcesRelative,
   urlGraph,
   injectSourcemapPlaceholder,
   foundSourcemap,
@@ -187,7 +187,7 @@ export const createUrlInfoTransformer = ({
         const sourcemapUrlInfo = urlGraph.getUrlInfo(sourcemapReference.url)
         sourcemapUrlInfo.contentType = "application/json"
         const sourcemap = urlInfo.sourcemap
-        if (sourcemapsRelativeSources) {
+        if (sourcemapsSourcesRelative) {
           sourcemap.sources = sourcemap.sources.map((source) => {
             const sourceRelative = urlToRelativeUrl(source, urlInfo.url)
             return sourceRelative || "."
@@ -214,7 +214,7 @@ export const createUrlInfoTransformer = ({
               contentType: urlInfo.contentType,
               content: urlInfo.content,
               specifier:
-                sourcemaps === "file" && sourcemapsRelativeSources
+                sourcemaps === "file" && sourcemapsSourcesRelative
                   ? urlToRelativeUrl(sourcemapReference.url, urlInfo.url)
                   : sourcemapReference.generatedSpecifier,
             })

package/src/plugins/bundling/js_module/bundle_js_modules.js

@@ -136,15 +136,27 @@ const rollupPluginJsenv = ({
         const rollupFileInfo = rollupResult[fileName]
         // there is 3 types of file: "placeholder", "asset", "chunk"
         if (rollupFileInfo.type === "chunk") {
+          const sourceUrls = Object.keys(rollupFileInfo.modules).map((id) =>
+            fileUrlConverter.asFileUrl(id),
+          )
+
           let url
+          let originalUrl
           if (rollupFileInfo.facadeModuleId) {
             url = fileUrlConverter.asFileUrl(rollupFileInfo.facadeModuleId)
+            originalUrl = url
           } else {
             url = new URL(rollupFileInfo.fileName, buildDirectoryUrl).href
+            if (rollupFileInfo.isDynamicEntry) {
+              originalUrl = sourceUrls[sourceUrls.length - 1]
+            } else {
+              originalUrl = url
+            }
           }
+
           const jsModuleBundleUrlInfo = {
             url,
-            originalUrl: url,
+            originalUrl,
             type: format === "esm" ? "js_module" : "common_js",
             data: {
               generatedBy: "rollup",
@@ -152,10 +164,9 @@ const rollupPluginJsenv = ({
               usesImport:
                 rollupFileInfo.imports.length > 0 ||
                 rollupFileInfo.dynamicImports.length > 0,
+              isDynamicEntry: rollupFileInfo.isDynamicEntry,
             },
-            sourceUrls: Object.keys(rollupFileInfo.modules).map((id) =>
-              fileUrlConverter.asFileUrl(id),
-            ),
+            sourceUrls,
             contentType: "text/javascript",
             content: rollupFileInfo.code,
             sourcemap: rollupFileInfo.map,

package/src/plugins/supervisor/client/supervisor.js

@@ -101,7 +101,10 @@ window.__supervisor__ = (() => {
               return
             }
             // firefox
-            if (message.startsWith("import not found:")) {
+            if (
+              message.startsWith("import not found:") ||
+              message.startsWith("ambiguous indirect export:")
+            ) {
               exception.code = DYNAMIC_IMPORT_EXPORT_MISSING
               return
             }

package/src/plugins/transpilation/as_js_classic/convert_js_module_to_js_classic.js

@@ -1,5 +1,9 @@
 import { readFileSync } from "@jsenv/filesystem"
-import { createMagicSource, composeTwoSourcemaps } from "@jsenv/sourcemap"
+import {
+  createMagicSource,
+  composeTwoSourcemaps,
+  SOURCEMAP,
+} from "@jsenv/sourcemap"
 import { applyBabelPlugins } from "@jsenv/ast"
 
 import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
@@ -67,8 +71,23 @@ export const convertJsModuleToJsClassic = async ({
     urlInfo.isEntryPoint
   ) {
     const magicSource = createMagicSource(code)
-    const systemjsCode = readFileSync(systemJsClientFileUrl, { as: "string" })
-    magicSource.prepend(`${systemjsCode}\n\n`)
+    let systemJsFileContent = readFileSync(systemJsClientFileUrl, {
+      as: "string",
+    })
+    const sourcemapFound = SOURCEMAP.readComment({
+      contentType: "text/javascript",
+      content: systemJsFileContent,
+    })
+    if (sourcemapFound) {
+      // for now let's remove s.js sourcemap
+      // because it would likely mess the sourcemap of the entry point itself
+      systemJsFileContent = SOURCEMAP.writeComment({
+        contentType: "text/javascript",
+        content: systemJsFileContent,
+        specifier: "",
+      })
+    }
+    magicSource.prepend(`${systemJsFileContent}\n\n`)
     const magicResult = magicSource.toContentAndSourcemap()
     sourcemap = await composeTwoSourcemaps(sourcemap, magicResult.sourcemap)
     return {

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic_conversion.js

@@ -4,6 +4,7 @@
  */
 
 import { injectQueryParams } from "@jsenv/urls"
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
 import { convertJsModuleToJsClassic } from "./convert_js_module_to_js_classic.js"
 
 export const jsenvPluginAsJsClassicConversion = ({
@@ -11,12 +12,44 @@ export const jsenvPluginAsJsClassicConversion = ({
   systemJsClientFileUrl,
   generateJsClassicFilename,
 }) => {
+  const isReferencingJsModule = (reference) => {
+    if (
+      reference.type === "js_import_export" ||
+      reference.subtype === "system_register_arg" ||
+      reference.subtype === "system_import_arg"
+    ) {
+      return true
+    }
+    if (reference.type === "js_url_specifier") {
+      if (reference.expectedType === "js_classic") {
+        return false
+      }
+      if (
+        reference.expectedType === undefined &&
+        CONTENT_TYPE.fromUrlExtension(reference.url) === "text/javascript"
+      ) {
+        // by default, js referenced by new URL is considered as "js_module"
+        // in case this is not desired code must use "?js_classic" like
+        // new URL('./file.js?js_classic', import.meta.url)
+        return true
+      }
+    }
+    return false
+  }
+
   const shouldPropagateJsClassic = (reference, context) => {
-    const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl)
-    if (!parentUrlInfo) {
-      return false
+    if (isReferencingJsModule(reference, context)) {
+      const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl)
+      if (!parentUrlInfo) {
+        return false
+      }
+      // if (parentUrlInfo.isEntryPoint) {
+      //   return true
+      // }
+      return new URL(parentUrlInfo.url).searchParams.has("as_js_classic")
     }
-    return new URL(parentUrlInfo.url).searchParams.has("as_js_classic")
+
+    return false
   }
   const markAsJsClassicProxy = (reference) => {
     reference.expectedType = "js_classic"
@@ -38,20 +71,14 @@ export const jsenvPluginAsJsClassicConversion = ({
         markAsJsClassicProxy(reference)
         return null
       }
-      if (
-        reference.type === "js_import_export" ||
-        reference.subtype === "system_register_arg" ||
-        reference.subtype === "system_import_arg"
-      ) {
-        // We want to propagate transformation of js module to js classic to:
-        // - import specifier (static/dynamic import + re-export)
-        // - url specifier when inside System.register/_context.import()
-        //   (because it's the transpiled equivalent of static and dynamic imports)
-        // And not other references otherwise we could try to transform inline resources
-        // or specifiers inside new URL()...
-        if (shouldPropagateJsClassic(reference, context)) {
-          return turnIntoJsClassicProxy(reference, context)
-        }
+      // We want to propagate transformation of js module to js classic to:
+      // - import specifier (static/dynamic import + re-export)
+      // - url specifier when inside System.register/_context.import()
+      //   (because it's the transpiled equivalent of static and dynamic imports)
+      // And not other references otherwise we could try to transform inline resources
+      // or specifiers inside new URL()...
+      if (shouldPropagateJsClassic(reference, context)) {
+        return turnIntoJsClassicProxy(reference, context)
       }
       return null
     },

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic_html.js

@@ -16,7 +16,8 @@ import {
   injectScriptNodeAsEarlyAsPossible,
   createHtmlNode,
 } from "@jsenv/ast"
-import { injectQueryParams } from "@jsenv/urls"
+import { injectQueryParams, urlToRelativeUrl } from "@jsenv/urls"
+import { SOURCEMAP } from "@jsenv/sourcemap"
 
 export const jsenvPluginAsJsClassicHtml = ({
   systemJsInjection,
@@ -162,10 +163,25 @@ export const jsenvPluginAsJsClassicHtml = ({
           }
           if (needsSystemJs) {
             mutations.push(async () => {
-              const systemJsFileContent = readFileSync(
+              let systemJsFileContent = readFileSync(
                 new URL(systemJsClientFileUrl),
                 { encoding: "utf8" },
               )
+              const sourcemapFound = SOURCEMAP.readComment({
+                contentType: "text/javascript",
+                content: systemJsFileContent,
+              })
+              if (sourcemapFound) {
+                const sourcemapFileUrl = new URL(
+                  sourcemapFound.specifier,
+                  systemJsClientFileUrl,
+                )
+                systemJsFileContent = SOURCEMAP.writeComment({
+                  contentType: "text/javascript",
+                  content: systemJsFileContent,
+                  specifier: urlToRelativeUrl(sourcemapFileUrl, urlInfo.url),
+                })
+              }
               const [systemJsReference, systemJsUrlInfo] =
                 context.referenceUtils.inject({
                   type: "script_src",