@jsenv/core 36.0.0 → 36.0.2

package/dist/js/ribbon.js

@@ -47,6 +47,10 @@ const injectRibbon = ({
     </div>`;
   const node = document.createElement("div");
   node.innerHTML = html;
+  const toolbarStateInLocalStorage = localStorage.hasOwnProperty("jsenv_toolbar") ? JSON.parse(localStorage.getItem("jsenv_toolbar")) : {};
+  if (toolbarStateInLocalStorage.ribbonDisplayed === false) {
+    node.querySelector("#jsenv_ribbon_container").style.display = "none";
+  }
   document.body.appendChild(node.firstChild);
 };
 

package/dist/jsenv_core.js

@@ -7806,7 +7806,7 @@ const createUrlInfo = url => {
     originalUrl: undefined,
     filename: "",
     isEntryPoint: false,
-    shouldHandle: undefined,
+    mustIgnore: undefined,
     originalContent: undefined,
     content: undefined,
     sourcemap: null,
@@ -8126,11 +8126,11 @@ const returnValueAssertions = [{
     }
     if (typeof valueReturned === "object") {
       const {
-        shouldHandle,
+        mustIgnore,
         content,
         body
       } = valueReturned;
-      if (shouldHandle === false) {
+      if (mustIgnore) {
         return undefined;
       }
       if (typeof content !== "string" && !Buffer.isBuffer(content) && !body) {
@@ -9192,7 +9192,7 @@ const createKitchen = ({
     specifierColumn,
     baseUrl,
     isOriginalPosition,
-    shouldHandle,
+    mustIgnore,
     isEntryPoint = false,
     isResourceHint = false,
     isImplicit = false,
@@ -9241,7 +9241,7 @@ const createKitchen = ({
       specifierColumn,
       isOriginalPosition,
       baseUrl,
-      shouldHandle,
+      mustIgnore,
       isEntryPoint,
       isResourceHint,
       isImplicit,
@@ -9333,8 +9333,13 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
         reference.generatedUrl = normalizeUrl(referencedUrlObject.href);
       });
       const returnValue = pluginController.callHooksUntil("formatReference", reference, referenceContext);
-      reference.generatedSpecifier = returnValue || reference.generatedUrl;
-      reference.generatedSpecifier = urlSpecifierEncoding.encode(reference);
+      if (reference.mustIgnore) {
+        reference.generatedSpecifier = reference.specifier;
+        reference.generatedSpecifier = urlSpecifierEncoding.encode(reference);
+      } else {
+        reference.generatedSpecifier = returnValue || reference.generatedUrl;
+        reference.generatedSpecifier = urlSpecifierEncoding.encode(reference);
+      }
       return [reference, urlInfo];
     } catch (error) {
       throw createResolveUrlError({
@@ -9504,7 +9509,7 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
         contextDuringFetch: context
       });
     };
-    if (urlInfo.shouldHandle) {
+    if (!urlInfo.mustIgnore) {
       // references
       const references = [];
       context.referenceUtils = {
@@ -9834,10 +9839,10 @@ const traceFromUrlSite = urlSite => {
   };
 };
 const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
-  if (reference.shouldHandle) {
-    urlInfo.shouldHandle = true;
+  if (reference.mustIgnore) {
+    urlInfo.mustIgnore = true;
   } else {
-    urlInfo.shouldHandle = false;
+    urlInfo.mustIgnore = false;
   }
   urlInfo.originalUrl = urlInfo.originalUrl || reference.url;
   if (reference.isEntryPoint || isWebWorkerEntryPointReference(reference)) {
@@ -10076,7 +10081,7 @@ const createUrlGraphReport = urlGraph => {
     // ignore:
     // - inline files: they are already taken into account in the file where they appear
     // - ignored files: we don't know their content
-    if (urlInfo.isInline || !urlInfo.shouldHandle) {
+    if (urlInfo.isInline || urlInfo.mustIgnore) {
       return;
     }
     // file loaded via import assertion are already inside the graph
@@ -11108,6 +11113,7 @@ const parseAndTransformJsReferences = async (urlInfo, context, {
 const jsenvPluginReferenceAnalysis = ({
   include,
   supportedProtocols = ["file:", "data:", "virtual:", "http:", "https:"],
+  ignoreProtocol = "remove",
   inlineContent = true,
   inlineConvertedScript = false,
   fetchInlineUrls = true,
@@ -11115,7 +11121,8 @@ const jsenvPluginReferenceAnalysis = ({
 }) => {
   return [jsenvPluginReferenceAnalysisInclude({
     include,
-    supportedProtocols
+    supportedProtocols,
+    ignoreProtocol
   }), jsenvPluginDirectoryReferenceAnalysis(), jsenvPluginHtmlReferenceAnalysis({
     inlineContent,
     inlineConvertedScript
@@ -11126,7 +11133,8 @@ const jsenvPluginReferenceAnalysis = ({
 };
 const jsenvPluginReferenceAnalysisInclude = ({
   include,
-  supportedProtocols
+  supportedProtocols,
+  ignoreProtocol
 }) => {
   // eslint-disable-next-line no-unused-vars
   let getIncludeInfo = url => undefined;
@@ -11152,7 +11160,7 @@ const jsenvPluginReferenceAnalysisInclude = ({
       }
     },
     redirectReference: reference => {
-      if (reference.shouldHandle !== undefined) {
+      if (reference.mustIgnore !== undefined) {
         return;
       }
       if (reference.specifier[0] === "#" &&
@@ -11161,24 +11169,36 @@ const jsenvPluginReferenceAnalysisInclude = ({
       // However for js import specifiers they have a different meaning and we want
       // to resolve them (https://nodejs.org/api/packages.html#imports for instance)
       reference.type !== "js_import") {
-        reference.shouldHandle = false;
+        reference.mustIgnore = true;
+        return;
+      }
+      if (reference.url.startsWith("ignore:")) {
+        reference.mustIgnore = true;
+        if (ignoreProtocol === "remove") {
+          reference.specifier = reference.specifier.slice("ignore:".length);
+        }
         return;
       }
       const includeInfo = getIncludeInfo(reference.url);
       if (includeInfo === true) {
-        reference.shouldHandle = true;
+        reference.mustIgnore = false;
         return;
       }
       if (includeInfo === false) {
-        reference.shouldHandle = false;
+        reference.mustIgnore = true;
         return;
       }
       const {
         protocol
       } = new URL(reference.url);
       const protocolIsSupported = supportedProtocols.some(supportedProtocol => protocol === supportedProtocol);
-      if (protocolIsSupported) {
-        reference.shouldHandle = true;
+      if (!protocolIsSupported) {
+        reference.mustIgnore = true;
+      }
+    },
+    formatReference: reference => {
+      if (ignoreProtocol === "inject" && reference.mustIgnore && !reference.url.startsWith("ignore:")) {
+        reference.specifier = `ignore:${reference.specifier}`;
       }
     }
   };
@@ -15425,11 +15445,10 @@ const jsenvPluginJsModuleFallbackInsideHtml = ({
             });
           }
         }
-        if (mutations.length === 0) {
-          return null;
-        }
         await Promise.all(mutations.map(mutation => mutation()));
-        return stringifyHtmlAst(htmlAst);
+        return stringifyHtmlAst(htmlAst, {
+          cleanupPositionAttributes: context.dev
+        });
       }
     }
   };
@@ -17436,10 +17455,10 @@ const jsenvPluginNodeEsmResolution = (resolutionConfig = {}) => {
         runtimeCompat,
         preservesSymlink: true
       });
-      if (!resolvers.js_module) {
+      if (resolvers.js_module === undefined) {
         resolvers.js_module = nodeEsmResolverDefault;
       }
-      if (!resolvers.js_classic) {
+      if (resolvers.js_classic === undefined) {
         resolvers.js_classic = (reference, context) => {
           if (reference.subtype === "self_import_scripts_arg") {
             return nodeEsmResolverDefault(reference, context);
@@ -17468,41 +17487,25 @@ const jsenvPluginNodeEsmResolution = (resolutionConfig = {}) => {
   };
 };
 
-const jsenvPluginWebResolution = (resolutionConfig = {}) => {
-  const resolvers = {};
-  const resolveUsingWebResolution = (reference, context) => {
-    if (reference.specifier === "/") {
-      const {
-        mainFilePath,
-        rootDirectoryUrl
-      } = context;
-      return String(new URL(mainFilePath, rootDirectoryUrl));
-    }
-    if (reference.specifier[0] === "/") {
-      return new URL(reference.specifier.slice(1), context.rootDirectoryUrl).href;
-    }
-    return new URL(reference.specifier,
-    // baseUrl happens second argument to new URL() is different from
-    // import.meta.url or document.currentScript.src
-    reference.baseUrl || reference.parentUrl).href;
-  };
-  Object.keys(resolutionConfig).forEach(urlType => {
-    const config = resolutionConfig[urlType];
-    if (config === true) {
-      resolvers[urlType] = resolveUsingWebResolution;
-    } else if (config === false) {
-      resolvers[urlType] = () => null;
-    } else {
-      throw new TypeError(`config must be true or false, got ${config} on "${urlType}"`);
-    }
-  });
+const jsenvPluginWebResolution = () => {
   return {
     name: "jsenv:web_resolution",
     appliesDuring: "*",
     resolveReference: (reference, context) => {
-      const urlType = urlTypeFromReference(reference, context);
-      const resolver = resolvers[urlType];
-      return resolver ? resolver(reference, context) : resolveUsingWebResolution(reference, context);
+      if (reference.specifier === "/") {
+        const {
+          mainFilePath,
+          rootDirectoryUrl
+        } = context;
+        return String(new URL(mainFilePath, rootDirectoryUrl));
+      }
+      if (reference.specifier[0] === "/") {
+        return new URL(reference.specifier.slice(1), context.rootDirectoryUrl).href;
+      }
+      return new URL(reference.specifier,
+      // baseUrl happens second argument to new URL() is different from
+      // import.meta.url or document.currentScript.src
+      reference.baseUrl || reference.parentUrl).href;
     }
   };
 };
@@ -17541,14 +17544,14 @@ const jsenvPluginVersionSearchParam = () => {
   };
 };
 
-const jsenvPluginFileUrls = ({
+const jsenvPluginProtocolFile = ({
   magicExtensions = ["inherit", ".js"],
   magicDirectoryIndex = true,
   preserveSymlinks = false,
   directoryReferenceAllowed = false
 }) => {
   return [{
-    name: "jsenv:file_url_resolution",
+    name: "jsenv:fs_redirection",
     appliesDuring: "*",
     redirectReference: reference => {
       // http, https, data, about, ...
@@ -17589,13 +17592,13 @@ const jsenvPluginFileUrls = ({
         urlObject.pathname = pathname.slice(0, -1);
       }
       let url = urlObject.href;
-      const shouldPreserve = stat && stat.isDirectory() && (
+      const mustIgnore = stat && stat.isDirectory() && (
       // ignore new URL second arg
       reference.subtype === "new_url_second_arg" ||
       // ignore root file url
       reference.url === "file:///" || reference.subtype === "new_url_first_arg" && reference.specifier === "./");
-      if (shouldPreserve) {
-        reference.shouldHandle = false;
+      if (mustIgnore) {
+        reference.mustIgnore = true;
       } else {
         const shouldApplyDilesystemMagicResolution = reference.type === "js_import";
         if (shouldApplyDilesystemMagicResolution) {
@@ -17627,7 +17630,7 @@ const jsenvPluginFileUrls = ({
       return null;
     }
   }, {
-    name: "jsenv:filesystem_resolution",
+    name: "jsenv:fs_resolution",
     appliesDuring: "*",
     resolveReference: {
       filesystem: (reference, context) => {
@@ -17640,10 +17643,10 @@ const jsenvPluginFileUrls = ({
       }
     }
   }, {
-    name: "jsenv:@fs_resolution",
-    // during dev and test it's a browser running the code
+    name: "jsenv:@fs",
+    // during build it's fine to use "file://"" urls
+    // but during dev it's a browser running the code
     // so absolute file urls needs to be relativized
-    // during build it's fine to use file:// urls
     appliesDuring: "dev",
     resolveReference: reference => {
       if (reference.specifier.startsWith("/@fs/")) {
@@ -17698,13 +17701,13 @@ const resolveSymlink = fileUrl => {
   return pathToFileURL(realpathSync(new URL(fileUrl))).href;
 };
 
-const jsenvPluginHttpUrls = () => {
+const jsenvPluginProtocolHttp = () => {
   return {
-    name: "jsenv:http_urls",
+    name: "jsenv:protocol_http",
     appliesDuring: "*",
     redirectReference: reference => {
       if (reference.url.startsWith("http:") || reference.url.startsWith("https:")) {
-        reference.shouldHandle = false;
+        reference.mustIgnore = true;
       }
       // TODO: according to some pattern matching jsenv could be allowed
       // to fetch and transform http urls
@@ -19986,7 +19989,7 @@ const jsenvPluginBabel = ({
   return {
     name: "jsenv:babel",
     appliesDuring: "*",
-    finalizeUrlContent: {
+    transformUrlContent: {
       js_classic: transformWithBabel,
       js_module: transformWithBabel
     }
@@ -20894,8 +20897,8 @@ const getCorePlugins = ({
   runtimeCompat,
   referenceAnalysis = {},
   nodeEsmResolution = {},
-  webResolution = {},
-  fileSystemMagicRedirection,
+  magicExtensions,
+  magicDirectoryIndex,
   directoryReferenceAllowed,
   supervisor,
   transpilation = true,
@@ -20913,9 +20916,6 @@ const getCorePlugins = ({
   if (supervisor === true) {
     supervisor = {};
   }
-  if (fileSystemMagicRedirection === true) {
-    fileSystemMagicRedirection = {};
-  }
   if (clientAutoreload === true) {
     clientAutoreload = {};
   }
@@ -20931,10 +20931,11 @@ const getCorePlugins = ({
      - reference inside a js module -> resolved by node esm
      - All the rest uses web standard url resolution
    */
-  jsenvPluginFileUrls({
+  jsenvPluginProtocolFile({
     directoryReferenceAllowed,
-    ...fileSystemMagicRedirection
-  }), jsenvPluginHttpUrls(), ...(nodeEsmResolution ? [jsenvPluginNodeEsmResolution(nodeEsmResolution)] : []), jsenvPluginWebResolution(webResolution), jsenvPluginVersionSearchParam(), jsenvPluginCommonJsGlobals(), jsenvPluginImportMetaScenarios(), ...(scenarioPlaceholders ? [jsenvPluginGlobalScenarios()] : []), jsenvPluginNodeRuntime({
+    magicExtensions,
+    magicDirectoryIndex
+  }), jsenvPluginProtocolHttp(), ...(nodeEsmResolution ? [jsenvPluginNodeEsmResolution(nodeEsmResolution)] : []), jsenvPluginWebResolution(), jsenvPluginVersionSearchParam(), jsenvPluginCommonJsGlobals(), jsenvPluginImportMetaScenarios(), ...(scenarioPlaceholders ? [jsenvPluginGlobalScenarios()] : []), jsenvPluginNodeRuntime({
     runtimeCompat
   }), jsenvPluginImportMetaHot(), ...(clientAutoreload ? [jsenvPluginAutoreload({
     ...clientAutoreload,
@@ -21336,8 +21337,8 @@ const build = async ({
   plugins = [],
   referenceAnalysis = {},
   nodeEsmResolution,
-  webResolution,
-  fileSystemMagicRedirection,
+  magicExtensions,
+  magicDirectoryIndex,
   directoryReferenceAllowed,
   scenarioPlaceholders,
   transpilation = {},
@@ -21474,12 +21475,6 @@ build ${entryPointKeys.length} entry points`);
       ...contextSharedDuringBuild,
       plugins: [...plugins, {
         appliesDuring: "build",
-        formatReference: reference => {
-          if (!reference.shouldHandle) {
-            return `ignore:${reference.specifier}`;
-          }
-          return null;
-        },
         fetchUrlContent: (urlInfo, context) => {
           if (context.reference.original) {
             rawRedirections.set(context.reference.original.url, context.reference.url);
@@ -21489,10 +21484,15 @@ build ${entryPointKeys.length} entry points`);
         rootDirectoryUrl: sourceDirectoryUrl,
         urlGraph: rawGraph,
         runtimeCompat,
-        referenceAnalysis,
+        referenceAnalysis: {
+          ...referenceAnalysis,
+          // during first pass (craft) we inject "ignore:" when a reference must be ignored
+          // so that the second pass (shape) properly ignore those urls
+          ignoreProtocol: "inject"
+        },
         nodeEsmResolution,
-        webResolution,
-        fileSystemMagicRedirection,
+        magicExtensions,
+        magicDirectoryIndex,
         directoryReferenceAllowed,
         transpilation: {
           ...transpilation,
@@ -21534,7 +21534,14 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       ...contextSharedDuringBuild,
       plugins: [jsenvPluginReferenceAnalysis({
         ...referenceAnalysis,
-        fetchInlineUrls: false
+        // here most plugins are not there
+        // - no external plugin
+        // - no plugin putting reference.mustIgnore on https urls
+        // At this stage it's only about redirecting urls to the build directory
+        // consequently only a subset or urls are supported
+        supportedProtocols: ["file:", "data:", "virtual:", "ignore:"],
+        fetchInlineUrls: false,
+        ignoreProtocol: versioning ? "keep" : "remove"
       }), ...(lineBreakNormalization ? [jsenvPluginLineBreakNormalization()] : []), jsenvPluginJsModuleFallback({
         systemJsInjection: true
       }), jsenvPluginInlining(), {
@@ -21686,9 +21693,6 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
         },
         formatReference: reference => {
           if (!reference.generatedUrl.startsWith("file:")) {
-            if (!versioning && reference.generatedUrl.startsWith("ignore:")) {
-              return reference.generatedUrl.slice("ignore:".length);
-            }
             return null;
           }
           if (reference.isResourceHint) {
@@ -21776,7 +21780,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       }, {
         name: "jsenv:optimize",
         appliesDuring: "build",
-        finalizeUrlContent: async (urlInfo, context) => {
+        transformUrlContent: async (urlInfo, context) => {
           await rawGraphKitchen.pluginController.callAsyncHooks("optimizeUrlContent", urlInfo, context, async optimizeReturnValue => {
             await finalGraphKitchen.urlInfoTransformer.applyFinalTransformations(urlInfo, optimizeReturnValue);
           });
@@ -22124,7 +22128,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             if (urlInfo.isInline) {
               return;
             }
-            if (!urlInfo.shouldHandle) {
+            if (urlInfo.mustIgnore) {
               return;
             }
             if (urlInfo.dependents.size === 0 && !urlInfo.isEntryPoint) {
@@ -22150,7 +22154,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                   const dependencyContentVersion = contentVersionMap.get(reference.url);
                   if (!dependencyContentVersion) {
                     // no content generated for this dependency
-                    // (inline, data:, sourcemap, shouldHandle is false, ...)
+                    // (inline, data:, sourcemap, mustIgnore is true, ...)
                     return null;
                   }
                   if (preferWithoutVersioning(reference)) {
@@ -22213,8 +22217,16 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             build: true,
             runtimeCompat,
             ...contextSharedDuringBuild,
-            plugins: [jsenvPluginReferenceAnalysis({
+            plugins: [
+            // here most plugins are not there
+            // - no external plugin
+            // - no plugin putting reference.mustIgnore on https urls
+            // At this stage it's only about versioning urls
+            // consequently only a subset or urls are supported
+            jsenvPluginReferenceAnalysis({
               ...referenceAnalysis,
+              supportedProtocols: ["file:", "data:", "virtual:"],
+              ignoreProtocol: "remove",
               fetchInlineUrls: false,
               inlineConvertedScript: true,
               // to be able to version their urls
@@ -22248,10 +22260,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                 return url;
               },
               formatReference: reference => {
-                if (!reference.shouldHandle) {
-                  if (reference.generatedUrl.startsWith("ignore:")) {
-                    return reference.generatedUrl.slice("ignore:".length);
-                  }
+                if (reference.mustIgnore) {
                   return null;
                 }
                 if (reference.isInline || reference.url.startsWith("data:")) {
@@ -22266,7 +22275,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                 if (!canUseVersionedUrl(referencedUrlInfo)) {
                   return reference.specifier;
                 }
-                if (!referencedUrlInfo.shouldHandle) {
+                if (referencedUrlInfo.mustIgnore) {
                   return null;
                 }
                 const versionedUrl = versionedUrlMap.get(reference.url);
@@ -22376,7 +22385,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       }
       {
         GRAPH.forEach(finalGraph, urlInfo => {
-          if (!urlInfo.shouldHandle) {
+          if (urlInfo.mustIgnore) {
             return;
           }
           if (!urlInfo.url.startsWith("file:")) {
@@ -22525,7 +22534,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
         if (serviceWorkerEntryUrlInfos.length > 0) {
           const serviceWorkerResources = {};
           GRAPH.forEach(finalGraph, urlInfo => {
-            if (urlInfo.isInline || !urlInfo.shouldHandle) {
+            if (urlInfo.isInline || urlInfo.mustIgnore) {
               return;
             }
             if (!urlInfo.url.startsWith("file:")) {
@@ -22584,7 +22593,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       return buildRelativeUrl;
     };
     GRAPH.forEach(finalGraph, urlInfo => {
-      if (!urlInfo.shouldHandle) {
+      if (urlInfo.mustIgnore) {
         return;
       }
       if (!urlInfo.url.startsWith("file:")) {
@@ -22856,8 +22865,8 @@ const createFileService = ({
   plugins,
   referenceAnalysis,
   nodeEsmResolution,
-  webResolution,
-  fileSystemMagicRedirection,
+  magicExtensions,
+  magicDirectoryIndex,
   supervisor,
   transpilation,
   clientAutoreload,
@@ -22933,8 +22942,8 @@ const createFileService = ({
         runtimeCompat,
         referenceAnalysis,
         nodeEsmResolution,
-        webResolution,
-        fileSystemMagicRedirection,
+        magicExtensions,
+        magicDirectoryIndex,
         supervisor,
         transpilation,
         clientAutoreload,
@@ -23272,9 +23281,9 @@ const startDevServer = async ({
   plugins = [],
   referenceAnalysis = {},
   nodeEsmResolution,
-  webResolution,
   supervisor = true,
-  fileSystemMagicRedirection,
+  magicExtensions,
+  magicDirectoryIndex,
   transpilation,
   cacheControl = true,
   ribbon = true,
@@ -23391,8 +23400,8 @@ const startDevServer = async ({
         plugins,
         referenceAnalysis,
         nodeEsmResolution,
-        webResolution,
-        fileSystemMagicRedirection,
+        magicExtensions,
+        magicDirectoryIndex,
         supervisor,
         transpilation,
         clientAutoreload,

package/package.json

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

package/src/build/build.js

@@ -136,8 +136,8 @@ export const build = async ({
   plugins = [],
   referenceAnalysis = {},
   nodeEsmResolution,
-  webResolution,
-  fileSystemMagicRedirection,
+  magicExtensions,
+  magicDirectoryIndex,
   directoryReferenceAllowed,
   scenarioPlaceholders,
   transpilation = {},
@@ -319,12 +319,6 @@ build ${entryPointKeys.length} entry points`);
         ...plugins,
         {
           appliesDuring: "build",
-          formatReference: (reference) => {
-            if (!reference.shouldHandle) {
-              return `ignore:${reference.specifier}`;
-            }
-            return null;
-          },
           fetchUrlContent: (urlInfo, context) => {
             if (context.reference.original) {
               rawRedirections.set(
@@ -339,16 +333,22 @@ build ${entryPointKeys.length} entry points`);
           urlGraph: rawGraph,
           runtimeCompat,
 
-          referenceAnalysis,
+          referenceAnalysis: {
+            ...referenceAnalysis,
+            // during first pass (craft) we inject "ignore:" when a reference must be ignored
+            // so that the second pass (shape) properly ignore those urls
+            ignoreProtocol: "inject",
+          },
           nodeEsmResolution,
-          webResolution,
-          fileSystemMagicRedirection,
+          magicExtensions,
+          magicDirectoryIndex,
           directoryReferenceAllowed,
           transpilation: {
             ...transpilation,
             babelHelpersAsImport: !explicitJsModuleFallback,
             jsModuleFallbackOnJsClassic: false,
           },
+
           inlining: false,
           scenarioPlaceholders,
         }),
@@ -390,7 +390,14 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       plugins: [
         jsenvPluginReferenceAnalysis({
           ...referenceAnalysis,
+          // here most plugins are not there
+          // - no external plugin
+          // - no plugin putting reference.mustIgnore on https urls
+          // At this stage it's only about redirecting urls to the build directory
+          // consequently only a subset or urls are supported
+          supportedProtocols: ["file:", "data:", "virtual:", "ignore:"],
           fetchInlineUrls: false,
+          ignoreProtocol: versioning ? "keep" : "remove",
         }),
         ...(lineBreakNormalization
           ? [jsenvPluginLineBreakNormalization()]
@@ -578,9 +585,6 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           },
           formatReference: (reference) => {
             if (!reference.generatedUrl.startsWith("file:")) {
-              if (!versioning && reference.generatedUrl.startsWith("ignore:")) {
-                return reference.generatedUrl.slice("ignore:".length);
-              }
               return null;
             }
             if (reference.isResourceHint) {
@@ -672,7 +676,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
         {
           name: "jsenv:optimize",
           appliesDuring: "build",
-          finalizeUrlContent: async (urlInfo, context) => {
+          transformUrlContent: async (urlInfo, context) => {
             await rawGraphKitchen.pluginController.callAsyncHooks(
               "optimizeUrlContent",
               urlInfo,
@@ -1078,7 +1082,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             if (urlInfo.isInline) {
               return;
             }
-            if (!urlInfo.shouldHandle) {
+            if (urlInfo.mustIgnore) {
               return;
             }
             if (urlInfo.dependents.size === 0 && !urlInfo.isEntryPoint) {
@@ -1090,7 +1094,9 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                     parseHtmlString(urlInfo.content, {
                       storeOriginalPositions: false,
                     }),
-                    { cleanupJsenvAttributes: true },
+                    {
+                      cleanupJsenvAttributes: true,
+                    },
                   )
                 : urlInfo.content;
             const contentVersionGenerator = createVersionGenerator();
@@ -1110,7 +1116,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                   );
                   if (!dependencyContentVersion) {
                     // no content generated for this dependency
-                    // (inline, data:, sourcemap, shouldHandle is false, ...)
+                    // (inline, data:, sourcemap, mustIgnore is true, ...)
                     return null;
                   }
                   if (preferWithoutVersioning(reference)) {
@@ -1181,8 +1187,15 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             runtimeCompat,
             ...contextSharedDuringBuild,
             plugins: [
+              // here most plugins are not there
+              // - no external plugin
+              // - no plugin putting reference.mustIgnore on https urls
+              // At this stage it's only about versioning urls
+              // consequently only a subset or urls are supported
               jsenvPluginReferenceAnalysis({
                 ...referenceAnalysis,
+                supportedProtocols: ["file:", "data:", "virtual:"],
+                ignoreProtocol: "remove",
                 fetchInlineUrls: false,
                 inlineConvertedScript: true, // to be able to version their urls
                 allowEscapeForVersioning: true,
@@ -1225,10 +1238,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                   return url;
                 },
                 formatReference: (reference) => {
-                  if (!reference.shouldHandle) {
-                    if (reference.generatedUrl.startsWith("ignore:")) {
-                      return reference.generatedUrl.slice("ignore:".length);
-                    }
+                  if (reference.mustIgnore) {
                     return null;
                   }
                   if (reference.isInline || reference.url.startsWith("data:")) {
@@ -1245,7 +1255,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                   if (!canUseVersionedUrl(referencedUrlInfo)) {
                     return reference.specifier;
                   }
-                  if (!referencedUrlInfo.shouldHandle) {
+                  if (referencedUrlInfo.mustIgnore) {
                     return null;
                   }
                   const versionedUrl = versionedUrlMap.get(reference.url);
@@ -1374,7 +1384,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       }
       cleanup_jsenv_attributes_from_html: {
         GRAPH.forEach(finalGraph, (urlInfo) => {
-          if (!urlInfo.shouldHandle) {
+          if (urlInfo.mustIgnore) {
             return;
           }
           if (!urlInfo.url.startsWith("file:")) {
@@ -1559,7 +1569,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
         if (serviceWorkerEntryUrlInfos.length > 0) {
           const serviceWorkerResources = {};
           GRAPH.forEach(finalGraph, (urlInfo) => {
-            if (urlInfo.isInline || !urlInfo.shouldHandle) {
+            if (urlInfo.isInline || urlInfo.mustIgnore) {
               return;
             }
             if (!urlInfo.url.startsWith("file:")) {
@@ -1632,7 +1642,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       return buildRelativeUrl;
     };
     GRAPH.forEach(finalGraph, (urlInfo) => {
-      if (!urlInfo.shouldHandle) {
+      if (urlInfo.mustIgnore) {
         return;
       }
       if (!urlInfo.url.startsWith("file:")) {

package/src/dev/file_service.js

@@ -28,8 +28,8 @@ export const createFileService = ({
   plugins,
   referenceAnalysis,
   nodeEsmResolution,
-  webResolution,
-  fileSystemMagicRedirection,
+  magicExtensions,
+  magicDirectoryIndex,
   supervisor,
   transpilation,
   clientAutoreload,
@@ -116,8 +116,8 @@ export const createFileService = ({
 
           referenceAnalysis,
           nodeEsmResolution,
-          webResolution,
-          fileSystemMagicRedirection,
+          magicExtensions,
+          magicDirectoryIndex,
           supervisor,
           transpilation,
 

package/src/dev/start_dev_server.js

@@ -52,9 +52,9 @@ export const startDevServer = async ({
   plugins = [],
   referenceAnalysis = {},
   nodeEsmResolution,
-  webResolution,
   supervisor = true,
-  fileSystemMagicRedirection,
+  magicExtensions,
+  magicDirectoryIndex,
   transpilation,
   cacheControl = true,
   ribbon = true,
@@ -192,8 +192,8 @@ export const startDevServer = async ({
           plugins,
           referenceAnalysis,
           nodeEsmResolution,
-          webResolution,
-          fileSystemMagicRedirection,
+          magicExtensions,
+          magicDirectoryIndex,
           supervisor,
           transpilation,
           clientAutoreload,

package/src/kitchen/kitchen.js

@@ -116,7 +116,7 @@ export const createKitchen = ({
     specifierColumn,
     baseUrl,
     isOriginalPosition,
-    shouldHandle,
+    mustIgnore,
     isEntryPoint = false,
     isResourceHint = false,
     isImplicit = false,
@@ -165,7 +165,7 @@ export const createKitchen = ({
       specifierColumn,
       isOriginalPosition,
       baseUrl,
-      shouldHandle,
+      mustIgnore,
       isEntryPoint,
       isResourceHint,
       isImplicit,
@@ -281,8 +281,13 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
         reference,
         referenceContext,
       );
-      reference.generatedSpecifier = returnValue || reference.generatedUrl;
-      reference.generatedSpecifier = urlSpecifierEncoding.encode(reference);
+      if (reference.mustIgnore) {
+        reference.generatedSpecifier = reference.specifier;
+        reference.generatedSpecifier = urlSpecifierEncoding.encode(reference);
+      } else {
+        reference.generatedSpecifier = returnValue || reference.generatedUrl;
+        reference.generatedSpecifier = urlSpecifierEncoding.encode(reference);
+      }
       return [reference, urlInfo];
     } catch (error) {
       throw createResolveUrlError({
@@ -464,7 +469,7 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
       });
     };
 
-    if (urlInfo.shouldHandle) {
+    if (!urlInfo.mustIgnore) {
       // references
       const references = [];
       context.referenceUtils = {
@@ -849,10 +854,10 @@ const traceFromUrlSite = (urlSite) => {
 };
 
 const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
-  if (reference.shouldHandle) {
-    urlInfo.shouldHandle = true;
+  if (reference.mustIgnore) {
+    urlInfo.mustIgnore = true;
   } else {
-    urlInfo.shouldHandle = false;
+    urlInfo.mustIgnore = false;
   }
   urlInfo.originalUrl = urlInfo.originalUrl || reference.url;
 

package/src/kitchen/url_graph/url_graph_report.js

@@ -36,7 +36,7 @@ const createUrlGraphReport = (urlGraph) => {
     // ignore:
     // - inline files: they are already taken into account in the file where they appear
     // - ignored files: we don't know their content
-    if (urlInfo.isInline || !urlInfo.shouldHandle) {
+    if (urlInfo.isInline || urlInfo.mustIgnore) {
       return;
     }
     // file loaded via import assertion are already inside the graph

package/src/kitchen/url_graph.js

@@ -268,7 +268,7 @@ const createUrlInfo = (url) => {
     originalUrl: undefined,
     filename: "",
     isEntryPoint: false,
-    shouldHandle: undefined,
+    mustIgnore: undefined,
     originalContent: undefined,
     content: undefined,
 

package/src/plugins/plugin_controller.js

@@ -325,8 +325,8 @@ const returnValueAssertions = [
         return { content: valueReturned };
       }
       if (typeof valueReturned === "object") {
-        const { shouldHandle, content, body } = valueReturned;
-        if (shouldHandle === false) {
+        const { mustIgnore, content, body } = valueReturned;
+        if (mustIgnore) {
           return undefined;
         }
         if (typeof content !== "string" && !Buffer.isBuffer(content) && !body) {

package/src/plugins/plugins.js

@@ -3,8 +3,8 @@ import { jsenvPluginImportmap } from "./importmap/jsenv_plugin_importmap.js";
 import { jsenvPluginNodeEsmResolution } from "./resolution_node_esm/jsenv_plugin_node_esm_resolution.js";
 import { jsenvPluginWebResolution } from "./resolution_web/jsenv_plugin_web_resolution.js";
 import { jsenvPluginVersionSearchParam } from "./version_search_param/jsenv_plugin_version_search_param.js";
-import { jsenvPluginFileUrls } from "./file_urls/jsenv_plugin_file_urls.js";
-import { jsenvPluginHttpUrls } from "./http_urls/jsenv_plugin_http_urls.js";
+import { jsenvPluginProtocolFile } from "./protocol_file/jsenv_plugin_protocol_file.js";
+import { jsenvPluginProtocolHttp } from "./protocol_http/jsenv_plugin_protocol_http.js";
 import { jsenvPluginInlining } from "./inlining/jsenv_plugin_inlining.js";
 import { jsenvPluginSupervisor } from "./supervisor/jsenv_plugin_supervisor.js";
 import { jsenvPluginCommonJsGlobals } from "./commonjs_globals/jsenv_plugin_commonjs_globals.js";
@@ -25,8 +25,8 @@ export const getCorePlugins = ({
 
   referenceAnalysis = {},
   nodeEsmResolution = {},
-  webResolution = {},
-  fileSystemMagicRedirection,
+  magicExtensions,
+  magicDirectoryIndex,
   directoryReferenceAllowed,
   supervisor,
   transpilation = true,
@@ -45,9 +45,6 @@ export const getCorePlugins = ({
   if (supervisor === true) {
     supervisor = {};
   }
-  if (fileSystemMagicRedirection === true) {
-    fileSystemMagicRedirection = {};
-  }
   if (clientAutoreload === true) {
     clientAutoreload = {};
   }
@@ -68,15 +65,16 @@ export const getCorePlugins = ({
        - reference inside a js module -> resolved by node esm
        - All the rest uses web standard url resolution
      */
-    jsenvPluginFileUrls({
+    jsenvPluginProtocolFile({
       directoryReferenceAllowed,
-      ...fileSystemMagicRedirection,
+      magicExtensions,
+      magicDirectoryIndex,
     }),
-    jsenvPluginHttpUrls(),
+    jsenvPluginProtocolHttp(),
     ...(nodeEsmResolution
       ? [jsenvPluginNodeEsmResolution(nodeEsmResolution)]
       : []),
-    jsenvPluginWebResolution(webResolution),
+    jsenvPluginWebResolution(),
 
     jsenvPluginVersionSearchParam(),
     jsenvPluginCommonJsGlobals(),

package/src/plugins/{file_urls/jsenv_plugin_file_urls.js → protocol_file/jsenv_plugin_protocol_file.js}

@@ -12,7 +12,7 @@ import {
 } from "@jsenv/node-esm-resolution";
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js";
 
-export const jsenvPluginFileUrls = ({
+export const jsenvPluginProtocolFile = ({
   magicExtensions = ["inherit", ".js"],
   magicDirectoryIndex = true,
   preserveSymlinks = false,
@@ -20,7 +20,7 @@ export const jsenvPluginFileUrls = ({
 }) => {
   return [
     {
-      name: "jsenv:file_url_resolution",
+      name: "jsenv:fs_redirection",
       appliesDuring: "*",
       redirectReference: (reference) => {
         // http, https, data, about, ...
@@ -57,7 +57,7 @@ export const jsenvPluginFileUrls = ({
         }
 
         let url = urlObject.href;
-        const shouldPreserve =
+        const mustIgnore =
           stat &&
           stat.isDirectory() &&
           // ignore new URL second arg
@@ -67,8 +67,8 @@ export const jsenvPluginFileUrls = ({
             (reference.subtype === "new_url_first_arg" &&
               reference.specifier === "./"));
 
-        if (shouldPreserve) {
-          reference.shouldHandle = false;
+        if (mustIgnore) {
+          reference.mustIgnore = true;
         } else {
           const shouldApplyDilesystemMagicResolution =
             reference.type === "js_import";
@@ -109,7 +109,7 @@ export const jsenvPluginFileUrls = ({
       },
     },
     {
-      name: "jsenv:filesystem_resolution",
+      name: "jsenv:fs_resolution",
       appliesDuring: "*",
       resolveReference: {
         filesystem: (reference, context) => {
@@ -124,10 +124,10 @@ export const jsenvPluginFileUrls = ({
       },
     },
     {
-      name: "jsenv:@fs_resolution",
-      // during dev and test it's a browser running the code
+      name: "jsenv:@fs",
+      // during build it's fine to use "file://"" urls
+      // but during dev it's a browser running the code
       // so absolute file urls needs to be relativized
-      // during build it's fine to use file:// urls
       appliesDuring: "dev",
       resolveReference: (reference) => {
         if (reference.specifier.startsWith("/@fs/")) {

package/src/plugins/{http_urls/jsenv_plugin_http_urls.js → protocol_http/jsenv_plugin_protocol_http.js}

@@ -1,13 +1,13 @@
-export const jsenvPluginHttpUrls = () => {
+export const jsenvPluginProtocolHttp = () => {
   return {
-    name: "jsenv:http_urls",
+    name: "jsenv:protocol_http",
     appliesDuring: "*",
     redirectReference: (reference) => {
       if (
         reference.url.startsWith("http:") ||
         reference.url.startsWith("https:")
       ) {
-        reference.shouldHandle = false;
+        reference.mustIgnore = true;
       }
       // TODO: according to some pattern matching jsenv could be allowed
       // to fetch and transform http urls

package/src/plugins/reference_analysis/jsenv_plugin_reference_analysis.js

@@ -12,6 +12,7 @@ export const jsenvPluginReferenceAnalysis = ({
   include,
   supportedProtocols = ["file:", "data:", "virtual:", "http:", "https:"],
 
+  ignoreProtocol = "remove",
   inlineContent = true,
   inlineConvertedScript = false,
   fetchInlineUrls = true,
@@ -21,6 +22,7 @@ export const jsenvPluginReferenceAnalysis = ({
     jsenvPluginReferenceAnalysisInclude({
       include,
       supportedProtocols,
+      ignoreProtocol,
     }),
     jsenvPluginDirectoryReferenceAnalysis(),
     jsenvPluginHtmlReferenceAnalysis({
@@ -44,6 +46,7 @@ export const jsenvPluginReferenceAnalysis = ({
 const jsenvPluginReferenceAnalysisInclude = ({
   include,
   supportedProtocols,
+  ignoreProtocol,
 }) => {
   // eslint-disable-next-line no-unused-vars
   let getIncludeInfo = (url) => undefined;
@@ -67,7 +70,7 @@ const jsenvPluginReferenceAnalysisInclude = ({
       }
     },
     redirectReference: (reference) => {
-      if (reference.shouldHandle !== undefined) {
+      if (reference.mustIgnore !== undefined) {
         return;
       }
       if (
@@ -78,24 +81,40 @@ const jsenvPluginReferenceAnalysisInclude = ({
         // to resolve them (https://nodejs.org/api/packages.html#imports for instance)
         reference.type !== "js_import"
       ) {
-        reference.shouldHandle = false;
+        reference.mustIgnore = true;
+        return;
+      }
+      if (reference.url.startsWith("ignore:")) {
+        reference.mustIgnore = true;
+        if (ignoreProtocol === "remove") {
+          reference.specifier = reference.specifier.slice("ignore:".length);
+        }
         return;
       }
       const includeInfo = getIncludeInfo(reference.url);
       if (includeInfo === true) {
-        reference.shouldHandle = true;
+        reference.mustIgnore = false;
         return;
       }
       if (includeInfo === false) {
-        reference.shouldHandle = false;
+        reference.mustIgnore = true;
         return;
       }
       const { protocol } = new URL(reference.url);
       const protocolIsSupported = supportedProtocols.some(
         (supportedProtocol) => protocol === supportedProtocol,
       );
-      if (protocolIsSupported) {
-        reference.shouldHandle = true;
+      if (!protocolIsSupported) {
+        reference.mustIgnore = true;
+      }
+    },
+    formatReference: (reference) => {
+      if (
+        ignoreProtocol === "inject" &&
+        reference.mustIgnore &&
+        !reference.url.startsWith("ignore:")
+      ) {
+        reference.specifier = `ignore:${reference.specifier}`;
       }
     },
   };

package/src/plugins/resolution_node_esm/jsenv_plugin_node_esm_resolution.js

@@ -1,4 +1,4 @@
-import { urlTypeFromReference } from "../url_type_from_reference.js";
+import { urlTypeFromReference } from "./url_type_from_reference.js";
 import { createNodeEsmResolver } from "./node_esm_resolver.js";
 
 export const jsenvPluginNodeEsmResolution = (resolutionConfig = {}) => {
@@ -41,10 +41,10 @@ export const jsenvPluginNodeEsmResolution = (resolutionConfig = {}) => {
         runtimeCompat,
         preservesSymlink: true,
       });
-      if (!resolvers.js_module) {
+      if (resolvers.js_module === undefined) {
         resolvers.js_module = nodeEsmResolverDefault;
       }
-      if (!resolvers.js_classic) {
+      if (resolvers.js_classic === undefined) {
         resolvers.js_classic = (reference, context) => {
           if (reference.subtype === "self_import_scripts_arg") {
             return nodeEsmResolverDefault(reference, context);

package/src/plugins/resolution_web/jsenv_plugin_web_resolution.js

@@ -1,45 +1,22 @@
-import { urlTypeFromReference } from "../url_type_from_reference.js";
-
-export const jsenvPluginWebResolution = (resolutionConfig = {}) => {
-  const resolvers = {};
-  const resolveUsingWebResolution = (reference, context) => {
-    if (reference.specifier === "/") {
-      const { mainFilePath, rootDirectoryUrl } = context;
-      return String(new URL(mainFilePath, rootDirectoryUrl));
-    }
-    if (reference.specifier[0] === "/") {
-      return new URL(reference.specifier.slice(1), context.rootDirectoryUrl)
-        .href;
-    }
-    return new URL(
-      reference.specifier,
-      // baseUrl happens second argument to new URL() is different from
-      // import.meta.url or document.currentScript.src
-      reference.baseUrl || reference.parentUrl,
-    ).href;
-  };
-  Object.keys(resolutionConfig).forEach((urlType) => {
-    const config = resolutionConfig[urlType];
-    if (config === true) {
-      resolvers[urlType] = resolveUsingWebResolution;
-    } else if (config === false) {
-      resolvers[urlType] = () => null;
-    } else {
-      throw new TypeError(
-        `config must be true or false, got ${config} on "${urlType}"`,
-      );
-    }
-  });
-
+export const jsenvPluginWebResolution = () => {
   return {
     name: "jsenv:web_resolution",
     appliesDuring: "*",
     resolveReference: (reference, context) => {
-      const urlType = urlTypeFromReference(reference, context);
-      const resolver = resolvers[urlType];
-      return resolver
-        ? resolver(reference, context)
-        : resolveUsingWebResolution(reference, context);
+      if (reference.specifier === "/") {
+        const { mainFilePath, rootDirectoryUrl } = context;
+        return String(new URL(mainFilePath, rootDirectoryUrl));
+      }
+      if (reference.specifier[0] === "/") {
+        return new URL(reference.specifier.slice(1), context.rootDirectoryUrl)
+          .href;
+      }
+      return new URL(
+        reference.specifier,
+        // baseUrl happens second argument to new URL() is different from
+        // import.meta.url or document.currentScript.src
+        reference.baseUrl || reference.parentUrl,
+      ).href;
     },
   };
 };

package/src/plugins/ribbon/client/ribbon.js

@@ -47,5 +47,14 @@ export const injectRibbon = ({ text }) => {
 
   const node = document.createElement("div");
   node.innerHTML = html;
+
+  const toolbarStateInLocalStorage = localStorage.hasOwnProperty(
+    "jsenv_toolbar",
+  )
+    ? JSON.parse(localStorage.getItem("jsenv_toolbar"))
+    : {};
+  if (toolbarStateInLocalStorage.ribbonDisplayed === false) {
+    node.querySelector("#jsenv_ribbon_container").style.display = "none";
+  }
   document.body.appendChild(node.firstChild);
 };

package/src/plugins/transpilation/babel/jsenv_plugin_babel.js

@@ -92,7 +92,7 @@ export const jsenvPluginBabel = ({
   return {
     name: "jsenv:babel",
     appliesDuring: "*",
-    finalizeUrlContent: {
+    transformUrlContent: {
       js_classic: transformWithBabel,
       js_module: transformWithBabel,
     },

package/src/plugins/transpilation/js_module_fallback/jsenv_plugin_js_module_fallback_inside_html.js

@@ -135,7 +135,6 @@ export const jsenvPluginJsModuleFallbackInsideHtml = ({
             }
           },
         });
-
         if (systemJsInjection) {
           let needsSystemJs = false;
           for (const reference of urlInfo.references) {
@@ -213,11 +212,10 @@ export const jsenvPluginJsModuleFallbackInsideHtml = ({
             });
           }
         }
-        if (mutations.length === 0) {
-          return null;
-        }
         await Promise.all(mutations.map((mutation) => mutation()));
-        return stringifyHtmlAst(htmlAst);
+        return stringifyHtmlAst(htmlAst, {
+          cleanupPositionAttributes: context.dev,
+        });
       },
     },
   };