@jsenv/core 27.0.0-alpha.83 → 27.0.0-alpha.84

package/src/helpers/command/command.js

@@ -0,0 +1,73 @@
+import { exec } from "node:child_process"
+import { createDetailedMessage, createLogger, UNICODE } from "@jsenv/log"
+
+export const executeCommand = (
+  command,
+  {
+    logLevel = "info",
+    signal = new AbortController().signal,
+    onStdout = () => {},
+    onStderr = () => {},
+    cwd,
+    env,
+    timeout,
+  } = {},
+) => {
+  const logger = createLogger({ logLevel })
+
+  return new Promise((resolve, reject) => {
+    logger.debug(`${UNICODE.COMMAND} ${command}`)
+    const commandProcess = exec(command, {
+      signal,
+      cwd:
+        cwd && typeof cwd === "string" && cwd.startsWith("file:")
+          ? new URL(cwd)
+          : cwd,
+      env,
+      timeout,
+      silent: true,
+    })
+    commandProcess.on("error", (error) => {
+      if (error && error.code === "ETIMEDOUT") {
+        logger.error(`timeout after ${timeout} ms`)
+        reject(error)
+      } else {
+        reject(error)
+      }
+    })
+    const stdoutDatas = []
+    commandProcess.stdout.on("data", (data) => {
+      stdoutDatas.push(data)
+      logger.debug(data)
+      onStderr(data)
+    })
+    let stderrDatas = []
+    commandProcess.stderr.on("data", (data) => {
+      stderrDatas.push(data)
+      logger.debug(data)
+      onStdout(data)
+    })
+    if (commandProcess.stdin) {
+      commandProcess.stdin.on("error", (error) => {
+        reject(error)
+      })
+    }
+    commandProcess.on("exit", (exitCode, signal) => {
+      if (signal) {
+        reject(new Error(`killed with ${signal}`))
+      }
+      if (exitCode) {
+        reject(
+          new Error(
+            createDetailedMessage(`failed with exit code ${exitCode}`, {
+              "command stderr": stderrDatas.join(""),
+              // "command stdout": stdoutDatas.join(""),
+            }),
+          ),
+        )
+        return
+      }
+      resolve({ exitCode, signal })
+    })
+  })
+}

package/src/helpers/worker_reload.js

