@jsenv/core 29.4.5 → 29.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "29.4.5",
+  "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"
@@ -61,7 +64,7 @@ import { jsenvPluginAsJsClassic } from "../plugins/transpilation/as_js_classic/j
 import { getCorePlugins } from "../plugins/plugins.js"
 
 import { GRAPH } from "./graph_utils.js"
-import { createBuilUrlsGenerator } from "./build_urls_generator.js"
+import { createBuildUrlsGenerator } from "./build_urls_generator.js"
 import { injectVersionMappings } from "./inject_global_version_mappings.js"
 import { createVersionGenerator } from "./version_generator.js"
 
@@ -90,8 +93,10 @@ export const defaultRuntimeCompat = {
  *        Describe entry point paths and control their names in the build directory
  * @param {object} buildParameters.runtimeCompat
  *        Code generated will be compatible with these runtimes
- * @param {string="/"} buildParameters.baseUrl
- *        All urls in build file contents are prefixed with this url
+ * @param {string} [buildParameters.assetsDirectory=""]
+ *        Directory where asset files will be written
+ * @param {string|url} [buildParameters.base=""]
+ *        Urls in build file contents will be prefixed with this string
  * @param {boolean|object} [buildParameters.minification=true]
  *        Minify build file contents
  * @param {boolean} [buildParameters.versioning=true]
@@ -112,12 +117,13 @@ export const build = async ({
   signal = new AbortController().signal,
   handleSIGINT = true,
   logLevel = "info",
+  runtimeCompat = defaultRuntimeCompat,
   rootDirectoryUrl,
   buildDirectoryUrl,
+  assetsDirectory = "",
+  base = runtimeCompat.node ? "./" : "/",
   entryPoints = {},
-  baseUrl = "/",
 
-  runtimeCompat = defaultRuntimeCompat,
   plugins = [],
   sourcemaps = false,
   sourcemapsSourcesContent,
@@ -127,11 +133,10 @@ export const build = async ({
   directoryReferenceAllowed,
   transpilation = {},
   bundling = true,
-  minification = true,
-  versioning = true,
+  minification = !runtimeCompat.node,
+  versioning = !runtimeCompat.node,
   versioningMethod = "search_param", // "filename", "search_param"
   lineBreakNormalization = process.platform === "win32",
-  ribbon,
 
   clientFiles = {
     "./src/": true,
@@ -139,10 +144,10 @@ export const build = async ({
   cooldownBetweenFileEvents,
   watch = false,
 
-  buildDirectoryClean = true,
+  directoryToClean,
   writeOnFileSystem = true,
   writeGeneratedFiles = false,
-  assetManifest = true,
+  assetManifest = versioningMethod === "filename",
   assetManifestFileRelativeUrl = "asset-manifest.json",
 }) => {
   const operation = Abort.startOperation()
@@ -166,6 +171,36 @@ export const build = async ({
       `Unexpected "versioningMethod": must be "filename", "search_param"; got ${versioning}`,
     )
   }
+  if (assetsDirectory && assetsDirectory[assetsDirectory.length - 1] !== "/") {
+    assetsDirectory = `${assetsDirectory}/`
+  }
+  if (directoryToClean === undefined) {
+    if (assetsDirectory === undefined) {
+      directoryToClean = buildDirectoryUrl
+    } else {
+      directoryToClean = new URL(assetsDirectory, buildDirectoryUrl).href
+    }
+  }
+  const asFormattedBuildUrl = (generatedUrl, reference) => {
+    if (base === "./") {
+      const urlRelativeToParent = urlToRelativeUrl(
+        generatedUrl,
+        reference.parentUrl === rootDirectoryUrl
+          ? buildDirectoryUrl
+          : reference.parentUrl,
+      )
+      if (urlRelativeToParent[0] !== ".") {
+        // ensure "./" on relative url (otherwise it could be a "bare specifier")
+        return `./${urlRelativeToParent}`
+      }
+      return urlRelativeToParent
+    }
+    const urlRelativeToBuildDirectory = urlToRelativeUrl(
+      generatedUrl,
+      buildDirectoryUrl,
+    )
+    return `${base}${urlRelativeToBuildDirectory}`
+  }
 
   const runBuild = async ({ signal, logLevel }) => {
     const logger = createLogger({ logLevel })
@@ -231,7 +266,6 @@ build ${entryPointKeys.length} entry points`)
           },
           minification,
           bundling,
-          ribbon,
         }),
       ],
       sourcemaps,
@@ -240,8 +274,9 @@ build ${entryPointKeys.length} entry points`)
       outDirectoryUrl: new URL(`.jsenv/build/`, rootDirectoryUrl),
     })
 
-    const buildUrlsGenerator = createBuilUrlsGenerator({
+    const buildUrlsGenerator = createBuildUrlsGenerator({
       buildDirectoryUrl,
+      assetsDirectory,
     })
     const buildDirectoryRedirections = new Map()
 
@@ -288,8 +323,8 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                 const parentRawUrl = buildDirectoryRedirections.get(
                   reference.parentUrl,
                 )
-                const baseUrl = ensurePathnameTrailingSlash(parentRawUrl)
-                return new URL(reference.specifier, baseUrl).href
+                const parentUrl = ensurePathnameTrailingSlash(parentRawUrl)
+                return new URL(reference.specifier, parentUrl).href
               }
               if (reference.specifier[0] === "/") {
                 return new URL(reference.specifier.slice(1), buildDirectoryUrl)
@@ -467,25 +502,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             generatedUrlObject.searchParams.delete("as_text_module")
             generatedUrlObject.hash = ""
             const generatedUrl = generatedUrlObject.href
-            let specifier
-            if (baseUrl === "./") {
-              const relativeUrl = urlToRelativeUrl(
-                generatedUrl,
-                reference.parentUrl === rootDirectoryUrl
-                  ? buildDirectoryUrl
-                  : reference.parentUrl,
-              )
-              // ensure "./" on relative url (otherwise it could be a "bare specifier")
-              specifier =
-                relativeUrl[0] === "." ? relativeUrl : `./${relativeUrl}`
-            } else {
-              // if a file is in the same directory we could prefer the relative notation
-              // but to keep things simple let's keep the "absolutely relative" to baseUrl for now
-              specifier = `${baseUrl}${urlToRelativeUrl(
-                generatedUrl,
-                buildDirectoryUrl,
-              )}`
-            }
+            const specifier = asFormattedBuildUrl(generatedUrl, reference)
             buildUrls.set(specifier, reference.generatedUrl)
             return specifier
           },
@@ -592,6 +609,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             })
           entryUrls.push(entryUrlInfo.url)
           entryUrlInfo.filename = entryPoints[key]
+          entryUrlInfo.isEntryPoint = true
           rawUrlGraphLoader.load(entryUrlInfo, { reference: entryReference })
         })
         await rawUrlGraphLoader.getAllLoadDonePromise(buildOperation)
@@ -740,6 +758,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                 {
                   ...rawGraphKitchen.kitchenContext,
                   buildDirectoryUrl,
+                  assetsDirectory,
                 },
               )
             Object.keys(bundlerGeneratedUrlInfos).forEach((url) => {
@@ -789,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")
@@ -1055,15 +1074,15 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                   const versionedUrl = versionedUrlMap.get(reference.url)
                   if (!versionedUrl) {
                     // happens for sourcemap
-                    return `${baseUrl}${urlToRelativeUrl(
+                    return urlToRelativeUrl(
                       referencedUrlInfo.url,
-                      buildDirectoryUrl,
-                    )}`
+                      reference.parentUrl,
+                    )
                   }
-                  const versionedSpecifier = `${baseUrl}${urlToRelativeUrl(
+                  const versionedSpecifier = asFormattedBuildUrl(
                     versionedUrl,
-                    buildDirectoryUrl,
-                  )}`
+                    reference,
+                  )
                   versionMappings[reference.specifier] = versionedSpecifier
                   versioningRedirections.set(reference.url, versionedUrl)
                   buildUrls.set(versionedSpecifier, versionedUrl)
@@ -1149,6 +1168,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                     urlInfo,
                     kitchen: finalGraphKitchen,
                     versionMappings: versionMappingsNeeded,
+                    minification,
                   })
                 })
               }
