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

package/dist/main.js

@@ -6,42 +6,30 @@ import { urlToRelativeUrl, generateInlineContentUrl, ensurePathnameTrailingSlash
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { workerData, Worker } from "node:worker_threads";
 import { URL_META } from "@jsenv/url-meta";
-import { parseHtmlString, stringifyHtmlAst, visitHtmlAst, getHtmlNodeAttributeByName, htmlNodePosition, findNode, getHtmlNodeTextNode, removeHtmlNode, setHtmlNodeGeneratedText, removeHtmlNodeAttributeByName, parseScriptNode, injectScriptAsEarlyAsPossible, createHtmlNode, removeHtmlNodeText, assignHtmlNodeAttributes, parseLinkNode } from "@jsenv/utils/html_ast/html_ast.js";
-import { htmlAttributeSrcSet } from "@jsenv/utils/html_ast/html_attribute_src_set.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 { parseJsUrls } from "@jsenv/utils/js_ast/parse_js_urls.js";
+import { parseHtmlString, stringifyHtmlAst, visitHtmlNodes, getHtmlNodeAttribute, setHtmlNodeAttributes, parseSrcSet, getHtmlNodePosition, getHtmlNodeAttributePosition, applyPostCss, postCssPluginUrlVisitor, parseJsUrls, findHtmlNode, getHtmlNodeText, removeHtmlNode, setHtmlNodeText, analyzeScriptNode, applyBabelPlugins, injectScriptNodeAsEarlyAsPossible, createHtmlNode, removeHtmlNodeText, transpileWithParcel, injectJsImport, minifyWithParcel, analyzeLinkNode } from "@jsenv/ast";
+import { createMagicSource, composeTwoSourcemaps, sourcemapConverter, SOURCEMAP, generateSourcemapFileUrl, generateSourcemapDataUrl } from "@jsenv/sourcemap";
 import { resolveImport, normalizeImportMap, composeTwoImportMaps } from "@jsenv/importmap";
 import { applyNodeEsmResolution, defaultLookupPackageScope, defaultReadPackageJson, readCustomConditionsFromProcessArgs, applyFileSystemMagicResolution, getExtensionsToTry } from "@jsenv/node-esm-resolution";
 import { statSync, realpathSync, readdirSync, readFileSync, existsSync } from "node:fs";
-import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js";
-import { JS_QUOTES } from "@jsenv/utils/string/js_quotes.js";
-import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js";
-import { transpileWithParcel, minifyWithParcel } from "@jsenv/utils/css_ast/parcel_css.js";
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js";
+import { JS_QUOTES } from "@jsenv/utils/src/string/js_quotes.js";
 import { createRequire } from "node:module";
-import { composeTwoSourcemaps } from "@jsenv/utils/sourcemap/sourcemap_composition_v3.js";
 import babelParser from "@babel/parser";
-import { findHighestVersion } from "@jsenv/utils/semantic_versioning/highest_version.js";
-import { injectImport } from "@jsenv/utils/js_ast/babel_utils.js";
-import { sortByDependencies } from "@jsenv/utils/graph/sort_by_dependencies.js";
-import { applyRollupPlugins } from "@jsenv/utils/js_ast/apply_rollup_plugins.js";
-import { sourcemapConverter } from "@jsenv/utils/sourcemap/sourcemap_converter.js";
-import { SOURCEMAP, generateSourcemapUrl, sourcemapToBase64Url } from "@jsenv/utils/sourcemap/sourcemap_utils.js";
+import { findHighestVersion } from "@jsenv/utils/src/semantic_versioning/highest_version.js";
 import { validateResponseIntegrity } from "@jsenv/integrity";
 import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/internal/convertFileSystemErrorToResponseProperties.js";
-import { memoizeByFirstArgument } from "@jsenv/utils/memoize/memoize_by_first_argument.js";
+import { memoizeByFirstArgument } from "@jsenv/utils/src/memoize/memoize_by_first_argument.js";
 import { memoryUsage } from "node:process";
 import wrapAnsi from "wrap-ansi";
 import stripAnsi from "strip-ansi";
 import cuid from "cuid";
 import v8 from "node:v8";
 import { runInNewContext, Script } from "node:vm";
-import { memoize } from "@jsenv/utils/memoize/memoize.js";
-import { escapeRegexpSpecialChars } from "@jsenv/utils/string/escape_regexp_special_chars.js";
+import { memoize } from "@jsenv/utils/src/memoize/memoize.js";
+import { escapeRegexpSpecialChars } from "@jsenv/utils/src/string/escape_regexp_special_chars.js";
 import { fork } from "node:child_process";
 import { uneval } from "@jsenv/uneval";
-import { createVersionGenerator } from "@jsenv/utils/versioning/version_generator.js";
+import { createHash } from "node:crypto";
 
 const createReloadableWorker = (workerFileUrl, options = {}) => {
   const workerFilePath = fileURLToPath(workerFileUrl);
@@ -75,12 +63,13 @@ 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 () => {
@@ -118,9 +107,14 @@ const parseAndTransformHtmlUrls = async (urlInfo, context) => {
       column,
       originalLine,
       originalColumn,
-      specifier,
-      attribute
+      node,
+      attributeName,
+      specifier
     }) => {
+      const {
+        crossorigin,
+        integrity
+      } = readFetchMetas(node);
       const isRessourceHint = ["preconnect", "dns-prefetch", "prefetch", "preload", "modulepreload"].includes(subtype);
       const [reference] = referenceUtils.found({
         type,
@@ -130,10 +124,14 @@ const parseAndTransformHtmlUrls = async (urlInfo, context) => {
         specifier,
         specifierLine: line,
         specifierColumn: column,
-        isRessourceHint
+        isRessourceHint,
+        crossorigin,
+        integrity
       });
       actions.push(async () => {
-        attribute.value = await referenceUtils.readGeneratedSpecifier(reference);
+        setHtmlNodeAttributes(node, {
+          [attributeName]: await referenceUtils.readGeneratedSpecifier(reference)
+        });
       });
     }
   });
@@ -147,6 +145,24 @@ const parseAndTransformHtmlUrls = async (urlInfo, context) => {
     content: stringifyHtmlAst(htmlAst)
   };
 };
