@jsenv/core 29.3.0-alpha.2 → 29.3.0

package/dist/main.js

@@ -8586,7 +8586,11 @@ const createKitchen = ({
     debug = false
   }) => {
     if (typeof specifier !== "string") {
-      throw new TypeError(`"specifier" must be a string, got ${specifier}`);
+      if (specifier instanceof URL) {
+        specifier = specifier.href;
+      } else {
+        throw new TypeError(`"specifier" must be a string, got ${specifier}`);
+      }
     }
     const reference = {
       original: null,
@@ -20656,28 +20660,28 @@ const jsenvPluginExplorer = ({
 };
 
 const jsenvPluginRibbon = ({
+  rootDirectoryUrl,
   htmlInclude = "**/*.html",
-  allowDuringBuild = false,
-  options = {}
-} = {}) => {
+  devAndBuild = false
+}) => {
   const ribbonClientFileUrl = new URL("./js/ribbon.js", import.meta.url);
   const associations = URL_META.resolveAssociations({
     ribbon: {
       [htmlInclude]: true
     }
-  }, "file://");
+  }, rootDirectoryUrl);
   return {
     name: "jsenv:ribbon",
     appliesDuring: "*",
     transformUrlContent: {
       html: (urlInfo, context) => {
-        if (context.scenarios.build && !allowDuringBuild) {
+        if (context.scenarios.build && !devAndBuild) {
           return null;
         }
         const {
           ribbon
         } = URL_META.applyAssociations({
-          url: urlInfo.url,
+          url: asUrlWithoutSearch(urlInfo.url),
           associations
         });
         if (!ribbon) {
@@ -20688,20 +20692,20 @@ const jsenvPluginRibbon = ({
           type: "script_src",
           subtype: "js_module",
           expectedType: "js_module",
-          specifier: ribbonClientFileUrl
+          specifier: ribbonClientFileUrl.href
         });
-        options = {
-          text: context.scenarios.dev ? "DEV" : "BUILD",
-          ...options
-        };
-        injectHtmlNode(htmlAst, createHtmlNode({
+        const paramsJson = JSON.stringify({
+          text: context.scenarios.dev ? "DEV" : "BUILD"
+        }, null, "  ");
+        const scriptNode = createHtmlNode({
           tagName: "script",
           type: "module",
-          content: `
-import { injectRibbon} from ${ribbonClientFileReference.generatedSpecifier}
+          textContent: `
+import { injectRibbon} from "${ribbonClientFileReference.generatedSpecifier}"
 
-injectRibbon(${JSON.stringify(options, null, "  ")})`
-        }));
+injectRibbon(${paramsJson})`
+        });
+        injectHtmlNode(htmlAst, scriptNode, "jsenv:ribbon");
         return stringifyHtmlAst(htmlAst);
       }
     }
@@ -20746,6 +20750,11 @@ const getCorePlugins = ({
   if (ribbon === true) {
     ribbon = {};
   }
+  if (ribbon === "dev_and_build") {
+    ribbon = {
+      devAndBuild: true
+    };
+  }
   return [jsenvPluginUrlAnalysis({
     rootDirectoryUrl,
     ...urlAnalysis
@@ -20772,7 +20781,10 @@ const getCorePlugins = ({
   })] : []), jsenvPluginCacheControl(), ...(explorer ? [jsenvPluginExplorer({
     ...explorer,
     clientMainFileUrl
-  })] : []), ...(ribbon ? [jsenvPluginRibbon(ribbon)] : [])];
+  })] : []), ...(ribbon ? [jsenvPluginRibbon({
+    rootDirectoryUrl,
+    ...ribbon
+  })] : [])];
 };
 
 const GRAPH = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "29.3.0-alpha.2",
+  "version": "29.3.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -66,7 +66,7 @@
     "@c88/v8-coverage": "0.1.1",
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.2.4",
-    "@jsenv/ast": "1.4.1",
+    "@jsenv/ast": "1.4.2",
     "@jsenv/babel-plugins": "1.0.8",
     "@jsenv/filesystem": "4.1.5",
     "@jsenv/importmap": "1.2.1",

package/src/kitchen/kitchen.js

@@ -100,7 +100,11 @@ export const createKitchen = ({
     debug = false,
   }) => {
     if (typeof specifier !== "string") {
-      throw new TypeError(`"specifier" must be a string, got ${specifier}`)
+      if (specifier instanceof URL) {
+        specifier = specifier.href
+      } else {
+        throw new TypeError(`"specifier" must be a string, got ${specifier}`)
+      }
     }
     const reference = {
       original: null,

package/src/plugins/plugins.js

@@ -67,6 +67,11 @@ export const getCorePlugins = ({
   if (ribbon === true) {
     ribbon = {}
   }
+  if (ribbon === "dev_and_build") {
+    ribbon = {
+      devAndBuild: true,
+    }
+  }
 
   return [
     jsenvPluginUrlAnalysis({ rootDirectoryUrl, ...urlAnalysis }),
@@ -108,6 +113,6 @@ export const getCorePlugins = ({
     ...(explorer
       ? [jsenvPluginExplorer({ ...explorer, clientMainFileUrl })]
       : []),
-    ...(ribbon ? [jsenvPluginRibbon(ribbon)] : []),
+    ...(ribbon ? [jsenvPluginRibbon({ rootDirectoryUrl, ...ribbon })] : []),
   ]
 }

package/src/plugins/ribbon/jsenv_plugin_ribbon.js

@@ -5,29 +5,30 @@ import {
   injectHtmlNode,
 } from "@jsenv/ast"
 import { URL_META } from "@jsenv/url-meta"
+import { asUrlWithoutSearch } from "@jsenv/urls"
 
 export const jsenvPluginRibbon = ({
+  rootDirectoryUrl,
   htmlInclude = "**/*.html",
-  allowDuringBuild = false,
-  options = {},
-} = {}) => {
+  devAndBuild = false,
+}) => {
   const ribbonClientFileUrl = new URL("./client/ribbon.js", import.meta.url)
   const associations = URL_META.resolveAssociations(
     {
       ribbon: { [htmlInclude]: true },
     },
-    "file://",
+    rootDirectoryUrl,
   )
   return {
     name: "jsenv:ribbon",
     appliesDuring: "*",
     transformUrlContent: {
       html: (urlInfo, context) => {
-        if (context.scenarios.build && !allowDuringBuild) {
+        if (context.scenarios.build && !devAndBuild) {
           return null
         }
         const { ribbon } = URL_META.applyAssociations({
-          url: urlInfo.url,
+          url: asUrlWithoutSearch(urlInfo.url),
           associations,
         })
         if (!ribbon) {
@@ -38,23 +39,22 @@ export const jsenvPluginRibbon = ({
           type: "script_src",
           subtype: "js_module",
           expectedType: "js_module",
-          specifier: ribbonClientFileUrl,
+          specifier: ribbonClientFileUrl.href,
         })
-        options = {
-          text: context.scenarios.dev ? "DEV" : "BUILD",
-          ...options,
-        }
-        injectHtmlNode(
-          htmlAst,
-          createHtmlNode({
-            tagName: "script",
-            type: "module",
-            content: `
-import { injectRibbon} from ${ribbonClientFileReference.generatedSpecifier}
-
-injectRibbon(${JSON.stringify(options, null, "  ")})`,
-          }),
+        const paramsJson = JSON.stringify(
+          { text: context.scenarios.dev ? "DEV" : "BUILD" },
+          null,
+          "  ",
         )
+        const scriptNode = createHtmlNode({
+          tagName: "script",
+          type: "module",
+          textContent: `
+import { injectRibbon} from "${ribbonClientFileReference.generatedSpecifier}"
+
+injectRibbon(${paramsJson})`,
+        })
+        injectHtmlNode(htmlAst, scriptNode, "jsenv:ribbon")
         return stringifyHtmlAst(htmlAst)
       },
     },