@jsenv/core 29.5.0 → 29.6.0

package/dist/js/script_type_module_supervisor.js

@@ -42,8 +42,9 @@ const createExecuteWithScript = ({
         nodeToReplace = currentScriptClone;
         currentScriptClone.src = urlObject.href;
       } else {
-        currentScriptClone.removeAttribute("jsenv-plugin-owner");
-        currentScriptClone.removeAttribute("jsenv-plugin-action");
+        currentScriptClone.removeAttribute("jsenv-cooked-by");
+        currentScriptClone.removeAttribute("jsenv-inlined-by");
+        currentScriptClone.removeAttribute("jsenv-injected-by");
         currentScriptClone.removeAttribute("inlined-from-src");
         currentScriptClone.removeAttribute("original-position");
         currentScriptClone.removeAttribute("original-src-position");

package/dist/js/supervisor.js

@@ -885,8 +885,9 @@ window.__supervisor__ = (() => {
               nodeToReplace = currentScriptClone;
               currentScriptClone.src = urlObject.href;
             } else {
-              currentScriptClone.removeAttribute("jsenv-plugin-owner");
-              currentScriptClone.removeAttribute("jsenv-plugin-action");
+              currentScriptClone.removeAttribute("jsenv-cooked-by");
+              currentScriptClone.removeAttribute("jsenv-inlined-by");
+              currentScriptClone.removeAttribute("jsenv-injected-by");
               currentScriptClone.removeAttribute("inlined-from-src");
               currentScriptClone.removeAttribute("original-position");
               currentScriptClone.removeAttribute("original-src-position");

package/dist/main.js

@@ -7574,8 +7574,9 @@ const stringifyHtmlAst = (htmlAst, {
             "original-href-position": undefined,
             "inlined-from-src": undefined,
             "inlined-from-href": undefined,
-            "jsenv-plugin-owner": undefined,
-            "jsenv-plugin-action": undefined,
+            "jsenv-cooked-by": undefined,
+            "jsenv-inlined-by": undefined,
+            "jsenv-injected-by": undefined,
             "jsenv-debug": undefined
           });
         }
@@ -7693,17 +7694,15 @@ const createHtmlNode = ({
 };
 const injectHtmlNode = (htmlAst, node, jsenvPluginName = "jsenv") => {
   setHtmlNodeAttributes(node, {
-    "jsenv-plugin-owner": jsenvPluginName,
-    "jsenv-plugin-action": "injected"
+    "jsenv-injected-by": jsenvPluginName
   });
   const htmlHtmlNode = findChild(htmlAst, node => node.nodeName === "html");
   const bodyNode = findChild(htmlHtmlNode, node => node.nodeName === "body");
-  return insertAfter(node, bodyNode);
+  return insertHtmlNodeAfter(node, bodyNode);
 };
 const injectScriptNodeAsEarlyAsPossible = (htmlAst, scriptNode, jsenvPluginName = "jsenv") => {
   setHtmlNodeAttributes(scriptNode, {
-    "jsenv-plugin-owner": jsenvPluginName,
-    "jsenv-plugin-action": "injected"
+    "jsenv-injected-by": jsenvPluginName
   });
   const isJsModule = analyzeScriptNode(scriptNode).type === "js_module";
   if (isJsModule) {
@@ -7717,35 +7716,35 @@ const injectScriptNodeAsEarlyAsPossible = (htmlAst, scriptNode, jsenvPluginName
       let after = firstImportmapScript;
       for (const nextSibling of nextSiblings) {
         if (nextSibling.nodeName === "script") {
-          return insertBefore(scriptNode, importmapParent, nextSibling);
+          return insertHtmlNodeBefore(scriptNode, importmapParent, nextSibling);
         }
         if (nextSibling.nodeName === "link") {
           after = nextSibling;
         }
       }
-      return insertAfter(scriptNode, importmapParent, after);
+      return insertHtmlNodeAfter(scriptNode, importmapParent, after);
     }
   }
   const headNode = findChild(htmlAst, node => node.nodeName === "html").childNodes[0];
   let after = headNode.childNodes[0];
   for (const child of headNode.childNodes) {
     if (child.nodeName === "script") {
-      return insertBefore(scriptNode, headNode, child);
+      return insertHtmlNodeBefore(scriptNode, headNode, child);
     }
     if (child.nodeName === "link") {
       after = child;
     }
   }
-  return insertAfter(scriptNode, headNode, after);
+  return insertHtmlNodeAfter(scriptNode, headNode, after);
 };
-const insertBefore = (nodeToInsert, futureParentNode, futureNextSibling) => {
+const insertHtmlNodeBefore = (nodeToInsert, futureParentNode, futureNextSibling) => {
   const {
     childNodes = []
   } = futureParentNode;
   const futureIndex = futureNextSibling ? childNodes.indexOf(futureNextSibling) : 0;
   injectWithWhitespaces(nodeToInsert, futureParentNode, futureIndex);
 };
-const insertAfter = (nodeToInsert, futureParentNode, futurePrevSibling) => {
+const insertHtmlNodeAfter = (nodeToInsert, futureParentNode, futurePrevSibling) => {
   const {
     childNodes = []
   } = futureParentNode;
@@ -7788,7 +7787,14 @@ const findChild = ({
   childNodes = []
 }, predicate) => childNodes.find(predicate);
 const stringifyAttributes = object => {
-  return Object.keys(object).map(key => `${key}=${valueToHtmlAttributeValue(object[key])}`).join(" ");
+  let string = "";
+  Object.keys(object).forEach(key => {
+    const value = object[key];
+    if (value === undefined) return;
+    if (string !== "") string += " ";
+    string += `${key}=${valueToHtmlAttributeValue(value)}`;
+  });
+  return string;
 };
 const valueToHtmlAttributeValue = value => {
   if (typeof value === "string") {
@@ -11676,8 +11682,8 @@ const visitHtmlUrls = ({
   }) => {
     const value = getHtmlNodeAttribute(node, attributeName);
     if (value) {
-      const jsenvPluginOwner = getHtmlNodeAttribute(node, "jsenv-plugin-owner");
-      if (jsenvPluginOwner === "jsenv:importmap") {
+      const jsenvInlinedBy = getHtmlNodeAttribute(node, "jsenv-inlined-by");
+      if (jsenvInlinedBy === "jsenv:importmap") {
         // during build the importmap is inlined
         // and shoud not be considered as a dependency anymore
         return null;
@@ -12127,8 +12133,7 @@ const jsenvPluginHtmlInlineContent = ({
             mutations.push(() => {
               setHtmlNodeText(styleNode, inlineStyleUrlInfo.content);
               setHtmlNodeAttributes(styleNode, {
-                "jsenv-plugin-owner": "jsenv:html_inline_content",
-                "jsenv-plugin-action": "content_cooked"
+                "jsenv-cooked-by": "jsenv:html_inline_content"
               });
             });
           },
@@ -12140,11 +12145,10 @@ const jsenvPluginHtmlInlineContent = ({
             // 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 jsenvPluginOwner = getHtmlNodeAttribute(scriptNode, "jsenv-plugin-owner");
-            if (jsenvPluginOwner === "jsenv:as_js_classic_html" && !analyzeConvertedScripts) {
+            if (!analyzeConvertedScripts && getHtmlNodeAttribute(scriptNode, "jsenv-injected-by") === "jsenv:as_js_classic_html") {
               return;
             }
-            if (jsenvPluginOwner === "jsenv:supervisor") {
+            if (getHtmlNodeAttribute(scriptNode, "jsenv-cooked-by") === "jsenv:supervisor" || getHtmlNodeAttribute(scriptNode, "jsenv-injected-by") === "jsenv:supervisor") {
               return;
             }
             const {
@@ -12193,8 +12197,7 @@ const jsenvPluginHtmlInlineContent = ({
             mutations.push(() => {
               setHtmlNodeText(scriptNode, inlineScriptUrlInfo.content);
               setHtmlNodeAttributes(scriptNode, {
-                "jsenv-plugin-owner": "jsenv:html_inline_content",
-                "jsenv-plugin-action": "content_cooked",
+                "jsenv-cooked-by": "jsenv:html_inline_content",
                 ...(extension ? {
                   type: type === "js_module" ? "module" : undefined
                 } : {})
@@ -16504,7 +16507,8 @@ const jsenvPluginAsJsClassicConversion = ({
         type: "js_classic",
         originalUrl: jsModuleUrlInfo.originalUrl,
         originalContent: jsModuleUrlInfo.originalContent,
-        sourcemap
+        sourcemap,
+        data: jsModuleUrlInfo.data
       };
     }
   };
@@ -16936,7 +16940,7 @@ const rollupPluginJsenv = ({
             originalUrl,
             type: format === "esm" ? "js_module" : "common_js",
             data: {
-              generatedBy: "rollup",
+              bundlerName: "rollup",
               bundleRelativeUrl: rollupFileInfo.fileName,
               usesImport: rollupFileInfo.imports.length > 0 || rollupFileInfo.dynamicImports.length > 0,
               isDynamicEntry: rollupFileInfo.isDynamicEntry
@@ -17278,7 +17282,8 @@ const jsenvPluginAsJsClassicLibrary = ({
         type: "js_classic",
         originalUrl: urlInfo.originalUrl,
         originalContent: jsModuleUrlInfo.originalContent,
-        sourcemap
+        sourcemap,
+        data: jsModuleUrlInfo.data
       };
     }
   };
@@ -18045,8 +18050,7 @@ const jsenvPluginImportmap = () => {
           });
           setHtmlNodeText(importmap, inlineImportmapUrlInfo.content);
           setHtmlNodeAttributes(importmap, {
-            "jsenv-plugin-owner": "jsenv:importmap",
-            "jsenv-plugin-action": "content_cooked"
+            "jsenv-cooked-by": "jsenv:importmap"
           });
           onHtmlImportmapParsed(JSON.parse(inlineImportmapUrlInfo.content), htmlUrlInfo.url);
         };
@@ -18065,8 +18069,7 @@ const jsenvPluginImportmap = () => {
           setHtmlNodeText(importmap, importmapUrlInfo.content);
           setHtmlNodeAttributes(importmap, {
             "src": undefined,
-            "jsenv-plugin-owner": "jsenv:importmap",
-            "jsenv-plugin-action": "inlined",
+            "jsenv-inlined-by": "jsenv:importmap",
             "inlined-from-src": src
           });
           const {
@@ -19740,10 +19743,7 @@ const jsenvPluginSupervisor = ({
             if (type !== "js_classic" && type !== "js_module") {
               return;
             }
-            const jsenvPluginOwner = getHtmlNodeAttribute(node, "jsenv-plugin-owner");
-            if (jsenvPluginOwner !== undefined) {
-              return;
-            }
+            if (getHtmlNodeAttribute(node, "jsenv-cooked-by") || getHtmlNodeAttribute(node, "jsenv-inlined-by") || getHtmlNodeAttribute(node, "jsenv-injected-by")) return;
             const noSupervisor = getHtmlNodeAttribute(node, "no-supervisor");
             if (noSupervisor !== undefined) {
               return;
@@ -19817,15 +19817,13 @@ const jsenvPluginSupervisor = ({
           }
           if (src) {
             setHtmlNodeAttributes(node, {
-              "jsenv-plugin-owner": "jsenv:supervisor",
-              "jsenv-plugin-action": "inlined",
+              "jsenv-inlined-by": "jsenv:supervisor",
               "src": undefined,
               "inlined-from-src": src
             });
           } else {
             setHtmlNodeAttributes(node, {
-              "jsenv-plugin-owner": "jsenv:supervisor",
-              "jsenv-plugin-action": "content_cooked"
+              "jsenv-cooked-by": "jsenv:supervisor"
             });
           }
         });
@@ -20244,7 +20242,8 @@ const jsenvPluginAsModules = () => {
         contentType: "text/javascript",
         type: "js_module",
         originalUrl: jsonUrlInfo.originalUrl,
-        originalContent: jsonUrlInfo.originalContent
+        originalContent: jsonUrlInfo.originalContent,
+        data: jsonUrlInfo.data
       };
     }
   };
@@ -20290,7 +20289,8 @@ const jsenvPluginAsModules = () => {
         contentType: "text/javascript",
         type: "js_module",
         originalUrl: cssUrlInfo.originalUrl,
-        originalContent: cssUrlInfo.originalContent
+        originalContent: cssUrlInfo.originalContent,
+        data: cssUrlInfo.data
       };
     }
   };
@@ -20334,7 +20334,8 @@ export default inlineContent.text`,
         contentType: "text/javascript",
         type: "js_module",
         originalUrl: textUrlInfo.originalUrl,
-        originalContent: textUrlInfo.originalContent
+        originalContent: textUrlInfo.originalContent,
+        data: textUrlInfo.data
       };
     }
   };
@@ -21426,7 +21427,7 @@ const bundleCss = async ({
   cssUrlInfos.forEach(cssUrlInfo => {
     bundledCssUrlInfos[cssUrlInfo.url] = {
       data: {
-        generatedBy: "parcel"
+        bundlerName: "parcel"
       },
       contentType: "text/css",
       content: cssBundleInfos[cssUrlInfo.url].bundleContent
@@ -23548,7 +23549,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                   bundleRedirections.set(bundlerGeneratedUrlInfo.originalUrl, buildUrl);
                   associateBuildUrlAndRawUrl(buildUrl, bundlerGeneratedUrlInfo.originalUrl, "bundle");
                 } else {
-                  // chunk generated by rollup to share code
+                  bundleUrlInfo.data.generatedToShareCode = true;
                 }
               } else {
                 associateBuildUrlAndRawUrl(buildUrl, url, "bundle");
@@ -23897,6 +23898,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               storeOriginalPositions: false
             });
             const mutations = [];
+            const hintsToInject = {};
             visitHtmlNodes(htmlAst, {
               link: node => {
                 const href = getHtmlNodeAttribute(node, "href");
@@ -23931,6 +23933,12 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                       href: buildSpecifierBeforeRedirect
                     });
                   });
+                  for (const dependencyUrl of buildUrlInfo.dependencies) {
+                    const dependencyUrlInfo = finalGraph.urlInfoMap.get(dependencyUrl);
+                    if (dependencyUrlInfo.data.generatedToShareCode) {
+                      hintsToInject[dependencyUrl] = node;
+                    }
+                  }
                 };
                 if (href.startsWith("file:")) {
                   let url = href;
@@ -23953,6 +23961,27 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                 }
               }
             });
+            Object.keys(hintsToInject).forEach(urlToHint => {
+              const hintNode = hintsToInject[urlToHint];
+              const urlFormatted = versioningRedirections.get(urlToHint) || urlToHint;
+              const specifierBeforeRedirect = findKey(buildUrls, urlFormatted);
+              const found = findHtmlNode(htmlAst, htmlNode => {
+                return htmlNode.nodeName === "link" && getHtmlNodeAttribute(htmlNode, "href") === specifierBeforeRedirect;
+              });
+              if (!found) {
+                mutations.push(() => {
+                  const nodeToInsert = createHtmlNode({
+                    tagName: "link",
+                    href: specifierBeforeRedirect,
+                    rel: getHtmlNodeAttribute(hintNode, "rel"),
+                    as: getHtmlNodeAttribute(hintNode, "as"),
+                    type: getHtmlNodeAttribute(hintNode, "type"),
+                    crossorigin: getHtmlNodeAttribute(hintNode, "crossorigin")
+                  });
+                  insertHtmlNodeAfter(nodeToInsert, hintNode.parentNode, hintNode);
+                });
+              }
+            });
             if (mutations.length > 0) {
               mutations.forEach(mutation => mutation());
               await finalGraphKitchen.urlInfoTransformer.applyFinalTransformations(urlInfo, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "29.5.0",
+  "version": "29.6.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -67,7 +67,7 @@
     "@c88/v8-coverage": "0.1.1",
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.2.4",
-    "@jsenv/ast": "1.4.3",
+    "@jsenv/ast": "1.4.4",
     "@jsenv/babel-plugins": "1.0.9",
     "@jsenv/filesystem": "4.1.5",
     "@jsenv/importmap": "1.2.1",

package/src/build/build.js

@@ -48,6 +48,9 @@ import {
   getHtmlNodeAttribute,
   setHtmlNodeAttributes,
   removeHtmlNode,
+  createHtmlNode,
+  insertHtmlNodeAfter,
+  findHtmlNode,
 } from "@jsenv/ast"
 
 import { createUrlGraph } from "../kitchen/url_graph.js"
@@ -805,7 +808,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                     "bundle",
                   )
                 } else {
-                  // chunk generated by rollup to share code
+                  bundleUrlInfo.data.generatedToShareCode = true
                 }
               } else {
                 associateBuildUrlAndRawUrl(buildUrl, url, "bundle")
@@ -1213,6 +1216,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               storeOriginalPositions: false,
             })
             const mutations = []
+            const hintsToInject = {}
             visitHtmlNodes(htmlAst, {
               link: (node) => {
                 const href = getHtmlNodeAttribute(node, "href")
@@ -1264,6 +1268,13 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                       href: buildSpecifierBeforeRedirect,
                     })
                   })
+                  for (const dependencyUrl of buildUrlInfo.dependencies) {
+                    const dependencyUrlInfo =
+                      finalGraph.urlInfoMap.get(dependencyUrl)
+                    if (dependencyUrlInfo.data.generatedToShareCode) {
+                      hintsToInject[dependencyUrl] = node
+                    }
+                  }
                 }
                 if (href.startsWith("file:")) {
                   let url = href
@@ -1288,6 +1299,36 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                 }
               },
             })
+            Object.keys(hintsToInject).forEach((urlToHint) => {
+              const hintNode = hintsToInject[urlToHint]
+              const urlFormatted =
+                versioningRedirections.get(urlToHint) || urlToHint
+              const specifierBeforeRedirect = findKey(buildUrls, urlFormatted)
+              const found = findHtmlNode(htmlAst, (htmlNode) => {
+                return (
+                  htmlNode.nodeName === "link" &&
+                  getHtmlNodeAttribute(htmlNode, "href") ===
+                    specifierBeforeRedirect
+                )
+              })
+              if (!found) {
+                mutations.push(() => {
+                  const nodeToInsert = createHtmlNode({
+                    tagName: "link",
+                    href: specifierBeforeRedirect,
+                    rel: getHtmlNodeAttribute(hintNode, "rel"),
+                    as: getHtmlNodeAttribute(hintNode, "as"),
+                    type: getHtmlNodeAttribute(hintNode, "type"),
+                    crossorigin: getHtmlNodeAttribute(hintNode, "crossorigin"),
+                  })
+                  insertHtmlNodeAfter(
+                    nodeToInsert,
+                    hintNode.parentNode,
+                    hintNode,
+                  )
+                })
+              }
+            })
             if (mutations.length > 0) {
               mutations.forEach((mutation) => mutation())
               await finalGraphKitchen.urlInfoTransformer.applyFinalTransformations(

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

@@ -21,7 +21,7 @@ export const bundleCss = async ({ cssUrlInfos, context }) => {
   cssUrlInfos.forEach((cssUrlInfo) => {
     bundledCssUrlInfos[cssUrlInfo.url] = {
       data: {
-        generatedBy: "parcel",
+        bundlerName: "parcel",
       },
       contentType: "text/css",
       content: cssBundleInfos[cssUrlInfo.url].bundleContent,

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

@@ -162,7 +162,7 @@ const rollupPluginJsenv = ({
             originalUrl,
             type: format === "esm" ? "js_module" : "common_js",
             data: {
-              generatedBy: "rollup",
+              bundlerName: "rollup",
               bundleRelativeUrl: rollupFileInfo.fileName,
               usesImport:
                 rollupFileInfo.imports.length > 0 ||

package/src/plugins/importmap/jsenv_plugin_importmap.js

@@ -134,8 +134,7 @@ export const jsenvPluginImportmap = () => {
           })
           setHtmlNodeText(importmap, inlineImportmapUrlInfo.content)
           setHtmlNodeAttributes(importmap, {
-            "jsenv-plugin-owner": "jsenv:importmap",
-            "jsenv-plugin-action": "content_cooked",
+            "jsenv-cooked-by": "jsenv:importmap",
           })
           onHtmlImportmapParsed(
             JSON.parse(inlineImportmapUrlInfo.content),
@@ -164,8 +163,7 @@ export const jsenvPluginImportmap = () => {
           setHtmlNodeText(importmap, importmapUrlInfo.content)
           setHtmlNodeAttributes(importmap, {
             "src": undefined,
-            "jsenv-plugin-owner": "jsenv:importmap",
-            "jsenv-plugin-action": "inlined",
+            "jsenv-inlined-by": "jsenv:importmap",
             "inlined-from-src": src,
           })
 

package/src/plugins/inline/jsenv_plugin_html_inline_content.js

@@ -65,8 +65,7 @@ export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {
             mutations.push(() => {
               setHtmlNodeText(styleNode, inlineStyleUrlInfo.content)
               setHtmlNodeAttributes(styleNode, {
-                "jsenv-plugin-owner": "jsenv:html_inline_content",
-                "jsenv-plugin-action": "content_cooked",
+                "jsenv-cooked-by": "jsenv:html_inline_content",
               })
             })
           },
@@ -78,17 +77,19 @@ export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {
             // 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 jsenvPluginOwner = getHtmlNodeAttribute(
-              scriptNode,
-              "jsenv-plugin-owner",
-            )
             if (
-              jsenvPluginOwner === "jsenv:as_js_classic_html" &&
-              !analyzeConvertedScripts
+              !analyzeConvertedScripts &&
+              getHtmlNodeAttribute(scriptNode, "jsenv-injected-by") ===
+                "jsenv:as_js_classic_html"
             ) {
               return
             }
-            if (jsenvPluginOwner === "jsenv:supervisor") {
+            if (
+              getHtmlNodeAttribute(scriptNode, "jsenv-cooked-by") ===
+                "jsenv:supervisor" ||
+              getHtmlNodeAttribute(scriptNode, "jsenv-injected-by") ===
+                "jsenv:supervisor"
+            ) {
               return
             }
             const { type, contentType, extension } =
@@ -131,8 +132,7 @@ export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {
             mutations.push(() => {
               setHtmlNodeText(scriptNode, inlineScriptUrlInfo.content)
               setHtmlNodeAttributes(scriptNode, {
-                "jsenv-plugin-owner": "jsenv:html_inline_content",
-                "jsenv-plugin-action": "content_cooked",
+                "jsenv-cooked-by": "jsenv:html_inline_content",
                 ...(extension
                   ? { type: type === "js_module" ? "module" : undefined }
                   : {}),

package/src/plugins/supervisor/client/script_type_module_supervisor.js

@@ -36,8 +36,9 @@ const createExecuteWithScript = ({ currentScript, src }) => {
         nodeToReplace = currentScriptClone
         currentScriptClone.src = urlObject.href
       } else {
-        currentScriptClone.removeAttribute("jsenv-plugin-owner")
-        currentScriptClone.removeAttribute("jsenv-plugin-action")
+        currentScriptClone.removeAttribute("jsenv-cooked-by")
+        currentScriptClone.removeAttribute("jsenv-inlined-by")
+        currentScriptClone.removeAttribute("jsenv-injected-by")
         currentScriptClone.removeAttribute("inlined-from-src")
         currentScriptClone.removeAttribute("original-position")
         currentScriptClone.removeAttribute("original-src-position")

package/src/plugins/supervisor/client/supervisor.js

@@ -885,8 +885,9 @@ window.__supervisor__ = (() => {
               nodeToReplace = currentScriptClone
               currentScriptClone.src = urlObject.href
             } else {
-              currentScriptClone.removeAttribute("jsenv-plugin-owner")
-              currentScriptClone.removeAttribute("jsenv-plugin-action")
+              currentScriptClone.removeAttribute("jsenv-cooked-by")
+              currentScriptClone.removeAttribute("jsenv-inlined-by")
+              currentScriptClone.removeAttribute("jsenv-injected-by")
               currentScriptClone.removeAttribute("inlined-from-src")
               currentScriptClone.removeAttribute("original-position")
               currentScriptClone.removeAttribute("original-src-position")

package/src/plugins/supervisor/jsenv_plugin_supervisor.js

@@ -277,13 +277,12 @@ export const jsenvPluginSupervisor = ({
             if (type !== "js_classic" && type !== "js_module") {
               return
             }
-            const jsenvPluginOwner = getHtmlNodeAttribute(
-              node,
-              "jsenv-plugin-owner",
+            if (
+              getHtmlNodeAttribute(node, "jsenv-cooked-by") ||
+              getHtmlNodeAttribute(node, "jsenv-inlined-by") ||
+              getHtmlNodeAttribute(node, "jsenv-injected-by")
             )
-            if (jsenvPluginOwner !== undefined) {
               return
-            }
             const noSupervisor = getHtmlNodeAttribute(node, "no-supervisor")
             if (noSupervisor !== undefined) {
               return
@@ -378,15 +377,13 @@ export const jsenvPluginSupervisor = ({
             }
             if (src) {
               setHtmlNodeAttributes(node, {
-                "jsenv-plugin-owner": "jsenv:supervisor",
-                "jsenv-plugin-action": "inlined",
+                "jsenv-inlined-by": "jsenv:supervisor",
                 "src": undefined,
                 "inlined-from-src": src,
               })
             } else {
               setHtmlNodeAttributes(node, {
-                "jsenv-plugin-owner": "jsenv:supervisor",
-                "jsenv-plugin-action": "content_cooked",
+                "jsenv-cooked-by": "jsenv:supervisor",
               })
             }
           },

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

@@ -116,6 +116,7 @@ export const jsenvPluginAsJsClassicConversion = ({
         originalUrl: jsModuleUrlInfo.originalUrl,
         originalContent: jsModuleUrlInfo.originalContent,
         sourcemap,
+        data: jsModuleUrlInfo.data,
       }
     },
   }

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

@@ -86,6 +86,7 @@ export const jsenvPluginAsJsClassicLibrary = ({
         originalUrl: urlInfo.originalUrl,
         originalContent: jsModuleUrlInfo.originalContent,
         sourcemap,
+        data: jsModuleUrlInfo.data,
       }
     },
   }

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

@@ -130,6 +130,7 @@ const jsenvPluginAsModules = () => {
         type: "js_module",
         originalUrl: jsonUrlInfo.originalUrl,
         originalContent: jsonUrlInfo.originalContent,
+        data: jsonUrlInfo.data,
       }
     },
   }
@@ -179,6 +180,7 @@ const jsenvPluginAsModules = () => {
         type: "js_module",
         originalUrl: cssUrlInfo.originalUrl,
         originalContent: cssUrlInfo.originalContent,
+        data: cssUrlInfo.data,
       }
     },
   }
@@ -226,6 +228,7 @@ export default inlineContent.text`,
         type: "js_module",
         originalUrl: textUrlInfo.originalUrl,
         originalContent: textUrlInfo.originalContent,
+        data: textUrlInfo.data,
       }
     },
   }

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

@@ -138,8 +138,8 @@ const visitHtmlUrls = ({ url, htmlAst }) => {
   const visitAttributeAsUrlSpecifier = ({ node, attributeName, ...rest }) => {
     const value = getHtmlNodeAttribute(node, attributeName)
     if (value) {
-      const jsenvPluginOwner = getHtmlNodeAttribute(node, "jsenv-plugin-owner")
-      if (jsenvPluginOwner === "jsenv:importmap") {
+      const jsenvInlinedBy = getHtmlNodeAttribute(node, "jsenv-inlined-by")
+      if (jsenvInlinedBy === "jsenv:importmap") {
         // during build the importmap is inlined
         // and shoud not be considered as a dependency anymore
         return null