@jsenv/core 38.3.2 → 38.3.4

package/README.md

@@ -9,7 +9,7 @@ The pillars of jsenv are:
 3. A build server serving build files
 4. A test runner executing test files in web browser(s)
 
-Jsenv cares a lot about the developer experience.   
+Jsenv cares a lot about the developer experience.  
 As a result it can be enjoyed by people without much experience in tooling or seeking for a simple tool without hidden complexities.
 
 [Link to documentation](<https://github.com/jsenv/core/wiki/A)-directory-structure>)

package/dist/babel_helpers/applyDecs2301/applyDecs2301.js

@@ -136,8 +136,8 @@ function applyDecs2301Factory() {
       get && set
         ? { get: get, set: set, has: has }
         : get
-        ? { get: get, has: has }
-        : { set: set, has: has };
+          ? { get: get, has: has }
+          : { set: set, has: has };
 
     try {
       return dec(value, ctx);

package/dist/babel_helpers/applyDecs2305/applyDecs2305.js

@@ -137,8 +137,8 @@ function memberDec(
     get && set
       ? { get: get, set: set, has: has }
       : get
-      ? { get: get, has: has }
-      : { set: set, has: has };
+        ? { get: get, has: has }
+        : { set: set, has: has };
 
   try {
     return dec.call(thisArg, value, ctx);

package/dist/jsenv_core.js

@@ -13,7 +13,7 @@ import http from "node:http";
 import { Readable, Stream, Writable } from "node:stream";
 import { Http2ServerResponse } from "node:http2";
 import { lookup } from "node:dns";
-import { injectJsImport, visitJsAstUntil, applyBabelPlugins, parseHtmlString, visitHtmlNodes, getHtmlNodeAttribute, analyzeScriptNode, getHtmlNodeText, stringifyHtmlAst, setHtmlNodeAttributes, injectHtmlNodeAsEarlyAsPossible, createHtmlNode, generateUrlForInlineContent, parseJsWithAcorn, getHtmlNodePosition, getUrlForContentInsideHtml, getHtmlNodeAttributePosition, parseSrcSet, removeHtmlNodeText, setHtmlNodeText, removeHtmlNode, parseCssUrls, parseJsUrls, getUrlForContentInsideJs, analyzeLinkNode, findHtmlNode, insertHtmlNodeAfter } from "@jsenv/ast";
+import { injectJsImport, visitJsAstUntil, applyBabelPlugins, parseHtml, visitHtmlNodes, getHtmlNodeAttribute, analyzeScriptNode, getHtmlNodeText, stringifyHtmlAst, setHtmlNodeAttributes, injectHtmlNodeAsEarlyAsPossible, createHtmlNode, generateUrlForInlineContent, parseJsWithAcorn, getHtmlNodePosition, getUrlForContentInsideHtml, getHtmlNodeAttributePosition, parseSrcSet, removeHtmlNodeText, setHtmlNodeText, removeHtmlNode, parseCssUrls, parseJsUrls, getUrlForContentInsideJs, analyzeLinkNode, findHtmlNode, insertHtmlNodeAfter } from "@jsenv/ast";
 import { sourcemapConverter, createMagicSource, composeTwoSourcemaps, SOURCEMAP, generateSourcemapFileUrl, generateSourcemapDataUrl } from "@jsenv/sourcemap";
 import { createRequire } from "node:module";
 import { systemJsClientFileUrlDefault, convertJsModuleToJsClassic } from "@jsenv/js-module-fallback";
@@ -5015,11 +5015,11 @@ const applyRedirectionToRequest = (
           baseUrl: request.url,
         })
       : pathname
-      ? getPropertiesFromPathname({
-          pathname,
-          baseUrl: request.url,
-        })
-      : {}),
+        ? getPropertiesFromPathname({
+            pathname,
+            baseUrl: request.url,
+          })
+        : {}),
     ...rest,
   };
 };
@@ -5602,13 +5602,13 @@ const applyCompositionForcingLowerCase = (
       firstKey: keyExistsIn(keyLowercased, firstObject)
         ? keyLowercased
         : keyExistsIn(key, firstObject)
-        ? key
-        : null,
+          ? key
+          : null,
       secondKey: keyExistsIn(keyLowercased, secondObject)
         ? keyLowercased
         : keyExistsIn(key, secondObject)
-        ? key
-        : null,
+          ? key
+          : null,
     });
   });
   return composed;
