@jsenv/core 29.4.4 → 29.5.0

package/dist/babel_helpers/wrapRegExp/wrapRegExp.js

@@ -15,14 +15,19 @@ export default function _wrapRegExp() {
   inherits(BabelRegExp, RegExp);
   BabelRegExp.prototype.exec = function (str) {
     var result = _super.exec.call(this, str);
-    if (result) result.groups = buildGroups(result, this);
+    if (result) {
+      result.groups = buildGroups(result, this);
+      var indices = result.indices;
+      if (indices) indices.groups = buildGroups(indices, this);
+    }
     return result;
   };
   BabelRegExp.prototype[Symbol.replace] = function (str, substitution) {
     if (typeof substitution === "string") {
       var groups = _groups.get(this);
       return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) {
-        return "$" + groups[name];
+        var group = groups[name];
+        return "$" + (Array.isArray(group) ? group.join("$") : group);
       }));
     } else if (typeof substitution === "function") {
       var _this = this;
@@ -45,7 +50,15 @@ export default function _wrapRegExp() {
 
     var g = _groups.get(re);
     return Object.keys(g).reduce(function (groups, name) {
-      groups[name] = result[g[name]];
+      var i = g[name];
+      if (typeof i === "number") groups[name] = result[i];else {
+        // i is an array of indexes
+        var k = 0;
+        // if no group matched, we stop at k = i.length - 1 and then
+        // we store result[i[i.length - 1]] which is undefined.
+        while (result[i[k]] === undefined && k + 1 < i.length) k++;
+        groups[name] = result[i[k]];
+      }
       return groups;
     }, Object.create(null));
   }

package/dist/js/ws.js

@@ -283,7 +283,7 @@ const kRun = Symbol('kRun');
  * A very simple job queue with adjustable concurrency. Adapted from
  * https://github.com/STRML/async-limiter
  */
-class Limiter$1 {
+let Limiter$1 = class Limiter {
   /**
    * Creates a new `Limiter`.
    *
@@ -324,7 +324,7 @@ class Limiter$1 {
       job(this[kDone]);
     }
   }
-}
+};
 var limiter = Limiter$1;
 const zlib = require$$0$1;
 const bufferUtil = bufferUtil$1.exports;
@@ -351,7 +351,7 @@ let zlibLimiter;
 /**
  * permessage-deflate implementation.
  */
-class PerMessageDeflate$4 {
+let PerMessageDeflate$4 = class PerMessageDeflate {
   /**
    * Creates a PerMessageDeflate instance.
    *
@@ -685,7 +685,7 @@ class PerMessageDeflate$4 {
       callback(null, data);
     });
   }
-}
+};
 var permessageDeflate = PerMessageDeflate$4;
 
 /**
@@ -873,7 +873,7 @@ const INFLATING = 5;
  *
  * @extends Writable
  */
-class Receiver$1 extends Writable {
+let Receiver$1 = class Receiver extends Writable {
   /**
    * Creates a Receiver instance.
    *
@@ -1264,7 +1264,7 @@ class Receiver$1 extends Writable {
     }
     this._state = GET_INFO;
   }
-}
+};
 var receiver = Receiver$1;
 
 /**
@@ -1308,7 +1308,7 @@ const maskBuffer = Buffer.alloc(4);
 /**
  * HyBi Sender implementation.
  */
-class Sender$1 {
+let Sender$1 = class Sender {
   /**
    * Creates a Sender instance.
    *
@@ -1700,7 +1700,7 @@ class Sender$1 {
       this._socket.write(list[0], cb);
     }
   }
-}
+};
 var sender = Sender$1;
 const {
   kForOnEventAttribute: kForOnEventAttribute$1,
@@ -2199,7 +2199,7 @@ const subprotocolRegex = /^[!#$%&'*+\-.0-9A-Z^_`|a-z~]+$/;
  *
  * @extends EventEmitter
  */
-class WebSocket$1 extends EventEmitter$1 {
+let WebSocket$1 = class WebSocket extends EventEmitter$1 {
   /**
    * Create a new `WebSocket`.
    *
@@ -2590,7 +2590,7 @@ class WebSocket$1 extends EventEmitter$1 {
       this._socket.destroy();
     }
   }
-}
+};
 
 /**
  * @constant {Number} CONNECTING

package/dist/main.js

@@ -8579,8 +8579,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;
 };
@@ -16812,6 +16822,7 @@ const bundleJsModules = async ({
     logger,
     rootDirectoryUrl,
     buildDirectoryUrl,
+    assetsDirectory,
     urlGraph,
     runtimeCompat,
     sourcemaps
@@ -16829,6 +16840,7 @@ const bundleJsModules = async ({
     logger,
     rootDirectoryUrl,
     buildDirectoryUrl,
+    assetsDirectory,
     urlGraph,
     jsModuleUrlInfos,
     runtimeCompat,
@@ -16844,6 +16856,7 @@ const rollupPluginJsenv = ({
   // logger,
   rootDirectoryUrl,
   buildDirectoryUrl,
+  assetsDirectory,
   urlGraph,
   jsModuleUrlInfos,
   sourcemaps,
@@ -16968,7 +16981,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 +17089,7 @@ const buildWithRollup = async ({
   logger,
   rootDirectoryUrl,
   buildDirectoryUrl,
+  assetsDirectory,
   urlGraph,
   jsModuleUrlInfos,
   runtimeCompat,
@@ -17094,6 +17108,7 @@ const buildWithRollup = async ({
         logger,
         rootDirectoryUrl,
         buildDirectoryUrl,
+        assetsDirectory,
         urlGraph,
         jsModuleUrlInfos,
         runtimeCompat,
@@ -22444,8 +22459,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 +22469,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 +22522,7 @@ const getCorePlugins = ({
   clientFileChangeCallbackList,
   clientFilesPruneCallbackList,
   explorer,
-  ribbon = false
+  ribbon = true
 } = {}) => {
   if (explorer === true) {
     explorer = {};
@@ -22533,11 +22544,6 @@ const getCorePlugins = ({
   if (ribbon === true) {
     ribbon = {};
   }
-  if (ribbon === "dev_and_build") {
-    ribbon = {
-      devAndBuild: true
-    };
-  }
   return [jsenvPluginUrlAnalysis({
     rootDirectoryUrl,
     ...urlAnalysis
@@ -22619,8 +22625,9 @@ const memoizeByFirstArgument = compute => {
   return fnWithMemoization;
 };
 
-const createBuilUrlsGenerator = ({
-  buildDirectoryUrl
+const createBuildUrlsGenerator = ({
+  buildDirectoryUrl,
+  assetsDirectory
 }) => {
   const cache = {};
   const getUrlName = (url, urlInfo) => {
@@ -22638,6 +22645,7 @@ const createBuilUrlsGenerator = ({
   }) => {
     const directoryPath = determineDirectoryPath({
       buildDirectoryUrl,
+      assetsDirectory,
       urlInfo,
       parentUrlInfo
     });
@@ -22692,6 +22700,7 @@ const splitFileExtension = filename => {
 };
 const determineDirectoryPath = ({
   buildDirectoryUrl,
+  assetsDirectory,
   urlInfo,
   parentUrlInfo
 }) => {
@@ -22705,6 +22714,7 @@ const determineDirectoryPath = ({
   if (urlInfo.isInline) {
     const parentDirectoryPath = determineDirectoryPath({
       buildDirectoryUrl,
+      assetsDirectory,
       urlInfo: parentUrlInfo
     });
     return parentDirectoryPath;
@@ -22716,25 +22726,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 +22753,8 @@ const injectVersionMappings = async ({
       content,
       sourcemap
     } = await injector(urlInfo, {
-      versionMappings
+      versionMappings,
+      minification
     });
     kitchen.urlInfoTransformer.applyFinalTransformations(urlInfo, {
       content,
@@ -22750,18 +22762,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 +22776,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 +22922,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 +22946,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 +22961,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 +22994,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 +23077,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 +23128,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 +23280,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 +23377,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           });
           entryUrls.push(entryUrlInfo.url);
           entryUrlInfo.filename = entryPoints[key];
+          entryUrlInfo.isEntryPoint = true;
           rawUrlGraphLoader.load(entryUrlInfo, {
             reference: entryReference
           });
@@ -23457,7 +23509,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);
@@ -23730,9 +23783,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 +23848,8 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                   await injectVersionMappings({
                     urlInfo,
                     kitchen: finalGraphKitchen,
-                    versionMappings: versionMappingsNeeded
+                    versionMappings: versionMappingsNeeded,
+                    minification
                   });
                 });
               }
@@ -24002,8 +24056,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 +24816,7 @@ const startDevServer = async ({
   transpilation,
   explorer = true,
   // see jsenv_plugin_explorer.js
-  ribbon = false,
+  ribbon = true,
   // toolbar = false,
 
   sourcemaps = "inline",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "29.4.4",
+  "version": "29.5.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -62,19 +62,19 @@
   },
   "dependencies": {
     "@babel/plugin-proposal-dynamic-import": "7.18.6",
-    "@babel/plugin-transform-modules-systemjs": "7.19.0",
+    "@babel/plugin-transform-modules-systemjs": "7.19.6",
     "@babel/plugin-transform-modules-umd": "7.18.6",
     "@c88/v8-coverage": "0.1.1",
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.2.4",
-    "@jsenv/ast": "1.4.2",
-    "@jsenv/babel-plugins": "1.0.8",
+    "@jsenv/ast": "1.4.3",
+    "@jsenv/babel-plugins": "1.0.9",
     "@jsenv/filesystem": "4.1.5",
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "3.3.1",
     "@jsenv/node-esm-resolution": "0.2.0",
-    "@jsenv/server": "14.1.8",
+    "@jsenv/server": "14.1.9",
     "@jsenv/sourcemap": "1.0.6",
     "@jsenv/uneval": "1.6.0",
     "@jsenv/url-meta": "7.0.0",
@@ -90,7 +90,7 @@
     "istanbul-reports": "3.1.5",
     "launch-editor": "2.6.0",
     "pidtree": "0.6.0",
-    "rollup": "3.2.2",
+    "rollup": "3.2.5",
     "string-width": "5.1.2",
     "strip-ansi": "7.0.1",
     "terser": "5.15.1",
@@ -99,14 +99,14 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "7.19.1",
-    "@babel/plugin-syntax-import-assertions": "7.18.6",
+    "@babel/plugin-syntax-import-assertions": "7.20.0",
     "@jsenv/assert": "./packages/assert/",
     "@jsenv/eslint-config": "./packages/eslint-config/",
     "@jsenv/file-size-impact": "13.0.1",
     "@jsenv/https-local": "3.0.1",
     "@jsenv/package-workspace": "0.5.0",
     "@jsenv/performance-impact": "3.0.1",
-    "eslint": "8.25.0",
+    "eslint": "8.26.0",
     "eslint-plugin-html": "7.1.0",
     "eslint-plugin-import": "2.26.0",
     "eslint-plugin-react": "7.31.10",

package/src/build/build.js

@@ -61,7 +61,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 +90,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 +114,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 +130,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 +141,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 +168,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 +263,6 @@ build ${entryPointKeys.length} entry points`)
           },
           minification,
           bundling,
-          ribbon,
         }),
       ],
       sourcemaps,
@@ -240,8 +271,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 +320,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 +499,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 +606,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 +755,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                 {
                   ...rawGraphKitchen.kitchenContext,
                   buildDirectoryUrl,
+                  assetsDirectory,
                 },
               )
             Object.keys(bundlerGeneratedUrlInfos).forEach((url) => {
@@ -1055,15 +1071,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 +1165,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                     urlInfo,
                     kitchen: finalGraphKitchen,
                     versionMappings: versionMappingsNeeded,
+                    minification,
                   })
                 })
               }
@@ -1407,8 +1424,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/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,
@@ -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/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,