@jsenv/core 25.4.9 → 26.0.0

package/src/internal/building/{buildUsingRollup.js → build_using_rollup.js}

@@ -33,13 +33,9 @@ export const buildUsingRollup = async ({
 
   format,
   systemJsUrl,
-  globalName,
   globals,
-  workers,
-  serviceWorkers,
+  preservedDynamicImports,
   serviceWorkerFinalizer,
-  classicWorkers,
-  classicServiceWorkers,
 
   node,
   browser,
@@ -79,6 +75,9 @@ export const buildUsingRollup = async ({
 
     format,
     systemJsUrl,
+    globals,
+    preservedDynamicImports,
+
     urlMappings,
     importResolutionMethod,
     importMapFileRelativeUrl,
@@ -86,11 +85,7 @@ export const buildUsingRollup = async ({
     externalImportSpecifiers,
     importPaths,
     preservedUrls,
-    workers,
-    serviceWorkers,
     serviceWorkerFinalizer,
-    classicWorkers,
-    classicServiceWorkers,
 
     node,
     browser,
@@ -118,8 +113,6 @@ export const buildUsingRollup = async ({
       rollupPlugins,
       compileProfile,
       format,
-      globals,
-      globalName,
       sourcemapExcludeSources,
       preserveEntrySignatures,
       treeshake,
@@ -224,8 +217,6 @@ const useRollup = async ({
   rollupPlugins,
   compileProfile,
   format,
-  globals,
-  globalName,
   sourcemapExcludeSources,
   preserveEntrySignatures,
   treeshake,
@@ -316,12 +307,6 @@ const useRollup = async ({
     sourcemap: true,
     sourcemapExcludeSources,
     // preserveModules: !jsConcatenation,
-    ...(format === "global"
-      ? {
-          globals,
-          name: globalName,
-        }
-      : {}),
   }
 
   buildOperation.throwIfAborted()
@@ -336,7 +321,7 @@ const useRollup = async ({
 }
 
 const formatToRollupFormat = (format) => {
-  if (format === "global") return "iife"
+  if (format === "global") return "esm" // will be handled by rollup_plugin_iife
   if (format === "commonjs") return "cjs"
   if (format === "systemjs") return "system"
   if (format === "esmodule") return "esm"
@@ -367,7 +352,7 @@ const getConvertSuggestion = async ({
   return {
     suggestion: `The file seems written in commonjs, you should use "customCompiler" to convert it to js module
 {
-  "./${importedFileOriginalRelativeUrl}": commonJsToJavaScriptModule
+  "./${importedFileOriginalRelativeUrl}": commonJsToJsModule
 }
 As documented in https://github.com/jsenv/jsenv-core/blob/master/docs/shared-parameters.md#customcompilers`,
   }

package/src/internal/building/css/{parseCssRessource.js → jsenv_parse_css.js}

@@ -9,11 +9,12 @@ import {
   generateSourcemapUrl,
   getCssSourceMappingUrl,
   setCssSourceMappingUrl,
-} from "@jsenv/core/src/internal/sourceMappingURLUtils.js"
+} from "@jsenv/core/src/internal/sourcemap_utils.js"
+
 import { getRessourceAsBase64Url } from "../ressource_builder_util.js"
-import { parseCssUrls } from "./parseCssUrls.js"
-import { replaceCssUrls } from "./replaceCssUrls.js"
-import { moveCssUrls } from "./moveCssUrls.js"
+import { parseCssUrls } from "./parse_css_urls.js"
+import { replaceCssUrls } from "./replace_css_urls.js"
+import { moveCssUrls } from "./move_css_urls.js"
 
 export const parseCssRessource = async (
   cssRessource,

package/src/internal/building/css/{moveCssUrls.js → move_css_urls.js}

@@ -1,6 +1,6 @@
 import { urlToRelativeUrl } from "@jsenv/filesystem"
 
-import { applyPostCss } from "./applyPostCss.js"
+import { applyPostCss } from "./apply_post_css.js"
 import { postCssPluginUrlVisitor } from "./postcss_plugin_url_visitor.js"
 
 export const moveCssUrls = async ({

package/src/internal/building/css/{parseCssUrls.js → parse_css_urls.js}

@@ -1,4 +1,4 @@
-import { applyPostCss } from "./applyPostCss.js"
+import { applyPostCss } from "./apply_post_css.js"
 import { postCssPluginUrlVisitor } from "./postcss_plugin_url_visitor.js"
 
 export const parseCssUrls = async ({ code, url = "file:///file.css" }) => {

package/src/internal/building/css/postcss_plugin_url_visitor.js

@@ -12,6 +12,7 @@ hence sourcemap cannot point the original source location
 */
 
 import { fileSystemPathToUrl, resolveUrl } from "@jsenv/filesystem"
+
 import { require } from "@jsenv/core/src/internal/require.js"
 
 export const postCssPluginUrlVisitor = ({ urlVisitor = () => null }) => {

package/src/internal/building/css/{replaceCssUrls.js → replace_css_urls.js}

@@ -4,7 +4,8 @@ import {
 } from "@jsenv/filesystem"
 
 import { require } from "@jsenv/core/src/internal/require.js"
-import { applyPostCss } from "./applyPostCss.js"
+
+import { applyPostCss } from "./apply_post_css.js"
 import { postCssPluginUrlVisitor } from "./postcss_plugin_url_visitor.js"
 
 export const replaceCssUrls = async ({

package/src/internal/building/global_format/es_to_system.js

@@ -0,0 +1,34 @@
+export const esToSystem = async ({ code, url, map }) => {
+  const { rollup } = await import("rollup")
+  const rollupBuild = await rollup({
+    input: url,
+    plugins: [
+      {
+        name: "es-to-system",
+        resolveId: (id) => {
+          if (id === url) {
+            return id
+          }
+          return { external: true }
+        },
+        load: (id) => {
+          if (id === url) {
+            return code
+          }
+          return null
+        },
+      },
+    ],
+  })
+  const { output } = await rollupBuild.generate({
+    format: "system",
+    sourcemap: true,
+  })
+  const firstChunk = output[0]
+  code = firstChunk.code
+  map = firstChunk.map
+  return {
+    code,
+    map,
+  }
+}

package/src/internal/building/html/{htmlScan.js → html_scan.js}

@@ -3,7 +3,7 @@ import {
   visitHtmlAst,
   getHtmlNodeAttributeByName,
   getHtmlNodeTextNode,
-} from "@jsenv/core/src/internal/compiling/compileHtml.js"
+} from "@jsenv/core/src/internal/compile_server/html/html_ast.js"
 
 export const importMapsFromHtml = (htmlSource) => {
   const importmaps = []

package/src/internal/building/html/{parseHtmlRessource.js → jsenv_parse_html.js}

@@ -19,7 +19,6 @@ Or be sure to also reference this url somewhere in the html file like
 import { urlToFilename, urlToRelativeUrl, resolveUrl } from "@jsenv/filesystem"
 import { applyAlgoToRepresentationData } from "@jsenv/integrity"
 
-
 import {
   parseHtmlString,
   parseHtmlAstRessources,
@@ -35,21 +34,21 @@ import {
   getHtmlNodeLocation,
   removeHtmlNode,
   addHtmlNodeAttribute,
-} from "@jsenv/core/src/internal/compiling/compileHtml.js"
+} from "@jsenv/core/src/internal/compile_server/html/html_ast.js"
 import {
   getJavaScriptSourceMappingUrl,
   setJavaScriptSourceMappingUrl,
   getCssSourceMappingUrl,
   setCssSourceMappingUrl,
-} from "@jsenv/core/src/internal/sourceMappingURLUtils.js"
+} from "@jsenv/core/src/internal/sourcemap_utils.js"
 import {
   getRessourceAsBase64Url,
   isReferencedOnlyByRessourceHint,
 } from "../ressource_builder_util.js"
-import { collectNodesMutations } from "../parsing.utils.js"
+import { collectNodesMutations } from "./html_node_mutations.js"
 
-import { collectSvgMutations } from "../svg/parseSvgRessource.js"
-import { moveCssUrls } from "../css/moveCssUrls.js"
+import { collectSvgMutations } from "../svg/jsenv_parse_svg.js"
+import { moveCssUrls } from "../css/move_css_urls.js"
 
 export const parseHtmlRessource = async (
   htmlRessource,

package/src/internal/building/{css_module.js → import_assertions/css_module.js}

@@ -1,11 +1,11 @@
 import { resolveUrl, urlToRelativeUrl } from "@jsenv/filesystem"
 
-import { moveCssUrls } from "@jsenv/core/src/internal/building/css/moveCssUrls.js"
-import { escapeTemplateStringSpecialCharacters } from "@jsenv/core/src/internal/escapeTemplateStringSpecialCharacters.js"
+import { escapeTemplateStringSpecialCharacters } from "@jsenv/core/src/internal/template_string_escape.js"
 import {
   getCssSourceMappingUrl,
   setCssSourceMappingUrl,
-} from "@jsenv/core/src/internal/sourceMappingURLUtils.js"
+} from "@jsenv/core/src/internal/sourcemap_utils.js"
+import { moveCssUrls } from "@jsenv/core/src/internal/building/css/move_css_urls.js"
 
 export const convertCssTextToJavascriptModule = async ({
   cssUrl,

package/src/internal/building/import_references.js

@@ -4,7 +4,6 @@ export const visitImportReferences = async ({
   onReferenceWithImportAssertion,
 }) => {
   const { asyncWalk } = await import("estree-walker")
-
   await asyncWalk(ast, {
     enter: async (node, parent) => {
       if (isNewUrlImportMetaUrl(node)) {

package/src/internal/building/js/{parseJsRessource.js → jsenv_parse_js.js}

@@ -4,7 +4,8 @@ import {
   generateSourcemapUrl,
   getJavaScriptSourceMappingUrl,
   setJavaScriptSourceMappingUrl,
-} from "@jsenv/core/src/internal/sourceMappingURLUtils.js"
+} from "@jsenv/core/src/internal/sourcemap_utils.js"
+
 import { transformWorker } from "./transform_worker.js"
 
 export const parseJsRessource = async (

package/src/internal/building/js/transform_worker.js

@@ -2,7 +2,7 @@
 // var blob = new Blob(code, { type: 'text/javascript' })
 // window.URL.createObjectURL(blob)
 
-import { readFileSync } from "fs"
+import { readFileSync } from "node:fs"
 import { urlToFileSystemPath } from "@jsenv/filesystem"
 import { createDetailedMessage } from "@jsenv/logger"
 

package/src/internal/building/{parseRessource.js → parse_ressource.js}

@@ -1,5 +1,9 @@
 import { readFile, urlToRelativeUrl } from "@jsenv/filesystem"
 
+import {
+  jsenvSystemJsFileInfo,
+  jsenvResolveImportUrlHelper,
+} from "@jsenv/core/src/jsenv_file_urls.js"
 import {
   parseHtmlString,
   findHtmlNode,
@@ -8,19 +12,15 @@ import {
   getHtmlNodeTextNode,
   manipulateHtmlAst,
   findFirstImportMapNode,
-} from "@jsenv/core/src/internal/compiling/compileHtml.js"
-import {
-  jsenvSystemJsFileInfo,
-  jsenvResolveImportUrlHelper,
-} from "@jsenv/core/src/internal/jsenvInternalFiles.js"
-
-import { parseHtmlRessource } from "./html/parseHtmlRessource.js"
-import { parseImportmapRessource } from "./importmap/parseImportmapRessource.js"
-import { parseSvgRessource } from "./svg/parseSvgRessource.js"
-import { parseCssRessource } from "./css/parseCssRessource.js"
-import { parseJsRessource } from "./js/parseJsRessource.js"
-import { parseJsonRessource } from "./json/parseJsonRessource.js"
-import { parseWebmanifestRessource } from "./webmanifest/parseWebmanifestRessource.js"
+} from "@jsenv/core/src/internal/compile_server/html/html_ast.js"
+
+import { parseHtmlRessource } from "./html/jsenv_parse_html.js"
+import { parseImportmapRessource } from "./importmap/jsenv_parse_importmap.js"
+import { parseSvgRessource } from "./svg/jsenv_parse_svg.js"
+import { parseCssRessource } from "./css/jsenv_parse_css.js"
+import { parseJsRessource } from "./js/jsenv_parse_js.js"
+import { parseJsonRessource } from "./json/jsenv_parse_json.js"
+import { parseWebmanifestRessource } from "./webmanifest/jsenv_parse_webmanifest.js"
 
 export const parseRessource = async (
   ressource,

package/src/internal/building/ressource_builder.js

@@ -1,10 +1,11 @@
 import { resolveUrl, urlToRelativeUrl } from "@jsenv/filesystem"
 import { createLogger, loggerToLevels } from "@jsenv/logger"
 
-import { setJavaScriptSourceMappingUrl } from "@jsenv/core/src/internal/sourceMappingURLUtils.js"
+import { setJavaScriptSourceMappingUrl } from "@jsenv/core/src/internal/sourcemap_utils.js"
+import { DataUrl } from "@jsenv/core/src/internal/data_url.js"
 
 import { racePromises } from "../promise_race.js"
-import { parseDataUrl } from "../dataUrl.utils.js"
+
 import {
   getRessourceAsBase64Url,
   memoize,
@@ -276,7 +277,7 @@ export const createRessourceBuilder = (
     if (ressourceUrl.startsWith("data:")) {
       isExternal = false
       isInline = true
-      const { mediaType, base64Flag, data } = parseDataUrl(ressourceUrl)
+      const { mediaType, base64Flag, data } = DataUrl.parse(ressourceUrl)
       contentTypeExpected = mediaType
       contentType = mediaType
       bufferBeforeBuild = base64Flag

package/src/internal/building/ressource_builder_util.js

@@ -1,10 +1,10 @@
 import { isFileSystemPath, fileSystemPathToUrl } from "@jsenv/filesystem"
 import { createDetailedMessage } from "@jsenv/logger"
 
-import { stringifyDataUrl } from "@jsenv/core/src/internal/dataUrl.utils.js"
+import { DataUrl } from "@jsenv/core/src/internal/data_url.js"
 
 export const getRessourceAsBase64Url = ({ bufferAfterBuild, contentType }) => {
-  return stringifyDataUrl({
+  return DataUrl.stringify({
     data: bufferAfterBuild,
     base64Flag: true,
     mediaType: contentType,