@@ -34,12 +34,13 @@ export const createReloadableWorker = (workerFileUrl, options = {}) => {
     worker.once("error", (error) => {
       console.error(error)
     })
-    worker.once("exit", () => {
-      worker = null
-    })
     await new Promise((resolve) => {
       worker.once("online", resolve)
     })
+    worker.once("exit", () => {
+      worker = null
+    })
+    return worker
   }
 
   const reload = async () => {

package/src/omega/compat/runtime_compat.js

@@ -1,4 +1,5 @@
-import { findHighestVersion } from "@jsenv/utils/semantic_versioning/highest_version.js"
+import { findHighestVersion } from "@jsenv/utils/src/semantic_versioning/highest_version.js"
+
 import { featureCompats } from "./features_compats.js"
 
 export const RUNTIME_COMPAT = {

package/src/omega/kitchen.js

@@ -8,7 +8,8 @@ import {
 } from "@jsenv/urls"
 import { writeFileSync, ensureWindowsDriveLetter } from "@jsenv/filesystem"
 import { createDetailedMessage } from "@jsenv/log"
-import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
+
 import { createPluginController } from "../plugins/plugin_controller.js"
 import { urlSpecifierEncoding } from "./url_specifier_encoding.js"
 import { createUrlInfoTransformer } from "./url_graph/url_info_transformations.js"

package/src/omega/server/user_agent.js

@@ -1,4 +1,5 @@
-import { memoizeByFirstArgument } from "@jsenv/utils/memoize/memoize_by_first_argument.js"
+import { memoizeByFirstArgument } from "@jsenv/utils/src/memoize/memoize_by_first_argument.js"
+
 import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
 
 export const parseUserAgentHeader = memoizeByFirstArgument((userAgent) => {

package/src/omega/url_graph/sort_by_dependencies.js

@@ -0,0 +1,27 @@
+export const sortByDependencies = (nodes) => {
+  const visited = []
+  const sorted = []
+  const circular = []
+  const visit = (url) => {
+    const isSorted = sorted.includes(url)
+    if (isSorted) {
+      return
+    }
+    const isVisited = visited.includes(url)
+    if (isVisited) {
+      circular.push(url)
+      sorted.push(url)
+    } else {
+      visited.push(url)
+      nodes[url].dependencies.forEach((dependencyUrl) => {
+        visit(dependencyUrl, url)
+      })
+      sorted.push(url)
+    }
+  }
+  Object.keys(nodes).forEach((url) => {
+    visit(url)
+  })
+  sorted.circular = circular
+  return sorted
+}

package/src/omega/url_graph/url_info_transformations.js

@@ -1,12 +1,12 @@
+import { pathToFileURL } from "node:url"
 import { bufferToEtag } from "@jsenv/filesystem"
-import { urlToRelativeUrl } from "@jsenv/urls"
-
-import { composeTwoSourcemaps } from "@jsenv/utils/sourcemap/sourcemap_composition_v3.js"
+import { urlToRelativeUrl, isFileSystemPath } from "@jsenv/urls"
 import {
+  composeTwoSourcemaps,
   SOURCEMAP,
-  sourcemapToBase64Url,
-  generateSourcemapUrl,
-} from "@jsenv/utils/sourcemap/sourcemap_utils.js"
+  generateSourcemapFileUrl,
+  generateSourcemapDataUrl,
+} from "@jsenv/sourcemap"
 
 export const createUrlInfoTransformer = ({
   logger,
@@ -23,18 +23,25 @@ export const createUrlInfoTransformer = ({
     sourcemaps === "programmatic"
 
   const normalizeSourcemap = (urlInfo, sourcemap) => {
+    let { sources } = sourcemap
+    if (sources) {
+      sources = sources.map((source) => {
+        if (source && isFileSystemPath(source)) {
+          return String(pathToFileURL(source))
+        }
+        return source
+      })
+    }
     const wantSourcesContent =
       // for inline content (<script> insdide html)
       // chrome won't be able to fetch the file as it does not exists
       // so sourcemap must contain sources
       sourcemapsSourcesContent ||
       urlInfo.isInline ||
-      (sourcemap.sources &&
-        sourcemap.sources.some(
-          (source) => !source || !source.startsWith("file:"),
-        ))
-    if (sourcemap.sources && sourcemap.sources.length > 1) {
-      sourcemap.sources = sourcemap.sources.map(
+      (sources &&
+        sources.some((source) => !source || !source.startsWith("file:")))
+    if (sources && sources.length > 1) {
+      sourcemap.sources = sources.map(
         (source) => new URL(source, urlInfo.originalUrl).href,
       )
       if (!wantSourcesContent) {
@@ -65,7 +72,9 @@ export const createUrlInfoTransformer = ({
     // when jsenv is done cooking the file
     //   during build it's urlInfo.url to be inside the build
     //   but otherwise it's generatedUrl to be inside .jsenv/ directory
-    urlInfo.sourcemapGeneratedUrl = generateSourcemapUrl(urlInfo.generatedUrl)
+    urlInfo.sourcemapGeneratedUrl = generateSourcemapFileUrl(
+      urlInfo.generatedUrl,
+    )
     const [sourcemapReference, sourcemapUrlInfo] = injectSourcemapPlaceholder({
       urlInfo,
       specifier: urlInfo.sourcemapGeneratedUrl,
@@ -154,7 +163,8 @@ export const createUrlInfoTransformer = ({
       }
       sourcemapUrlInfo.content = JSON.stringify(sourcemap, null, "  ")
       if (sourcemaps === "inline") {
-        sourcemapReference.generatedSpecifier = sourcemapToBase64Url(sourcemap)
+        sourcemapReference.generatedSpecifier =
+          generateSourcemapDataUrl(sourcemap)
       }
       if (sourcemaps === "file" || sourcemaps === "inline") {
         urlInfo.content = SOURCEMAP.writeComment({

package/src/plugins/autoreload/dev_sse/client/reload.js

@@ -1,4 +1,4 @@
-import { htmlAttributeSrcSet } from "@jsenv/utils/html_ast/html_attribute_src_set.js"
+import { htmlAttributeSrcSet } from "@jsenv/utils/src/html_ast/html_attribute_src_set.js"
 
 import { injectQuery, compareTwoUrlPaths } from "./url_helpers.js"
 

package/src/plugins/autoreload/dev_sse/jsenv_plugin_dev_sse_client.js

@@ -3,7 +3,7 @@ import {
   stringifyHtmlAst,
   injectScriptAsEarlyAsPossible,
   createHtmlNode,
-} from "@jsenv/utils/html_ast/html_ast.js"
+} from "@jsenv/utils/src/html_ast/html_ast.js"
 
 export const jsenvPluginDevSSEClient = () => {
   const eventSourceClientFileUrl = new URL(

package/src/plugins/bundling/css/bundle_css.js

@@ -6,10 +6,11 @@
  *   It can be quite challenging, see "bundle_sourcemap.js"
  */
 
-import { applyPostCss } from "@jsenv/utils/css_ast/apply_post_css.js"
-import { postCssPluginUrlVisitor } from "@jsenv/utils/css_ast/postcss_plugin_url_visitor.js"
-import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
-import { sortByDependencies } from "@jsenv/utils/graph/sort_by_dependencies.js"
+import { createMagicSource } from "@jsenv/sourcemap"
+import { applyPostCss } from "@jsenv/utils/src/css_ast/apply_post_css.js"
+import { postCssPluginUrlVisitor } from "@jsenv/utils/src/css_ast/postcss_plugin_url_visitor.js"
+
+import { sortByDependencies } from "@jsenv/core/src/omega/url_graph/sort_by_dependencies.js"
 
 // Do not use until https://github.com/parcel-bundler/parcel-css/issues/181
 export const bundleCss = async ({ cssUrlInfos, context }) => {

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

@@ -4,8 +4,8 @@ import { URL_META } from "@jsenv/url-meta"
 import { isFileSystemPath } from "@jsenv/urls"
 import { createDetailedMessage } from "@jsenv/log"
 import { babelHelperNameFromUrl } from "@jsenv/babel-plugins"
-import { applyRollupPlugins } from "@jsenv/utils/js_ast/apply_rollup_plugins.js"
-import { sourcemapConverter } from "@jsenv/utils/sourcemap/sourcemap_converter.js"
+import { sourcemapConverter } from "@jsenv/sourcemap"
+import { applyRollupPlugins } from "@jsenv/utils/src/js_ast/apply_rollup_plugins.js"
 import { fileUrlConverter } from "@jsenv/core/src/omega/file_url_converter.js"
 
 const globalThisClientFileUrl = new URL(

package/src/plugins/commonjs_globals/jsenv_plugin_commonjs_globals.js

@@ -7,8 +7,8 @@
  * - global
  */
 
-import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
-import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
+import { createMagicSource } from "@jsenv/sourcemap"
+import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
 
 export const jsenvPluginCommonJsGlobals = () => {
   const transformCommonJsGlobals = async (urlInfo, { scenario }) => {

package/src/plugins/file_urls/jsenv_plugin_file_urls.js

@@ -6,12 +6,11 @@ import {
   urlToFilename,
   ensurePathnameTrailingSlash,
 } from "@jsenv/urls"
-
 import {
   applyFileSystemMagicResolution,
   getExtensionsToTry,
 } from "@jsenv/node-esm-resolution"
-import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
 
 export const jsenvPluginFileUrls = ({
   magicExtensions = ["inherit", ".js"],

package/src/plugins/html_supervisor/jsenv_plugin_html_supervisor.js

@@ -17,7 +17,7 @@ import {
   getHtmlNodeTextNode,
   removeHtmlNodeText,
   setHtmlNodeGeneratedText,
-} from "@jsenv/utils/html_ast/html_ast.js"
+} from "@jsenv/utils/src/html_ast/html_ast.js"
 import { generateInlineContentUrl } from "@jsenv/urls"
 
 export const jsenvPluginHtmlSupervisor = ({

package/src/plugins/import_meta_hot/html_hot_dependencies.js

@@ -1,8 +1,8 @@
 import {
   getHtmlNodeAttributeByName,
   parseLinkNode,
-} from "@jsenv/utils/html_ast/html_ast.js"
-import { htmlAttributeSrcSet } from "@jsenv/utils/html_ast/html_attribute_src_set.js"
+} from "@jsenv/utils/src/html_ast/html_ast.js"
+import { htmlAttributeSrcSet } from "@jsenv/utils/src/html_ast/html_attribute_src_set.js"
 
 // Some "smart" default applied to decide what should hot reload / fullreload:
 // By default:

package/src/plugins/import_meta_hot/jsenv_plugin_import_meta_hot.js

@@ -1,6 +1,7 @@
-import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
-import { parseHtmlString } from "@jsenv/utils/html_ast/html_ast.js"
-import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
+import { createMagicSource } from "@jsenv/sourcemap"
+import { parseHtmlString } from "@jsenv/utils/src/html_ast/html_ast.js"
+import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
+
 import { collectHotDataFromHtmlAst } from "./html_hot_dependencies.js"
 import { babelPluginMetadataImportMetaHot } from "./babel_plugin_metadata_import_meta_hot.js"
 

package/src/plugins/import_meta_scenarios/jsenv_plugin_import_meta_scenarios.js

@@ -9,8 +9,8 @@
  * - replaced by undefined (import.meta.dev but it's build; the goal is to ensure it's tree-shaked)
  */
 
-import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
-import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
+import { createMagicSource } from "@jsenv/sourcemap"
+import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
 
 export const jsenvPluginImportMetaScenarios = () => {
   return {

package/src/plugins/importmap/jsenv_plugin_importmap.js

@@ -22,7 +22,7 @@ import {
   composeTwoImportMaps,
   normalizeImportMap,
 } from "@jsenv/importmap"
-
+import { generateInlineContentUrl } from "@jsenv/urls"
 import {
   parseHtmlString,
   stringifyHtmlAst,
@@ -33,8 +33,7 @@ import {
   setHtmlNodeGeneratedText,
   getHtmlNodeTextNode,
   removeHtmlNode,
-} from "@jsenv/utils/html_ast/html_ast.js"
-import { generateInlineContentUrl } from "@jsenv/urls"
+} from "@jsenv/utils/src/html_ast/html_ast.js"
 
 export const jsenvPluginImportmap = () => {
   let finalImportmap = null

package/src/plugins/inject_globals/inject_globals.js

@@ -1,10 +1,10 @@
+import { createMagicSource } from "@jsenv/sourcemap"
 import {
   parseHtmlString,
   injectScriptAsEarlyAsPossible,
   createHtmlNode,
   stringifyHtmlAst,
-} from "@jsenv/utils/html_ast/html_ast.js"
-import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
+} from "@jsenv/utils/src/html_ast/html_ast.js"
 
 export const injectGlobals = (urlInfo, globals) => {
   if (urlInfo.type === "html") {

package/src/plugins/inline/jsenv_plugin_data_urls.js

@@ -1,5 +1,5 @@
 import { DATA_URL } from "@jsenv/urls"
-import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
 
 export const jsenvPluginDataUrls = () => {
   return {

package/src/plugins/inline/jsenv_plugin_html_inline_content.js

@@ -1,3 +1,4 @@
+import { generateInlineContentUrl } from "@jsenv/urls"
 import {
   parseHtmlString,
   stringifyHtmlAst,
@@ -7,9 +8,8 @@ import {
   parseScriptNode,
   setHtmlNodeGeneratedText,
   getHtmlNodeAttributeByName,
-} from "@jsenv/utils/html_ast/html_ast.js"
-import { generateInlineContentUrl } from "@jsenv/urls"
-import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
+} from "@jsenv/utils/src/html_ast/html_ast.js"
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
 
 export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {
   return {

package/src/plugins/inline/jsenv_plugin_js_inline_content.js

@@ -1,8 +1,8 @@
-import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
-import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
-import { JS_QUOTES } from "@jsenv/utils/string/js_quotes.js"
-import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
 import { generateInlineContentUrl } from "@jsenv/urls"
+import { createMagicSource } from "@jsenv/sourcemap"
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
+import { JS_QUOTES } from "@jsenv/utils/src/string/js_quotes.js"
+import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
 
 export const jsenvPluginJsInlineContent = ({ allowEscapeForVersioning }) => {
   const parseAndTransformInlineContentCalls = async (urlInfo, context) => {

package/src/plugins/minification/css/minify_css.js

@@ -1,4 +1,4 @@
-import { minifyWithParcel } from "@jsenv/utils/css_ast/parcel_css.js"
+import { minifyWithParcel } from "@jsenv/utils/src/css_ast/parcel_css.js"
 
 export const minifyCss = ({ cssUrlInfo, context }) => {
   const { code, map } = minifyWithParcel(cssUrlInfo, context)

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

@@ -13,11 +13,9 @@
 
 import { urlToFilename, injectQueryParams } from "@jsenv/urls"
 import { readFileSync } from "@jsenv/filesystem"
-
+import { createMagicSource, composeTwoSourcemaps } from "@jsenv/sourcemap"
 import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
-import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
-import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
-import { composeTwoSourcemaps } from "@jsenv/utils/sourcemap/sourcemap_composition_v3.js"
+import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
 
 import { requireBabelPlugin } from "../babel/require_babel_plugin.js"
 import { babelPluginTransformImportMetaUrl } from "./helpers/babel_plugin_transform_import_meta_url.js"

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

@@ -1,3 +1,7 @@
+import {
+  generateInlineContentUrl,
+  injectQueryParamsIntoSpecifier,
+} from "@jsenv/urls"
 import {
   getHtmlNodeAttributeByName,
   getHtmlNodeTextNode,
@@ -10,11 +14,7 @@ import {
   setHtmlNodeGeneratedText,
   injectScriptAsEarlyAsPossible,
   createHtmlNode,
-} from "@jsenv/utils/html_ast/html_ast.js"
-import {
-  generateInlineContentUrl,
-  injectQueryParamsIntoSpecifier,
-} from "@jsenv/urls"
+} from "@jsenv/utils/src/html_ast/html_ast.js"
 
 export const jsenvPluginAsJsClassicHtml = ({
   systemJsInjection,

package/src/plugins/transpilation/babel/global_this/babel_plugin_global_this_as_jsenv_import.js

@@ -1,6 +1,6 @@
 import { pathToFileURL } from "node:url"
 
-import { injectImport } from "@jsenv/utils/js_ast/babel_utils.js"
+import { injectImport } from "@jsenv/utils/src/js_ast/babel_utils.js"
 
 export const babelPluginGlobalThisAsJsenvImport = (
   babel,

package/src/plugins/transpilation/babel/helpers/babel_plugin_babel_helpers_as_jsenv_imports.js

@@ -1,10 +1,9 @@
 import { pathToFileURL } from "node:url"
-
-import { injectImport } from "@jsenv/utils/js_ast/babel_utils.js"
+import { injectImport } from "@jsenv/utils/src/js_ast/babel_utils.js"
 import {
   getBabelHelperFileUrl,
   babelHelperNameFromUrl,
-} from "@jsenv/babel-plugins/main.js"
+} from "@jsenv/babel-plugins"
 
 // named import approach found here:
 // https://github.com/rollup/rollup-plugin-babel/blob/18e4232a450f320f44c651aa8c495f21c74d59ac/src/helperPlugin.js#L1

package/src/plugins/transpilation/babel/jsenv_plugin_babel.js

@@ -1,4 +1,4 @@
-import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
+import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
 
 import { RUNTIME_COMPAT } from "@jsenv/core/src/omega/compat/runtime_compat.js"
 import { getBaseBabelPluginStructure } from "./helpers/babel_plugin_structure.js"

package/src/plugins/transpilation/babel/new_stylesheet/babel_plugin_new_stylesheet_as_jsenv_import.js

@@ -1,6 +1,5 @@
 import { pathToFileURL } from "node:url"
-
-import { injectImport } from "@jsenv/utils/js_ast/babel_utils.js"
+import { injectImport } from "@jsenv/utils/src/js_ast/babel_utils.js"
 
 export const babelPluginNewStylesheetAsJsenvImport = (
   babel,

package/src/plugins/transpilation/babel/regenerator_runtime/babel_plugin_regenerator_runtime_as_jsenv_import.js

@@ -1,6 +1,5 @@
 import { pathToFileURL } from "node:url"
-
-import { injectImport } from "@jsenv/utils/js_ast/babel_utils.js"
+import { injectImport } from "@jsenv/utils/src/js_ast/babel_utils.js"
 
 export const babelPluginRegeneratorRuntimeAsJsenvImport = (
   babel,

package/src/plugins/transpilation/css_parcel/jsenv_plugin_css_parcel.js

@@ -1,4 +1,4 @@
-import { transpileWithParcel } from "@jsenv/utils/css_ast/parcel_css.js"
+import { transpileWithParcel } from "@jsenv/utils/src/css_ast/parcel_css.js"
 
 // https://github.com/parcel-bundler/parcel-css
 export const jsenvPluginCssParcel = () => {

package/src/plugins/transpilation/import_assertions/jsenv_plugin_import_assertions.js

@@ -12,7 +12,7 @@
 
 import { urlToFilename, injectQueryParams } from "@jsenv/urls"
 
-import { JS_QUOTES } from "@jsenv/utils/string/js_quotes.js"
+import { JS_QUOTES } from "@jsenv/utils/src/string/js_quotes.js"
 
 export const jsenvPluginImportAssertions = () => {
   const updateReference = (reference, searchParam) => {

package/src/plugins/transpilation/jsenv_plugin_top_level_await.js

@@ -1,4 +1,5 @@
-import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
+import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
+
 import { requireBabelPlugin } from "./babel/require_babel_plugin.js"
 
 export const jsenvPluginTopLevelAwait = () => {

package/src/plugins/url_analysis/css/css_urls.js

@@ -2,9 +2,9 @@
  * https://github.com/parcel-bundler/parcel/blob/v2/packages/transformers/css/src/CSSTransformer.js
  */
 
-import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
-import { applyPostCss } from "@jsenv/utils/css_ast/apply_post_css.js"
-import { postCssPluginUrlVisitor } from "@jsenv/utils/css_ast/postcss_plugin_url_visitor.js"
+import { createMagicSource } from "@jsenv/sourcemap"
+import { applyPostCss } from "@jsenv/utils/src/css_ast/apply_post_css.js"
+import { postCssPluginUrlVisitor } from "@jsenv/utils/src/css_ast/postcss_plugin_url_visitor.js"
 
 export const parseAndTransformCssUrls = async (urlInfo, context) => {
   const actions = []

package/src/plugins/url_analysis/html/html_urls.js

@@ -4,8 +4,8 @@ import {
   getHtmlNodeAttributeByName,
   htmlNodePosition,
   visitHtmlAst,
-} from "@jsenv/utils/html_ast/html_ast.js"
-import { htmlAttributeSrcSet } from "@jsenv/utils/html_ast/html_attribute_src_set.js"
+} from "@jsenv/utils/src/html_ast/html_ast.js"
+import { htmlAttributeSrcSet } from "@jsenv/utils/src/html_ast/html_attribute_src_set.js"
 
 export const parseAndTransformHtmlUrls = async (urlInfo, context) => {
   const url = urlInfo.originalUrl

package/src/plugins/url_analysis/js/js_urls.js

@@ -1,5 +1,6 @@
-import { parseJsUrls } from "@jsenv/utils/js_ast/parse_js_urls.js"
-import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
+import { createMagicSource } from "@jsenv/sourcemap"
+import { parseJsUrls } from "@jsenv/utils/src/js_ast/parse_js_urls.js"
+
 import { isWebWorkerUrlInfo } from "@jsenv/core/src/omega/web_workers.js"
 
 export const parseAndTransformJsUrls = async (urlInfo, context) => {

package/src/test/coverage/empty_coverage_factory.js

@@ -1,7 +1,7 @@
 import { readFile } from "@jsenv/filesystem"
 import { resolveUrl } from "@jsenv/urls"
 import { Abort } from "@jsenv/abort"
-import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
+import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
 
 import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
 import { babelPluginInstrument } from "./babel_plugin_instrument.js"

package/src/test/coverage/file_by_file_coverage.js

@@ -2,7 +2,6 @@ import {
   urlToRelativeUrl,
   fileSystemPathToUrl,
   isFileSystemPath,
-  resolveUrl,
 } from "@jsenv/urls"
 
 export const normalizeFileByFileCoveragePaths = (
@@ -15,7 +14,7 @@ export const normalizeFileByFileCoveragePaths = (
     const { path } = fileCoverage
     const url = isFileSystemPath(path)
       ? fileSystemPathToUrl(path)
-      : resolveUrl(path, rootDirectoryUrl)
+      : new URL(path, rootDirectoryUrl).href
     const relativeUrl = urlToRelativeUrl(url, rootDirectoryUrl)
     fileByFileNormalized[`./${relativeUrl}`] = {
       ...fileCoverage,