@jsenv/core 25.5.0 → 26.0.1

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,

package/src/internal/building/rollup_plugin_jsenv.js

@@ -1,4 +1,4 @@
-import { extname } from "node:path"
+import path from "node:path"
 import MagicString from "magic-string"
 import { composeTwoImportMaps, normalizeImportMap } from "@jsenv/importmap"
 import { isSpecifierForNodeCoreModule } from "@jsenv/importmap/src/isSpecifierForNodeCoreModule.js"
@@ -15,25 +15,28 @@ import {
   urlToBasename,
   urlToFilename,
   readFile,
+  urlToFileSystemPath,
 } from "@jsenv/filesystem"
 import { UNICODE } from "@jsenv/log"
 
-import { convertJsonTextToJavascriptModule } from "@jsenv/core/src/internal/building/json_module.js"
-import { convertCssTextToJavascriptModule } from "@jsenv/core/src/internal/building/css_module.js"
-import { transformJs } from "@jsenv/core/src/internal/compiling/js-compilation-service/transformJs.js"
+import { jsenvHelpersDirectoryInfo } from "@jsenv/core/src/jsenv_file_urls.js"
+import { require } from "@jsenv/core/src/internal/require.js"
+import { transformJs } from "@jsenv/core/src/internal/compile_server/js/js_transformer.js"
 import { createUrlConverter } from "@jsenv/core/src/internal/url_conversion.js"
-import { createUrlFetcher } from "@jsenv/core/src/internal/building/url_fetcher.js"
-import { createUrlLoader } from "@jsenv/core/src/internal/building/url_loader.js"
-import { stringifyUrlTrace } from "@jsenv/core/src/internal/building/url_trace.js"
-import { sortObjectByPathnames } from "@jsenv/core/src/internal/building/sortObjectByPathnames.js"
-import { jsenvHelpersDirectoryInfo } from "@jsenv/core/src/internal/jsenvInternalFiles.js"
-import { createImportResolverForNode } from "@jsenv/core/src/internal/import-resolution/import-resolver-node.js"
-import { createImportResolverForImportmap } from "@jsenv/core/src/internal/import-resolution/import-resolver-importmap.js"
-import { getDefaultImportmap } from "@jsenv/core/src/internal/import-resolution/importmap_default.js"
+import { createImportResolverForNode } from "@jsenv/core/src/internal/import_resolution/import_resolver_node.js"
+import { createImportResolverForImportmap } from "@jsenv/core/src/internal/import_resolution/import_resolver_importmap.js"
+import { getDefaultImportmap } from "@jsenv/core/src/internal/import_resolution/importmap_default.js"
 import { createJsenvRemoteDirectory } from "@jsenv/core/src/internal/jsenv_remote_directory.js"
 import { setUrlSearchParamsDescriptor } from "@jsenv/core/src/internal/url_utils.js"