@@ -1196,6 +1216,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               storeOriginalPositions: false,
             })
             const mutations = []
+            const hintsToInject = {}
             visitHtmlNodes(htmlAst, {
               link: (node) => {
                 const href = getHtmlNodeAttribute(node, "href")
@@ -1247,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
@@ -1271,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(
@@ -1407,8 +1465,8 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       }
     })
     if (writeOnFileSystem) {
-      if (buildDirectoryClean) {
-        await ensureEmptyDirectory(buildDirectoryUrl)
+      if (directoryToClean) {
+        await ensureEmptyDirectory(directoryToClean)
       }
       const buildRelativeUrls = Object.keys(buildFileContents)
       buildRelativeUrls.forEach((buildRelativeUrl) => {

package/src/build/build_urls_generator.js

@@ -1,7 +1,10 @@
 import { urlToFilename, urlToRelativeUrl } from "@jsenv/urls"
 import { memoizeByFirstArgument } from "@jsenv/utils/src/memoize/memoize_by_first_argument.js"
 
-export const createBuilUrlsGenerator = ({ buildDirectoryUrl }) => {
+export const createBuildUrlsGenerator = ({
+  buildDirectoryUrl,
+  assetsDirectory,
+}) => {
   const cache = {}
 
   const getUrlName = (url, urlInfo) => {
@@ -17,6 +20,7 @@ export const createBuilUrlsGenerator = ({ buildDirectoryUrl }) => {
   const generate = memoizeByFirstArgument((url, { urlInfo, parentUrlInfo }) => {
     const directoryPath = determineDirectoryPath({
       buildDirectoryUrl,
+      assetsDirectory,
       urlInfo,
       parentUrlInfo,
     })
@@ -71,6 +75,7 @@ const splitFileExtension = (filename) => {
 
 const determineDirectoryPath = ({
   buildDirectoryUrl,
+  assetsDirectory,
   urlInfo,
   parentUrlInfo,
 }) => {
@@ -87,6 +92,7 @@ const determineDirectoryPath = ({
   if (urlInfo.isInline) {
     const parentDirectoryPath = determineDirectoryPath({
       buildDirectoryUrl,
+      assetsDirectory,
       urlInfo: parentUrlInfo,
     })
     return parentDirectoryPath
@@ -98,16 +104,16 @@ const determineDirectoryPath = ({
     return ""
   }
   if (urlInfo.type === "html") {
-    return "html/"
+    return `${assetsDirectory}html/`
   }
   if (urlInfo.type === "css") {
-    return "css/"
+    return `${assetsDirectory}css/`
   }
   if (urlInfo.type === "js_module" || urlInfo.type === "js_classic") {
-    return "js/"
+    return `${assetsDirectory}js/`
   }
   if (urlInfo.type === "json") {
-    return "json/"
+    return `${assetsDirectory}json/`
   }
-  return "other/"
+  return `${assetsDirectory}other/`
 }

package/src/build/inject_global_version_mappings.js

@@ -14,10 +14,14 @@ export const injectVersionMappings = async ({
   urlInfo,
   kitchen,
   versionMappings,
+  minification,
 }) => {
   const injector = injectors[urlInfo.type]
   if (injector) {
-    const { content, sourcemap } = await injector(urlInfo, { versionMappings })
+    const { content, sourcemap } = await injector(urlInfo, {
+      versionMappings,
+      minification,
+    })
     kitchen.urlInfoTransformer.applyFinalTransformations(urlInfo, {
       content,
       sourcemap,
@@ -25,18 +29,8 @@ export const injectVersionMappings = async ({
   }
 }
 
-const jsInjector = (urlInfo, { versionMappings }) => {
-  const magicSource = createMagicSource(urlInfo.content)
-  magicSource.prepend(
-    generateClientCodeForVersionMappings(versionMappings, {
-      globalName: isWebWorkerUrlInfo(urlInfo) ? "self" : "window",
-    }),
-  )
-  return magicSource.toContentAndSourcemap()
-}
-
 const injectors = {
-  html: (urlInfo, { versionMappings }) => {
+  html: (urlInfo, { versionMappings, minification }) => {
     // 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
@@ -49,6 +43,7 @@ const injectors = {
         tagName: "script",
         textContent: generateClientCodeForVersionMappings(versionMappings, {
           globalName: "window",
+          minify: minification || minification.js_classic,
         }),
       }),
       "jsenv:versioning",
@@ -57,14 +52,40 @@ const injectors = {
       content: stringifyHtmlAst(htmlAst),
     }
   },
-  js_classic: jsInjector,
-  js_module: jsInjector,
+  js_classic: (urlInfo, { versionMappings, minification }) => {
+    return jsInjector(urlInfo, {
+      versionMappings,
+      minify: minification || minification.js_classic,
+    })
+  },
+  js_module: (urlInfo, { versionMappings, minification }) => {
+    return jsInjector(urlInfo, {
+      versionMappings,
+      minify: minification || minification.js_module,
+    })
+  },
+}
+
+const jsInjector = (urlInfo, { versionMappings, minify }) => {
+  const magicSource = createMagicSource(urlInfo.content)
+  magicSource.prepend(
+    generateClientCodeForVersionMappings(versionMappings, {
+      globalName: isWebWorkerUrlInfo(urlInfo) ? "self" : "window",
+      minify,
+    }),
+  )
+  return magicSource.toContentAndSourcemap()
 }
 
 const generateClientCodeForVersionMappings = (
   versionMappings,
-  { globalName },
+  { globalName, minify },
 ) => {
+  if (minify) {
+    return `;(function(){var m = ${JSON.stringify(
+      versionMappings,
+    )}; ${globalName}.__v__ = function (s) { return m[s] || s }; })();`
+  }
   return `
 ;(function() {
 

package/src/dev/start_dev_server.js

@@ -64,7 +64,7 @@ export const startDevServer = async ({
   fileSystemMagicRedirection,
   transpilation,
   explorer = true, // see jsenv_plugin_explorer.js
-  ribbon = false,
+  ribbon = true,
   // toolbar = false,
 
   sourcemaps = "inline",

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

@@ -31,6 +31,7 @@ export const bundleJsModules = async ({
     logger,
     rootDirectoryUrl,
     buildDirectoryUrl,
+    assetsDirectory,
     urlGraph,
     runtimeCompat,
     sourcemaps,
@@ -46,6 +47,7 @@ export const bundleJsModules = async ({
     logger,
     rootDirectoryUrl,
     buildDirectoryUrl,
+    assetsDirectory,
     urlGraph,
     jsModuleUrlInfos,
 
@@ -64,6 +66,7 @@ const rollupPluginJsenv = ({
   // logger,
   rootDirectoryUrl,
   buildDirectoryUrl,
+  assetsDirectory,
   urlGraph,
   jsModuleUrlInfos,
   sourcemaps,
@@ -159,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 ||
@@ -208,7 +211,7 @@ const rollupPluginJsenv = ({
             }
           }
           const name = nameFromUrlInfo || `${chunkInfo.name}.js`
-          return insideJs ? `js/${name}` : `${name}`
+          return insideJs ? `${assetsDirectory}js/${name}` : `${name}`
         },
         manualChunks: (id) => {
           if (babelHelpersChunk) {
@@ -307,6 +310,7 @@ const buildWithRollup = async ({
   logger,
   rootDirectoryUrl,
   buildDirectoryUrl,
+  assetsDirectory,
   urlGraph,
   jsModuleUrlInfos,
 
@@ -326,6 +330,7 @@ const buildWithRollup = async ({
           logger,
           rootDirectoryUrl,
           buildDirectoryUrl,
+          assetsDirectory,
           urlGraph,
           jsModuleUrlInfos,
 

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/plugins.js

@@ -43,7 +43,7 @@ export const getCorePlugins = ({
   clientFileChangeCallbackList,
   clientFilesPruneCallbackList,
   explorer,
-  ribbon = false,
+  ribbon = true,
 } = {}) => {
   if (explorer === true) {
     explorer = {}
@@ -67,11 +67,6 @@ export const getCorePlugins = ({
   if (ribbon === true) {
     ribbon = {}
   }
-  if (ribbon === "dev_and_build") {
-    ribbon = {
-      devAndBuild: true,
-    }
-  }
 
   return [
     jsenvPluginUrlAnalysis({ rootDirectoryUrl, ...urlAnalysis }),

package/src/plugins/ribbon/jsenv_plugin_ribbon.js

@@ -10,7 +10,6 @@ import { asUrlWithoutSearch } from "@jsenv/urls"
 export const jsenvPluginRibbon = ({
   rootDirectoryUrl,
   htmlInclude = "**/*.html",
-  devAndBuild = false,
 }) => {
   const ribbonClientFileUrl = new URL("./client/ribbon.js", import.meta.url)
   const associations = URL_META.resolveAssociations(
@@ -21,12 +20,9 @@ export const jsenvPluginRibbon = ({
   )
   return {
     name: "jsenv:ribbon",
-    appliesDuring: "*",
+    appliesDuring: "dev",
     transformUrlContent: {
       html: (urlInfo, context) => {
-        if (context.scenarios.build && !devAndBuild) {
-          return null
-        }
         const { ribbon } = URL_META.applyAssociations({
           url: asUrlWithoutSearch(urlInfo.url),
           associations,

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")