@@ -10474,7 +10474,7 @@ const jsenvPluginJsModuleFallbackInsideHtml = ({
     },
     finalizeUrlContent: {
       html: async (urlInfo) => {
-        const htmlAst = parseHtmlString(urlInfo.content);
+        const htmlAst = parseHtml({ html: urlInfo.content, url: urlInfo.url });
         const mutations = [];
         visitHtmlNodes(htmlAst, {
           link: (node) => {
@@ -11368,7 +11368,10 @@ const prependContent = async (
 };
 
 const prependJsClassicInHtml = (htmlUrlInfo, urlInfoToPrepend) => {
-  const htmlAst = parseHtmlString(htmlUrlInfo.content);
+  const htmlAst = parseHtml({
+    html: htmlUrlInfo.content,
+    url: htmlUrlInfo.url,
+  });
   injectHtmlNodeAsEarlyAsPossible(
     htmlAst,
     createHtmlNode({
@@ -12978,7 +12981,10 @@ const returnValueAssertions = [
 ];
 
 const applyScriptInjections = (htmlUrlInfo, scriptInjections, hook) => {
-  const htmlAst = parseHtmlString(htmlUrlInfo.content);
+  const htmlAst = parseHtml({
+    html: htmlUrlInfo.content,
+    url: htmlUrlInfo.url,
+  });
 
   scriptInjections.reverse().forEach((scriptInjection) => {
     const { setup } = scriptInjection;
@@ -13150,11 +13156,11 @@ const createUrlInfoTransformer = ({
           return sourcemapsSources(source, urlInfo);
         }
       : sourcemapsSources === "relative"
-      ? (source, urlInfo) => {
-          const sourceRelative = urlToRelativeUrl(source, urlInfo.url);
-          return sourceRelative || ".";
-        }
-      : null;
+        ? (source, urlInfo) => {
+            const sourceRelative = urlToRelativeUrl(source, urlInfo.url);
+            return sourceRelative || ".";
+          }
+        : null;
 
   const normalizeSourcemap = (urlInfo, sourcemap) => {
     let { sources } = sourcemap;
@@ -14393,24 +14399,25 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
         });
       } catch (e) {
         urlInfo.error = e;
-        if (e.code === "DIRECTORY_REFERENCE_NOT_ALLOWED") {
-          throw e;
-        }
-        if (urlInfo.isInline && errorOnInlineContentCanSkipThrow(urlInfo)) {
-          // When something like <style> or <script> contains syntax error
-          // the HTML in itself it still valid
-          // keep the syntax error and continue with the HTML
+        if (
+          urlInfo.isInline &&
+          e.code !== "DIRECTORY_REFERENCE_NOT_ALLOWED" &&
+          errorOnInlineContentCanSkipThrow(urlInfo)
+        ) {
           const errorInfo =
             e.code === "PARSE_ERROR" && e.cause
               ? `${e.cause.reasonCode}\n${e.traceMessage}`
               : e.stack;
+          // When something like <style> or <script> contains syntax error
+          // the HTML in itself it still valid
+          // keep the syntax error and continue with the HTML
           logger.error(
-            `Error while handling ${urlInfo.type} declared in ${urlInfo.firstReference.trace.message}:
+            `Error while cooking ${urlInfo.type} declared in ${urlInfo.firstReference.trace.message}:
 ${errorInfo}`,
           );
-        } else {
-          throw e;
+          return;
         }
+        throw e;
       }
     }
 
@@ -15842,8 +15849,10 @@ const jsenvPluginHtmlReferenceAnalysis = ({
         let importmapFound = false;
         const importmapLoaded = startLoadingImportmap(urlInfo);
 
-        const content = urlInfo.content;
-        const htmlAst = parseHtmlString(content);
+        const htmlAst = parseHtml({
+          html: urlInfo.content,
+          url: urlInfo.url,
+        });
 
         const mutations = [];
         const actions = [];
@@ -18409,7 +18418,10 @@ const jsenvPluginInliningIntoHtml = () => {
     appliesDuring: "*",
     transformUrlContent: {
       html: async (urlInfo) => {
-        const htmlAst = parseHtmlString(urlInfo.content);
+        const htmlAst = parseHtml({
+          html: urlInfo.content,
+          url: urlInfo.url,
+        });
         const mutations = [];
         const actions = [];
 
@@ -19145,7 +19157,10 @@ const jsenvPluginImportMetaHot = () => {
         if (htmlUrlInfo.context.build) {
           return;
         }
-        const htmlAst = parseHtmlString(htmlUrlInfo.content);
+        const htmlAst = parseHtml({
+          html: htmlUrlInfo.content,
+          url: htmlUrlInfo.url,
+        });
         const hotReferences = collectHotDataFromHtmlAst(htmlAst);
         htmlUrlInfo.data.hotDecline = false;
         htmlUrlInfo.data.hotAcceptSelf = false;
@@ -19332,7 +19347,10 @@ const jsenvPluginAutoreloadClient = () => {
     appliesDuring: "dev",
     transformUrlContent: {
       html: (htmlUrlInfo) => {
-        const htmlAst = parseHtmlString(htmlUrlInfo.content);
+        const htmlAst = parseHtml({
+          html: htmlUrlInfo.content,
+          url: htmlUrlInfo.url,
+        });
         const autoreloadClientReference = htmlUrlInfo.dependencies.inject({
           type: "script",
           subtype: "js_module",
@@ -19769,7 +19787,10 @@ const jsenvPluginRibbon = ({
         if (!ribbon) {
           return null;
         }
-        const htmlAst = parseHtmlString(urlInfo.content);
+        const htmlAst = parseHtml({
+          html: urlInfo.content,
+          url: urlInfo.url,
+        });
         const ribbonClientFileReference = urlInfo.dependencies.inject({
           type: "script",
           subtype: "js_module",
@@ -19804,7 +19825,10 @@ const jsenvPluginCleanHTML = () => {
     appliesDuring: "dev",
     finalizeUrlContent: {
       html: (urlInfo) => {
-        const htmlAst = parseHtmlString(urlInfo.content);
+        const htmlAst = parseHtml({
+          html: urlInfo.content,
+          url: urlInfo.url,
+        });
         return stringifyHtmlAst(htmlAst, {
           cleanupPositionAttributes: true,
         });
@@ -20163,7 +20187,9 @@ const generateClientCodeForVersionMappings = (
 };
 
 const injectVersionMappingsAsImportmap = (urlInfo, versionMappings) => {
-  const htmlAst = parseHtmlString(urlInfo.content, {
+  const htmlAst = parseHtml({
+    html: urlInfo.content,
+    url: urlInfo.url,
     storeOriginalPositions: false,
   });
   // jsenv_plugin_importmap.js is removing importmap during build
@@ -20680,7 +20706,9 @@ const createBuildSpecifierManager = ({
           let content = urlInfo.content;
           if (urlInfo.type === "html") {
             content = stringifyHtmlAst(
-              parseHtmlString(urlInfo.content, {
+              parseHtml({
+                html: urlInfo.content,
+                url: urlInfo.url,
                 storeOriginalPositions: false,
               }),
               {
@@ -20933,7 +20961,9 @@ const createBuildSpecifierManager = ({
         if (urlInfo.type !== "html") {
           return;
         }
-        const htmlAst = parseHtmlString(urlInfo.content, {
+        const htmlAst = parseHtml({
+          html: urlInfo.content,
+          url: urlInfo.url,
           storeOriginalPositions: false,
         });
         const mutations = [];
@@ -21930,7 +21960,9 @@ build ${entryPointKeys.length} entry points`);
             return;
           }
           if (urlInfo.type === "html") {
-            const htmlAst = parseHtmlString(urlInfo.content, {
+            const htmlAst = parseHtml({
+              html: urlInfo.content,
+              url: urlInfo.url,
               storeOriginalPositions: false,
             });
             urlInfo.content = stringifyHtmlAst(htmlAst, {
@@ -22509,6 +22541,9 @@ const createFileService = ({
         // it's not possible to do that when url info content is not available
         // (happens for js_module_fallback for instance)
         if (urlInfo.content !== undefined) {
+          kitchen.context.logger.error(`Error while handling ${request.url}:
+${originalError.reasonCode || originalError.code}
+${e.traceMessage}`);
           return {
             url: reference.url,
             status: 200,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "38.3.2",
+  "version": "38.3.4",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -44,13 +44,13 @@
     "eslint": "npx eslint . --ext=.js,.mjs,.cjs,.html",
     "dev": "node --conditions=development ./scripts/dev/dev.mjs",
     "test": "node --conditions=development ./scripts/test/test.mjs",
+    "test:workspace": "npm run test --workspaces --if-present -- --workspace",
     "snapshots:core": "npm run test -- --no-snapshot-assertion",
     "snapshots:packages": "npm run test --workspaces --if-present -- --workspace --no-snapshot-assertion",
     "snapshots:only_dev_server_errors": "node --conditions=development ./tests/dev_server/errors/generate_snapshot_files.mjs",
-    "workspace:test": "npm run test --workspaces --if-present -- --workspace",
     "build": "node --conditions=development ./scripts/build/build.mjs",
     "build:file_size": "node ./scripts/build/build_file_size.mjs --log",
-    "workspace:build": "npm run build --workspaces --if-present",
+    "build:workspace": "npm run build --workspaces --if-present --conditions=developement",
     "monorepo:upgrade_versions": "node ./scripts/monorepo/upgrade_external_versions.mjs",
     "monorepo:sync_packages_versions": "node ./scripts/monorepo/sync_packages_versions.mjs",
     "monorepo:publish": "node ./scripts/monorepo/publish_packages.mjs",
@@ -63,17 +63,17 @@
   "dependencies": {
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.2.4",
-    "@jsenv/ast": "5.2.1",
+    "@jsenv/ast": "6.0.1",
     "@jsenv/filesystem": "4.3.2",
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.1",
-    "@jsenv/js-module-fallback": "1.3.7",
+    "@jsenv/js-module-fallback": "1.3.9",
     "@jsenv/log": "3.4.2",
     "@jsenv/node-esm-resolution": "1.0.1",
     "@jsenv/plugin-bundling": "2.5.8",
     "@jsenv/plugin-minification": "1.5.4",
-    "@jsenv/plugin-supervisor": "1.3.7",
-    "@jsenv/plugin-transpilation": "1.3.6",
+    "@jsenv/plugin-supervisor": "1.3.9",
+    "@jsenv/plugin-transpilation": "1.3.8",
     "@jsenv/runtime-compat": "1.2.0",
     "@jsenv/server": "15.1.5",
     "@jsenv/sourcemap": "1.2.4",
@@ -82,15 +82,15 @@
     "@jsenv/utils": "2.0.1"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "7.22.15",
-    "@babel/plugin-syntax-import-assertions": "7.22.5",
+    "@babel/eslint-parser": "7.23.3",
+    "@babel/plugin-syntax-import-assertions": "7.23.3",
     "@jsenv/assert": "./packages/independent/assert/",
     "@jsenv/core": "./",
     "@jsenv/eslint-config": "./packages/independent/eslint-config/",
-    "@jsenv/file-size-impact": "14.1.3",
+    "@jsenv/file-size-impact": "14.1.4",
     "@jsenv/https-local": "3.0.7",
-    "@jsenv/monorepo": "0.0.2",
-    "@jsenv/performance-impact": "4.1.3",
+    "@jsenv/monorepo": "0.0.4",
+    "@jsenv/performance-impact": "4.1.4",
     "@jsenv/plugin-as-js-classic": "./packages/related/plugin-as-js-classic/",
     "@jsenv/test": "./packages/related/test/",
     "babel-plugin-transform-async-to-promises": "0.8.18",
@@ -100,6 +100,6 @@
     "eslint-plugin-react": "7.33.2",
     "open": "9.1.0",
     "playwright": "1.39.0",
-    "prettier": "3.0.3"
+    "prettier": "3.1.0"
   }
 }

package/src/build/build.js

@@ -23,7 +23,7 @@ import {
 } from "@jsenv/filesystem";
 import { Abort, raceProcessTeardownEvents } from "@jsenv/abort";
 import { createLogger, createTaskLog } from "@jsenv/log";
-import { parseHtmlString, stringifyHtmlAst } from "@jsenv/ast";
+import { parseHtml, stringifyHtmlAst } from "@jsenv/ast";
 import { jsenvPluginBundling } from "@jsenv/plugin-bundling";
 import { jsenvPluginMinification } from "@jsenv/plugin-minification";
 import { jsenvPluginJsModuleFallback } from "@jsenv/plugin-transpilation";
@@ -587,7 +587,9 @@ build ${entryPointKeys.length} entry points`);
             return;
           }
           if (urlInfo.type === "html") {
-            const htmlAst = parseHtmlString(urlInfo.content, {
+            const htmlAst = parseHtml({
+              html: urlInfo.content,
+              url: urlInfo.url,
               storeOriginalPositions: false,
             });
             urlInfo.content = stringifyHtmlAst(htmlAst, {

package/src/build/build_specifier_manager.js

@@ -9,7 +9,7 @@ import {
   renderUrlOrRelativeUrlFilename,
 } from "@jsenv/urls";
 import {
-  parseHtmlString,
+  parseHtml,
   stringifyHtmlAst,
   visitHtmlNodes,
   getHtmlNodeAttribute,
@@ -510,7 +510,9 @@ export const createBuildSpecifierManager = ({
           let content = urlInfo.content;
           if (urlInfo.type === "html") {
             content = stringifyHtmlAst(
-              parseHtmlString(urlInfo.content, {
+              parseHtml({
+                html: urlInfo.content,
+                url: urlInfo.url,
                 storeOriginalPositions: false,
               }),
               {
@@ -763,7 +765,9 @@ export const createBuildSpecifierManager = ({
         if (urlInfo.type !== "html") {
           return;
         }
-        const htmlAst = parseHtmlString(urlInfo.content, {
+        const htmlAst = parseHtml({
+          html: urlInfo.content,
+          url: urlInfo.url,
           storeOriginalPositions: false,
         });
         const mutations = [];

package/src/build/version_mappings_injection.js

@@ -1,7 +1,7 @@
 // https://bundlers.tooling.report/hashing/avoid-cascade/
 
 import {
-  parseHtmlString,
+  parseHtml,
   injectHtmlNodeAsEarlyAsPossible,
   createHtmlNode,
   stringifyHtmlAst,
@@ -58,7 +58,9 @@ const generateClientCodeForVersionMappings = (
 };
 
 export const injectVersionMappingsAsImportmap = (urlInfo, versionMappings) => {
-  const htmlAst = parseHtmlString(urlInfo.content, {
+  const htmlAst = parseHtml({
+    html: urlInfo.content,
+    url: urlInfo.url,
     storeOriginalPositions: false,
   });
   // jsenv_plugin_importmap.js is removing importmap during build

package/src/dev/file_service.js

@@ -349,6 +349,9 @@ export const createFileService = ({
         // it's not possible to do that when url info content is not available
         // (happens for js_module_fallback for instance)
         if (urlInfo.content !== undefined) {
+          kitchen.context.logger.error(`Error while handling ${request.url}:
+${originalError.reasonCode || originalError.code}
+${e.traceMessage}`);
           return {
             url: reference.url,
             status: 200,

package/src/kitchen/kitchen.js

@@ -480,24 +480,25 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
         });
       } catch (e) {
         urlInfo.error = e;
-        if (e.code === "DIRECTORY_REFERENCE_NOT_ALLOWED") {
-          throw e;
-        }
-        if (urlInfo.isInline && errorOnInlineContentCanSkipThrow(urlInfo)) {
-          // When something like <style> or <script> contains syntax error
-          // the HTML in itself it still valid
-          // keep the syntax error and continue with the HTML
+        if (
+          urlInfo.isInline &&
+          e.code !== "DIRECTORY_REFERENCE_NOT_ALLOWED" &&
+          errorOnInlineContentCanSkipThrow(urlInfo)
+        ) {
           const errorInfo =
             e.code === "PARSE_ERROR" && e.cause
               ? `${e.cause.reasonCode}\n${e.traceMessage}`
               : e.stack;
+          // When something like <style> or <script> contains syntax error
+          // the HTML in itself it still valid
+          // keep the syntax error and continue with the HTML
           logger.error(
-            `Error while handling ${urlInfo.type} declared in ${urlInfo.firstReference.trace.message}:
+            `Error while cooking ${urlInfo.type} declared in ${urlInfo.firstReference.trace.message}:
 ${errorInfo}`,
           );
-        } else {
-          throw e;
+          return;
         }
+        throw e;
       }
     }
 

package/src/kitchen/prepend_content.js

@@ -1,6 +1,6 @@
 import { createMagicSource, composeTwoSourcemaps } from "@jsenv/sourcemap";
 import {
-  parseHtmlString,
+  parseHtml,
   stringifyHtmlAst,
   createHtmlNode,
   injectHtmlNodeAsEarlyAsPossible,
@@ -44,7 +44,10 @@ export const prependContent = async (
 };
 
 const prependJsClassicInHtml = (htmlUrlInfo, urlInfoToPrepend) => {
-  const htmlAst = parseHtmlString(htmlUrlInfo.content);
+  const htmlAst = parseHtml({
+    html: htmlUrlInfo.content,
+    url: htmlUrlInfo.url,
+  });
   injectHtmlNodeAsEarlyAsPossible(
     htmlAst,
     createHtmlNode({

package/src/kitchen/url_graph/url_info_transformations.js

@@ -28,11 +28,11 @@ export const createUrlInfoTransformer = ({
           return sourcemapsSources(source, urlInfo);
         }
       : sourcemapsSources === "relative"
-      ? (source, urlInfo) => {
-          const sourceRelative = urlToRelativeUrl(source, urlInfo.url);
-          return sourceRelative || ".";
-        }
-      : null;
+        ? (source, urlInfo) => {
+            const sourceRelative = urlToRelativeUrl(source, urlInfo.url);
+            return sourceRelative || ".";
+          }
+        : null;
 
   const normalizeSourcemap = (urlInfo, sourcemap) => {
     let { sources } = sourcemap;

package/src/plugins/autoreload/jsenv_plugin_autoreload_client.js

@@ -1,5 +1,5 @@
 import {
-  parseHtmlString,
+  parseHtml,
   stringifyHtmlAst,
   injectHtmlNodeAsEarlyAsPossible,
   createHtmlNode,
@@ -16,7 +16,10 @@ export const jsenvPluginAutoreloadClient = () => {
     appliesDuring: "dev",
     transformUrlContent: {
       html: (htmlUrlInfo) => {
-        const htmlAst = parseHtmlString(htmlUrlInfo.content);
+        const htmlAst = parseHtml({
+          html: htmlUrlInfo.content,
+          url: htmlUrlInfo.url,
+        });
         const autoreloadClientReference = htmlUrlInfo.dependencies.inject({
           type: "script",
           subtype: "js_module",

package/src/plugins/clean_html/jsenv_plugin_clean_html.js

@@ -1,4 +1,4 @@
-import { parseHtmlString, stringifyHtmlAst } from "@jsenv/ast";
+import { parseHtml, stringifyHtmlAst } from "@jsenv/ast";
 
 export const jsenvPluginCleanHTML = () => {
   return {
@@ -6,7 +6,10 @@ export const jsenvPluginCleanHTML = () => {
     appliesDuring: "dev",
     finalizeUrlContent: {
       html: (urlInfo) => {
-        const htmlAst = parseHtmlString(urlInfo.content);
+        const htmlAst = parseHtml({
+          html: urlInfo.content,
+          url: urlInfo.url,
+        });
         return stringifyHtmlAst(htmlAst, {
           cleanupPositionAttributes: true,
         });

package/src/plugins/import_meta_hot/jsenv_plugin_import_meta_hot.js

@@ -1,5 +1,5 @@
 import { createMagicSource } from "@jsenv/sourcemap";
-import { parseHtmlString, applyBabelPlugins } from "@jsenv/ast";
+import { parseHtml, applyBabelPlugins } from "@jsenv/ast";
 
 import { collectHotDataFromHtmlAst } from "./html_hot_dependencies.js";
 import { babelPluginMetadataImportMetaHot } from "./babel_plugin_metadata_import_meta_hot.js";
@@ -19,7 +19,10 @@ export const jsenvPluginImportMetaHot = () => {
         if (htmlUrlInfo.context.build) {
           return;
         }
-        const htmlAst = parseHtmlString(htmlUrlInfo.content);
+        const htmlAst = parseHtml({
+          html: htmlUrlInfo.content,
+          url: htmlUrlInfo.url,
+        });
         const hotReferences = collectHotDataFromHtmlAst(htmlAst);
         htmlUrlInfo.data.hotDecline = false;
         htmlUrlInfo.data.hotAcceptSelf = false;

package/src/plugins/injections/internal/inject_globals.js

@@ -1,6 +1,6 @@
 import { createMagicSource } from "@jsenv/sourcemap";
 import {
-  parseHtmlString,
+  parseHtml,
   injectHtmlNodeAsEarlyAsPossible,
   createHtmlNode,
   stringifyHtmlAst,
@@ -16,11 +16,13 @@ export const injectGlobals = (content, globals, urlInfo) => {
   throw new Error(`cannot inject globals into "${urlInfo.type}"`);
 };
 
-const globalInjectorOnHtml = (content, globals) => {
+const globalInjectorOnHtml = (content, globals, urlInfo) => {
   // ideally we would inject an importmap but browser support is too low
   // (even worse for worker/service worker)
   // so for now we inject code into entry points
-  const htmlAst = parseHtmlString(content, {
+  const htmlAst = parseHtml({
+    html: content,
+    url: urlInfo.url,
     storeOriginalPositions: false,
   });
   const clientCode = generateClientCodeForGlobals(globals, {

package/src/plugins/inlining/jsenv_plugin_inlining_into_html.js

@@ -1,5 +1,5 @@
 import {
-  parseHtmlString,
+  parseHtml,
   stringifyHtmlAst,
   visitHtmlNodes,
   getHtmlNodeText,
@@ -17,7 +17,10 @@ export const jsenvPluginInliningIntoHtml = () => {
     appliesDuring: "*",
     transformUrlContent: {
       html: async (urlInfo) => {
-        const htmlAst = parseHtmlString(urlInfo.content);
+        const htmlAst = parseHtml({
+          html: urlInfo.content,
+          url: urlInfo.url,
+        });
         const mutations = [];
         const actions = [];
 

package/src/plugins/plugin_controller.js

@@ -1,6 +1,6 @@
 import { performance } from "node:perf_hooks";
 import {
-  parseHtmlString,
+  parseHtml,
   stringifyHtmlAst,
   injectHtmlNodeAsEarlyAsPossible,
   createHtmlNode,
@@ -388,7 +388,10 @@ const returnValueAssertions = [
 ];
 
 const applyScriptInjections = (htmlUrlInfo, scriptInjections, hook) => {
-  const htmlAst = parseHtmlString(htmlUrlInfo.content);
+  const htmlAst = parseHtml({
+    html: htmlUrlInfo.content,
+    url: htmlUrlInfo.url,
+  });
 
   scriptInjections.reverse().forEach((scriptInjection) => {
     const { setup } = scriptInjection;

package/src/plugins/reference_analysis/html/jsenv_plugin_html_reference_analysis.js

@@ -1,5 +1,5 @@
 import {
-  parseHtmlString,
+  parseHtml,
   visitHtmlNodes,
   getHtmlNodeText,
   setHtmlNodeText,
@@ -129,8 +129,10 @@ export const jsenvPluginHtmlReferenceAnalysis = ({
         let importmapFound = false;
         const importmapLoaded = startLoadingImportmap(urlInfo);
 
-        const content = urlInfo.content;
-        const htmlAst = parseHtmlString(content);
+        const htmlAst = parseHtml({
+          html: urlInfo.content,
+          url: urlInfo.url,
+        });
 
         const mutations = [];
         const actions = [];

package/src/plugins/ribbon/jsenv_plugin_ribbon.js

@@ -1,5 +1,5 @@
 import {
-  parseHtmlString,
+  parseHtml,
   stringifyHtmlAst,
   createHtmlNode,
   injectHtmlNodeAsEarlyAsPossible,
@@ -42,7 +42,10 @@ export const jsenvPluginRibbon = ({
         if (!ribbon) {
           return null;
         }
-        const htmlAst = parseHtmlString(urlInfo.content);
+        const htmlAst = parseHtml({
+          html: urlInfo.content,
+          url: urlInfo.url,
+        });
         const ribbonClientFileReference = urlInfo.dependencies.inject({
           type: "script",
           subtype: "js_module",