@jsenv/core 37.1.1 → 37.1.3

package/dist/jsenv_core.js

@@ -12108,6 +12108,16 @@ const createPluginController = (kitchenContext) => {
     });
   };
 
+  const getPluginMeta = (id) => {
+    for (const plugin of plugins) {
+      const { meta } = plugin;
+      if (meta && meta[id] !== undefined) {
+        return meta[id];
+      }
+    }
+    return undefined;
+  };
+
   return {
     plugins,
     pushPlugin,
@@ -12121,6 +12131,8 @@ const createPluginController = (kitchenContext) => {
     callAsyncHooks,
     callAsyncHooksUntil,
 
+    getPluginMeta,
+
     getLastPluginUsed: () => lastPluginUsed,
     getCurrentPlugin: () => currentPlugin,
     getCurrentHookName: () => currentHookName,
@@ -13150,6 +13162,7 @@ const createKitchen = ({
       inlineContentClientFileUrl,
       isSupportedOnCurrentClients: memoizeIsSupported(clientRuntimeCompat),
       isSupportedOnFutureClients: memoizeIsSupported(runtimeCompat),
+      getPluginMeta: null,
       sourcemaps,
       outDirectoryUrl,
     },
@@ -13169,6 +13182,9 @@ const createKitchen = ({
 
   const pluginController = createPluginController(kitchenContext);
   kitchen.pluginController = pluginController;
+  kitchenContext.getPluginMeta = memoizeGetPluginMeta(
+    pluginController.getPluginMeta,
+  );
   plugins.forEach((pluginEntry) => {
     pluginController.pushPlugin(pluginEntry);
   });
@@ -13695,6 +13711,19 @@ const memoizeCook = (cook) => {
   };
 };
 
+const memoizeGetPluginMeta = (getPluginMeta) => {
+  const cache = new Map();
+  return (id) => {
+    const fromCache = cache.get(id);
+    if (fromCache) {
+      return fromCache;
+    }
+    const value = getPluginMeta(id);
+    cache.set(id, value);
+    return value;
+  };
+};
+
 const memoizeIsSupported = (runtimeCompat) => {
   const cache = new Map();
   return (feature, featureCompat) => {
@@ -18703,7 +18732,14 @@ const jsenvPluginRibbon = ({
     appliesDuring: "dev",
     transformUrlContent: {
       html: (urlInfo) => {
-        if (urlInfo.data.isJsenvToolbar || urlInfo.data.noribbon) {
+        const jsenvToolbarHtmlClientFileUrl = urlInfo.context.getPluginMeta(
+          "jsenvToolbarHtmlClientFileUrl",
+        );
+        if (
+          jsenvToolbarHtmlClientFileUrl &&
+          // startsWith to ignore search params
+          urlInfo.url.startsWith(jsenvToolbarHtmlClientFileUrl)
+        ) {
           return null;
         }
         const { ribbon } = URL_META.applyAssociations({
@@ -19044,7 +19080,9 @@ const injectVersionMappingsAsGlobal = async (
       type: "js_classic",
       content: generateClientCodeForVersionMappings(versionMappings, {
         globalName: "window",
-        minification: urlInfo.context.minification,
+        minification: Boolean(
+          urlInfo.context.getPluginMeta("willMinifyJsClassic"),
+        ),
       }),
     });
     return;
@@ -19054,7 +19092,9 @@ const injectVersionMappingsAsGlobal = async (
       type: "js_classic",
       content: generateClientCodeForVersionMappings(versionMappings, {
         globalName: isWebWorkerUrlInfo(urlInfo) ? "self" : "window",
-        minification: urlInfo.context.minification,
+        minification: Boolean(
+          urlInfo.context.getPluginMeta("willMinifyJsClassic"),
+        ),
       }),
     });
     return;
@@ -19087,12 +19127,15 @@ const injectVersionMappingsAsImportmap = (urlInfo, versionMappings) => {
   // jsenv_plugin_importmap.js is removing importmap during build
   // it means at this point we know HTML has no importmap in it
   // we can safely inject one
+  const importmapMinification = Boolean(
+    urlInfo.context.getPluginMeta("willMinifyJson"),
+  );
   injectHtmlNodeAsEarlyAsPossible(
     htmlAst,
     createHtmlNode({
       tagName: "script",
       type: "importmap",
-      textContent: urlInfo.context.minification
+      textContent: importmapMinification
         ? JSON.stringify({ imports: versionMappings })
         : JSON.stringify({ imports: versionMappings }, null, "  "),
     }),
@@ -19847,9 +19890,6 @@ build ${entryPointKeys.length} entry points`);
           return true;
         return false;
       })(),
-      minification: plugins.some(
-        (plugin) => plugin.name === "jsenv:minification",
-      ),
     };
     const rawKitchen = createKitchen({
       signal,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "37.1.1",
+  "version": "37.1.3",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {

package/src/build/build.js

@@ -298,9 +298,6 @@ build ${entryPointKeys.length} entry points`);
           return true;
         return false;
       })(),
-      minification: plugins.some(
-        (plugin) => plugin.name === "jsenv:minification",
-      ),
     };
     const rawKitchen = createKitchen({
       signal,

package/src/build/version_mappings_injection.js

@@ -19,7 +19,9 @@ export const injectVersionMappingsAsGlobal = async (
       type: "js_classic",
       content: generateClientCodeForVersionMappings(versionMappings, {
         globalName: "window",
-        minification: urlInfo.context.minification,
+        minification: Boolean(
+          urlInfo.context.getPluginMeta("willMinifyJsClassic"),
+        ),
       }),
     });
     return;
@@ -29,7 +31,9 @@ export const injectVersionMappingsAsGlobal = async (
       type: "js_classic",
       content: generateClientCodeForVersionMappings(versionMappings, {
         globalName: isWebWorkerUrlInfo(urlInfo) ? "self" : "window",
-        minification: urlInfo.context.minification,
+        minification: Boolean(
+          urlInfo.context.getPluginMeta("willMinifyJsClassic"),
+        ),
       }),
     });
     return;
@@ -62,12 +66,15 @@ export const injectVersionMappingsAsImportmap = (urlInfo, versionMappings) => {
   // jsenv_plugin_importmap.js is removing importmap during build
   // it means at this point we know HTML has no importmap in it
   // we can safely inject one
+  const importmapMinification = Boolean(
+    urlInfo.context.getPluginMeta("willMinifyJson"),
+  );
   injectHtmlNodeAsEarlyAsPossible(
     htmlAst,
     createHtmlNode({
       tagName: "script",
       type: "importmap",
-      textContent: urlInfo.context.minification
+      textContent: importmapMinification
         ? JSON.stringify({ imports: versionMappings })
         : JSON.stringify({ imports: versionMappings }, null, "  "),
     }),

package/src/kitchen/kitchen.js

@@ -70,6 +70,7 @@ export const createKitchen = ({
       inlineContentClientFileUrl,
       isSupportedOnCurrentClients: memoizeIsSupported(clientRuntimeCompat),
       isSupportedOnFutureClients: memoizeIsSupported(runtimeCompat),
+      getPluginMeta: null,
       sourcemaps,
       outDirectoryUrl,
     },
@@ -89,6 +90,9 @@ export const createKitchen = ({
 
   const pluginController = createPluginController(kitchenContext);
   kitchen.pluginController = pluginController;
+  kitchenContext.getPluginMeta = memoizeGetPluginMeta(
+    pluginController.getPluginMeta,
+  );
   plugins.forEach((pluginEntry) => {
     pluginController.pushPlugin(pluginEntry);
   });
@@ -615,6 +619,19 @@ const memoizeCook = (cook) => {
   };
 };
 
+const memoizeGetPluginMeta = (getPluginMeta) => {
+  const cache = new Map();
+  return (id) => {
+    const fromCache = cache.get(id);
+    if (fromCache) {
+      return fromCache;
+    }
+    const value = getPluginMeta(id);
+    cache.set(id, value);
+    return value;
+  };
+};
+
 const memoizeIsSupported = (runtimeCompat) => {
   const cache = new Map();
   return (feature, featureCompat) => {

package/src/plugins/plugin_controller.js

@@ -251,6 +251,16 @@ export const createPluginController = (kitchenContext) => {
     });
   };
 
+  const getPluginMeta = (id) => {
+    for (const plugin of plugins) {
+      const { meta } = plugin;
+      if (meta && meta[id] !== undefined) {
+        return meta[id];
+      }
+    }
+    return undefined;
+  };
+
   return {
     plugins,
     pushPlugin,
@@ -264,6 +274,8 @@ export const createPluginController = (kitchenContext) => {
     callAsyncHooks,
     callAsyncHooksUntil,
 
+    getPluginMeta,
+
     getLastPluginUsed: () => lastPluginUsed,
     getCurrentPlugin: () => currentPlugin,
     getCurrentHookName: () => currentHookName,

package/src/plugins/ribbon/jsenv_plugin_ribbon.js

@@ -25,7 +25,14 @@ export const jsenvPluginRibbon = ({
     appliesDuring: "dev",
     transformUrlContent: {
       html: (urlInfo) => {
-        if (urlInfo.data.isJsenvToolbar || urlInfo.data.noribbon) {
+        const jsenvToolbarHtmlClientFileUrl = urlInfo.context.getPluginMeta(
+          "jsenvToolbarHtmlClientFileUrl",
+        );
+        if (
+          jsenvToolbarHtmlClientFileUrl &&
+          // startsWith to ignore search params
+          urlInfo.url.startsWith(jsenvToolbarHtmlClientFileUrl)
+        ) {
           return null;
         }
         const { ribbon } = URL_META.applyAssociations({