+const crossOriginCompatibleTagNames = ["script", "link", "img", "source"];
+const integrityCompatibleTagNames = ["script", "link", "img", "source"];
+
+const readFetchMetas = node => {
+  const meta = {};
+
+  if (crossOriginCompatibleTagNames.includes(node.nodeName)) {
+    const crossorigin = getHtmlNodeAttribute(node, "crossorigin") !== undefined;
+    meta.crossorigin = crossorigin;
+  }
+
+  if (integrityCompatibleTagNames.includes(node.nodeName)) {
+    const integrity = getHtmlNodeAttribute(node, "integrity");
+    meta.integrity = integrity;
+  }
+
+  return meta;
+};
 
 const visitHtmlUrls = ({
   url,
@@ -158,18 +174,18 @@ const visitHtmlUrls = ({
     subtype,
     expectedType,
     node,
-    attribute,
+    attributeName,
     specifier
   }) => {
-    const generatedFromInlineContent = Boolean(getHtmlNodeAttributeByName(node, "generated-from-inline-content"));
+    const generatedFromInlineContent = getHtmlNodeAttribute(node, "generated-from-inline-content") !== undefined;
     let position;
 
     if (generatedFromInlineContent) {
       // when generated from inline content,
       // line, column is not "src" nor "generated-from-src" but "original-position"
-      position = htmlNodePosition.readNodePosition(node);
+      position = getHtmlNodePosition(node);
     } else {
-      position = htmlNodePosition.readAttributePosition(node, attribute.name);
+      position = getHtmlNodeAttributePosition(node, attributeName);
     }
 
     const {
@@ -185,19 +201,68 @@ const visitHtmlUrls = ({
       column,
       // originalLine, originalColumn
       specifier,
-      attribute,
-      // injected:Boolean(getHtmlNodeAttributeByName(node, "injected-by"))
-      // srcGeneratedFromInlineContent
-      ...readFetchMetas(node)
+      node,
+      attributeName
     });
   };
 
-  const visitors = {
+  const visitAttributeAsUrlSpecifier = ({
+    node,
+    attributeName,
+    ...rest
+  }) => {
+    const value = getHtmlNodeAttribute(node, attributeName);
+
+    if (value) {
+      const generatedBy = getHtmlNodeAttribute(node, "generated-by");
+
+      if (generatedBy !== undefined) {
+        // during build the importmap is inlined
+        // and shoud not be considered as a dependency anymore
+        return;
+      }
+
+      addDependency({ ...rest,
+        node,
+        attributeName,
+        specifier: attributeName === "generated-from-src" || attributeName === "generated-from-href" ? new URL(value, url).href : value
+      });
+    } else if (attributeName === "src") {
+      visitAttributeAsUrlSpecifier({ ...rest,
+        node,
+        attributeName: "generated-from-src"
+      });
+    } else if (attributeName === "href") {
+      visitAttributeAsUrlSpecifier({ ...rest,
+        node,
+        attributeName: "generated-from-href"
+      });
+    }
+  };
+
+  const visitSrcset = ({
+    type,
+    node
+  }) => {
+    const srcset = getHtmlNodeAttribute(node, "srcset");
+
+    if (srcset) {
+      const srcCandidates = parseSrcSet(srcset);
+      srcCandidates.forEach(srcCandidate => {
+        addDependency({
+          type,
+          node,
+          attributeName: "srcset",
+          specifier: srcCandidate.specifier
+        });
+      });
+    }
+  };
+
+  visitHtmlNodes(htmlAst, {
     link: node => {
-      const relAttribute = getHtmlNodeAttributeByName(node, "rel");
-      const rel = relAttribute ? relAttribute.value : undefined;
-      const typeAttribute = getHtmlNodeAttributeByName(node, "type");
-      const type = typeAttribute ? typeAttribute.value : undefined;
+      const rel = getHtmlNodeAttribute(node, "rel");
+      const type = getHtmlNodeAttribute(node, "type");
       visitAttributeAsUrlSpecifier({
         type: "link_href",
         subtype: rel,
@@ -213,15 +278,16 @@ const visitHtmlUrls = ({
     },
     // style: () => {},
     script: node => {
-      const typeAttributeNode = getHtmlNodeAttributeByName(node, "type");
+      const type = getHtmlNodeAttribute(node, "type");
+      const expectedType = {
+        "undefined": "js_classic",
+        "text/javascript": "js_classic",
+        "module": "js_module",
+        "importmap": "importmap"
+      }[type];
       visitAttributeAsUrlSpecifier({
         type: "script_src",
-        expectedType: {
-          "undefined": "js_classic",
-          "text/javascript": "js_classic",
-          "module": "js_module",
-          "importmap": "importmap"
-        }[typeAttributeNode ? typeAttributeNode.value : undefined],
+        expectedType,
         node,
         attributeName: "src"
       });
@@ -277,102 +343,9 @@ const visitHtmlUrls = ({
         attributeName: "href"
       });
     }
-  };
-
-  const visitAttributeAsUrlSpecifier = ({
-    type,
-    subtype,
-    expectedType,
-    node,
-    attributeName
-  }) => {
-    const attribute = getHtmlNodeAttributeByName(node, attributeName);
-    const value = attribute ? attribute.value : undefined;
-
-    if (value) {
-      const generatedBy = getHtmlNodeAttributeByName(node, "generated-by");
-
-      if (generatedBy) {
-        // during build the importmap is inlined
-        // and shoud not be considered as a dependency anymore
-        return;
-      }
-
-      addDependency({
-        type,
-        subtype,
-        expectedType,
-        node,
-        attribute,
-        specifier: attributeName === "generated-from-src" || attributeName === "generated-from-href" ? new URL(value, url).href : value
-      });
-    } else if (attributeName === "src") {
-      visitAttributeAsUrlSpecifier({
-        type,
-        subtype,
-        expectedType,
-        node,
-        attributeName: "generated-from-src"
-      });
-    } else if (attributeName === "href") {
-      visitAttributeAsUrlSpecifier({
-        type,
-        subtype,
-        expectedType,
-        node,
-        attributeName: "generated-from-href"
-      });
-    }
-  };
-
-  const visitSrcset = ({
-    type,
-    node
-  }) => {
-    const srcsetAttribute = getHtmlNodeAttributeByName(node, "srcset");
-    const srcset = srcsetAttribute ? srcsetAttribute.value : undefined;
-
-    if (srcset) {
-      const srcCandidates = htmlAttributeSrcSet.parse(srcset);
-      srcCandidates.forEach(srcCandidate => {
-        addDependency({
-          type,
-          node,
-          attribute: srcsetAttribute,
-          specifier: srcCandidate.specifier
-        });
-      });
-    }
-  };
-
-  visitHtmlAst(htmlAst, node => {
-    const visitor = visitors[node.nodeName];
-
-    if (visitor) {
-      visitor(node);
-    }
   });
 };
 
-const crossOriginCompatibleTagNames = ["script", "link", "img", "source"];
-const integrityCompatibleTagNames = ["script", "link", "img", "source"];
-
-const readFetchMetas = node => {
-  const meta = {};
-
-  if (crossOriginCompatibleTagNames.includes(node.nodeName)) {
-    const crossoriginAttribute = getHtmlNodeAttributeByName(node, "crossorigin");
-    meta.crossorigin = crossoriginAttribute ? crossoriginAttribute.value : undefined;
-  }
-
-  if (integrityCompatibleTagNames.includes(node.nodeName)) {
-    const integrityAttribute = getHtmlNodeAttributeByName(node, "integrity");
-    meta.integrity = integrityAttribute ? integrityAttribute.value : undefined;
-  }
-
-  return meta;
-};
-
 /*
  * https://github.com/parcel-bundler/parcel/blob/v2/packages/transformers/css/src/CSSTransformer.js
  */
@@ -547,7 +520,8 @@ const parseAndTransformWebmanifestUrls = async (urlInfo, context) => {
 
 const jsenvPluginUrlAnalysis = ({
   rootDirectoryUrl,
-  include
+  include,
+  supportedProtocols = ["file:", "data:", "virtual:", "http:", "https:"]
 }) => {
   let getIncludeInfo = () => undefined;
 
@@ -592,12 +566,12 @@ const jsenvPluginUrlAnalysis = ({
         return;
       }
 
-      if (reference.url.startsWith("data:")) {
-        reference.shouldHandle = true;
-        return;
-      }
+      const {
+        protocol
+      } = new URL(reference.url);
+      const protocolIsSupported = supportedProtocols.some(supportedProtocol => protocol === supportedProtocol);
 
-      if (reference.url.startsWith("file:")) {
+      if (protocolIsSupported) {
         reference.shouldHandle = true;
         return;
       }
@@ -748,14 +722,14 @@ const jsenvPluginImportmap = () => {
     transformUrlContent: {
       html: async (htmlUrlInfo, context) => {
         const htmlAst = parseHtmlString(htmlUrlInfo.content);
-        const importmap = findNode(htmlAst, node => {
+        const importmap = findHtmlNode(htmlAst, node => {
           if (node.nodeName !== "script") {
             return false;
           }
 
-          const typeAttribute = getHtmlNodeAttributeByName(node, "type");
+          const type = getHtmlNodeAttribute(node, "type");
 
-          if (!typeAttribute || typeAttribute.value !== "importmap") {
+          if (type === undefined || type !== "importmap") {
             return false;
           }
 
@@ -774,7 +748,7 @@ const jsenvPluginImportmap = () => {
             lineEnd,
             columnEnd,
             isOriginal
-          } = htmlNodePosition.readNodePosition(importmap, {
+          } = getHtmlNodePosition(importmap, {
             preferOriginal: true
           });
           const inlineImportmapUrl = generateInlineContentUrl({
@@ -797,9 +771,9 @@ const jsenvPluginImportmap = () => {
           await context.cook(inlineImportmapUrlInfo, {
             reference: inlineImportmapReference
           });
-          setHtmlNodeGeneratedText(importmap, {
-            generatedText: inlineImportmapUrlInfo.content,
-            generatedBy: "jsenv:importmap"
+          setHtmlNodeText(importmap, inlineImportmapUrlInfo.content);
+          setHtmlNodeAttributes(importmap, {
+            "generated-by": "jsenv:importmap"
           });
           onHtmlImportmapParsed(JSON.parse(inlineImportmapUrlInfo.content), htmlUrlInfo.url);
         };
@@ -816,11 +790,11 @@ const jsenvPluginImportmap = () => {
             reference: importmapReference
           });
           onHtmlImportmapParsed(JSON.parse(importmapUrlInfo.content), htmlUrlInfo.url);
-          removeHtmlNodeAttributeByName(importmap, "src");
-          setHtmlNodeGeneratedText(importmap, {
-            generatedText: importmapUrlInfo.content,
-            generatedBy: "jsenv:importmap",
-            generatedFromSrc: src
+          setHtmlNodeText(importmap, importmapUrlInfo.content);
+          setHtmlNodeAttributes(importmap, {
+            "src": undefined,
+            "generated-by": "jsenv:importmap",
+            "generated-from-src": src
           });
           const {
             line,
@@ -828,7 +802,7 @@ const jsenvPluginImportmap = () => {
             lineEnd,
             columnEnd,
             isOriginal
-          } = htmlNodePosition.readNodePosition(importmap, {
+          } = getHtmlNodePosition(importmap, {
             preferOriginal: true
           });
           const inlineImportmapUrl = generateInlineContentUrl({
@@ -849,16 +823,15 @@ const jsenvPluginImportmap = () => {
           });
         };
 
-        const srcAttribute = getHtmlNodeAttributeByName(importmap, "src");
-        const src = srcAttribute ? srcAttribute.value : undefined;
+        const src = getHtmlNodeAttribute(importmap, "src");
 
         if (src) {
           await handleImportmapWithSrc(importmap, src);
         } else {
-          const textNode = getHtmlNodeTextNode(importmap);
+          const htmlNodeText = getHtmlNodeText(importmap);
 
-          if (textNode) {
-            await handleInlineImportmap(importmap, textNode);
+          if (htmlNodeText) {
+            await handleInlineImportmap(importmap, htmlNodeText);
           }
         } // once this plugin knows the importmap, it will use it
         // to map imports. These import specifiers will be normalized
@@ -1107,7 +1080,7 @@ const jsenvPluginUrlVersion = () => {
 const jsenvPluginFileUrls = ({
   magicExtensions = ["inherit", ".js"],
   magicDirectoryIndex = true,
-  preservesSymlink = true,
+  preserveSymlinks = false,
   directoryReferenceAllowed = false
 }) => {
   return [{
@@ -1162,7 +1135,7 @@ const jsenvPluginFileUrls = ({
       if (foundADirectory && directoryReferenceAllowed) {
         reference.data.foundADirectory = true;
         const directoryFacadeUrl = urlObject.href;
-        const directoryUrlRaw = preservesSymlink ? directoryFacadeUrl : resolveSymlink(directoryFacadeUrl);
+        const directoryUrlRaw = preserveSymlinks ? directoryFacadeUrl : resolveSymlink(directoryFacadeUrl);
         const directoryUrl = `${directoryUrlRaw}${search}${hash}`;
         return directoryUrl;
       }
@@ -1181,7 +1154,7 @@ const jsenvPluginFileUrls = ({
 
       reference.data.foundADirectory = filesystemResolution.isDirectory;
       const fileFacadeUrl = filesystemResolution.url;
-      const fileUrlRaw = preservesSymlink ? fileFacadeUrl : resolveSymlink(fileFacadeUrl);
+      const fileUrlRaw = preserveSymlinks ? fileFacadeUrl : resolveSymlink(fileFacadeUrl);
       const fileUrl = `${fileUrlRaw}${search}${hash}`;
       return fileUrl;
     }
@@ -1279,13 +1252,14 @@ const resolveSymlink = fileUrl => {
 const jsenvPluginHttpUrls = () => {
   return {
     name: "jsenv:http_urls",
-    appliesDuring: "*" // fetchUrlContent: (urlInfo) => {
-    //   if (urlInfo.url.startsWith("http") || urlInfo.url.startsWith("https")) {
-    //     return { shouldHandle: false }
-    //   }
-    //   return null
-    // },
+    appliesDuring: "*",
+    redirectUrl: reference => {
+      if (reference.url.startsWith("http:") || reference.url.startsWith("https:")) {
+        reference.shouldHandle = false;
+      } // TODO: according to some pattern matching jsenv could be allowed
+      // to fetch and transform http urls
 
+    }
   };
 };
 
@@ -1301,13 +1275,9 @@ const jsenvPluginHtmlInlineContent = ({
         const actions = [];
 
         const handleInlineStyle = node => {
-          if (node.nodeName !== "style") {
-            return;
-          }
-
-          const textNode = getHtmlNodeTextNode(node);
+          const htmlNodeText = getHtmlNodeText(node);
 
-          if (!textNode) {
+          if (!htmlNodeText) {
             return;
           }
 
@@ -1318,7 +1288,7 @@ const jsenvPluginHtmlInlineContent = ({
               lineEnd,
               columnEnd,
               isOriginal
-            } = htmlNodePosition.readNodePosition(node, {
+            } = getHtmlNodePosition(node, {
               preferOriginal: true
             });
             const inlineStyleUrl = generateInlineContentUrl({
@@ -1340,55 +1310,47 @@ const jsenvPluginHtmlInlineContent = ({
               specifierColumn: column,
               specifier: inlineStyleUrl,
               contentType: "text/css",
-              content: textNode.value
+              content: htmlNodeText
             });
             await context.cook(inlineStyleUrlInfo, {
               reference: inlineStyleReference
             });
-            setHtmlNodeGeneratedText(node, {
-              generatedText: inlineStyleUrlInfo.content,
-              generatedBy: "jsenv:html_inline_content"
+            setHtmlNodeText(node, inlineStyleUrlInfo.content);
+            setHtmlNodeAttributes(node, {
+              "generated-by": "jsenv:html_inline_content"
             });
           });
         };
 
         const handleInlineScript = node => {
-          if (node.nodeName !== "script") {
-            return;
-          }
-
-          const textNode = getHtmlNodeTextNode(node);
+          const htmlNodeText = getHtmlNodeText(node);
 
-          if (!textNode) {
+          if (!htmlNodeText) {
             return;
           } // If the inline script was already handled by an other plugin, ignore it
           // - we want to preserve inline scripts generated by html supervisor during dev
           // - we want to avoid cooking twice a script during build
 
 
-          const generatedBy = getHtmlNodeAttributeByName(node, "generated-by");
+          const generatedBy = getHtmlNodeAttribute(node, "generated-by");
 
-          if (generatedBy) {
-            if (generatedBy.value === "jsenv:as_js_classic_html") {
-              if (!analyzeConvertedScripts) {
-                return;
-              }
-            }
+          if (generatedBy === "jsenv:as_js_classic_html" && !analyzeConvertedScripts) {
+            return;
+          }
 
-            if (generatedBy.value === "jsenv:html_supervisor") {
-              return;
-            }
+          if (generatedBy === "jsenv:html_supervisor") {
+            return;
           }
 
           actions.push(async () => {
-            const scriptCategory = parseScriptNode(node);
+            const scriptCategory = analyzeScriptNode(node);
             const {
               line,
               column,
               lineEnd,
               columnEnd,
               isOriginal
-            } = htmlNodePosition.readNodePosition(node, {
+            } = getHtmlNodePosition(node, {
               preferOriginal: true
             }); // from MDN about [type] attribute:
             // "Any other value: The embedded content is treated as a data block
@@ -1424,21 +1386,25 @@ const jsenvPluginHtmlInlineContent = ({
               isOriginalPosition: isOriginal,
               specifier: inlineScriptUrl,
               contentType,
-              content: textNode.value
+              content: htmlNodeText
             });
             await context.cook(inlineScriptUrlInfo, {
               reference: inlineScriptReference
             });
-            setHtmlNodeGeneratedText(node, {
-              generatedText: inlineScriptUrlInfo.content,
-              generatedBy: "jsenv:html_inline_content"
+            setHtmlNodeText(node, inlineScriptUrlInfo.content);
+            setHtmlNodeAttributes(node, {
+              "generated-by": "jsenv:html_inline_content"
             });
           });
         };
 
-        visitHtmlAst(htmlAst, node => {
-          handleInlineStyle(node);
-          handleInlineScript(node);
+        visitHtmlNodes(htmlAst, {
+          style: node => {
+            handleInlineStyle(node);
+          },
+          script: node => {
+            handleInlineScript(node);
+          }
         });
 
         if (actions.length === 0) {
@@ -1978,15 +1944,15 @@ const jsenvPluginHtmlSupervisor = ({
         const htmlAst = parseHtmlString(content);
         const scriptsToSupervise = [];
 
-        const handleInlineScript = (node, textNode) => {
-          const scriptCategory = parseScriptNode(node);
+        const handleInlineScript = (node, htmlNodeText) => {
+          const scriptCategory = analyzeScriptNode(node);
           const {
             line,
             column,
             lineEnd,
             columnEnd,
             isOriginal
-          } = htmlNodePosition.readNodePosition(node, {
+          } = getHtmlNodePosition(node, {
             preferOriginal: true
           });
           let inlineScriptUrl = generateInlineContentUrl({
@@ -2008,7 +1974,7 @@ const jsenvPluginHtmlSupervisor = ({
             specifierColumn: column,
             specifier: inlineScriptUrl,
             contentType: "text/javascript",
-            content: textNode.value
+            content: htmlNodeText
           });
           removeHtmlNodeText(node);
           scriptsToSupervise.push({
@@ -2019,21 +1985,19 @@ const jsenvPluginHtmlSupervisor = ({
           });
         };
 
-        const handleScriptWithSrc = (node, srcAttribute) => {
-          const scriptCategory = parseScriptNode(node);
-          const integrityAttribute = getHtmlNodeAttributeByName(node, "integrity");
-          const integrity = integrityAttribute ? integrityAttribute.value : undefined;
-          const crossoriginAttribute = getHtmlNodeAttributeByName(node, "crossorigin");
-          const crossorigin = crossoriginAttribute ? crossoriginAttribute.value : undefined;
-          const deferAttribute = getHtmlNodeAttributeByName(node, "crossorigin");
-          const defer = deferAttribute ? deferAttribute.value : undefined;
-          const asyncAttribute = getHtmlNodeAttributeByName(node, "crossorigin");
-          const async = asyncAttribute ? asyncAttribute.value : undefined;
-          removeHtmlNodeAttributeByName(node, "src");
+        const handleScriptWithSrc = (node, src) => {
+          const scriptCategory = analyzeScriptNode(node);
+          const integrity = getHtmlNodeAttribute(node, "integrity");
+          const crossorigin = getHtmlNodeAttribute(node, "crossorigin") !== undefined;
+          const defer = getHtmlNodeAttribute(node, "defer") !== undefined;
+          const async = getHtmlNodeAttribute(node, "async") !== undefined;
+          setHtmlNodeAttributes(node, {
+            src: undefined
+          });
           scriptsToSupervise.push({
             node,
             type: scriptCategory,
-            src: srcAttribute.value,
+            src,
             defer,
             async,
             integrity,
@@ -2041,41 +2005,39 @@ const jsenvPluginHtmlSupervisor = ({
           });
         };
 
-        visitHtmlAst(htmlAst, node => {
-          if (node.nodeName !== "script") {
-            return;
-          }
-
-          const scriptCategory = parseScriptNode(node);
+        visitHtmlNodes(htmlAst, {
+          script: node => {
+            const scriptCategory = analyzeScriptNode(node);
 
-          if (scriptCategory !== "classic" && scriptCategory !== "module") {
-            return;
-          }
+            if (scriptCategory !== "classic" && scriptCategory !== "module") {
+              return;
+            }
 
-          const injectedByAttribute = getHtmlNodeAttributeByName(node, "injected-by");
+            const injectedBy = getHtmlNodeAttribute(node, "injected-by");
 
-          if (injectedByAttribute) {
-            return;
-          }
+            if (injectedBy !== undefined) {
+              return;
+            }
 
-          const noHtmlSupervisor = getHtmlNodeAttributeByName(node, "no-html-supervisor");
+            const noHtmlSupervisor = getHtmlNodeAttribute(node, "no-html-supervisor");
 
-          if (noHtmlSupervisor) {
-            return;
-          }
+            if (noHtmlSupervisor !== undefined) {
+              return;
+            }
 
-          const textNode = getHtmlNodeTextNode(node);
+            const htmlNodeText = getHtmlNodeText(node);
 
-          if (textNode) {
-            handleInlineScript(node, textNode);
-            return;
-          }
+            if (htmlNodeText) {
+              handleInlineScript(node, htmlNodeText);
+              return;
+            }
 
-          const srcAttribute = getHtmlNodeAttributeByName(node, "src");
+            const src = getHtmlNodeAttribute(node, "src");
 
-          if (srcAttribute) {
-            handleScriptWithSrc(node, srcAttribute);
-            return;
+            if (src) {
+              handleScriptWithSrc(node, src);
+              return;
+            }
           }
         });
         const [htmlSupervisorInstallerFileReference] = referenceUtils.inject({
@@ -2083,7 +2045,7 @@ const jsenvPluginHtmlSupervisor = ({
           expectedType: "js_module",
           specifier: htmlSupervisorInstallerFileUrl
         });
-        injectScriptAsEarlyAsPossible(htmlAst, createHtmlNode({
+        injectScriptNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
           "tagName": "script",
           "type": "module",
           "textContent": `
@@ -2099,7 +2061,7 @@ const jsenvPluginHtmlSupervisor = ({
           expectedType: "js_classic",
           specifier: htmlSupervisorSetupFileUrl
         });
-        injectScriptAsEarlyAsPossible(htmlAst, createHtmlNode({
+        injectScriptNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
           "tagName": "script",
           "src": htmlSupervisorSetupFileReference.generatedSpecifier,
           "injected-by": "jsenv:html_supervisor"
@@ -2114,20 +2076,24 @@ const jsenvPluginHtmlSupervisor = ({
           integrity,
           crossorigin
         }) => {
-          setHtmlNodeGeneratedText(node, {
-            generatedText: generateCodeToSuperviseScript({
-              type,
-              src,
-              isInline,
-              defer,
-              async,
-              integrity,
-              crossorigin,
-              htmlSupervisorInstallerSpecifier: htmlSupervisorInstallerFileReference.generatedSpecifier
-            }),
-            generatedBy: "jsenv:html_supervisor",
-            generatedFromSrc: src,
-            generatedFromInlineContent: isInline
+          setHtmlNodeText(node, generateCodeToSuperviseScript({
+            type,
+            src,
+            isInline,
+            defer,
+            async,
+            integrity,
+            crossorigin,
+            htmlSupervisorInstallerSpecifier: htmlSupervisorInstallerFileReference.generatedSpecifier
+          }));
+          setHtmlNodeAttributes(node, {
+            "generated-by": "jsenv:html_supervisor",
+            ...(src ? {
+              "generated-from-src": src
+            } : {}),
+            ...(isInline ? {
+              "generated-from-inline-content": ""
+            } : {})
           });
         });
         const htmlModified = stringifyHtmlAst(htmlAst);
@@ -2742,12 +2708,7 @@ const jsenvPluginAsJsClassicHtml = ({
         const classicScriptNodes = [];
 
         const visitLinkNodes = node => {
-          if (node.nodeName !== "link") {
-            return;
-          }
-
-          const relAttribute = getHtmlNodeAttributeByName(node, "rel");
-          const rel = relAttribute ? relAttribute.value : undefined;
+          const rel = getHtmlNodeAttribute(node, "rel");
 
           if (rel === "modulepreload") {
             modulePreloadNodes.push(node);
@@ -2755,8 +2716,7 @@ const jsenvPluginAsJsClassicHtml = ({
           }
 
           if (rel === "preload") {
-            const asAttribute = getHtmlNodeAttributeByName(node, "as");
-            const asValue = asAttribute ? asAttribute.value : undefined;
+            const asValue = getHtmlNodeAttribute(node, "as");
 
             if (asValue === "script") {
               preloadAsScriptNodes.push(node);
@@ -2767,12 +2727,7 @@ const jsenvPluginAsJsClassicHtml = ({
         };
 
         const visitScriptNodes = node => {
-          if (node.nodeName !== "script") {
-            return;
-          }
-
-          const typeAttribute = getHtmlNodeAttributeByName(node, "type");
-          const type = typeAttribute ? typeAttribute.value : undefined;
+          const type = getHtmlNodeAttribute(node, "type");
 
           if (type === "module") {
             moduleScriptNodes.push(node);
@@ -2785,9 +2740,13 @@ const jsenvPluginAsJsClassicHtml = ({
           }
         };
 
-        visitHtmlAst(htmlAst, node => {
-          visitLinkNodes(node);
-          visitScriptNodes(node);
+        visitHtmlNodes(htmlAst, {
+          link: node => {
+            visitLinkNodes(node);
+          },
+          script: node => {
+            visitScriptNodes(node);
+          }
         });
         const actions = [];
         const jsModuleUrls = [];
@@ -2829,10 +2788,10 @@ const jsenvPluginAsJsClassicHtml = ({
         };
 
         classicScriptNodes.forEach(classicScriptNode => {
-          const srcAttribute = getHtmlNodeAttributeByName(classicScriptNode, "src");
+          const src = getHtmlNodeAttribute(classicScriptNode, "src");
 
-          if (srcAttribute) {
-            const reference = urlInfo.references.find(ref => ref.generatedSpecifier === srcAttribute.value && ref.type === "script_src");
+          if (src !== undefined) {
+            const reference = urlInfo.references.find(ref => ref.generatedSpecifier === src && ref.type === "script_src");
             const urlObject = new URL(reference.url);
 
             if (urlObject.searchParams.has("as_js_classic")) {
@@ -2851,10 +2810,10 @@ const jsenvPluginAsJsClassicHtml = ({
           }
         });
         moduleScriptNodes.forEach(moduleScriptNode => {
-          const srcAttribute = getHtmlNodeAttributeByName(moduleScriptNode, "src");
+          const src = getHtmlNodeAttribute(moduleScriptNode, "src");
 
-          if (srcAttribute) {
-            const reference = urlInfo.references.find(ref => ref.generatedSpecifier === srcAttribute.value && ref.type === "script_src" && ref.expectedType === "js_module");
+          if (src !== undefined) {
+            const reference = urlInfo.references.find(ref => ref.generatedSpecifier === src && ref.type === "script_src" && ref.expectedType === "js_module");
             jsModuleUrls.push(reference.url);
 
             if (shouldTransformScriptTypeModule) {
@@ -2862,8 +2821,10 @@ const jsenvPluginAsJsClassicHtml = ({
                 const [newReference] = await getReferenceAsJsClassic(reference, {
                   cookIt: true
                 });
-                removeHtmlNodeAttributeByName(moduleScriptNode, "type");
-                srcAttribute.value = newReference.generatedSpecifier;
+                setHtmlNodeAttributes(moduleScriptNode, {
+                  type: undefined,
+                  src: newReference.generatedSpecifier
+                });
               });
             }
 
@@ -2871,7 +2832,7 @@ const jsenvPluginAsJsClassicHtml = ({
           }
 
           if (shouldTransformScriptTypeModule) {
-            const textNode = getHtmlNodeTextNode(moduleScriptNode);
+            const htmlNodeText = getHtmlNodeText(moduleScriptNode);
             actions.push(async () => {
               const {
                 line,
@@ -2879,7 +2840,7 @@ const jsenvPluginAsJsClassicHtml = ({
                 lineEnd,
                 columnEnd,
                 isOriginal
-              } = htmlNodePosition.readNodePosition(moduleScriptNode, {
+              } = getHtmlNodePosition(moduleScriptNode, {
                 preferOriginal: true
               });
               let inlineScriptUrl = generateInlineContentUrl({
@@ -2902,15 +2863,15 @@ const jsenvPluginAsJsClassicHtml = ({
                 specifierColumn: column,
                 specifier: inlineScriptUrl,
                 contentType: "text/javascript",
-                content: textNode.value
+                content: htmlNodeText
               });
               const [, newUrlInfo] = await getReferenceAsJsClassic(inlineReference, {
                 cookIt: true
               });
-              removeHtmlNodeAttributeByName(moduleScriptNode, "type");
-              setHtmlNodeGeneratedText(moduleScriptNode, {
-                generatedText: newUrlInfo.content,
-                generatedBy: "jsenv:as_js_classic_html"
+              setHtmlNodeText(moduleScriptNode, newUrlInfo.content);
+              setHtmlNodeAttributes(moduleScriptNode, {
+                "type": undefined,
+                "generated-by": "jsenv:as_js_classic_html"
               });
             });
           }
@@ -2918,8 +2879,7 @@ const jsenvPluginAsJsClassicHtml = ({
 
         if (shouldTransformScriptTypeModule) {
           preloadAsScriptNodes.forEach(preloadAsScriptNode => {
-            const hrefAttribute = getHtmlNodeAttributeByName(preloadAsScriptNode, "href");
-            const href = hrefAttribute.value;
+            const href = getHtmlNodeAttribute(preloadAsScriptNode, "href");
             const reference = urlInfo.references.find(ref => ref.generatedSpecifier === href && ref.type === "link_href" && ref.expectedType === undefined);
             const expectedScriptType = jsModuleUrls.includes(reference.url) ? "module" : "classic";
 
@@ -2934,16 +2894,15 @@ const jsenvPluginAsJsClassicHtml = ({
                   [newReference] = await getReferenceAsJsClassic(reference);
                 }
 
-                assignHtmlNodeAttributes(preloadAsScriptNode, {
-                  href: newReference.generatedSpecifier
+                setHtmlNodeAttributes(preloadAsScriptNode, {
+                  href: newReference.generatedSpecifier,
+                  crossorigin: undefined
                 });
-                removeHtmlNodeAttributeByName(preloadAsScriptNode, "crossorigin");
               });
             }
           });
           modulePreloadNodes.forEach(modulePreloadNode => {
-            const hrefAttribute = getHtmlNodeAttributeByName(modulePreloadNode, "href");
-            const href = hrefAttribute.value;
+            const href = getHtmlNodeAttribute(modulePreloadNode, "href");
             const reference = urlInfo.references.find(ref => ref.generatedSpecifier === href && ref.type === "link_href" && ref.expectedType === "js_module");
             actions.push(async () => {
               let newReference;
@@ -2954,7 +2913,7 @@ const jsenvPluginAsJsClassicHtml = ({
                 [newReference] = await getReferenceAsJsClassic(reference);
               }
 
-              assignHtmlNodeAttributes(modulePreloadNode, {
+              setHtmlNodeAttributes(modulePreloadNode, {
                 rel: "preload",
                 as: "script",
                 href: newReference.generatedSpecifier
@@ -2978,7 +2937,7 @@ const jsenvPluginAsJsClassicHtml = ({
               expectedType: "js_classic",
               specifier: systemJsClientFileUrl
             });
-            injectScriptAsEarlyAsPossible(htmlAst, createHtmlNode({
+            injectScriptNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
               "tagName": "script",
               "src": systemJsReference.generatedSpecifier,
               "injected-by": "jsenv:as_js_classic_html"
@@ -4057,7 +4016,7 @@ const babelPluginBabelHelpersAsJsenvImports = (babel, {
         }
 
         const babelHelperImportSpecifier = getBabelHelperFileUrl(name);
-        const helper = injectImport({
+        const helper = injectJsImport({
           programPath: file.path,
           from: getImportSpecifier(babelHelperImportSpecifier),
           nameHint: `_${name}`,
@@ -4160,7 +4119,7 @@ const babelPluginNewStylesheetAsJsenvImport = (babel, {
         });
 
         if (usesNewStylesheet) {
-          injectImport({
+          injectJsImport({
             programPath,
             from: getImportSpecifier(newStylesheetClientFileUrl),
             sideEffect: true
@@ -4225,7 +4184,7 @@ const babelPluginGlobalThisAsJsenvImport = (babel, {
         } = path; // we should do this once, tree shaking will remote it but still
 
         if (node.name === "globalThis") {
-          injectImport({
+          injectJsImport({
             programPath: path.scope.getProgramParent().path,
             from: getImportSpecifier(globalThisClientFileUrl),
             sideEffect: true
@@ -4259,7 +4218,7 @@ const babelPluginRegeneratorRuntimeAsJsenvImport = (babel, {
         } = path;
 
         if (node.name === "regeneratorRuntime") {
-          injectImport({
+          injectJsImport({
             programPath: path.scope.getProgramParent().path,
             from: getImportSpecifier(regeneratorRuntimeClientFileUrl),
             sideEffect: true
@@ -4503,6 +4462,39 @@ const jsenvPluginNodeRuntime = ({
   };
 };
 
+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);
+      });
+      sorted.push(url);
+    }
+  };
+
+  Object.keys(nodes).forEach(url => {
+    visit(url);
+  });
+  sorted.circular = circular;
+  return sorted;
+};
+
 /*
  * Each @import found in css is replaced by the file content
  * - There is no need to worry about urls (such as background-image: url())
@@ -4720,71 +4712,6 @@ const bundleJsModule = async ({
   });
   return jsModuleBundleUrlInfos;
 };
-const buildWithRollup = async ({
-  signal,
-  logger,
-  rootDirectoryUrl,
-  buildDirectoryUrl,
-  urlGraph,
-  jsModuleUrlInfos,
-  runtimeCompat,
-  sourcemaps,
-  include,
-  babelHelpersChunk
-}) => {
-  const resultRef = {
-    current: null
-  };
-
-  try {
-    await applyRollupPlugins({
-      rollupPlugins: [rollupPluginJsenv({
-        signal,
-        logger,
-        rootDirectoryUrl,
-        buildDirectoryUrl,
-        urlGraph,
-        jsModuleUrlInfos,
-        runtimeCompat,
-        sourcemaps,
-        include,
-        babelHelpersChunk,
-        resultRef
-      })],
-      inputOptions: {
-        input: [],
-        onwarn: warning => {
-          if (warning.code === "CIRCULAR_DEPENDENCY") {
-            return;
-          }
-
-          if (warning.code === "THIS_IS_UNDEFINED" && pathToFileURL(warning.id).href === globalThisClientFileUrl) {
-            return;
-          }
-
-          if (warning.code === "EVAL") {
-            // ideally we should disable only for jsenv files
-            return;
-          }
-
-          logger.warn(String(warning));
-        }
-      }
-    });
-    return resultRef.current;
-  } catch (e) {
-    if (e.code === "MISSING_EXPORT") {
-      const detailedMessage = createDetailedMessage(e.message, {
-        frame: e.frame
-      });
-      throw new Error(detailedMessage, {
-        cause: e
-      });
-    }
-
-    throw e;
-  }
-};
 
 const rollupPluginJsenv = ({
   // logger,
@@ -5010,6 +4937,91 @@ const rollupPluginJsenv = ({
   };
 };
 
+const buildWithRollup = async ({
+  signal,
+  logger,
+  rootDirectoryUrl,
+  buildDirectoryUrl,
+  urlGraph,
+  jsModuleUrlInfos,
+  runtimeCompat,
+  sourcemaps,
+  include,
+  babelHelpersChunk
+}) => {
+  const resultRef = {
+    current: null
+  };
+
+  try {
+    await applyRollupPlugins({
+      rollupPlugins: [rollupPluginJsenv({
+        signal,
+        logger,
+        rootDirectoryUrl,
+        buildDirectoryUrl,
+        urlGraph,
+        jsModuleUrlInfos,
+        runtimeCompat,
+        sourcemaps,
+        include,
+        babelHelpersChunk,
+        resultRef
+      })],
+      inputOptions: {
+        input: [],
+        onwarn: warning => {
+          if (warning.code === "CIRCULAR_DEPENDENCY") {
+            return;
+          }
+
+          if (warning.code === "THIS_IS_UNDEFINED" && pathToFileURL(warning.id).href === globalThisClientFileUrl) {
+            return;
+          }
+
+          if (warning.code === "EVAL") {
+            // ideally we should disable only for jsenv files
+            return;
+          }
+
+          logger.warn(String(warning));
+        }
+      }
+    });
+    return resultRef.current;
+  } catch (e) {
+    if (e.code === "MISSING_EXPORT") {
+      const detailedMessage = createDetailedMessage(e.message, {
+        frame: e.frame
+      });
+      throw new Error(detailedMessage, {
+        cause: e
+      });
+    }
+
+    throw e;
+  }
+};
+
+const applyRollupPlugins = async ({
+  rollupPlugins,
+  inputOptions = {},
+  outputOptions = {}
+}) => {
+  const {
+    rollup
+  } = await import("rollup");
+  const {
+    importAssertions
+  } = await import("acorn-import-assertions");
+  const rollupReturnValue = await rollup({ ...inputOptions,
+    plugins: rollupPlugins,
+    acornInjectPlugins: [importAssertions, ...(inputOptions.acornInjectPlugins || [])]
+  });
+  const rollupOutputArray = await rollupReturnValue.generate(outputOptions);
+  return rollupOutputArray;
+};
+
 const willBeInsideJsDirectory = ({
   chunkInfo,
   fileUrlConverter,
@@ -5252,8 +5264,7 @@ const collectHotDataFromHtmlAst = htmlAst => {
     attributeName,
     hotAccepted
   }) => {
-    const attribute = getHtmlNodeAttributeByName(node, attributeName);
-    const value = attribute ? attribute.value : undefined;
+    const value = getHtmlNodeAttribute(node, attributeName);
 
     if (value) {
       onSpecifier({
@@ -5300,11 +5311,10 @@ const collectHotDataFromHtmlAst = htmlAst => {
     }
 
     if (nodeNamesWithSrcset.includes(node.nodeName)) {
-      const srcsetAttribute = getHtmlNodeAttributeByName(node, "srcset");
-      const srcset = srcsetAttribute ? srcsetAttribute.value : undefined;
+      const srcset = getHtmlNodeAttribute(node, "srcset");
 
       if (srcset) {
-        const srcCandidates = htmlAttributeSrcSet.parse(srcset);
+        const srcCandidates = parseSrcSet(srcset);
         srcCandidates.forEach(srcCandidate => {
           onSpecifier({
             node,
@@ -5345,15 +5355,15 @@ const nodeNamesWithSrcset = ["img", "source"];
 
 const getNodeContext = node => {
   const context = {};
-  const hotAcceptAttribute = getHtmlNodeAttributeByName(node, "hot-accept");
+  const hotAccept = getHtmlNodeAttribute(node, "hot-accept");
 
-  if (hotAcceptAttribute) {
+  if (hotAccept !== undefined) {
     context.hotAccepted = true;
   }
 
-  const hotDeclineAttribute = getHtmlNodeAttributeByName(node, "hot-decline");
+  const hotDecline = getHtmlNodeAttribute(node, "hot-decline");
 
-  if (hotDeclineAttribute) {
+  if (hotDecline !== undefined) {
     context.hotAccepted = false;
   }
 
@@ -5366,7 +5376,7 @@ const htmlNodeCanHotReload = node => {
       isStylesheet,
       isRessourceHint,
       rel
-    } = parseLinkNode(node);
+    } = analyzeLinkNode(node);
 
     if (isStylesheet) {
       // stylesheets can be hot replaced by default
@@ -5666,7 +5676,7 @@ const jsenvPluginDevSSEClient = () => {
           expectedType: "js_module",
           specifier: eventSourceClientFileUrl
         });
-        injectScriptAsEarlyAsPossible(htmlAst, createHtmlNode({
+        injectScriptNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
           "tagName": "script",
           "type": "module",
           "src": eventSourceClientReference.generatedSpecifier,
@@ -6706,13 +6716,27 @@ const createUrlInfoTransformer = ({
   const sourcemapsEnabled = sourcemaps === "inline" || sourcemaps === "file" || 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:"));
+    sourcemapsSourcesContent || urlInfo.isInline || sources && sources.some(source => !source || !source.startsWith("file:"));
 
-    if (sourcemap.sources && sourcemap.sources.length > 1) {
-      sourcemap.sources = sourcemap.sources.map(source => new URL(source, urlInfo.originalUrl).href);
+    if (sources && sources.length > 1) {
+      sourcemap.sources = sources.map(source => new URL(source, urlInfo.originalUrl).href);
 
       if (!wantSourcesContent) {
         sourcemap.sourcesContent = undefined;
@@ -6748,7 +6772,7 @@ const createUrlInfoTransformer = ({
     //   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
@@ -6854,7 +6878,7 @@ const createUrlInfoTransformer = ({
       sourcemapUrlInfo.content = JSON.stringify(sourcemap, null, "  ");
 
       if (sourcemaps === "inline") {
-        sourcemapReference.generatedSpecifier = sourcemapToBase64Url(sourcemap);
+        sourcemapReference.generatedSpecifier = generateSourcemapDataUrl(sourcemap);
       }
 
       if (sourcemaps === "file" || sourcemaps === "inline") {
@@ -7759,6 +7783,8 @@ const memoizeCook = cook => {
 const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
   if (reference.shouldHandle) {
     urlInfo.shouldHandle = true;
+  } else {
+    urlInfo.shouldHandle = false;
   }
 
   urlInfo.originalUrl = urlInfo.originalUrl || reference.url;
@@ -8368,7 +8394,7 @@ const jsenvPluginExplorer = ({
         meta
       }));
       let html = String(readFileSync(new URL(htmlClientFileUrl)));
-      html = html.replace("virtual:FAVICON_HREF", DATA_URL.stringify({
+      html = html.replace("ignore:FAVICON_HREF", DATA_URL.stringify({
         contentType: CONTENT_TYPE.fromUrlExtension(faviconClientFileUrl),
         base64Flag: true,
         data: readFileSync(new URL(faviconClientFileUrl)).toString("base64")
@@ -8521,7 +8547,12 @@ const startDevServer = async ({
       stopWatchingDevServerFiles();
       reloadableWorker.terminate();
     });
-    await reloadableWorker.load();
+    const worker = await reloadableWorker.load();
+
+    if (!keepProcessAlive) {
+      worker.unref();
+    }
+
     return {
       origin: `${protocol}://127.0.0.1:${port}`,
       stop: () => {
@@ -9051,7 +9082,7 @@ const normalizeFileByFileCoveragePaths = (fileByFileCoverage, rootDirectoryUrl)
     const {
       path
     } = fileCoverage;
-    const url = isFileSystemPath(path) ? fileSystemPathToUrl(path) : resolveUrl(path, rootDirectoryUrl);
+    const url = isFileSystemPath(path) ? fileSystemPathToUrl(path) : new URL(path, rootDirectoryUrl).href;
     const relativeUrl = urlToRelativeUrl(url, rootDirectoryUrl);
     fileByFileNormalized[`./${relativeUrl}`] = { ...fileCoverage,
       path: `./${relativeUrl}`
@@ -12317,7 +12348,7 @@ const injectors = {
     const htmlAst = parseHtmlString(urlInfo.content, {
       storeOriginalPositions: false
     });
-    injectScriptAsEarlyAsPossible(htmlAst, createHtmlNode({
+    injectScriptNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
       "tagName": "script",
       "textContent": generateClientCodeForVersionMappings(versionMappings, {
         globalName: "window"
@@ -12348,6 +12379,60 @@ ${globalName}.__v__ = function (specifier) {
 `;
 };
 
+// https://github.com/rollup/rollup/blob/5a5391971d695c808eed0c5d7d2c6ccb594fc689/src/Chunk.ts#L870
+
+const createVersionGenerator = () => {
+  const hash = createHash("sha256");
+
+  const augmentWithContent = ({
+    content,
+    contentType = "application/octet-stream",
+    lineBreakNormalization = false
+  }) => {
+    hash.update(lineBreakNormalization && CONTENT_TYPE.isTextual(contentType) ? normalizeLineBreaks(content) : content);
+  };
+
+  const augmentWithDependencyVersion = version => {
+    hash.update(version);
+  };
+
+  return {
+    augmentWithContent,
+    augmentWithDependencyVersion,
+    generate: () => {
+      return hash.digest("hex").slice(0, 8);
+    }
+  };
+};
+
+const normalizeLineBreaks = stringOrBuffer => {
+  if (typeof stringOrBuffer === "string") {
+    const stringWithLinuxBreaks = stringOrBuffer.replace(/\r\n/g, "\n");
+    return stringWithLinuxBreaks;
+  }
+
+  return normalizeLineBreaksForBuffer(stringOrBuffer);
+}; // https://github.com/nodejs/help/issues/1738#issuecomment-458460503
+
+
+const normalizeLineBreaksForBuffer = buffer => {
+  const int32Array = new Int32Array(buffer, 0, buffer.length);
+  const int32ArrayWithLineBreaksNormalized = int32Array.filter((element, index, typedArray) => {
+    if (element === 0x0d) {
+      if (typedArray[index + 1] === 0x0a) {
+        // Windows -> Unix
+        return false;
+      } // Mac OS -> Unix
+
+
+      typedArray[index] = 0x0a;
+    }
+
+    return true;
+  });
+  return Buffer.from(int32ArrayWithLineBreaksNormalized);
+};
+
 const injectServiceWorkerUrls = async ({
   finalGraph,
   finalGraphKitchen,
@@ -12445,15 +12530,12 @@ const resyncRessourceHints = async ({
       });
       const actions = [];
 
-      const visitLinkWithHref = (linkNode, hrefAttribute) => {
-        const href = hrefAttribute.value;
-
+      const visitLinkWithHref = (linkNode, href) => {
         if (!href || href.startsWith("data:")) {
           return;
         }
 
-        const relAttribute = getHtmlNodeAttributeByName(linkNode, "rel");
-        const rel = relAttribute ? relAttribute.value : undefined;
+        const rel = getHtmlNodeAttribute(linkNode, "rel");
         const isRessourceHint = ["preconnect", "dns-prefetch", "prefetch", "preload", "modulepreload"].includes(rel);
 
         if (!isRessourceHint) {
@@ -12497,22 +12579,20 @@ const resyncRessourceHints = async ({
         }
 
         actions.push(() => {
-          hrefAttribute.value = urlInfo.data.buildUrlSpecifier;
+          setHtmlNodeAttributes(linkNode, {
+            href: urlInfo.data.buildUrlSpecifier
+          });
         });
       };
 
-      visitHtmlAst(htmlAst, node => {
-        if (node.nodeName !== "link") {
-          return;
-        }
-
-        const hrefAttribute = getHtmlNodeAttributeByName(node, "href");
+      visitHtmlNodes(htmlAst, {
+        link: node => {
+          const href = getHtmlNodeAttribute(node, "href");
 
-        if (!hrefAttribute) {
-          return;
+          if (href !== undefined) {
+            visitLinkWithHref(node, href);
+          }
         }
-
-        visitLinkWithHref(node, hrefAttribute);
       });
 
       if (actions.length) {
@@ -13077,7 +13157,7 @@ build ${entryPointKeys.length} entry points`);
 
           if (reference.type === "sourcemap_comment") {
             // inherit parent build url
-            return generateSourcemapUrl(reference.parentUrl);
+            return generateSourcemapFileUrl(reference.parentUrl);
           } // files generated during the final graph:
           // - sourcemaps
           // const finalUrlInfo = finalGraph.getUrlInfo(url)
@@ -13803,6 +13883,7 @@ const startBuildServer = async ({
   ip,
   port = 9779,
   services = {},
+  keepProcessAlive = true,
   rootDirectoryUrl,
   buildDirectoryUrl,
   mainBuildFileUrl = "/index.html",
@@ -13892,7 +13973,12 @@ const startBuildServer = async ({
       stopWatchingBuildServerFiles();
       reloadableWorker.terminate();
     });
-    await reloadableWorker.load();
+    const worker = await reloadableWorker.load();
+
+    if (!keepProcessAlive) {
+      worker.unref();
+    }
+
     return {
       origin: `${protocol}://127.0.0.1:${port}`,
       stop: () => {
@@ -14150,7 +14236,7 @@ const globalInjectorOnHtml = async (urlInfo, globals) => {
     globals,
     isWebWorker: false
   });
-  injectScriptAsEarlyAsPossible(htmlAst, createHtmlNode({
+  injectScriptNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
     "tagName": "script",
     "textContent": clientCode,
     "injected-by": "jsenv:inject_globals"