@jsenv/core 34.2.1 → 34.3.0

package/dist/no_experimental_warnings.cjs

@@ -0,0 +1,8 @@
+// see https://github.com/nodejs/node/issues/47478
+const originalEmit = process.emit;
+process.emit = (event, error) => {
+  if (event === "warning" && error.name === "ExperimentalWarning" && error.message.includes("--experimental-loader")) {
+    return false;
+  }
+  return originalEmit.call(process, event, error);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "34.2.1",
+  "version": "34.3.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -43,6 +43,7 @@
     "eslint": "npx eslint . --ext=.js,.mjs,.cjs,.html",
     "dev": "node --conditions=development ./scripts/dev/dev.mjs",
     "test": "node --conditions=development ./scripts/test/test.mjs",
+    "test:no_snapshot_assertion": "npm run test -- --no-snapshot-assertion",
     "test:dev_errors_snapshots": "node --conditions=development ./tests/dev_server/errors/generate_snapshot_files.mjs",
     "test:workspace": "npm run test --workspaces --if-present -- --workspace",
     "build": "node --conditions=development ./scripts/build/build.mjs",
@@ -65,7 +66,7 @@
     "@c88/v8-coverage": "0.1.1",
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.2.4",
-    "@jsenv/ast": "3.0.5",
+    "@jsenv/ast": "3.0.6",
     "@jsenv/babel-plugins": "1.1.5",
     "@jsenv/filesystem": "4.2.3",
     "@jsenv/importmap": "1.2.1",

package/src/build/build.js

@@ -65,7 +65,8 @@ import {
   isWebWorkerUrlInfo,
 } 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 { jsenvPluginInlining } from "../plugins/inlining/jsenv_plugin_inlining.js"
+import { jsenvPluginInlineContentAnalysis } from "../plugins/inline_content_analysis/jsenv_plugin_inline_content_analysis.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"
@@ -112,7 +113,7 @@ export const defaultRuntimeCompat = {
  *        Controls if url in build file contents are versioned
  * @param {('search_param'|'filename')} [buildParameters.versioningMethod="search_param"]
  *        Controls how url are versioned
- * @param {boolean|string} [buildParameters.sourcemaps=false]
+ * @param {('none'|'inline'|'file'|'programmatic'} [buildParameters.sourcemaps="none"]
  *        Generate sourcemaps in the build directory
  * @return {Object} buildReturnValue
  * @return {Object} buildReturnValue.buildFileContents
@@ -134,7 +135,7 @@ export const build = async ({
   runtimeCompat = defaultRuntimeCompat,
   base = runtimeCompat.node ? "./" : "/",
   plugins = [],
-  sourcemaps = false,
+  sourcemaps = "none",
   sourcemapsSourcesContent,
   urlAnalysis = {},
   urlResolution,
@@ -347,6 +348,7 @@ build ${entryPointKeys.length} entry points`)
             babelHelpersAsImport: !explicitJsModuleFallback,
             jsModuleFallbackOnJsClassic: false,
           },
+          inlining: false,
           scenarioPlaceholders,
         }),
       ],
@@ -396,9 +398,10 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
         jsenvPluginJsModuleFallback({
           systemJsInjection: true,
         }),
-        jsenvPluginInline({
+        jsenvPluginInlineContentAnalysis({
           fetchInlineUrls: false,
         }),
+        jsenvPluginInlining(),
         {
           name: "jsenv:build",
           appliesDuring: "build",
@@ -442,16 +445,28 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               return reference.url
             }
             if (reference.isInline) {
+              const parentUrlInfo = finalGraph.getUrlInfo(reference.parentUrl)
+              const parentRawUrl = parentUrlInfo.originalUrl
               const rawUrlInfo = GRAPH.find(rawGraph, (rawUrlInfo) => {
-                if (!rawUrlInfo.isInline) {
-                  return false
+                const { inlineUrlSite } = rawUrlInfo
+                // not inline
+                if (!inlineUrlSite) return false
+                if (
+                  inlineUrlSite.url === parentRawUrl &&
+                  inlineUrlSite.line === reference.specifierLine &&
+                  inlineUrlSite.column === reference.specifierColumn
+                ) {
+                  return true
                 }
                 if (rawUrlInfo.content === reference.content) {
                   return true
                 }
-                return rawUrlInfo.originalContent === reference.content
+                if (rawUrlInfo.originalContent === reference.content) {
+                  return true
+                }
+                return false
               })
-              const parentUrlInfo = finalGraph.getUrlInfo(reference.parentUrl)
+
               if (!rawUrlInfo) {
                 // generated during final graph
                 // (happens for JSON.parse injected for import assertions for instance)
@@ -640,6 +655,13 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               return rawUrlInfo
             }
             if (reference.isInline) {
+              if (reference.prev && !reference.prev.isInline) {
+                const urlBeforeRedirect = findKey(
+                  finalRedirections,
+                  reference.prev.url,
+                )
+                return fromBundleOrRawGraph(urlBeforeRedirect)
+              }
               return fromBundleOrRawGraph(reference.url)
             }
             // reference updated during "postbuild":
@@ -1162,7 +1184,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             ...contextSharedDuringBuild,
             plugins: [
               urlAnalysisPlugin,
-              jsenvPluginInline({
+              jsenvPluginInlineContentAnalysis({
                 fetchInlineUrls: false,
                 analyzeConvertedScripts: true, // to be able to version their urls
                 allowEscapeForVersioning: true,
@@ -1485,11 +1507,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                     type: getHtmlNodeAttribute(hintNode, "type"),
                     crossorigin: getHtmlNodeAttribute(hintNode, "crossorigin"),
                   })
-                  insertHtmlNodeAfter(
-                    nodeToInsert,
-                    hintNode.parentNode,
-                    hintNode,
-                  )
+                  insertHtmlNodeAfter(nodeToInsert, hintNode)
                 })
               }
             })

package/src/build/version_mappings_injection.js

@@ -3,7 +3,7 @@
 import { createMagicSource } from "@jsenv/sourcemap"
 import {
   parseHtmlString,
-  injectScriptNodeAsEarlyAsPossible,
+  injectHtmlNodeAsEarlyAsPossible,
   createHtmlNode,
   stringifyHtmlAst,
 } from "@jsenv/ast"
@@ -32,7 +32,7 @@ const injectors = {
     const htmlAst = parseHtmlString(urlInfo.content, {
       storeOriginalPositions: false,
     })
-    injectScriptNodeAsEarlyAsPossible(
+    injectHtmlNodeAsEarlyAsPossible(
       htmlAst,
       createHtmlNode({
         tagName: "script",
@@ -52,12 +52,11 @@ const injectors = {
 }
 const jsInjector = (urlInfo, { versionMappings, minification }) => {
   const magicSource = createMagicSource(urlInfo.content)
-  magicSource.prepend(
-    generateClientCodeForVersionMappings(versionMappings, {
-      globalName: isWebWorkerUrlInfo(urlInfo) ? "self" : "window",
-      minification,
-    }),
-  )
+  const code = generateClientCodeForVersionMappings(versionMappings, {
+    globalName: isWebWorkerUrlInfo(urlInfo) ? "self" : "window",
+    minification,
+  })
+  magicSource.prepend(`${code}\n\n`)
   return magicSource.toContentAndSourcemap()
 }
 const generateClientCodeForVersionMappings = (
@@ -69,14 +68,12 @@ const generateClientCodeForVersionMappings = (
       versionMappings,
     )}; ${globalName}.__v__ = function (s) { return m[s] || s }; })();`
   }
-  return `
-;(function() {
+  return `;(function() {
   var __versionMappings__ = ${JSON.stringify(versionMappings, null, "  ")};
   ${globalName}.__v__ = function (specifier) {
     return __versionMappings__[specifier] || specifier
   };
-})();
-`
+})();`
 }
 
 export const injectVersionMappingsAsImportmap = async ({
@@ -90,21 +87,17 @@ export const injectVersionMappingsAsImportmap = async ({
   // jsenv_plugin_importmap.js is removing importmap during build
   // it means at this point we know HTML has no importmap in it
   // we can safely inject one
-  const importmapNode = createHtmlNode({
-    tagName: "script",
-    type: "importmap",
-    textContent: kitchen.kitchenContext.minification
-      ? JSON.stringify({ imports: versionMappings })
-      : `  
-      {
-        "imports": {${JSON.stringify(versionMappings, null, "          ").slice(
-          1,
-          -1,
-        )}        }
-      }
-    `,
-  })
-  injectScriptNodeAsEarlyAsPossible(htmlAst, importmapNode, "jsenv:versioning")
+  injectHtmlNodeAsEarlyAsPossible(
+    htmlAst,
+    createHtmlNode({
+      tagName: "script",
+      type: "importmap",
+      textContent: kitchen.kitchenContext.minification
+        ? JSON.stringify({ imports: versionMappings })
+        : JSON.stringify({ imports: versionMappings }, null, "  "),
+    }),
+    "jsenv:versioning",
+  )
   kitchen.urlInfoTransformer.applyFinalTransformations(urlInfo, {
     content: stringifyHtmlAst(htmlAst),
   })

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 for instance)
+        // (happens for js_module_fallback for instance)
         if (urlInfo.content !== undefined) {
           return {
             url: reference.url,

package/src/execute/execute.js

@@ -23,6 +23,7 @@ export const execute = async ({
   logLevel,
   rootDirectoryUrl,
   webServer,
+  importMap,
 
   fileRelativeUrl,
   allocatedMs,
@@ -65,6 +66,7 @@ export const execute = async ({
     rootDirectoryUrl,
     webServer,
     fileRelativeUrl,
+    importMap,
     ...runtimeParams,
   }
 

package/src/execute/runtimes/node/exec_options.js

@@ -5,7 +5,14 @@ export const ExecOptions = {
     while (i < execArgv.length) {
       const execArg = execArgv[i]
       const option = execOptionFromExecArg(execArg)
-      execOptions[option.name] = option.value
+      const existing = execOptions[option.name]
+      if (existing) {
+        execOptions[option.name] = Array.isArray(existing)
+          ? [...existing, option.value]
+          : [existing, option.value]
+      } else {
+        execOptions[option.name] = option.value
+      }
       i++
     }
     return execOptions
@@ -21,7 +28,13 @@ export const ExecOptions = {
         execArgv.push(optionName)
         return
       }
-      execArgv.push(`${optionName}=${optionValue}`)
+      if (Array.isArray(optionValue)) {
+        optionValue.forEach((subValue) => {
+          execArgv.push(`${optionName}=${subValue}`)
+        })
+      } else {
+        execArgv.push(`${optionName}=${optionValue}`)
+      }
     })
     return execArgv
   },

package/src/execute/runtimes/node/importmap_node_loader.mjs

@@ -0,0 +1,51 @@
+import { readFileSync } from "node:fs"
+import { pathToFileURL } from "node:url"
+import { normalizeImportMap, resolveImport } from "@jsenv/importmap"
+
+let importMap
+
+const cwdUrl = `${String(pathToFileURL(process.cwd()))}/`
+
+if (process.env.IMPORT_MAP) {
+  importMap = JSON.parse(process.env.IMPORT_MAP)
+} else if (process.env.IMPORT_MAP_PATH) {
+  const importmapFileUrl = pathToFileURL(process.env.IMPORT_MAP_PATH)
+  const importmapFileContentAsString = readFileSync(importmapFileUrl, "utf8")
+  importMap = JSON.parse(importmapFileContentAsString)
+} else {
+  const importmapFileUrl = new URL("./import_map.json", cwdUrl)
+  const importmapFileContentAsString = readFileSync(importmapFileUrl, "utf8")
+  importMap = JSON.parse(importmapFileContentAsString)
+}
+
+const importMapBaseUrl = process.env.IMPORT_MAP_BASE_URL || cwdUrl
+importMap = normalizeImportMap(importMap, importMapBaseUrl)
+
+export const resolve = (specifier, context, nextResolve) => {
+  try {
+    let mapped
+    const importer = context.parentURL ? String(context.parentURL) : undefined
+    const resolved = resolveImport({
+      specifier,
+      importer,
+      importMap,
+      defaultExtension: ".js",
+      onImportMapping: () => {
+        mapped = true
+      },
+    })
+    if (mapped) {
+      return {
+        shortCircuit: true,
+        url: resolved,
+      }
+    }
+  } catch (e) {
+    if (e.message.includes("bare specifier")) {
+      return nextResolve(specifier, context)
+    }
+    console.error(e)
+    return nextResolve(specifier, context)
+  }
+  return nextResolve(specifier, context)
+}

package/src/execute/runtimes/node/importmap_node_loader_file_url.js

@@ -0,0 +1,4 @@
+export const IMPORTMAP_NODE_LOADER_FILE_URL = new URL(
+  "./importmap_node_loader.mjs?entry_point",
+  import.meta.url,
+).href

package/src/execute/runtimes/node/no_experimental_warnings.cjs

@@ -0,0 +1,12 @@
+// see https://github.com/nodejs/node/issues/47478
+const originalEmit = process.emit
+process.emit = (event, error) => {
+  if (
+    event === "warning" &&
+    error.name === "ExperimentalWarning" &&
+    error.message.includes("--experimental-loader")
+  ) {
+    return false
+  }
+  return originalEmit.call(process, event, error)
+}

package/src/execute/runtimes/node/no_experimental_warnings_file_url.js

@@ -0,0 +1,4 @@
+export const NO_EXPERIMENTAL_WARNING_FILE_URL = new URL(
+  "./no_experimental_warnings.cjs?entry_point",
+  import.meta.url,
+).href

package/src/execute/runtimes/node/node_child_process.js

@@ -12,6 +12,8 @@ import { createChildExecOptions } from "./child_exec_options.js"
 import { ExecOptions } from "./exec_options.js"
 import { killProcessTree } from "./kill_process_tree.js"
 import { EXIT_CODES } from "./exit_codes.js"
+import { IMPORTMAP_NODE_LOADER_FILE_URL } from "./importmap_node_loader_file_url.js"
+import { NO_EXPERIMENTAL_WARNING_FILE_URL } from "./no_experimental_warnings_file_url.js"
 
 const CONTROLLABLE_CHILD_PROCESS_URL = new URL(
   "./controllable_child_process.mjs?entry_point",
@@ -30,6 +32,7 @@ nodeChildProcess.run = async ({
   logProcessCommand = false,
   rootDirectoryUrl,
   fileRelativeUrl,
+  importMap,
 
   keepRunning,
   gracefulStopAllocatedMs = 4000,
@@ -67,6 +70,17 @@ nodeChildProcess.run = async ({
     ...commandLineOptions,
   ]
 
+  if (importMap) {
+    env.IMPORT_MAP = JSON.stringify(importMap)
+    env.IMPORT_MAP_BASE_URL = rootDirectoryUrl
+    commandLineOptions.push(
+      `--experimental-loader=${fileURLToPath(IMPORTMAP_NODE_LOADER_FILE_URL)}`,
+    )
+    commandLineOptions.push(
+      `--require=${fileURLToPath(NO_EXPERIMENTAL_WARNING_FILE_URL)}`,
+    )
+  }
+
   const cleanupCallbackList = createCallbackListNotifiedOnce()
   const cleanup = async (reason) => {
     await cleanupCallbackList.notify({ reason })
@@ -96,6 +110,7 @@ nodeChildProcess.run = async ({
     // silent: true
     stdio: ["pipe", "pipe", "pipe", "ipc"],
     env: envForChildProcess,
+    cwd: new URL(rootDirectoryUrl),
   })
   logger.debug(
     createDetailedMessage(`child process forked (pid ${childProcess.pid})`, {

package/src/execute/runtimes/node/node_worker_thread.js

@@ -13,6 +13,8 @@ import { memoize } from "@jsenv/utils/src/memoize/memoize.js"
 import { createChildExecOptions } from "./child_exec_options.js"
 import { ExecOptions } from "./exec_options.js"
 import { EXIT_CODES } from "./exit_codes.js"
+import { IMPORTMAP_NODE_LOADER_FILE_URL } from "./importmap_node_loader_file_url.js"
+import { NO_EXPERIMENTAL_WARNING_FILE_URL } from "./no_experimental_warnings_file_url.js"
 
 const CONTROLLABLE_WORKER_THREAD_URL = new URL(
   "./controllable_worker_thread.mjs?entry_point",
@@ -30,6 +32,7 @@ nodeWorkerThread.run = async ({
   // logger,
   rootDirectoryUrl,
   fileRelativeUrl,
+  importMap,
 
   keepRunning,
   stopSignal,
@@ -59,6 +62,16 @@ nodeWorkerThread.run = async ({
   if (coverageMethodForNodeJs !== "NODE_V8_COVERAGE") {
     env.NODE_V8_COVERAGE = ""
   }
+  if (importMap) {
+    env.IMPORT_MAP = JSON.stringify(importMap)
+    env.IMPORT_MAP_BASE_URL = rootDirectoryUrl
+    commandLineOptions.push(
+      `--experimental-loader=${fileURLToPath(IMPORTMAP_NODE_LOADER_FILE_URL)}`,
+    )
+    commandLineOptions.push(
+      `--require=${fileURLToPath(NO_EXPERIMENTAL_WARNING_FILE_URL)}`,
+    )
+  }
 
   const workerThreadExecOptions = await createChildExecOptions({
     signal,

package/src/kitchen/kitchen.js

@@ -720,6 +720,7 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
 
   const getWithoutSearchParam = ({
     urlInfo,
+    reference,
     context,
     searchParam,
     expectedType,
@@ -730,17 +731,18 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
       return [null, null]
     }
     searchParams.delete(searchParam)
-    const originalRef = context.reference.original || context.reference
+    const originalRef =
+      reference || context.reference.original || context.reference
     const referenceWithoutSearchParam = {
       ...originalRef,
       original: originalRef,
       searchParams,
       data: { ...originalRef.data },
       expectedType,
-      specifier: context.reference.specifier
+      specifier: originalRef.specifier
         .replace(`?${searchParam}`, "")
         .replace(`&${searchParam}`, ""),
-      url: urlObject.href,
+      url: normalizeUrl(urlObject.href),
       generatedSpecifier: null,
       generatedUrl: null,
       filename: null,

package/src/plugins/autoreload/jsenv_plugin_autoreload_client.js

@@ -1,7 +1,7 @@
 import {
   parseHtmlString,
   stringifyHtmlAst,
-  injectScriptNodeAsEarlyAsPossible,
+  injectHtmlNodeAsEarlyAsPossible,
   createHtmlNode,
 } from "@jsenv/ast"
 
@@ -23,7 +23,7 @@ export const jsenvPluginAutoreloadClient = () => {
           expectedType: "js_module",
           specifier: autoreloadClientFileUrl,
         })
-        injectScriptNodeAsEarlyAsPossible(
+        injectHtmlNodeAsEarlyAsPossible(
           htmlAst,
           createHtmlNode({
             tagName: "script",

package/src/plugins/importmap/jsenv_plugin_importmap.js

@@ -132,7 +132,9 @@ export const jsenvPluginImportmap = () => {
           await context.cook(inlineImportmapUrlInfo, {
             reference: inlineImportmapReference,
           })
-          setHtmlNodeText(importmap, inlineImportmapUrlInfo.content)
+          setHtmlNodeText(importmap, inlineImportmapUrlInfo.content, {
+            indentation: "auto",
+          })
           setHtmlNodeAttributes(importmap, {
             "jsenv-cooked-by": "jsenv:importmap",
           })
@@ -160,7 +162,9 @@ export const jsenvPluginImportmap = () => {
             JSON.parse(importmapUrlInfo.content),
             htmlUrlInfo.url,
           )
-          setHtmlNodeText(importmap, importmapUrlInfo.content)
+          setHtmlNodeText(importmap, importmapUrlInfo.content, {
+            indentation: "auto",
+          })
           setHtmlNodeAttributes(importmap, {
             "src": undefined,
             "jsenv-inlined-by": "jsenv:importmap",

package/src/plugins/{inline/jsenv_plugin_html_inline_content.js → inline_content_analysis/jsenv_plugin_html_inline_content_analysis.js}

@@ -19,7 +19,9 @@ import {
 } from "@jsenv/ast"
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
 
-export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {
+export const jsenvPluginHtmlInlineContentAnalysis = ({
+  analyzeConvertedScripts,
+}) => {
   const cookInlineContent = async ({
     context,
     inlineContentUrlInfo,
@@ -48,7 +50,7 @@ ${e.traceMessage}`)
   }
 
   return {
-    name: "jsenv:html_inline_content",
+    name: "jsenv:html_inline_content_analysis",
     appliesDuring: "*",
     transformUrlContent: {
       html: async (urlInfo, context) => {
@@ -99,9 +101,11 @@ ${e.traceMessage}`)
               })
             })
             mutations.push(() => {
-              setHtmlNodeText(styleNode, inlineStyleUrlInfo.content)
+              setHtmlNodeText(styleNode, inlineStyleUrlInfo.content, {
+                indentation: false, // indentation would decrease strack trace precision
+              })
               setHtmlNodeAttributes(styleNode, {
-                "jsenv-cooked-by": "jsenv:html_inline_content",
+                "jsenv-cooked-by": "jsenv:html_inline_content_analysis",
               })
             })
           },
@@ -163,7 +167,7 @@ ${e.traceMessage}`)
               })
               mutations.push(() => {
                 const attributes = {
-                  "jsenv-cooked-by": "jsenv:html_inline_content",
+                  "jsenv-cooked-by": "jsenv:html_inline_content_analysis",
                   // 1. <script type="jsx"> becomes <script>
                   // 2. <script type="module/jsx"> becomes <script type="module">
                   ...(extension
@@ -176,7 +180,9 @@ ${e.traceMessage}`)
                     ...attributes,
                   })
                 } else {
-                  setHtmlNodeText(scriptNode, inlineScriptUrlInfo.content)
+                  setHtmlNodeText(scriptNode, inlineScriptUrlInfo.content, {
+                    indentation: false, // indentation would decrease stack trace precision
+                  })
                   setHtmlNodeAttributes(scriptNode, {
                     ...attributes,
                   })

package/src/plugins/{inline/jsenv_plugin_inline.js → inline_content_analysis/jsenv_plugin_inline_content_analysis.js}

@@ -1,25 +1,23 @@
-import { jsenvPluginHtmlInlineContent } from "./jsenv_plugin_html_inline_content.js"
-import { jsenvPluginJsInlineContent } from "./jsenv_plugin_js_inline_content.js"
+import { jsenvPluginHtmlInlineContentAnalysis } from "./jsenv_plugin_html_inline_content_analysis.js"
+import { jsenvPluginJsInlineContentAnalysis } from "./jsenv_plugin_js_inline_content_analysis.js"
 import { jsenvPluginDataUrls } from "./jsenv_plugin_data_urls.js"
-import { jsenvPluginInlineQueryParam } from "./jsenv_plugin_inline_query_param.js"
 
-export const jsenvPluginInline = ({
+export const jsenvPluginInlineContentAnalysis = ({
   fetchInlineUrls = true,
   analyzeConvertedScripts = false,
   allowEscapeForVersioning = false,
 } = {}) => {
   return [
-    ...(fetchInlineUrls ? [jsenvPluginInlineUrls()] : []),
-    jsenvPluginHtmlInlineContent({ analyzeConvertedScripts }),
-    jsenvPluginJsInlineContent({ allowEscapeForVersioning }),
+    ...(fetchInlineUrls ? [jsenvPluginInlineContentFetcher()] : []),
+    jsenvPluginHtmlInlineContentAnalysis({ analyzeConvertedScripts }),
+    jsenvPluginJsInlineContentAnalysis({ allowEscapeForVersioning }),
     jsenvPluginDataUrls(),
-    jsenvPluginInlineQueryParam(),
   ]
 }
 
-const jsenvPluginInlineUrls = () => {
+const jsenvPluginInlineContentFetcher = () => {
   return {
-    name: "jsenv:inline_urls",
+    name: "jsenv:inline_content_fetcher",
     appliesDuring: "*",
     fetchUrlContent: (urlInfo) => {
       if (!urlInfo.isInline) {

package/src/plugins/{inline/jsenv_plugin_js_inline_content.js → inline_content_analysis/jsenv_plugin_js_inline_content_analysis.js}

@@ -4,7 +4,9 @@ import { applyBabelPlugins } from "@jsenv/ast"
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
 import { JS_QUOTES } from "@jsenv/utils/src/string/js_quotes.js"
 
-export const jsenvPluginJsInlineContent = ({ allowEscapeForVersioning }) => {
+export const jsenvPluginJsInlineContentAnalysis = ({
+  allowEscapeForVersioning,
+}) => {
   const parseAndTransformInlineContentCalls = async (urlInfo, context) => {
     const inlineContentInfos = await parseJsInlineContentInfos({
       js: urlInfo.content,
@@ -63,7 +65,7 @@ export const jsenvPluginJsInlineContent = ({ allowEscapeForVersioning }) => {
   }
 
   return {
-    name: "jsenv:js_inline_content",
+    name: "jsenv:js_inline_content_analysis",
     appliesDuring: "*",
     transformUrlContent: {
       js_classic: parseAndTransformInlineContentCalls,

package/src/plugins/inlining/jsenv_plugin_inlining.js

@@ -0,0 +1,22 @@
+import { jsenvPluginInliningAsDataUrl } from "./jsenv_plugin_inlining_as_data_url.js"
+import { jsenvPluginInliningIntoHtml } from "./jsenv_plugin_inlining_into_html.js"
+
+export const jsenvPluginInlining = () => {
+  return [
+    {
+      name: "jsenv:inlining",
+      appliesDuring: "*",
+      redirectUrl: (reference) => {
+        const { searchParams } = reference
+        if (searchParams.has("inline")) {
+          const urlObject = new URL(reference.url)
+          urlObject.searchParams.delete("inline")
+          return urlObject.href
+        }
+        return null
+      },
+    },
+    jsenvPluginInliningAsDataUrl(),
+    jsenvPluginInliningIntoHtml(),
+  ]
+}