@jsenv/core 34.1.5 → 34.2.0

package/dist/js/s.js.map

@@ -3,13 +3,13 @@
   "sources": [
     "../../packages/babel-plugins/src/babel_helpers/arrayWithHoles/arrayWithHoles.js",
     "../../packages/babel-plugins/src/babel_helpers/iterableToArrayLimit/iterableToArrayLimit.js",
-    "../../src/plugins/transpilation/as_js_classic/client/s.js",
+    "../../src/plugins/transpilation/js_module_fallback/client/s.js",
     "../../packages/babel-plugins/src/babel_helpers/arrayLikeToArray/arrayLikeToArray.js",
     "../../packages/babel-plugins/src/babel_helpers/unsupportedIterableToArray/unsupportedIterableToArray.js",
     "../../packages/babel-plugins/src/babel_helpers/nonIterableRest/nonIterableRest.js",
     "../../packages/babel-plugins/src/babel_helpers/slicedToArray/slicedToArray.js",
     "../../packages/babel-plugins/src/babel_helpers/typeof/typeof.js",
-    "../../src/plugins/transpilation/as_js_classic/client/s.js?as_js_classic_library"
+    "../../src/plugins/transpilation/js_module_fallback/client/s.js?as_js_classic"
   ],
   "names": [
     "arr",

package/dist/jsenv.js

@@ -18,7 +18,6 @@ import { SOURCEMAP, generateSourcemapFileUrl, composeTwoSourcemaps, generateSour
 import { parseHtmlString, stringifyHtmlAst, getHtmlNodeAttribute, visitHtmlNodes, analyzeScriptNode, setHtmlNodeAttributes, parseSrcSet, getHtmlNodePosition, getHtmlNodeAttributePosition, parseCssUrls, parseJsUrls, getHtmlNodeText, setHtmlNodeText, removeHtmlNodeText, applyBabelPlugins, injectScriptNodeAsEarlyAsPossible, createHtmlNode, findHtmlNode, removeHtmlNode, injectJsImport, analyzeLinkNode, injectHtmlNode, insertHtmlNodeAfter } from "@jsenv/ast";
 import { createRequire } from "node:module";
 import babelParser from "@babel/parser";
-import { bundleJsModules } from "@jsenv/plugin-bundling";
 import v8, { takeCoverage } from "node:v8";
 import stripAnsi from "strip-ansi";
 import { createId } from "@paralleldrive/cuid2";
@@ -7872,9 +7871,9 @@ const createUrlInfoTransformer = ({
     //   during build it's urlInfo.url to be inside the build
     //   but otherwise it's generatedUrl to be inside .jsenv/ directory
     const generatedUrlObject = new URL(urlInfo.generatedUrl);
+    generatedUrlObject.searchParams.delete("js_module_fallback");
     generatedUrlObject.searchParams.delete("as_js_module");
     generatedUrlObject.searchParams.delete("as_js_classic");
-    generatedUrlObject.searchParams.delete("as_js_classic_library");
     const urlForSourcemap = generatedUrlObject.href;
     urlInfo.sourcemapGeneratedUrl = generateSourcemapFileUrl(urlForSourcemap);
 
@@ -9880,7 +9879,7 @@ const jsenvPluginReferenceExpectedTypes = () => {
     }
     if (searchParams.has("js_classic")) {
       reference.expectedType = "js_classic";
-    } else if (searchParams.has("as_js_classic") || searchParams.has("as_js_classic_library")) {
+    } else if (searchParams.has("js_module_fallback") || searchParams.has("as_js_classic")) {
       reference.expectedType = "js_classic";
     } else if (searchParams.has("as_js_module")) {
       reference.expectedType = "js_module";
@@ -10526,7 +10525,7 @@ ${e.traceMessage}`);
             // If the inline script was already handled by an other plugin, ignore it
             // - we want to preserve inline scripts generated by html supervisor during dev
             // - we want to avoid cooking twice a script during build
-            if (!analyzeConvertedScripts && getHtmlNodeAttribute(scriptNode, "jsenv-injected-by") === "jsenv:as_js_classic_html") {
+            if (!analyzeConvertedScripts && getHtmlNodeAttribute(scriptNode, "jsenv-injected-by") === "jsenv:js_module_fallback") {
               return;
             }
             const hotAccept = getHtmlNodeAttribute(scriptNode, "hot-accept") !== undefined;
@@ -14766,9 +14765,10 @@ function default_1({
   };
 }
 
+const systemJsClientFileUrlDefault = new URL("./js/s.js", import.meta.url).href;
 const convertJsModuleToJsClassic = async ({
   systemJsInjection,
-  systemJsClientFileUrl,
+  systemJsClientFileUrl = systemJsClientFileUrlDefault,
   urlInfo,
   jsModuleUrlInfo
 }) => {
@@ -14903,10 +14903,10 @@ const babelPluginRelativeImports = babel => {
 };
 
 /*
- * - propagate ?as_js_classic to urls
- * - perform conversion from js module to js classic when url uses ?as_js_classic
+ * - propagate "?js_module_fallback" query string param on urls
+ * - perform conversion from js module to js classic when url uses "?js_module_fallback"
  */
-const jsenvPluginAsJsClassicConversion = ({
+const jsenvPluginJsModuleConversion = ({
   systemJsInjection,
   systemJsClientFileUrl,
   generateJsClassicFilename
@@ -14920,13 +14920,13 @@ const jsenvPluginAsJsClassicConversion = ({
     }
     return false;
   };
-  const shouldPropagateJsClassic = (reference, context) => {
+  const shouldPropagateJsModuleConversion = (reference, context) => {
     if (isReferencingJsModule(reference)) {
       const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl);
       if (!parentUrlInfo) {
         return false;
       }
-      const parentGotAsJsClassic = new URL(parentUrlInfo.url).searchParams.has("as_js_classic");
+      const parentGotAsJsClassic = new URL(parentUrlInfo.url).searchParams.has("js_module_fallback");
       return parentGotAsJsClassic;
     }
     return false;
@@ -14937,16 +14937,16 @@ const jsenvPluginAsJsClassicConversion = ({
   };
   const turnIntoJsClassicProxy = reference => {
     const urlTransformed = injectQueryParams(reference.url, {
-      as_js_classic: ""
+      js_module_fallback: ""
     });
     markAsJsClassicProxy(reference);
     return urlTransformed;
   };
   return {
-    name: "jsenv:as_js_classic_conversion",
+    name: "jsenv:js_module_conversion",
     appliesDuring: "*",
     redirectUrl: (reference, context) => {
-      if (reference.searchParams.has("as_js_classic")) {
+      if (reference.searchParams.has("js_module_fallback")) {
         markAsJsClassicProxy(reference);
         return null;
       }
@@ -14956,7 +14956,7 @@ const jsenvPluginAsJsClassicConversion = ({
       //   (because it's the transpiled equivalent of static and dynamic imports)
       // And not other references otherwise we could try to transform inline resources
       // or specifiers inside new URL()...
-      if (shouldPropagateJsClassic(reference, context)) {
+      if (shouldPropagateJsModuleConversion(reference, context)) {
         return turnIntoJsClassicProxy(reference);
       }
       return null;
@@ -14965,9 +14965,9 @@ const jsenvPluginAsJsClassicConversion = ({
       const [jsModuleReference, jsModuleUrlInfo] = context.getWithoutSearchParam({
         urlInfo,
         context,
-        searchParam: "as_js_classic",
+        searchParam: "js_module_fallback",
         // override the expectedType to "js_module"
-        // because when there is ?as_js_classic it means the underlying resource
+        // because when there is ?js_module_fallback it means the underlying resource
         // is a js_module
         expectedType: "js_module"
       });
@@ -15012,21 +15012,21 @@ const jsenvPluginAsJsClassicConversion = ({
 
 /*
  * when <script type="module"> cannot be used:
- * - ?as_js_classic is injected into the src of <script type="module">
+ * - ?js_module_fallback is injected into the src of <script type="module">
  * - js inside <script type="module"> is transformed into classic js
  * - <link rel="modulepreload"> are converted to <link rel="preload">
  */
-const jsenvPluginAsJsClassicHtml = ({
+const jsenvPluginJsModuleFallbackInsideHtml = ({
   systemJsInjection,
   systemJsClientFileUrl
 }) => {
   const turnIntoJsClassicProxy = reference => {
     return injectQueryParams(reference.url, {
-      as_js_classic: ""
+      js_module_fallback: ""
     });
   };
   return {
-    name: "jsenv:as_js_classic_html",
+    name: "jsenv:js_module_fallback_inside_html",
     appliesDuring: "*",
     redirectUrl: {
       link_href: (reference, context) => {
@@ -15179,7 +15179,7 @@ const jsenvPluginAsJsClassicHtml = ({
               injectScriptNodeAsEarlyAsPossible(htmlAst, createHtmlNode({
                 tagName: "script",
                 textContent: systemJsUrlInfo.content
-              }), "jsenv:as_js_classic_html");
+              }), "jsenv:js_module_fallback");
             });
           }
         }
@@ -15202,7 +15202,7 @@ const isOrWasExpectingJsModule = reference => {
   return false;
 };
 const isExpectingJsModule = reference => {
-  return reference.expectedType === "js_module" || reference.searchParams.has("as_js_classic") || reference.searchParams.has("as_js_classic_library");
+  return reference.expectedType === "js_module" || reference.searchParams.has("js_module_fallback") || reference.searchParams.has("as_js_classic");
 };
 
 /*
@@ -15217,7 +15217,7 @@ const isExpectingJsModule = reference => {
  *   transformed into
  *   new SharedWorker("shared_worker.js?as_js_classic", { type: "classic" })
  */
-const jsenvPluginAsJsClassicWorkers = () => {
+const jsenvPluginJsModuleFallbackOnWorkers = () => {
   const turnIntoJsClassicProxy = reference => {
     reference.mutation = magicSource => {
       magicSource.replace({
@@ -15227,11 +15227,11 @@ const jsenvPluginAsJsClassicWorkers = () => {
       });
     };
     return injectQueryParams(reference.url, {
-      as_js_classic: ""
+      js_module_fallback: ""
     });
   };
   return {
-    name: "jsenv:as_js_classic_workers",
+    name: "jsenv:js_module_fallback_on_workers",
     appliesDuring: "*",
     redirectUrl: {
       js_url: (reference, context) => {
@@ -15262,132 +15262,36 @@ const jsenvPluginAsJsClassicWorkers = () => {
   };
 };
 
-const jsenvPluginAsJsClassicLibrary = ({
-  systemJsInjection,
-  systemJsClientFileUrl,
-  generateJsClassicFilename
-}) => {
-  const markAsJsClassicLibraryProxy = reference => {
-    reference.expectedType = "js_classic";
-    reference.filename = generateJsClassicFilename(reference.url);
-  };
-  return {
-    name: "jsenv:as_js_classic_library",
-    appliesDuring: "*",
-    redirectUrl: reference => {
-      if (reference.searchParams.has("as_js_classic_library")) {
-        markAsJsClassicLibraryProxy(reference);
-      }
-    },
-    fetchUrlContent: async (urlInfo, context) => {
-      const [jsModuleReference, jsModuleUrlInfo] = context.getWithoutSearchParam({
-        urlInfo,
-        context,
-        searchParam: "as_js_classic_library",
-        // override the expectedType to "js_module"
-        // because when there is ?as_js_classic_library it means the underlying resource
-        // is a js_module
-        expectedType: "js_module"
-      });
-      if (!jsModuleReference) {
-        return null;
-      }
-      // cook it to get content + dependencies
-      await context.cook(jsModuleUrlInfo, {
-        reference: jsModuleReference
-      });
-      const loader = createUrlGraphLoader(context);
-      loader.loadReferencedUrlInfos(jsModuleUrlInfo, {
-        // we ignore dynamic import to cook lazyly (as browser request the server)
-        // these dynamic imports must inherit "?as_js_classic_library"
-        // This is done inside rollup for convenience
-        ignoreDynamicImport: true
-      });
-      await loader.getAllLoadDonePromise();
-      const bundleUrlInfos = await bundleJsModules({
-        jsModuleUrlInfos: [jsModuleUrlInfo],
-        context: {
-          ...context,
-          buildDirectoryUrl: new URL("./", import.meta.url)
-        },
-        preserveDynamicImport: true
-      });
-      const jsModuleBundledUrlInfo = bundleUrlInfos[jsModuleUrlInfo.url];
-      if (context.dev) {
-        jsModuleBundledUrlInfo.sourceUrls.forEach(sourceUrl => {
-          context.referenceUtils.inject({
-            type: "js_url",
-            specifier: sourceUrl,
-            isImplicit: true
-          });
-        });
-      } else if (context.build) {
-        jsModuleBundledUrlInfo.sourceUrls.forEach(sourceUrl => {
-          const sourceUrlInfo = context.urlGraph.getUrlInfo(sourceUrl);
-          if (sourceUrlInfo && sourceUrlInfo.dependents.size === 0) {
-            context.urlGraph.deleteUrlInfo(sourceUrl);
-          }
-        });
-      }
-      const {
-        content,
-        sourcemap
-      } = await convertJsModuleToJsClassic({
-        rootDirectoryUrl: context.rootDirectoryUrl,
-        systemJsInjection,
-        systemJsClientFileUrl,
-        urlInfo,
-        jsModuleUrlInfo: jsModuleBundledUrlInfo
-      });
-      return {
-        content,
-        contentType: "text/javascript",
-        type: "js_classic",
-        originalUrl: urlInfo.originalUrl,
-        originalContent: jsModuleUrlInfo.originalContent,
-        sourcemap,
-        data: jsModuleUrlInfo.data
-      };
-    }
-  };
-};
-
-const jsenvPluginAsJsClassic = ({
-  jsClassicLibrary,
-  jsClassicFallback,
-  systemJsInjection
+const jsenvPluginJsModuleFallback = ({
+  systemJsInjection = true,
+  systemJsClientFileUrl = systemJsClientFileUrlDefault
 }) => {
-  const systemJsClientFileUrl = new URL("./js/s.js", import.meta.url).href;
-  const generateJsClassicFilename = url => {
-    const filename = urlToFilename$1(url);
-    let [basename, extension] = splitFileExtension(filename);
-    const {
-      searchParams
-    } = new URL(url);
-    if (searchParams.has("as_json_module") || searchParams.has("as_css_module") || searchParams.has("as_text_module")) {
-      extension = ".js";
-    }
-    return `${basename}.nomodule${extension}`;
-  };
-  const splitFileExtension = filename => {
-    const dotLastIndex = filename.lastIndexOf(".");
-    if (dotLastIndex === -1) {
-      return [filename, ""];
-    }
-    return [filename.slice(0, dotLastIndex), filename.slice(dotLastIndex)];
-  };
-  return [...(jsClassicLibrary ? [jsenvPluginAsJsClassicLibrary({
-    systemJsInjection,
-    systemJsClientFileUrl,
-    generateJsClassicFilename
-  })] : []), ...(jsClassicFallback ? [jsenvPluginAsJsClassicHtml({
+  return [jsenvPluginJsModuleFallbackInsideHtml({
     systemJsInjection,
     systemJsClientFileUrl
-  }), jsenvPluginAsJsClassicWorkers(), jsenvPluginAsJsClassicConversion({
+  }), jsenvPluginJsModuleFallbackOnWorkers(), jsenvPluginJsModuleConversion({
     systemJsInjection,
     systemJsClientFileUrl,
     generateJsClassicFilename
-  })] : [])];
+  })];
+};
+const generateJsClassicFilename = url => {
+  const filename = urlToFilename$1(url);
+  let [basename, extension] = splitFileExtension$2(filename);
+  const {
+    searchParams
+  } = new URL(url);
+  if (searchParams.has("as_json_module") || searchParams.has("as_css_module") || searchParams.has("as_text_module")) {
+    extension = ".js";
+  }
+  return `${basename}.nomodule${extension}`;
+};
+const splitFileExtension$2 = filename => {
+  const dotLastIndex = filename.lastIndexOf(".");
+  if (dotLastIndex === -1) {
+    return [filename, ""];
+  }
+  return [filename.slice(0, dotLastIndex), filename.slice(dotLastIndex)];
 };
 
 // duplicated from @jsenv/log to avoid the dependency
@@ -19953,12 +19857,10 @@ const jsenvPluginImportMetaResolve = () => {
 const jsenvPluginTranspilation = ({
   importAssertions = true,
   css = true,
-  jsClassicLibrary = true,
-  // build sets jsClassicFallback: false during first step of the build
+  // build sets jsModuleFallbackOnJsClassic: false during first step of the build
   // and re-enable it in the second phase (when performing the bundling)
   // so that bundling is applied on js modules THEN it is converted to js classic if needed
-  jsClassicFallback = true,
-  systemJsInjection = true,
+  jsModuleFallbackOnJsClassic = true,
   topLevelAwait = true,
   importMetaResolve = true,
   babelHelpersAsImport = true,
@@ -19967,18 +19869,17 @@ const jsenvPluginTranspilation = ({
   if (importAssertions === true) {
     importAssertions = {};
   }
+  if (jsModuleFallbackOnJsClassic === true) {
+    jsModuleFallbackOnJsClassic = {};
+  }
   return [...(importMetaResolve ? [jsenvPluginImportMetaResolve()] : []), ...(importAssertions ? [jsenvPluginImportAssertions(importAssertions)] : []),
   // babel also so that rollup can bundle babel helpers for instance
   jsenvPluginBabel({
     topLevelAwait,
     getCustomBabelPlugins,
     babelHelpersAsImport
-  }), jsenvPluginAsJsClassic({
-    jsClassicLibrary,
-    jsClassicFallback,
-    systemJsInjection
-  }), jsenvPluginAsJsModule(),
-  // topLevelAwait must come after jsenvPluginAsJsClassic because it's related to the module format
+  }), ...(jsModuleFallbackOnJsClassic ? [jsenvPluginJsModuleFallback(jsModuleFallbackOnJsClassic)] : []), jsenvPluginAsJsModule(),
+  // topLevelAwait must come after jsModuleFallback because it's related to the module format
   // so we want to wait to know the module format before transforming things related to top level await
   ...(topLevelAwait ? [jsenvPluginTopLevelAwait()] : []), ...(css ? [jsenvPluginCssTranspilation()] : [])];
 };
@@ -20771,9 +20672,9 @@ const jsenvPluginRibbon = ({
           tagName: "script",
           type: "module",
           textContent: `
-import { injectRibbon } from "${ribbonClientFileReference.generatedSpecifier}"
-
-injectRibbon(${paramsJson})
+  import { injectRibbon } from "${ribbonClientFileReference.generatedSpecifier}"
+  
+  injectRibbon(${paramsJson})
 `
         });
         injectHtmlNode(htmlAst, scriptNode, "jsenv:ribbon");
@@ -21350,7 +21251,7 @@ build "${entryPointKeys[0]}"`);
       logger.info(`
 build ${entryPointKeys.length} entry points`);
     }
-    const useExplicitJsClassicConversion = entryPointKeys.some(key => entryPoints[key].includes("?as_js_classic"));
+    const explicitJsModuleFallback = entryPointKeys.some(key => entryPoints[key].includes("?js_module_fallback"));
     const rawRedirections = new Map();
     const bundleRedirections = new Map();
     const bundleInternalRedirections = new Map();
@@ -21401,8 +21302,8 @@ build ${entryPointKeys.length} entry points`);
         directoryReferenceAllowed,
         transpilation: {
           ...transpilation,
-          babelHelpersAsImport: !useExplicitJsClassicConversion,
-          jsClassicFallback: false
+          babelHelpersAsImport: !explicitJsModuleFallback,
+          jsModuleFallbackOnJsClassic: false
         },
         scenarioPlaceholders
       })],
@@ -21440,9 +21341,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       build: true,
       runtimeCompat,
       ...contextSharedDuringBuild,
-      plugins: [urlAnalysisPlugin, ...(lineBreakNormalization ? [jsenvPluginLineBreakNormalization()] : []), jsenvPluginAsJsClassic({
-        jsClassicLibrary: false,
-        jsClassicFallback: true,
+      plugins: [urlAnalysisPlugin, ...(lineBreakNormalization ? [jsenvPluginLineBreakNormalization()] : []), jsenvPluginJsModuleFallback({
         systemJsInjection: true
       }), jsenvPluginInline({
         fetchInlineUrls: false
@@ -21506,9 +21405,9 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             associateBuildUrlAndRawUrl(buildUrl, rawUrlInfo.url, "inline content");
             return buildUrl;
           }
-          // from "js_module_as_js_classic":
-          //   - injecting "?as_js_classic" for the first time
-          //   - injecting "?as_js_classic" because the parentUrl has it
+          // from "js_module_fallback":
+          //   - injecting "?js_module_fallback" for the first time
+          //   - injecting "?js_module_fallback" because the parentUrl has it
           if (reference.original) {
             const urlBeforeRedirect = reference.original.url;
             const urlAfterRedirect = reference.url;
@@ -21540,7 +21439,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             associateBuildUrlAndRawUrl(buildUrl, rawUrl, "redirected during postbuild");
             return buildUrl;
           }
-          // from "js_module_as_js_classic":
+          // from "js_module_fallback":
           //   - to inject "s.js"
           if (reference.injected) {
             const buildUrl = buildUrlsGenerator.generate(reference.url, {
@@ -21558,7 +21457,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           // files from root directory but not given to rollup nor postcss
           if (rawUrlInfo) {
             const referencedUrlObject = new URL(reference.url);
-            referencedUrlObject.searchParams.delete("as_js_classic_library");
+            referencedUrlObject.searchParams.delete("as_js_classic");
             const buildUrl = buildUrlsGenerator.generate(referencedUrlObject.href, {
               urlInfo: rawUrlInfo,
               parentUrlInfo
@@ -21600,8 +21499,8 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           const generatedUrlObject = new URL(reference.generatedUrl);
           generatedUrlObject.searchParams.delete("js_classic");
           generatedUrlObject.searchParams.delete("js_module");
+          generatedUrlObject.searchParams.delete("js_module_fallback");
           generatedUrlObject.searchParams.delete("as_js_classic");
-          generatedUrlObject.searchParams.delete("as_js_classic_library");
           generatedUrlObject.searchParams.delete("as_js_module");
           generatedUrlObject.searchParams.delete("as_json_module");
           generatedUrlObject.searchParams.delete("as_css_module");
@@ -21648,7 +21547,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             reference
           } = context;
           // reference injected during "postbuild":
-          // - happens for "as_js_classic" injecting "s.js"
+          // - happens for "js_module_fallback" injecting "s.js"
           if (reference.injected) {
             const [ref, rawUrlInfo] = rawGraphKitchen.injectReference({
               ...reference,
@@ -21663,7 +21562,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             return fromBundleOrRawGraph(reference.url);
           }
           // reference updated during "postbuild":
-          // - happens for "as_js_classic"
+          // - happens for "js_module_fallback"
           if (reference.original) {
             return fromBundleOrRawGraph(reference.original.url);
           }
@@ -21753,7 +21652,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           // cleanup unused urls (avoid bundling things that are not actually used)
           // happens for:
           // - js import assertions
-          // - as_js_classic_library
+          // - as_js_classic
           if (!isUsed(rawUrlInfo)) {
             rawGraph.deleteUrlInfo(rawUrlInfo.url);
             return;
@@ -22078,10 +21977,10 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               }
               versionMap.set(urlInfo.url, version);
               const buildUrlObject = new URL(urlInfo.url);
-              // remove ?as_js_classic as
+              // remove ?js_module_fallback
               // this information is already hold into ".nomodule"
+              buildUrlObject.searchParams.delete("js_module_fallback");
               buildUrlObject.searchParams.delete("as_js_classic");
-              buildUrlObject.searchParams.delete("as_js_classic_library");
               buildUrlObject.searchParams.delete("as_js_module");
               buildUrlObject.searchParams.delete("as_json_module");
               buildUrlObject.searchParams.delete("as_css_module");
@@ -22464,7 +22363,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
     const buildInlineRelativeUrls = [];
     const getBuildRelativeUrl = url => {
       const urlObject = new URL(url);
-      urlObject.searchParams.delete("as_js_classic");
+      urlObject.searchParams.delete("js_module_fallback");
       urlObject.searchParams.delete("as_css_module");
       urlObject.searchParams.delete("as_json_module");
       urlObject.searchParams.delete("as_text_module");
@@ -23054,7 +22953,7 @@ const createFileService = ({
       if (code === "PARSE_ERROR") {
         // when possible let browser re-throw the syntax error
         // it's not possible to do that when url info content is not available
-        // (happens for as_js_classic library for instance)
+        // (happens for as_js_classic for instance)
         if (urlInfo.content !== undefined) {
           return {
             url: reference.url,
@@ -24975,7 +24874,7 @@ const executeSteps = async (executionSteps, {
         }
         const isLastExecutionLog = executionIndex === executionSteps.length - 1;
         const cancelRemaining = failFast && executionResult.status !== "completed" && counters.done < counters.total;
-        if (isLastExecutionLog) {
+        if (isLastExecutionLog && logger.levels.info) {
           executionLog.write("\n");
         }
         if (cancelRemaining) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "34.1.5",
+  "version": "34.2.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -72,7 +72,6 @@
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "3.3.4",
     "@jsenv/node-esm-resolution": "1.0.1",
-    "@jsenv/plugin-bundling": "2.1.5",
     "@jsenv/server": "15.0.2",
     "@jsenv/sourcemap": "1.0.10",
     "@jsenv/uneval": "1.6.0",
@@ -106,6 +105,7 @@
     "@jsenv/plugin-globals": "./packages/jsenv-plugin-globals/",
     "@jsenv/plugin-minification": "./packages/jsenv-plugin-minification/",
     "@jsenv/plugin-placeholders": "./packages/jsenv-plugin-placeholders/",
+    "@jsenv/plugin-as-js-classic": "./packages/jsenv-plugin-as-js-classic/",
     "eslint": "8.38.0",
     "eslint-plugin-html": "7.1.0",
     "eslint-plugin-import": "2.27.5",

package/src/build/build.js

@@ -66,7 +66,7 @@ import {
 } from "../kitchen/web_workers.js"
 import { jsenvPluginUrlAnalysis } from "../plugins/url_analysis/jsenv_plugin_url_analysis.js"
 import { jsenvPluginInline } from "../plugins/inline/jsenv_plugin_inline.js"
-import { jsenvPluginAsJsClassic } from "../plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic.js"
+import { jsenvPluginJsModuleFallback } from "../plugins/transpilation/js_module_fallback/jsenv_plugin_js_module_fallback.js"
 import { getCorePlugins } from "../plugins/plugins.js"
 import { jsenvPluginLineBreakNormalization } from "./jsenv_plugin_line_break_normalization.js"
 
@@ -274,8 +274,8 @@ build "${entryPointKeys[0]}"`)
       logger.info(`
 build ${entryPointKeys.length} entry points`)
     }
-    const useExplicitJsClassicConversion = entryPointKeys.some((key) =>
-      entryPoints[key].includes("?as_js_classic"),
+    const explicitJsModuleFallback = entryPointKeys.some((key) =>
+      entryPoints[key].includes("?js_module_fallback"),
     )
     const rawRedirections = new Map()
     const bundleRedirections = new Map()
@@ -344,8 +344,8 @@ build ${entryPointKeys.length} entry points`)
           directoryReferenceAllowed,
           transpilation: {
             ...transpilation,
-            babelHelpersAsImport: !useExplicitJsClassicConversion,
-            jsClassicFallback: false,
+            babelHelpersAsImport: !explicitJsModuleFallback,
+            jsModuleFallbackOnJsClassic: false,
           },
           scenarioPlaceholders,
         }),
@@ -393,9 +393,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
         ...(lineBreakNormalization
           ? [jsenvPluginLineBreakNormalization()]
           : []),
-        jsenvPluginAsJsClassic({
-          jsClassicLibrary: false,
-          jsClassicFallback: true,
+        jsenvPluginJsModuleFallback({
           systemJsInjection: true,
         }),
         jsenvPluginInline({
@@ -471,9 +469,9 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               )
               return buildUrl
             }
-            // from "js_module_as_js_classic":
-            //   - injecting "?as_js_classic" for the first time
-            //   - injecting "?as_js_classic" because the parentUrl has it
+            // from "js_module_fallback":
+            //   - injecting "?js_module_fallback" for the first time
+            //   - injecting "?js_module_fallback" because the parentUrl has it
             if (reference.original) {
               const urlBeforeRedirect = reference.original.url
               const urlAfterRedirect = reference.url
@@ -511,7 +509,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               )
               return buildUrl
             }
-            // from "js_module_as_js_classic":
+            // from "js_module_fallback":
             //   - to inject "s.js"
             if (reference.injected) {
               const buildUrl = buildUrlsGenerator.generate(reference.url, {
@@ -533,7 +531,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             // files from root directory but not given to rollup nor postcss
             if (rawUrlInfo) {
               const referencedUrlObject = new URL(reference.url)
-              referencedUrlObject.searchParams.delete("as_js_classic_library")
+              referencedUrlObject.searchParams.delete("as_js_classic")
               const buildUrl = buildUrlsGenerator.generate(
                 referencedUrlObject.href,
                 {
@@ -584,8 +582,8 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             const generatedUrlObject = new URL(reference.generatedUrl)
             generatedUrlObject.searchParams.delete("js_classic")
             generatedUrlObject.searchParams.delete("js_module")
+            generatedUrlObject.searchParams.delete("js_module_fallback")
             generatedUrlObject.searchParams.delete("as_js_classic")
-            generatedUrlObject.searchParams.delete("as_js_classic_library")
             generatedUrlObject.searchParams.delete("as_js_module")
             generatedUrlObject.searchParams.delete("as_json_module")
             generatedUrlObject.searchParams.delete("as_css_module")
@@ -632,7 +630,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             }
             const { reference } = context
             // reference injected during "postbuild":
-            // - happens for "as_js_classic" injecting "s.js"
+            // - happens for "js_module_fallback" injecting "s.js"
             if (reference.injected) {
               const [ref, rawUrlInfo] = rawGraphKitchen.injectReference({
                 ...reference,
@@ -645,7 +643,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               return fromBundleOrRawGraph(reference.url)
             }
             // reference updated during "postbuild":
-            // - happens for "as_js_classic"
+            // - happens for "js_module_fallback"
             if (reference.original) {
               return fromBundleOrRawGraph(reference.original.url)
             }
@@ -750,7 +748,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           // cleanup unused urls (avoid bundling things that are not actually used)
           // happens for:
           // - js import assertions
-          // - as_js_classic_library
+          // - as_js_classic
           if (!isUsed(rawUrlInfo)) {
             rawGraph.deleteUrlInfo(rawUrlInfo.url)
             return
@@ -1126,10 +1124,10 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               }
               versionMap.set(urlInfo.url, version)
               const buildUrlObject = new URL(urlInfo.url)
-              // remove ?as_js_classic as
+              // remove ?js_module_fallback
               // this information is already hold into ".nomodule"
+              buildUrlObject.searchParams.delete("js_module_fallback")
               buildUrlObject.searchParams.delete("as_js_classic")
-              buildUrlObject.searchParams.delete("as_js_classic_library")
               buildUrlObject.searchParams.delete("as_js_module")
               buildUrlObject.searchParams.delete("as_json_module")
               buildUrlObject.searchParams.delete("as_css_module")
@@ -1599,7 +1597,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
     const buildInlineRelativeUrls = []
     const getBuildRelativeUrl = (url) => {
       const urlObject = new URL(url)
-      urlObject.searchParams.delete("as_js_classic")
+      urlObject.searchParams.delete("js_module_fallback")
       urlObject.searchParams.delete("as_css_module")
       urlObject.searchParams.delete("as_json_module")
       urlObject.searchParams.delete("as_text_module")

package/src/dev/file_service.js

@@ -370,7 +370,7 @@ export const createFileService = ({
       if (code === "PARSE_ERROR") {
         // when possible let browser re-throw the syntax error
         // it's not possible to do that when url info content is not available
-        // (happens for as_js_classic library for instance)
+        // (happens for as_js_classic for instance)
         if (urlInfo.content !== undefined) {
           return {
             url: reference.url,

package/src/kitchen/url_graph/url_info_transformations.js

@@ -87,9 +87,9 @@ export const createUrlInfoTransformer = ({
     //   during build it's urlInfo.url to be inside the build
     //   but otherwise it's generatedUrl to be inside .jsenv/ directory
     const generatedUrlObject = new URL(urlInfo.generatedUrl)
+    generatedUrlObject.searchParams.delete("js_module_fallback")
     generatedUrlObject.searchParams.delete("as_js_module")
     generatedUrlObject.searchParams.delete("as_js_classic")
-    generatedUrlObject.searchParams.delete("as_js_classic_library")
     const urlForSourcemap = generatedUrlObject.href
     urlInfo.sourcemapGeneratedUrl = generateSourcemapFileUrl(urlForSourcemap)
 

package/src/plugins/inline/jsenv_plugin_html_inline_content.js

@@ -116,7 +116,7 @@ ${e.traceMessage}`)
             if (
               !analyzeConvertedScripts &&
               getHtmlNodeAttribute(scriptNode, "jsenv-injected-by") ===
-                "jsenv:as_js_classic_html"
+                "jsenv:js_module_fallback"
             ) {
               return
             }

package/src/plugins/ribbon/jsenv_plugin_ribbon.js

@@ -51,9 +51,9 @@ export const jsenvPluginRibbon = ({
           tagName: "script",
           type: "module",
           textContent: `
-import { injectRibbon } from "${ribbonClientFileReference.generatedSpecifier}"
-
-injectRibbon(${paramsJson})
+  import { injectRibbon } from "${ribbonClientFileReference.generatedSpecifier}"
+  
+  injectRibbon(${paramsJson})
 `,
         })
         injectHtmlNode(htmlAst, scriptNode, "jsenv:ribbon")

package/src/plugins/transpilation/{as_js_classic → js_module_fallback}/convert_js_module_to_js_classic.js

@@ -12,13 +12,17 @@ import { requireBabelPlugin } from "../babel/require_babel_plugin.js"
 import { babelPluginTransformImportMetaUrl } from "./helpers/babel_plugin_transform_import_meta_url.js"
 import { babelPluginTransformImportMetaResolve } from "./helpers/babel_plugin_transform_import_meta_resolve.js"
 
-// import { jsenvPluginAsJsClassicLibrary } from "./jsenv_plugin_as_js_classic_library.js"
 // because of https://github.com/rpetrich/babel-plugin-transform-async-to-promises/issues/84
 import customAsyncToPromises from "./async-to-promises.js"
 
+export const systemJsClientFileUrlDefault = new URL(
+  "./client/s.js",
+  import.meta.url,
+).href
+
 export const convertJsModuleToJsClassic = async ({
   systemJsInjection,
-  systemJsClientFileUrl,
+  systemJsClientFileUrl = systemJsClientFileUrlDefault,
   urlInfo,
   jsModuleUrlInfo,
 }) => {

package/src/plugins/transpilation/{as_js_classic/jsenv_plugin_as_js_classic_conversion.js → js_module_fallback/jsenv_plugin_js_module_conversion.js}

@@ -1,12 +1,12 @@
 /*
- * - propagate ?as_js_classic to urls
- * - perform conversion from js module to js classic when url uses ?as_js_classic
+ * - propagate "?js_module_fallback" query string param on urls
+ * - perform conversion from js module to js classic when url uses "?js_module_fallback"
  */
 
 import { injectQueryParams } from "@jsenv/urls"
 import { convertJsModuleToJsClassic } from "./convert_js_module_to_js_classic.js"
 
-export const jsenvPluginAsJsClassicConversion = ({
+export const jsenvPluginJsModuleConversion = ({
   systemJsInjection,
   systemJsClientFileUrl,
   generateJsClassicFilename,
@@ -25,37 +25,38 @@ export const jsenvPluginAsJsClassicConversion = ({
     return false
   }
 
-  const shouldPropagateJsClassic = (reference, context) => {
+  const shouldPropagateJsModuleConversion = (reference, context) => {
     if (isReferencingJsModule(reference, context)) {
       const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl)
       if (!parentUrlInfo) {
         return false
       }
       const parentGotAsJsClassic = new URL(parentUrlInfo.url).searchParams.has(
-        "as_js_classic",
+        "js_module_fallback",
       )
       return parentGotAsJsClassic
     }
-
     return false
   }
+
   const markAsJsClassicProxy = (reference) => {
     reference.expectedType = "js_classic"
     reference.filename = generateJsClassicFilename(reference.url)
   }
+
   const turnIntoJsClassicProxy = (reference) => {
     const urlTransformed = injectQueryParams(reference.url, {
-      as_js_classic: "",
+      js_module_fallback: "",
     })
     markAsJsClassicProxy(reference)
     return urlTransformed
   }
 
   return {
-    name: "jsenv:as_js_classic_conversion",
+    name: "jsenv:js_module_conversion",
     appliesDuring: "*",
     redirectUrl: (reference, context) => {
-      if (reference.searchParams.has("as_js_classic")) {
+      if (reference.searchParams.has("js_module_fallback")) {
         markAsJsClassicProxy(reference)
         return null
       }
@@ -65,7 +66,7 @@ export const jsenvPluginAsJsClassicConversion = ({
       //   (because it's the transpiled equivalent of static and dynamic imports)
       // And not other references otherwise we could try to transform inline resources
       // or specifiers inside new URL()...
-      if (shouldPropagateJsClassic(reference, context)) {
+      if (shouldPropagateJsModuleConversion(reference, context)) {
         return turnIntoJsClassicProxy(reference, context)
       }
       return null
@@ -75,9 +76,9 @@ export const jsenvPluginAsJsClassicConversion = ({
         context.getWithoutSearchParam({
           urlInfo,
           context,
-          searchParam: "as_js_classic",
+          searchParam: "js_module_fallback",
           // override the expectedType to "js_module"
-          // because when there is ?as_js_classic it means the underlying resource
+          // because when there is ?js_module_fallback it means the underlying resource
           // is a js_module
           expectedType: "js_module",
         })

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

@@ -0,0 +1,45 @@
+import { urlToFilename } from "@jsenv/urls"
+import { systemJsClientFileUrlDefault } from "./convert_js_module_to_js_classic.js"
+import { jsenvPluginJsModuleConversion } from "./jsenv_plugin_js_module_conversion.js"
+import { jsenvPluginJsModuleFallbackInsideHtml } from "./jsenv_plugin_js_module_fallback_inside_html.js"
+import { jsenvPluginJsModuleFallbackOnWorkers } from "./jsenv_plugin_js_module_fallback_on_workers.js"
+
+export const jsenvPluginJsModuleFallback = ({
+  systemJsInjection = true,
+  systemJsClientFileUrl = systemJsClientFileUrlDefault,
+}) => {
+  return [
+    jsenvPluginJsModuleFallbackInsideHtml({
+      systemJsInjection,
+      systemJsClientFileUrl,
+    }),
+    jsenvPluginJsModuleFallbackOnWorkers(),
+    jsenvPluginJsModuleConversion({
+      systemJsInjection,
+      systemJsClientFileUrl,
+      generateJsClassicFilename,
+    }),
+  ]
+}
+
+const generateJsClassicFilename = (url) => {
+  const filename = urlToFilename(url)
+  let [basename, extension] = splitFileExtension(filename)
+  const { searchParams } = new URL(url)
+  if (
+    searchParams.has("as_json_module") ||
+    searchParams.has("as_css_module") ||
+    searchParams.has("as_text_module")
+  ) {
+    extension = ".js"
+  }
+  return `${basename}.nomodule${extension}`
+}
+
+const splitFileExtension = (filename) => {
+  const dotLastIndex = filename.lastIndexOf(".")
+  if (dotLastIndex === -1) {
+    return [filename, ""]
+  }
+  return [filename.slice(0, dotLastIndex), filename.slice(dotLastIndex)]
+}

package/src/plugins/transpilation/{as_js_classic/jsenv_plugin_as_js_classic_html.js → js_module_fallback/jsenv_plugin_js_module_fallback_inside_html.js}

@@ -1,6 +1,6 @@
 /*
  * when <script type="module"> cannot be used:
- * - ?as_js_classic is injected into the src of <script type="module">
+ * - ?js_module_fallback is injected into the src of <script type="module">
  * - js inside <script type="module"> is transformed into classic js
  * - <link rel="modulepreload"> are converted to <link rel="preload">
  */
@@ -19,16 +19,16 @@ import {
 import { injectQueryParams, urlToRelativeUrl } from "@jsenv/urls"
 import { SOURCEMAP } from "@jsenv/sourcemap"
 
-export const jsenvPluginAsJsClassicHtml = ({
+export const jsenvPluginJsModuleFallbackInsideHtml = ({
   systemJsInjection,
   systemJsClientFileUrl,
 }) => {
   const turnIntoJsClassicProxy = (reference) => {
-    return injectQueryParams(reference.url, { as_js_classic: "" })
+    return injectQueryParams(reference.url, { js_module_fallback: "" })
   }
 
   return {
-    name: "jsenv:as_js_classic_html",
+    name: "jsenv:js_module_fallback_inside_html",
     appliesDuring: "*",
     redirectUrl: {
       link_href: (reference, context) => {
@@ -208,7 +208,7 @@ export const jsenvPluginAsJsClassicHtml = ({
                   tagName: "script",
                   textContent: systemJsUrlInfo.content,
                 }),
-                "jsenv:as_js_classic_html",
+                "jsenv:js_module_fallback",
               )
             })
           }
@@ -236,7 +236,7 @@ const isOrWasExpectingJsModule = (reference) => {
 const isExpectingJsModule = (reference) => {
   return (
     reference.expectedType === "js_module" ||
-    reference.searchParams.has("as_js_classic") ||
-    reference.searchParams.has("as_js_classic_library")
+    reference.searchParams.has("js_module_fallback") ||
+    reference.searchParams.has("as_js_classic")
   )
 }

package/src/plugins/transpilation/{as_js_classic/jsenv_plugin_as_js_classic_workers.js → js_module_fallback/jsenv_plugin_js_module_fallback_on_workers.js}

@@ -13,7 +13,7 @@
 
 import { injectQueryParams } from "@jsenv/urls"
 
-export const jsenvPluginAsJsClassicWorkers = () => {
+export const jsenvPluginJsModuleFallbackOnWorkers = () => {
   const turnIntoJsClassicProxy = (reference) => {
     reference.mutation = (magicSource) => {
       magicSource.replace({
@@ -22,11 +22,11 @@ export const jsenvPluginAsJsClassicWorkers = () => {
         replacement: JSON.stringify("classic"),
       })
     }
-    return injectQueryParams(reference.url, { as_js_classic: "" })
+    return injectQueryParams(reference.url, { js_module_fallback: "" })
   }
 
   return {
-    name: "jsenv:as_js_classic_workers",
+    name: "jsenv:js_module_fallback_on_workers",
     appliesDuring: "*",
     redirectUrl: {
       js_url: (reference, context) => {

package/src/plugins/transpilation/jsenv_plugin_transpilation.js

@@ -9,7 +9,7 @@
 
 import { jsenvPluginCssTranspilation } from "./css/jsenv_plugin_css_transpilation.js"
 import { jsenvPluginImportAssertions } from "./import_assertions/jsenv_plugin_import_assertions.js"
-import { jsenvPluginAsJsClassic } from "./as_js_classic/jsenv_plugin_as_js_classic.js"
+import { jsenvPluginJsModuleFallback } from "./js_module_fallback/jsenv_plugin_js_module_fallback.js"
 import { jsenvPluginAsJsModule } from "./as_js_module/jsenv_plugin_as_js_module.js"
 import { jsenvPluginBabel } from "./babel/jsenv_plugin_babel.js"
 import { jsenvPluginTopLevelAwait } from "./jsenv_plugin_top_level_await.js"
@@ -18,12 +18,10 @@ import { jsenvPluginImportMetaResolve } from "./jsenv_plugin_import_meta_resolve
 export const jsenvPluginTranspilation = ({
   importAssertions = true,
   css = true,
-  jsClassicLibrary = true,
-  // build sets jsClassicFallback: false during first step of the build
+  // build sets jsModuleFallbackOnJsClassic: false during first step of the build
   // and re-enable it in the second phase (when performing the bundling)
   // so that bundling is applied on js modules THEN it is converted to js classic if needed
-  jsClassicFallback = true,
-  systemJsInjection = true,
+  jsModuleFallbackOnJsClassic = true,
   topLevelAwait = true,
   importMetaResolve = true,
   babelHelpersAsImport = true,
@@ -32,6 +30,9 @@ export const jsenvPluginTranspilation = ({
   if (importAssertions === true) {
     importAssertions = {}
   }
+  if (jsModuleFallbackOnJsClassic === true) {
+    jsModuleFallbackOnJsClassic = {}
+  }
   return [
     ...(importMetaResolve ? [jsenvPluginImportMetaResolve()] : []),
     ...(importAssertions
@@ -43,13 +44,11 @@ export const jsenvPluginTranspilation = ({
       getCustomBabelPlugins,
       babelHelpersAsImport,
     }),
-    jsenvPluginAsJsClassic({
-      jsClassicLibrary,
-      jsClassicFallback,
-      systemJsInjection,
-    }),
+    ...(jsModuleFallbackOnJsClassic
+      ? [jsenvPluginJsModuleFallback(jsModuleFallbackOnJsClassic)]
+      : []),
     jsenvPluginAsJsModule(),
-    // topLevelAwait must come after jsenvPluginAsJsClassic because it's related to the module format
+    // topLevelAwait must come after jsModuleFallback because it's related to the module format
     // so we want to wait to know the module format before transforming things related to top level await
     ...(topLevelAwait ? [jsenvPluginTopLevelAwait(topLevelAwait)] : []),
     ...(css ? [jsenvPluginCssTranspilation()] : []),

package/src/plugins/url_analysis/jsenv_plugin_reference_expected_types.js

@@ -11,8 +11,8 @@ export const jsenvPluginReferenceExpectedTypes = () => {
     if (searchParams.has("js_classic")) {
       reference.expectedType = "js_classic"
     } else if (
-      searchParams.has("as_js_classic") ||
-      searchParams.has("as_js_classic_library")
+      searchParams.has("js_module_fallback") ||
+      searchParams.has("as_js_classic")
     ) {
       reference.expectedType = "js_classic"
     } else if (searchParams.has("as_js_module")) {

package/src/test/execute_steps.js

@@ -309,7 +309,7 @@ export const executeSteps = async (
           failFast &&
           executionResult.status !== "completed" &&
           counters.done < counters.total
-        if (isLastExecutionLog) {
+        if (isLastExecutionLog && logger.levels.info) {
           executionLog.write("\n")
         }
 

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic.js

@@ -1,61 +0,0 @@
-import { urlToFilename } from "@jsenv/urls"
-import { jsenvPluginAsJsClassicConversion } from "./jsenv_plugin_as_js_classic_conversion.js"
-import { jsenvPluginAsJsClassicHtml } from "./jsenv_plugin_as_js_classic_html.js"
-import { jsenvPluginAsJsClassicWorkers } from "./jsenv_plugin_as_js_classic_workers.js"
-import { jsenvPluginAsJsClassicLibrary } from "./jsenv_plugin_as_js_classic_library.js"
-
-export const jsenvPluginAsJsClassic = ({
-  jsClassicLibrary,
-  jsClassicFallback,
-  systemJsInjection,
-}) => {
-  const systemJsClientFileUrl = new URL("./client/s.js", import.meta.url).href
-
-  const generateJsClassicFilename = (url) => {
-    const filename = urlToFilename(url)
-    let [basename, extension] = splitFileExtension(filename)
-    const { searchParams } = new URL(url)
-    if (
-      searchParams.has("as_json_module") ||
-      searchParams.has("as_css_module") ||
-      searchParams.has("as_text_module")
-    ) {
-      extension = ".js"
-    }
-    return `${basename}.nomodule${extension}`
-  }
-
-  const splitFileExtension = (filename) => {
-    const dotLastIndex = filename.lastIndexOf(".")
-    if (dotLastIndex === -1) {
-      return [filename, ""]
-    }
-    return [filename.slice(0, dotLastIndex), filename.slice(dotLastIndex)]
-  }
-
-  return [
-    ...(jsClassicLibrary
-      ? [
-          jsenvPluginAsJsClassicLibrary({
-            systemJsInjection,
-            systemJsClientFileUrl,
-            generateJsClassicFilename,
-          }),
-        ]
-      : []),
-    ...(jsClassicFallback
-      ? [
-          jsenvPluginAsJsClassicHtml({
-            systemJsInjection,
-            systemJsClientFileUrl,
-          }),
-          jsenvPluginAsJsClassicWorkers(),
-          jsenvPluginAsJsClassicConversion({
-            systemJsInjection,
-            systemJsClientFileUrl,
-            generateJsClassicFilename,
-          }),
-        ]
-      : []),
-  ]
-}

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic_library.js

@@ -1,91 +0,0 @@
-import { bundleJsModules } from "@jsenv/plugin-bundling"
-
-import { createUrlGraphLoader } from "@jsenv/core/src/kitchen/url_graph/url_graph_loader.js"
-import { convertJsModuleToJsClassic } from "./convert_js_module_to_js_classic.js"
-
-export const jsenvPluginAsJsClassicLibrary = ({
-  systemJsInjection,
-  systemJsClientFileUrl,
-  generateJsClassicFilename,
-}) => {
-  const markAsJsClassicLibraryProxy = (reference) => {
-    reference.expectedType = "js_classic"
-    reference.filename = generateJsClassicFilename(reference.url)
-  }
-
-  return {
-    name: "jsenv:as_js_classic_library",
-    appliesDuring: "*",
-    redirectUrl: (reference) => {
-      if (reference.searchParams.has("as_js_classic_library")) {
-        markAsJsClassicLibraryProxy(reference)
-      }
-    },
-    fetchUrlContent: async (urlInfo, context) => {
-      const [jsModuleReference, jsModuleUrlInfo] =
-        context.getWithoutSearchParam({
-          urlInfo,
-          context,
-          searchParam: "as_js_classic_library",
-          // override the expectedType to "js_module"
-          // because when there is ?as_js_classic_library it means the underlying resource
-          // is a js_module
-          expectedType: "js_module",
-        })
-      if (!jsModuleReference) {
-        return null
-      }
-      // cook it to get content + dependencies
-      await context.cook(jsModuleUrlInfo, { reference: jsModuleReference })
-      const loader = createUrlGraphLoader(context)
-      loader.loadReferencedUrlInfos(jsModuleUrlInfo, {
-        // we ignore dynamic import to cook lazyly (as browser request the server)
-        // these dynamic imports must inherit "?as_js_classic_library"
-        // This is done inside rollup for convenience
-        ignoreDynamicImport: true,
-      })
-      await loader.getAllLoadDonePromise()
-      const bundleUrlInfos = await bundleJsModules({
-        jsModuleUrlInfos: [jsModuleUrlInfo],
-        context: {
-          ...context,
-          buildDirectoryUrl: new URL("./", import.meta.url),
-        },
-        preserveDynamicImport: true,
-      })
-      const jsModuleBundledUrlInfo = bundleUrlInfos[jsModuleUrlInfo.url]
-      if (context.dev) {
-        jsModuleBundledUrlInfo.sourceUrls.forEach((sourceUrl) => {
-          context.referenceUtils.inject({
-            type: "js_url",
-            specifier: sourceUrl,
-            isImplicit: true,
-          })
-        })
-      } else if (context.build) {
-        jsModuleBundledUrlInfo.sourceUrls.forEach((sourceUrl) => {
-          const sourceUrlInfo = context.urlGraph.getUrlInfo(sourceUrl)
-          if (sourceUrlInfo && sourceUrlInfo.dependents.size === 0) {
-            context.urlGraph.deleteUrlInfo(sourceUrl)
-          }
-        })
-      }
-      const { content, sourcemap } = await convertJsModuleToJsClassic({
-        rootDirectoryUrl: context.rootDirectoryUrl,
-        systemJsInjection,
-        systemJsClientFileUrl,
-        urlInfo,
-        jsModuleUrlInfo: jsModuleBundledUrlInfo,
-      })
-      return {
-        content,
-        contentType: "text/javascript",
-        type: "js_classic",
-        originalUrl: urlInfo.originalUrl,
-        originalContent: jsModuleUrlInfo.originalContent,
-        sourcemap,
-        data: jsModuleUrlInfo.data,
-      }
-    },
-  }
-}