@jsenv/core 25.6.2 → 26.0.0

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

@@ -19,23 +19,24 @@ import {
 } from "@jsenv/filesystem"
 import { UNICODE } from "@jsenv/log"
 
+import { jsenvHelpersDirectoryInfo } from "@jsenv/core/src/jsenv_file_urls.js"
 import { require } from "@jsenv/core/src/internal/require.js"
-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 { 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,
@@ -43,15 +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 { esToSystem } from "./es_to_system.js"
+import { sortObjectByPathnames } from "./sort_pathnames.js"
 import { createBuildStats } from "./build_stats.js"
 
 export const createRollupPlugins = async ({
@@ -360,7 +360,9 @@ export const createRollupPlugins = async ({
           return null
         }
         const magicString = new MagicString(code)
-        magicString.prepend(`import "@jsenv/core/src/internal/runtime/s.js";`)
+        magicString.prepend(
+          `import "@jsenv/core/src/internal/runtime_client/s.js";`,
+        )
         code = magicString.toString()
         map = magicString.generateMap({ hires: true })
         return { code, map }
@@ -423,11 +425,11 @@ export const createRollupPlugins = async ({
   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)
       },
     }
@@ -1484,7 +1486,7 @@ export const createRollupPlugins = async ({
       ) {
         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()

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 = (

package/src/internal/{compiling/compileFile.js → compile_server/compile_file.js}

@@ -7,8 +7,8 @@ import {
 } from "@jsenv/filesystem"
 import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/internal/convertFileSystemErrorToResponseProperties.js"
 
-import { getOrGenerateCompiledFile } from "./jsenv_directory/getOrGenerateCompiledFile.js"
-import { updateMeta } from "./jsenv_directory/updateMeta.js"
+import { reuseOrCreateCompiledFile } from "./jsenv_directory/reuse_or_create_compiled_file.js"
+import { updateCompileCache } from "./jsenv_directory/update_compile_cache.js"
 
 export const compileFile = async ({
   logger,
@@ -47,7 +47,7 @@ export const compileFile = async ({
 
   try {
     const { meta, compileResult, compileResultStatus, timing } =
-      await getOrGenerateCompiledFile({
+      await reuseOrCreateCompiledFile({
         logger,
         projectDirectoryUrl,
         originalFileUrl,
@@ -101,7 +101,7 @@ export const compileFile = async ({
     if (compileResultStatus !== "cached" && compileCacheStrategy !== "none") {
       // we MUST await updateMeta otherwise we might get 404
       // when serving sourcemap files
-      await updateMeta({
+      await updateCompileCache({
         logger,
         meta,
         compileResult,

package/src/internal/{compiling/startCompileServer.js → compile_server/compile_server.js}

@@ -17,24 +17,25 @@ import { createLogger, createDetailedMessage } from "@jsenv/logger"
 import { createCallbackListNotifiedOnce } from "@jsenv/abort"
 
 import {
+  jsenvDistDirectoryUrl,
   sourcemapMainFileInfo,
   sourcemapMappingFileInfo,
-} from "@jsenv/core/src/internal/jsenvInternalFiles.js"
+} from "@jsenv/core/src/jsenv_file_urls.js"
 import { createJsenvRemoteDirectory } from "../jsenv_remote_directory.js"
-import { babelPluginReplaceExpressions } from "../babel_plugin_replace_expressions.js"
-import { jsenvDistDirectoryUrl } from "../jsenvCoreDirectoryUrl.js"
+
 import { createCompileContext } from "./jsenv_directory/compile_context.js"
 import { createCompileProfile } from "./jsenv_directory/compile_profile.js"
 import { setupJsenvDirectory } from "./jsenv_directory/jsenv_directory.js"
 import { urlIsCompilationAsset } from "./jsenv_directory/compile_asset.js"
 import { createSSEService } from "./sse_service/sse_service.js"
-import { loadBabelPluginMapFromFile } from "./load_babel_plugin_map_from_file.js"
-import { extractSyntaxBabelPluginMap } from "./babel_plugins.js"
-import { babelPluginGlobalThisAsJsenvImport } from "./babel_plugin_global_this_as_jsenv_import.js"
-import { babelPluginNewStylesheetAsJsenvImport } from "./babel_plugin_new_stylesheet_as_jsenv_import.js"
-import { babelPluginImportAssertions } from "./babel_plugin_import_assertions.js"
-import { createCompiledFileService } from "./createCompiledFileService.js"
-import { createTransformHtmlSourceFileService } from "./html_source_file_service.js"
+import { loadBabelPluginMapFromFile } from "./js/load_babel_plugin_map_from_file.js"
+import { extractSyntaxBabelPluginMap } from "./js/babel_plugins.js"
+import { babelPluginReplaceExpressions } from "./js/babel_plugin_replace_expressions.js"
+import { babelPluginGlobalThisAsJsenvImport } from "./js/babel_plugin_global_this_as_jsenv_import.js"
+import { babelPluginNewStylesheetAsJsenvImport } from "./js/babel_plugin_new_stylesheet_as_jsenv_import.js"
+import { babelPluginImportAssertions } from "./js/babel_plugin_import_assertions.js"
+import { createCompiledFileService } from "./compiled_file_service.js"
+import { createTransformHtmlSourceFileService } from "./html/html_source_file_service.js"
 
 let compileServerId = 0
 

package/src/internal/{compiling/createCompiledFileService.js → compile_server/compiled_file_service.js}

@@ -12,10 +12,10 @@ import { serverUrlToCompileInfo } from "@jsenv/core/src/internal/url_conversion.
 import { setUrlExtension } from "../url_utils.js"
 
 import { shakeBabelPluginMap } from "./jsenv_directory/compile_profile.js"
-import { compileFile } from "./compileFile.js"
-import { compileHtml } from "./jsenvCompilerForHtml.js"
-import { compileImportmap } from "./jsenvCompilerForImportmap.js"
-import { compileJavascript } from "./jsenvCompilerForJavaScript.js"
+import { compileFile } from "./compile_file.js"
+import { compileHtml } from "./html/jsenv_compile_html.js"
+import { compileImportmap } from "./importmap/jsenv_compile_importmap.js"
+import { compileJavascript } from "./js/jsenv_compile_js.js"
 
 const jsenvCompilers = {
   "**/*.js": compileJavascript,

package/src/internal/{compiling/compileHtml.js → compile_server/html/html_ast.js}

@@ -1,16 +1,6 @@
-/**
+import { createHash } from "node:crypto"
 
-An important concern here:
-
-All script type="module" will be converted to inline script.
-These inline script execution order is non predictible it depends
-which one is being done first
-
-*/
-
-import { createHash } from "crypto"
-
-import { require } from "../require.js"
+import { require } from "@jsenv/core/src/internal/require.js"
 
 // https://github.com/inikulin/parse5/blob/master/packages/parse5/lib/tree-adapters/default.js
 // eslint-disable-next-line import/no-unresolved

package/src/internal/{compiling → compile_server/html}/html_source_file_service.js

@@ -22,13 +22,14 @@ import { composeTwoImportMaps, moveImportMap } from "@jsenv/importmap"
 import { createDetailedMessage } from "@jsenv/logger"
 
 import {
-  BROWSER_RUNTIME_BUILD_URL,
+  BROWSER_CLIENT_BUILD_URL,
   EVENT_SOURCE_CLIENT_BUILD_URL,
   TOOLBAR_INJECTOR_BUILD_URL,
 } from "@jsenv/core/dist/build_manifest.js"
-import { fetchUrl } from "@jsenv/core/src/internal/fetchUrl.js"
-import { stringifyDataUrl } from "@jsenv/core/src/internal/dataUrl.utils.js"
-import { getDefaultImportmap } from "@jsenv/core/src/internal/import-resolution/importmap_default.js"
+import { fetchUrl } from "@jsenv/core/src/internal/fetching.js"
+import { DataUrl } from "@jsenv/core/src/internal/data_url.js"
+import { getDefaultImportmap } from "@jsenv/core/src/internal/import_resolution/importmap_default.js"
+import { jsenvCoreDirectoryUrl } from "@jsenv/core/src/jsenv_file_urls.js"
 
 import {
   parseHtmlString,
@@ -42,8 +43,7 @@ import {
   getHtmlNodeTextNode,
   setHtmlNodeText,
   getIdForInlineHtmlNode,
-} from "./compileHtml.js"
-import { jsenvCoreDirectoryUrl } from "../jsenvCoreDirectoryUrl.js"
+} from "./html_ast.js"
 
 const jsenvDistDirectoryUrl = new URL("./dist/", jsenvCoreDirectoryUrl).href
 
@@ -165,8 +165,8 @@ const transformHTMLSourceFile = async ({
     projectDirectoryUrl,
   })
 
-  const browserRuntimeBuildUrlRelativeToProject = urlToRelativeUrl(
-    BROWSER_RUNTIME_BUILD_URL,
+  const browserClientBuildUrlRelativeToProject = urlToRelativeUrl(
+    BROWSER_CLIENT_BUILD_URL,
     projectDirectoryUrl,
   )
 
@@ -185,7 +185,7 @@ const transformHTMLSourceFile = async ({
       ...(jsenvScriptInjection
         ? [
             {
-              src: `/${browserRuntimeBuildUrlRelativeToProject}`,
+              src: `/${browserClientBuildUrlRelativeToProject}`,
             },
           ]
         : []),
@@ -413,7 +413,7 @@ const forceInlineRessources = async ({
       specifier: src,
       mutateHtml: async (response) => {
         const responseArrayBuffer = await response.arrayBuffer()
-        const responseAsBase64 = stringifyDataUrl({
+        const responseAsBase64 = DataUrl.stringify({
           data: responseArrayBuffer,
           base64Flag: true,
           mediaType: response.headers["content-type"],

package/src/internal/{compiling/jsenvCompilerForHtml.js → compile_server/html/jsenv_compile_html.js}

@@ -7,21 +7,22 @@ import {
 import { moveImportMap, composeTwoImportMaps } from "@jsenv/importmap"
 import { createDetailedMessage } from "@jsenv/logger"
 
-import { jsenvDistDirectoryUrl } from "@jsenv/core/src/internal/jsenvCoreDirectoryUrl.js"
+import { jsenvDistDirectoryUrl } from "@jsenv/core/src/jsenv_file_urls.js"
 import {
-  BROWSER_RUNTIME_BUILD_URL,
+  BROWSER_CLIENT_BUILD_URL,
   EVENT_SOURCE_CLIENT_BUILD_URL,
   TOOLBAR_INJECTOR_BUILD_URL,
 } from "@jsenv/core/dist/build_manifest.js"
-import { fetchUrl } from "@jsenv/core/src/internal/fetchUrl.js"
-import { getDefaultImportmap } from "@jsenv/core/src/internal/import-resolution/importmap_default.js"
-
+import { fetchUrl } from "@jsenv/core/src/internal/fetching.js"
+import { getDefaultImportmap } from "@jsenv/core/src/internal/import_resolution/importmap_default.js"
+import { generateCompilationAssetUrl } from "@jsenv/core/src/internal/compile_server/jsenv_directory/compile_asset.js"
 import {
   generateSourcemapUrl,
   setJavaScriptSourceMappingUrl,
   sourcemapToBase64Url,
-} from "../sourceMappingURLUtils.js"
-import { transformJs } from "./js-compilation-service/transformJs.js"
+} from "@jsenv/core/src/internal/sourcemap_utils.js"
+
+import { transformJs } from "../js/js_transformer.js"
 import {
   parseHtmlString,
   parseHtmlAstRessources,
@@ -35,8 +36,7 @@ import {
   setHtmlNodeText,
   visitHtmlAst,
   addHtmlNodeAttribute,
-} from "./compileHtml.js"
-import { generateCompilationAssetUrl } from "./jsenv_directory/compile_asset.js"
+} from "./html_ast.js"
 
 export const compileHtml = async ({
   // cancellationToken,
@@ -61,8 +61,8 @@ export const compileHtml = async ({
   code,
 }) => {
   const compileDirectoryUrl = `${projectDirectoryUrl}${jsenvDirectoryRelativeUrl}${compileId}/`
-  const browserRuntimeBuildUrlRelativeToProject = urlToRelativeUrl(
-    BROWSER_RUNTIME_BUILD_URL,
+  const browserClientBuildUrlRelativeToProject = urlToRelativeUrl(
+    BROWSER_CLIENT_BUILD_URL,
     projectDirectoryUrl,
   )
   const eventSourceClientBuildRelativeUrlForProject = urlToRelativeUrl(
@@ -81,7 +81,7 @@ export const compileHtml = async ({
       ...(jsenvScriptInjection
         ? [
             {
-              src: `/${browserRuntimeBuildUrlRelativeToProject}`,
+              src: `/${browserClientBuildUrlRelativeToProject}`,
             },
           ]
         : []),

package/src/internal/{compiling/jsenvCompilerForImportmap.js → compile_server/importmap/jsenv_compile_importmap.js}

@@ -1,6 +1,6 @@
 import { composeTwoImportMaps } from "@jsenv/importmap"
 
-import { getDefaultImportmap } from "@jsenv/core/src/internal/import-resolution/importmap_default.js"
+import { getDefaultImportmap } from "@jsenv/core/src/internal/import_resolution/importmap_default.js"
 
 export const compileImportmap = async ({
   code,

package/src/internal/{compiling/js-compilation-service/ansiToHTML.js → compile_server/js/ansi_to_html.js}

@@ -1,4 +1,4 @@
-import { require } from "../../require.js"
+import { require } from "@jsenv/core/src/internal/require.js"
 
 // https://github.com/rburns/ansi-to-html/blob/master/src/ansi_to_html.js
 // https://github.com/drudru/ansi_up/blob/master/ansi_up.js

package/src/internal/{compiling/js-compilation-service → compile_server/js}/babelHelper.js

@@ -1,7 +1,7 @@
 // https://github.com/babel/babel/blob/99f4f6c3b03c7f3f67cf1b9f1a21b80cfd5b0224/packages/babel-core/src/tools/build-external-helpers.js
 // the list of possible helpers:
 // https://github.com/babel/babel/blob/99f4f6c3b03c7f3f67cf1b9f1a21b80cfd5b0224/packages/babel-helpers/src/helpers.js#L13
-import { require } from "../../require.js"
+import { require } from "@jsenv/core/src/internal/require.js"
 
 const babelHelperNameInsideJsenvCoreArray = [
   "applyDecoratedDescriptor",

package/src/internal/{compiling/js-compilation-service → compile_server/js}/babel_plugin_babel_helpers_as_jsenv_imports.js

@@ -1,6 +1,7 @@
 import { fileSystemPathToUrl } from "@jsenv/filesystem"
 
-import { require } from "../../require.js"
+import { require } from "@jsenv/core/src/internal/require.js"
+
 import {
   babelHelperNameFromUrl,
   babelHelperNameToImportSpecifier,

package/src/internal/{compiling → compile_server/js}/babel_plugin_global_this_as_jsenv_import.js

@@ -1,4 +1,4 @@
-import { require } from "../require.js"
+import { require } from "@jsenv/core/src/internal/require.js"
 
 export const babelPluginGlobalThisAsJsenvImport = (api, options) => {
   const { addSideEffect } = require("@babel/helper-module-imports")

package/src/internal/{compiling → compile_server/js}/babel_plugin_import_assertions.js

@@ -1,6 +1,7 @@
 import { urlToRelativeUrl } from "@jsenv/filesystem"
 
 import { setUrlSearchParamsDescriptor } from "@jsenv/core/src/internal/url_utils.js"
+
 import { babelPluginImportVisitor } from "./babel_plugin_import_visitor.js"
 
 export const babelPluginImportAssertions = (

package/src/internal/{compiling → compile_server/js}/babel_plugin_new_stylesheet_as_jsenv_import.js

@@ -4,7 +4,7 @@
  * - code should also inject helper when code uses "document.adoptedStylesheets"
  */
 
-import { require } from "../require.js"
+import { require } from "@jsenv/core/src/internal/require.js"
 
 export const babelPluginNewStylesheetAsJsenvImport = (
   api,

package/src/internal/{compiling/js-compilation-service → compile_server/js}/babel_plugin_regenerator_runtime_as_jsenv_import.js

@@ -5,7 +5,7 @@ import {
 } from "@jsenv/filesystem"
 
 import { require } from "@jsenv/core/src/internal/require.js"
-import { jsenvCoreDirectoryUrl } from "@jsenv/core/src/internal/jsenvCoreDirectoryUrl.js"
+import { jsenvCoreDirectoryUrl } from "@jsenv/core/src/jsenv_file_urls.js"
 
 const regeneratorRuntimeHelperDirectoryUrl = resolveUrl(
   "./helpers/regenerator-runtime/",

package/src/internal/{compiling/js-compilation-service → compile_server/js}/babel_plugin_systemjs_prepend.js

@@ -1,11 +1,11 @@
 import { readFileSync } from "node:fs"
 
-import { jsenvCoreDirectoryUrl } from "@jsenv/core/src/internal/jsenvCoreDirectoryUrl.js"
+import { jsenvCoreDirectoryUrl } from "@jsenv/core/src/jsenv_file_urls.js"
 
 export const babelPluginSystemJsPrepend = (api) => {
   api.assertVersion(7)
   const systemJsUrl = new URL(
-    "src/internal/runtime/s.js",
+    "src/internal/runtime_client/s.js",
     jsenvCoreDirectoryUrl,
   )
   return {

package/src/internal/{compiling/js-compilation-service → compile_server/js}/generateBabelHelper.js

@@ -1,4 +1,4 @@
-import { require } from "../../require.js"
+import { require } from "@jsenv/core/src/internal/require.js"
 
 export const generateBabelHelper = (name) => {
   const { buildExternalHelpers } = require("@babel/core")

package/src/internal/{compiling/js-compilation-service/transformJs.js → compile_server/js/js_transformer.js}

@@ -1,20 +1,19 @@
 import { urlToRelativeUrl, urlToFileSystemPath } from "@jsenv/filesystem"
 
 import { require } from "@jsenv/core/src/internal/require.js"
-import { createParseError } from "@jsenv/core/src/internal/compiling/babel_parse_error.js"
-import { babelPluginTransformImportMeta } from "@jsenv/core/src/internal/compiling/babel_plugin_transform_import_meta.js"
+import { ansiToHTML } from "./ansi_to_html.js"
+import { createParseError } from "./babel_parse_error.js"
 import {
   getMinimalBabelPluginMap,
   babelPluginsFromBabelPluginMap,
-} from "@jsenv/core/src/internal/compiling/babel_plugins.js"
-import { babelPluginProxyExternalImports } from "@jsenv/core/src/internal/compiling/babel_plugin_proxy_external_imports.js"
-import { babelPluginImportMetadata } from "@jsenv/core/src/internal/compiling/babel_plugin_import_metadata.js"
-
-import { ansiToHTML } from "./ansiToHTML.js"
-import { babelPluginRegeneratorRuntimeAsJsenvImport } from "./babel_plugin_regenerator_runtime_as_jsenv_import.js"
+} from "./babel_plugins.js"
+import { babelHelperNameFromUrl } from "./babelHelper.js"
 import { babelPluginBabelHelpersAsJsenvImports } from "./babel_plugin_babel_helpers_as_jsenv_imports.js"
+import { babelPluginRegeneratorRuntimeAsJsenvImport } from "./babel_plugin_regenerator_runtime_as_jsenv_import.js"
+import { babelPluginTransformImportMeta } from "./babel_plugin_transform_import_meta.js"
+import { babelPluginImportMetadata } from "./babel_plugin_import_metadata.js"
+import { babelPluginProxyExternalImports } from "./babel_plugin_proxy_external_imports.js"
 import { babelPluginSystemJsPrepend } from "./babel_plugin_systemjs_prepend.js"
-import { babelHelperNameFromUrl } from "./babelHelper.js"
 
 export const transformJs = async ({
   projectDirectoryUrl,