@jsenv/core 29.4.5 → 29.6.0

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") {
@@ -8579,8 +8585,18 @@ const analyzeUrlNodeType = (secondArgNode, {
   if (!isJsModule && isContextMetaUrlFromSystemJs(secondArgNode)) {
     return "context.meta.url";
   }
-  if (!isJsModule && isDocumentCurrentScriptSrc(secondArgNode)) {
-    return "document.currentScript.src";
+  if (!isJsModule) {
+    if (isDocumentCurrentScriptSrc(secondArgNode)) {
+      return "document.currentScript.src";
+    }
+    // new URL('specifier', document.currentScript.src)
+    // becomes
+    // var _currentUrl = document.currentScript.src
+    // new URL('specifier', currentUrl)
+    // (search for scope.generateUidIdentifier("currentUrl")
+    if (secondArgNode.type === "Identifier") {
+      return "document.currentScript.src";
+    }
   }
   return null;
 };
@@ -11666,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;
@@ -12117,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"
               });
             });
           },
@@ -12130,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 {
@@ -12183,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
                 } : {})
@@ -16494,7 +16507,8 @@ const jsenvPluginAsJsClassicConversion = ({
         type: "js_classic",
         originalUrl: jsModuleUrlInfo.originalUrl,
         originalContent: jsModuleUrlInfo.originalContent,
-        sourcemap
+        sourcemap,
+        data: jsModuleUrlInfo.data
       };
     }
   };
@@ -16812,6 +16826,7 @@ const bundleJsModules = async ({
     logger,
     rootDirectoryUrl,
     buildDirectoryUrl,
+    assetsDirectory,
     urlGraph,
     runtimeCompat,
     sourcemaps
@@ -16829,6 +16844,7 @@ const bundleJsModules = async ({
     logger,
     rootDirectoryUrl,
     buildDirectoryUrl,
+    assetsDirectory,
     urlGraph,
     jsModuleUrlInfos,
     runtimeCompat,
@@ -16844,6 +16860,7 @@ const rollupPluginJsenv = ({
   // logger,
   rootDirectoryUrl,
   buildDirectoryUrl,
+  assetsDirectory,
   urlGraph,
   jsModuleUrlInfos,
   sourcemaps,
@@ -16923,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
@@ -16968,7 +16985,7 @@ const rollupPluginJsenv = ({
             }
           }
           const name = nameFromUrlInfo || `${chunkInfo.name}.js`;
-          return insideJs ? `js/${name}` : `${name}`;
+          return insideJs ? `${assetsDirectory}js/${name}` : `${name}`;
         },
         manualChunks: id => {
           if (babelHelpersChunk) {
@@ -17076,6 +17093,7 @@ const buildWithRollup = async ({
   logger,
   rootDirectoryUrl,
   buildDirectoryUrl,
+  assetsDirectory,
   urlGraph,
   jsModuleUrlInfos,
   runtimeCompat,
@@ -17094,6 +17112,7 @@ const buildWithRollup = async ({
         logger,
         rootDirectoryUrl,
         buildDirectoryUrl,
+        assetsDirectory,
         urlGraph,
         jsModuleUrlInfos,
         runtimeCompat,
@@ -17263,7 +17282,8 @@ const jsenvPluginAsJsClassicLibrary = ({
         type: "js_classic",
         originalUrl: urlInfo.originalUrl,
         originalContent: jsModuleUrlInfo.originalContent,
-        sourcemap
+        sourcemap,
+        data: jsModuleUrlInfo.data
       };
     }
   };
@@ -18030,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);
         };
@@ -18050,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 {
@@ -19725,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;
@@ -19802,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"
             });
           }
         });
@@ -20229,7 +20242,8 @@ const jsenvPluginAsModules = () => {
         contentType: "text/javascript",
         type: "js_module",
         originalUrl: jsonUrlInfo.originalUrl,
-        originalContent: jsonUrlInfo.originalContent
+        originalContent: jsonUrlInfo.originalContent,
+        data: jsonUrlInfo.data
       };
     }
   };
@@ -20275,7 +20289,8 @@ const jsenvPluginAsModules = () => {
         contentType: "text/javascript",
         type: "js_module",
         originalUrl: cssUrlInfo.originalUrl,
-        originalContent: cssUrlInfo.originalContent
+        originalContent: cssUrlInfo.originalContent,
+        data: cssUrlInfo.data
       };
     }
   };