-import { shakeBabelPluginMap } from "@jsenv/core/src/internal/compiling/jsenv_directory/compile_profile.js"
-
+import { shakeBabelPluginMap } from "@jsenv/core/src/internal/compile_server/jsenv_directory/compile_profile.js"
+
+import { convertJsonTextToJavascriptModule } from "./import_assertions/json_module.js"
+import { convertCssTextToJavascriptModule } from "./import_assertions/css_module.js"
+import { importMapsFromHtml } from "./html/html_scan.js"
+import { esToSystem } from "./global_format/es_to_system.js"
+import { createUrlFetcher } from "./url_fetcher.js"
+import { createUrlLoader } from "./url_loader.js"
+import { stringifyUrlTrace } from "./url_trace.js"
 import {
   formatBuildStartLog,
   formatUseImportMapFromHtml,
@@ -41,14 +44,14 @@ import {
   formatRessourceHintNeverUsedWarning,
   formatBuildDoneInfo,
 } from "./build_logs.js"
-import { importMapsFromHtml } from "./html/htmlScan.js"
-import { parseRessource } from "./parseRessource.js"
+import { parseRessource } from "./parse_ressource.js"
 import {
   createRessourceBuilder,
   referenceToCodeForRollup,
 } from "./ressource_builder.js"
 import { createBuildUrlGenerator } from "./build_url_generator.js"
 import { visitImportReferences } from "./import_references.js"
+import { sortObjectByPathnames } from "./sort_pathnames.js"
 import { createBuildStats } from "./build_stats.js"
 
 export const createRollupPlugins = async ({
@@ -66,13 +69,12 @@ export const createRollupPlugins = async ({
   externalImportSpecifiers,
   importPaths,
   preservedUrls,
-  workers,
-  serviceWorkers,
   serviceWorkerFinalizer,
-  classicWorkers,
-  classicServiceWorkers,
+
   format,
   systemJsUrl,
+  globals,
+  preservedDynamicImports,
 
   node,
   compileServer,
@@ -127,12 +129,15 @@ export const createRollupPlugins = async ({
   let buildStats = {}
   const buildStartMs = Date.now()
 
+  const serviceWorkerUrls = []
+  const classicServiceWorkerUrls = []
+
   let lastErrorMessage
   const storeLatestJsenvPluginError = (error) => {
     lastErrorMessage = error.message
   }
 
-  const extension = extname(entryPoints[Object.keys(entryPoints)[0]])
+  const extension = path.extname(entryPoints[Object.keys(entryPoints)[0]])
   const outputExtension = extension === ".html" ? ".js" : extension
 
   const entryPointUrls = {}
@@ -140,19 +145,6 @@ export const createRollupPlugins = async ({
     const url = resolveUrl(key, projectDirectoryUrl)
     entryPointUrls[url] = entryPoints[key]
   })
-  const workerUrls = workers.map((worker) =>
-    resolveUrl(worker, projectDirectoryUrl),
-  )
-  const serviceWorkerUrls = serviceWorkers.map((serviceWorker) =>
-    resolveUrl(serviceWorker, projectDirectoryUrl),
-  )
-  const classicWorkerUrls = classicWorkers.map((classicWorker) =>
-    resolveUrl(classicWorker, projectDirectoryUrl),
-  )
-  const classicServiceWorkerUrls = classicServiceWorkers.map(
-    (classicServiceWorker) =>
-      resolveUrl(classicServiceWorker, projectDirectoryUrl),
-  )
 
   let ressourceBuilder
   let importResolver
@@ -311,18 +303,136 @@ export const createRollupPlugins = async ({
       },
     })
   }
+  if (format === "global") {
+    const globalsForRollup = {}
+    Object.keys(globals).forEach((key) => {
+      if (key.startsWith("./")) {
+        const keyAsUrl = resolveUrl(key, projectDirectoryUrl)
+        const keyAsPath = urlToFileSystemPath(keyAsUrl)
+        globalsForRollup[keyAsPath] = globals[key]
+      } else {
+        globalsForRollup[key] = globals[key]
+      }
+    })
+    const ESIIFE = require("es-iife")
+    const globalNameFromChunkInfo = (chunkInfo) => {
+      const originalUrl = asOriginalUrl(chunkInfo.facadeModuleId)
+      const originalPath = urlToFileSystemPath(originalUrl)
+      const nameFromGlobals = globalsForRollup[originalPath]
+      return nameFromGlobals || path.parse(chunkInfo.fileName).name
+    }
+    const structuredMetaMap = normalizeStructuredMetaMap(
+      { preserved: preservedDynamicImports },
+      projectDirectoryUrl,
+    )
+    const isPreservedDynamicImport = (url) => {
+      const meta = urlToMeta({ url, structuredMetaMap })
+      return Boolean(meta.preserved)
+    }
+    rollupPlugins.push({
+      async transform(code, id) {
+        const serverUrl = asServerUrl(id)
+        const originalUrl = asOriginalUrl(id)
+        if (isPreservedDynamicImport(originalUrl)) {
+          return null
+        }
+        const jsRessource = ressourceBuilder.findRessource((ressource) => {
+          return ressource.url === serverUrl
+        })
+        if (!jsRessource || !jsRessource.isEntryPoint) {
+          return null
+        }
+        let map = null
+        const ast = this.parse(code, {
+          // used to know node line and column
+          locations: true,
+        })
+        let useDynamicImport = false
+        const { walk } = await import("estree-walker")
+        walk(ast, {
+          enter: (node) => {
+            if (node.type === "ImportExpression") {
+              useDynamicImport = true
+            }
+          },
+        })
+        if (!useDynamicImport) {
+          return null
+        }
+        const magicString = new MagicString(code)
+        magicString.prepend(
+          `import "@jsenv/core/src/internal/runtime_client/s.js";`,
+        )
+        code = magicString.toString()
+        map = magicString.generateMap({ hires: true })
+        return { code, map }
+      },
+
+      outputOptions: (outputOptions) => {
+        outputOptions.globals = globalsForRollup
+        outputOptions.format = "esm"
+      },
+      resolveImportMeta: (property, { chunkId }) => {
+        if (property === "url") {
+          return `(document.currentScript && document.currentScript.src || new URL("${chunkId}", document.baseURI).href);`
+        }
+        return undefined
+      },
+      renderDynamicImport: ({ moduleId }) => {
+        const originalUrl = asOriginalUrl(moduleId)
+        if (isPreservedDynamicImport(originalUrl)) {
+          return null
+        }
+        return {
+          left: "System.import(",
+          right: ")",
+        }
+      },
+      async renderChunk(code, chunkInfo) {
+        const serverUrl = asServerUrl(chunkInfo.facadeModuleId)
+        const jsRessource = ressourceBuilder.findRessource(
+          (ressource) => ressource.url === serverUrl,
+        )
+        if (jsRessource.isEntryPoint) {
+          const name = globalNameFromChunkInfo(chunkInfo)
+          const out = ESIIFE.transform({
+            code,
+            parse: this.parse,
+            name,
+            sourcemap: true,
+            resolveGlobal: (specifier) => {
+              const url = resolveUrl(specifier, chunkInfo.facadeModuleId)
+              const globalName = urlToBasename(url)
+              return globalName
+            },
+            strict: true,
+          })
+          code = out.code
+          const map = out.map
+          return {
+            code,
+            map,
+          }
+        }
+        return esToSystem({
+          code,
+          url: serverUrl,
+          map: chunkInfo.map,
+        })
+      },
+    })
+  }
   if (minify) {
     const methodHooks = {
       minifyJs: async (...args) => {
-        const { minifyJs } = await import("./js/minifyJs.js")
+        const { minifyJs } = await import("./js/minify_js.js")
         return minifyJs(...args)
       },
       minifyHtml: async (...args) => {
-        const { minifyHtml } = await import("./html/minifyHtml.js")
+        const { minifyHtml } = await import("./html/minify_html.js")
         return minifyHtml(...args)
       },
     }
-
     minifyJs = async ({ url, code, map, ...rest }) => {
       const result = await methodHooks.minifyJs({
         url,
@@ -336,11 +446,9 @@ export const createRollupPlugins = async ({
         map: result.map,
       }
     }
-
     minifyHtml = async (html) => {
       return methodHooks.minifyHtml(html, minifyHtmlOptions)
     }
-
     rollupPlugins.push({
       name: "jsenv_minifier",
       async renderChunk(code, chunk) {
@@ -354,7 +462,6 @@ export const createRollupPlugins = async ({
           module: format === "esmodule",
           ...(format === "global" ? { toplevel: false } : { toplevel: true }),
         })
-
         code = result.code
         map = result.map
         return {
@@ -685,19 +792,21 @@ export const createRollupPlugins = async ({
               const compiledFileUrl = asCompiledServerUrl(fileUrl)
               resolutionResult.url = compiledFileUrl
             }
-
-            if (workerUrls.includes(ressourceOriginalUrl)) {
+            const { searchParams } = new URL(ressourceUrl)
+            if (searchParams.has("module")) {
+              resolutionResult.isJsModule = true
+            } else if (searchParams.has("worker")) {
               resolutionResult.isWorker = true
               resolutionResult.isJsModule = true
-            } else if (serviceWorkerUrls.includes(ressourceOriginalUrl)) {
+            } else if (searchParams.has("service_worker")) {
               resolutionResult.isServiceWorker = true
               resolutionResult.isJsModule = true
-            } else if (classicWorkerUrls.includes(ressourceOriginalUrl)) {
+              serviceWorkerUrls.push(ressourceOriginalUrl)
+            } else if (searchParams.has("worker_type_classic")) {
               resolutionResult.isWorker = true
-            } else if (
-              classicServiceWorkerUrls.includes(ressourceOriginalUrl)
-            ) {
+            } else if (searchParams.has("service_worker_type_classic")) {
               resolutionResult.isServiceWorker = true
+              classicServiceWorkerUrls.push(ressourceOriginalUrl)
             }
             return resolutionResult
           },
@@ -927,6 +1036,9 @@ export const createRollupPlugins = async ({
           return ressource.rollupReferenceId === referenceId
         })
         ressource.buildRelativeUrlWithoutHash = fileName
+        if (ressource.isJsModule) {
+          return fileName
+        }
         const buildRelativeUrl = ressource.buildRelativeUrl
         return buildRelativeUrl
       }
@@ -1047,22 +1159,16 @@ export const createRollupPlugins = async ({
         onReferenceWithImportMetaUrlPattern: async ({ importNode }) => {
           const specifier = importNode.arguments[0].value
           const { line, column } = importNode.loc.start
-
           const { id } = normalizeRollupResolveReturnValue(
             await this.resolve(specifier, url),
           )
           const ressourceUrl = asServerUrl(id)
-          const originalUrl = asOriginalUrl(ressourceUrl)
-          const isJsModule = Boolean(
-            workerUrls[originalUrl] || serviceWorkerUrls[originalUrl],
-          )
           const reference = ressourceBuilder.createReferenceFoundInJsModule({
             referenceLabel: "URL + import.meta.url",
             jsUrl: url,
             jsLine: line,
             jsColumn: column,
             ressourceSpecifier: ressourceUrl,
-            isJsModule,
           })
           if (!reference) {
             return
@@ -1363,7 +1469,6 @@ export const createRollupPlugins = async ({
         }
         return sourceUrl
       }
-
       return outputOptions
     },
 
@@ -1373,12 +1478,15 @@ export const createRollupPlugins = async ({
         // happens for inline module scripts for instance
         return null
       }
-
       const url = asOriginalUrl(facadeModuleId)
-      if (workerUrls.includes(url) || serviceWorkerUrls.includes(url)) {
+      const { searchParams } = new URL(url)
+      if (
+        format === "systemjs" &&
+        (searchParams.has("worker") || searchParams.has("service_worker"))
+      ) {
         const magicString = new MagicString(code)
         const systemjsCode = await readFile(
-          new URL("../runtime/s.js", import.meta.url),
+          new URL("../runtime_client/s.js", import.meta.url),
         )
         magicString.prepend(systemjsCode)
         code = magicString.toString()
@@ -1388,7 +1496,6 @@ export const createRollupPlugins = async ({
           map,
         }
       }
-
       return null
     },
 
@@ -1609,9 +1716,9 @@ export const createRollupPlugins = async ({
       buildMappings = sortObjectByPathnames(buildMappings)
       await visitServiceWorkers({
         projectDirectoryUrl,
+        serviceWorkerFinalizer,
         serviceWorkerUrls,
         classicServiceWorkerUrls,
-        serviceWorkerFinalizer,
         buildMappings,
         ressourceMappings,
         buildFileContents,
@@ -1831,7 +1938,6 @@ const visitServiceWorkers = async ({
     ...serviceWorkerUrls,
     ...classicServiceWorkerUrls,
   ]
-
   await Promise.all(
     allServiceWorkerUrls.map(async (serviceWorkerUrl) => {
       const serviceWorkerRelativeUrl = urlToRelativeUrl(
@@ -1845,7 +1951,6 @@ const visitServiceWorkers = async ({
           `"${serviceWorkerRelativeUrl}" service worker file missing in the build`,
         )
       }
-
       if (serviceWorkerFinalizer) {
         let code = buildFileContents[serviceWorkerBuildRelativeUrl]
         code = await serviceWorkerFinalizer(code, {

package/src/internal/building/{sourcemap_loader.js → sourcemap/sourcemap_loader.js}

@@ -1,11 +1,8 @@
 import { resolveUrl } from "@jsenv/filesystem"
 import { createDetailedMessage } from "@jsenv/logger"
 
-import {
-  dataUrlToRawData,
-  parseDataUrl,
-} from "@jsenv/core/src/internal/dataUrl.utils.js"
-import { fetchUrl } from "@jsenv/core/src/internal/fetchUrl.js"
+import { DataUrl } from "@jsenv/core/src/internal/data_url.js"
+import { fetchUrl } from "@jsenv/core/src/internal/fetching.js"
 import { validateResponse } from "@jsenv/core/src/internal/response_validation.js"
 
 export const loadSourcemap = async ({
@@ -23,7 +20,7 @@ export const loadSourcemap = async ({
 
   const sourcemapUrl = resolveUrl(sourcemapSpecifier, url)
   if (sourcemapUrl.startsWith("data:")) {
-    const sourcemapString = dataUrlToRawData(parseDataUrl(sourcemapUrl))
+    const sourcemapString = DataUrl.parse(sourcemapUrl, { as: "string" })
     return parseSourcemapString(
       sourcemapString,
       sourcemapUrl,

package/src/internal/building/svg/{parseSvgRessource.js → jsenv_parse_svg.js}

@@ -4,10 +4,11 @@ import {
   getHtmlNodeAttributeByName,
   stringifyHtmlAst,
   getHtmlNodeLocation,
-} from "@jsenv/core/src/internal/compiling/compileHtml.js"
-import { collectNodesMutations } from "../parsing.utils.js"
+} from "@jsenv/core/src/internal/compile_server/html/html_ast.js"
+
 import { getRessourceAsBase64Url } from "../ressource_builder_util.js"
-import { minifyHtml } from "../html/minifyHtml.js"
+import { collectNodesMutations } from "../html/html_node_mutations.js"
+import { minifyHtml } from "../html/minify_html.js"
 
 export const parseSvgRessource = async (
   svgRessource,

package/src/internal/building/url_fetcher.js

@@ -1,7 +1,7 @@
 import { createDetailedMessage } from "@jsenv/logger"
 import { urlToExtension, urlToRelativeUrl } from "@jsenv/filesystem"
 
-import { fetchUrl as jsenvFetchUrl } from "@jsenv/core/src/internal/fetchUrl.js"
+import { fetchUrl as jsenvFetchUrl } from "@jsenv/core/src/internal/fetching.js"
 import { validateResponse } from "@jsenv/core/src/internal/response_validation.js"
 
 export const createUrlFetcher = ({

package/src/internal/building/url_loader.js

@@ -1,7 +1,7 @@
-import { convertJsonTextToJavascriptModule } from "@jsenv/core/src/internal/building/json_module.js"
-import { getJavaScriptSourceMappingUrl } from "@jsenv/core/src/internal/sourceMappingURLUtils.js"
+import { getJavaScriptSourceMappingUrl } from "@jsenv/core/src/internal/sourcemap_utils.js"
 
-import { loadSourcemap } from "./sourcemap_loader.js"
+import { convertJsonTextToJavascriptModule } from "./import_assertions/json_module.js"
+import { loadSourcemap } from "./sourcemap/sourcemap_loader.js"
 
 export const createUrlLoader = ({
   urlCustomLoaders,

package/src/internal/building/{url_versioning.js → url_versioning/url_versioning.js}

@@ -1,4 +1,4 @@
-import { createHash } from "crypto"
+import { createHash } from "node:crypto"
 
 // https://github.com/rollup/rollup/blob/19e50af3099c2f627451a45a84e2fa90d20246d5/src/utils/FileEmitter.ts#L47
 export const generateContentHash = (