@@ -20319,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
       };
     }
   };
@@ -21411,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
@@ -22444,8 +22460,7 @@ const jsenvPluginExplorer = ({
 
 const jsenvPluginRibbon = ({
   rootDirectoryUrl,
-  htmlInclude = "**/*.html",
-  devAndBuild = false
+  htmlInclude = "**/*.html"
 }) => {
   const ribbonClientFileUrl = new URL("./js/ribbon.js", import.meta.url);
   const associations = URL_META.resolveAssociations({
@@ -22455,12 +22470,9 @@ const jsenvPluginRibbon = ({
   }, rootDirectoryUrl);
   return {
     name: "jsenv:ribbon",
-    appliesDuring: "*",
+    appliesDuring: "dev",
     transformUrlContent: {
       html: (urlInfo, context) => {
-        if (context.scenarios.build && !devAndBuild) {
-          return null;
-        }
         const {
           ribbon
         } = URL_META.applyAssociations({
@@ -22511,7 +22523,7 @@ const getCorePlugins = ({
   clientFileChangeCallbackList,
   clientFilesPruneCallbackList,
   explorer,
-  ribbon = false
+  ribbon = true
 } = {}) => {
   if (explorer === true) {
     explorer = {};
@@ -22533,11 +22545,6 @@ const getCorePlugins = ({
   if (ribbon === true) {
     ribbon = {};
   }
-  if (ribbon === "dev_and_build") {
-    ribbon = {
-      devAndBuild: true
-    };
-  }
   return [jsenvPluginUrlAnalysis({
     rootDirectoryUrl,
     ...urlAnalysis
@@ -22619,8 +22626,9 @@ const memoizeByFirstArgument = compute => {
   return fnWithMemoization;
 };
 
-const createBuilUrlsGenerator = ({
-  buildDirectoryUrl
+const createBuildUrlsGenerator = ({
+  buildDirectoryUrl,
+  assetsDirectory
 }) => {
   const cache = {};
   const getUrlName = (url, urlInfo) => {
@@ -22638,6 +22646,7 @@ const createBuilUrlsGenerator = ({
   }) => {
     const directoryPath = determineDirectoryPath({
       buildDirectoryUrl,
+      assetsDirectory,
       urlInfo,
       parentUrlInfo
     });
@@ -22692,6 +22701,7 @@ const splitFileExtension = filename => {
 };
 const determineDirectoryPath = ({
   buildDirectoryUrl,
+  assetsDirectory,
   urlInfo,
   parentUrlInfo
 }) => {
@@ -22705,6 +22715,7 @@ const determineDirectoryPath = ({
   if (urlInfo.isInline) {
     const parentDirectoryPath = determineDirectoryPath({
       buildDirectoryUrl,
+      assetsDirectory,
       urlInfo: parentUrlInfo
     });
     return parentDirectoryPath;
@@ -22716,25 +22727,26 @@ 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/`;
 };
 
 // https://bundlers.tooling.report/hashing/avoid-cascade/
 const injectVersionMappings = async ({
   urlInfo,
   kitchen,
-  versionMappings
+  versionMappings,
+  minification
 }) => {
   const injector = injectors[urlInfo.type];
   if (injector) {
@@ -22742,7 +22754,8 @@ const injectVersionMappings = async ({
       content,
       sourcemap
     } = await injector(urlInfo, {
-      versionMappings
+      versionMappings,
+      minification
     });
     kitchen.urlInfoTransformer.applyFinalTransformations(urlInfo, {
       content,
@@ -22750,18 +22763,10 @@ 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
+    versionMappings,
+    minification
   }) => {
     // ideally we would inject an importmap but browser support is too low
     // (even worse for worker/service worker)
@@ -22772,19 +22777,51 @@ const injectors = {
     injectScriptNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
       tagName: "script",
       textContent: generateClientCodeForVersionMappings(versionMappings, {
-        globalName: "window"
+        globalName: "window",
+        minify: minification || minification.js_classic
       })
     }), "jsenv:versioning");
     return {
       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() {
 
@@ -22886,8 +22923,10 @@ 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]
@@ -22908,11 +22947,12 @@ 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,
@@ -22922,21 +22962,20 @@ 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
   },
   cooldownBetweenFileEvents,
   watch = false,
-  buildDirectoryClean = true,
+  directoryToClean,
   writeOnFileSystem = true,
   writeGeneratedFiles = false,
-  assetManifest = true,
+  assetManifest = versioningMethod === "filename",
   assetManifestFileRelativeUrl = "asset-manifest.json"
 }) => {
   const operation = Abort.startOperation();
@@ -22956,6 +22995,28 @@ const build = async ({
   if (!["filename", "search_param"].includes(versioningMethod)) {
     throw new Error(`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
@@ -23017,16 +23078,16 @@ build ${entryPointKeys.length} entry points`);
           jsClassicFallback: false
         },
         minification,
-        bundling,
-        ribbon
+        bundling
       })],
       sourcemaps,
       sourcemapsSourcesContent,
       writeGeneratedFiles,
       outDirectoryUrl: new URL(`.jsenv/build/`, rootDirectoryUrl)
     });
-    const buildUrlsGenerator = createBuilUrlsGenerator({
-      buildDirectoryUrl
+    const buildUrlsGenerator = createBuildUrlsGenerator({
+      buildDirectoryUrl,
+      assetsDirectory
     });
     const buildDirectoryRedirections = new Map();
     const associateBuildUrlAndRawUrl = (buildUrl, rawUrl, reason) => {
@@ -23068,8 +23129,8 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           const getUrl = () => {
             if (reference.type === "filesystem") {
               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).href;
@@ -23220,16 +23281,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;
         },
@@ -23326,6 +23378,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           });
           entryUrls.push(entryUrlInfo.url);
           entryUrlInfo.filename = entryPoints[key];
+          entryUrlInfo.isEntryPoint = true;
           rawUrlGraphLoader.load(entryUrlInfo, {
             reference: entryReference
           });
@@ -23457,7 +23510,8 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               value: bundler.bundleFunction
             }, urlInfosToBundle, {
               ...rawGraphKitchen.kitchenContext,
-              buildDirectoryUrl
+              buildDirectoryUrl,
+              assetsDirectory
             });
             Object.keys(bundlerGeneratedUrlInfos).forEach(url => {
               const rawUrlInfo = rawGraph.getUrlInfo(url);
@@ -23495,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");
@@ -23730,9 +23784,9 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                 const versionedUrl = versionedUrlMap.get(reference.url);
                 if (!versionedUrl) {
                   // happens for sourcemap
-                  return `${baseUrl}${urlToRelativeUrl(referencedUrlInfo.url, buildDirectoryUrl)}`;
+                  return urlToRelativeUrl(referencedUrlInfo.url, reference.parentUrl);
                 }
-                const versionedSpecifier = `${baseUrl}${urlToRelativeUrl(versionedUrl, buildDirectoryUrl)}`;
+                const versionedSpecifier = asFormattedBuildUrl(versionedUrl, reference);
                 versionMappings[reference.specifier] = versionedSpecifier;
                 versioningRedirections.set(reference.url, versionedUrl);
                 buildUrls.set(versionedSpecifier, versionedUrl);
@@ -23795,7 +23849,8 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                   await injectVersionMappings({
                     urlInfo,
                     kitchen: finalGraphKitchen,
-                    versionMappings: versionMappingsNeeded
+                    versionMappings: versionMappingsNeeded,
+                    minification
                   });
                 });
               }
@@ -23843,6 +23898,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               storeOriginalPositions: false
             });
             const mutations = [];
+            const hintsToInject = {};
             visitHtmlNodes(htmlAst, {
               link: node => {
                 const href = getHtmlNodeAttribute(node, "href");
@@ -23877,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;
@@ -23899,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, {
@@ -24002,8 +24085,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 => {
@@ -24762,7 +24845,7 @@ const startDevServer = async ({
   transpilation,
   explorer = true,
   // see jsenv_plugin_explorer.js
-  ribbon = false,
+  ribbon = true,
   // toolbar = false,
 
   sourcemaps = "inline",