@jsenv/core 41.5.25 → 41.5.26

package/dist/build/build.js

@@ -4883,6 +4883,140 @@ const isBareSpecifier = (specifier) => {
   }
 };
 
+/*
+ * Text patches applied to files as they are served and built, keyed by file:
+ *
+ *   patches: {
+ *     "preact/dist/preact.mjs": [{ from: "a&&b", to: "a&&b&&c" }],
+ *   }
+ *
+ * A key is a url pattern relative to the root directory ("./main.js",
+ * "**\/*.css"), or a path inside a package ("preact/dist/preact.mjs") found by
+ * walking up from the root directory into node_modules, the way node does,
+ * so the key holds wherever the package manager hoists the package.
+ *
+ * Every `from` must occur exactly once in the file, otherwise the file fails
+ * to cook and says which patch did not apply: a dependency update that moved
+ * the patched code must be looked at, never silently unpatched.
+ */
+
+
+const jsenvPluginPatches = (rawPatches) => {
+  if (!rawPatches || Object.keys(rawPatches).length === 0) {
+    return [];
+  }
+  let findPatches;
+  const patchesPlugin = {
+    name: "jsenv:patches",
+    appliesDuring: "*",
+    init: (context) => {
+      const { rootDirectoryUrl } = context;
+      const patchesByPattern = {};
+      for (const key of Object.keys(rawPatches)) {
+        const patches = rawPatches[key];
+        assertPatches(patches, key);
+        patchesByPattern[resolvePatchKey(key, rootDirectoryUrl)] = patches;
+      }
+      const associations = URL_META.resolveAssociations(
+        { patches: patchesByPattern },
+        rootDirectoryUrl,
+      );
+      findPatches = (url) => {
+        const { patches } = URL_META.applyAssociations({
+          url: asUrlWithoutSearch(url),
+          associations,
+        });
+        return patches;
+      };
+    },
+    transformUrlContent: (urlInfo) => {
+      const patches = findPatches(urlInfo.url);
+      if (!patches) {
+        return null;
+      }
+      const { content } = urlInfo;
+      const magicSource = createMagicSource(content);
+      for (const { from, to } of patches) {
+        const start = content.indexOf(from);
+        const occurrenceCount =
+          start === -1 ? 0 : content.indexOf(from, start + 1) === -1 ? 1 : 2;
+        if (occurrenceCount !== 1) {
+          const fileRelativeUrl = urlToRelativeUrl(
+            urlInfo.url,
+            urlInfo.context.rootDirectoryUrl,
+          );
+          throw new Error(
+            `patch cannot apply on "${fileRelativeUrl}": ${JSON.stringify(from)} found ${occurrenceCount === 0 ? "nowhere" : "more than once"} in the file. The file may have changed since the patch was written.`,
+          );
+        }
+        magicSource.replace({
+          start,
+          end: start + from.length,
+          replacement: to,
+        });
+      }
+      return magicSource.toContentAndSourcemap();
+    },
+  };
+  return [patchesPlugin];
+};
+
+const assertPatches = (patches, key) => {
+  if (!Array.isArray(patches)) {
+    throw new TypeError(
+      `patches["${key}"] must be an array of { from, to }, got ${patches}`,
+    );
+  }
+  for (const patch of patches) {
+    if (
+      !patch ||
+      typeof patch.from !== "string" ||
+      patch.from === "" ||
+      typeof patch.to !== "string"
+    ) {
+      throw new TypeError(
+        `patches["${key}"] entries must be { from: string, to: string } with a non-empty "from"`,
+      );
+    }
+  }
+};
+
+// "./x", "../x", "/x", "file:///x" and "**/x" are url patterns; anything
+// else names a path inside a package, looked up in node_modules
+const resolvePatchKey = (key, rootDirectoryUrl) => {
+  if (
+    key.startsWith("./") ||
+    key.startsWith("../") ||
+    key.startsWith("/") ||
+    key.startsWith("file:") ||
+    key.startsWith("*")
+  ) {
+    return key;
+  }
+  const segments = key.split("/");
+  const packageName = key.startsWith("@")
+    ? `${segments[0]}/${segments[1]}`
+    : segments[0];
+  const pathInsidePackage = key.slice(packageName.length);
+  let directoryUrl = new URL(rootDirectoryUrl);
+  while (true) {
+    const packageDirectoryUrl = new URL(
+      `./node_modules/${packageName}/`,
+      directoryUrl,
+    );
+    if (existsSync(packageDirectoryUrl)) {
+      return String(new URL(`.${pathInsidePackage}`, packageDirectoryUrl));
+    }
+    const parentDirectoryUrl = new URL("../", directoryUrl);
+    if (parentDirectoryUrl.href === directoryUrl.href) {
+      throw new Error(
+        `patches["${key}"]: package "${packageName}" not found in any node_modules above ${rootDirectoryUrl}`,
+      );
+    }
+    directoryUrl = parentDirectoryUrl;
+  }
+};
+
 /*
  * https://github.com/parcel-bundler/parcel/blob/v2/packages/transformers/css/src/CSSTransformer.js
  */
@@ -8175,140 +8309,6 @@ const asInheritedInjections = (injections) => {
   return inheritedInjections;
 };
 
-/*
- * Text patches applied to files as they are served and built, keyed by file:
- *
- *   patches: {
- *     "preact/dist/preact.mjs": [{ from: "a&&b", to: "a&&b&&c" }],
- *   }
- *
- * A key is a url pattern relative to the root directory ("./main.js",
- * "**\/*.css"), or a path inside a package ("preact/dist/preact.mjs") found by
- * walking up from the root directory into node_modules, the way node does,
- * so the key holds wherever the package manager hoists the package.
- *
- * Every `from` must occur exactly once in the file, otherwise the file fails
- * to cook and says which patch did not apply: a dependency update that moved
- * the patched code must be looked at, never silently unpatched.
- */
-
-
-const jsenvPluginPatches = (rawPatches) => {
-  if (!rawPatches || Object.keys(rawPatches).length === 0) {
-    return [];
-  }
-  let findPatches;
-  const patchesPlugin = {
-    name: "jsenv:patches",
-    appliesDuring: "*",
-    init: (context) => {
-      const { rootDirectoryUrl } = context;
-      const patchesByPattern = {};
-      for (const key of Object.keys(rawPatches)) {
-        const patches = rawPatches[key];
-        assertPatches(patches, key);
-        patchesByPattern[resolvePatchKey(key, rootDirectoryUrl)] = patches;
-      }
-      const associations = URL_META.resolveAssociations(
-        { patches: patchesByPattern },
-        rootDirectoryUrl,
-      );
-      findPatches = (url) => {
-        const { patches } = URL_META.applyAssociations({
-          url: asUrlWithoutSearch(url),
-          associations,
-        });
-        return patches;
-      };
-    },
-    transformUrlContent: (urlInfo) => {
-      const patches = findPatches(urlInfo.url);
-      if (!patches) {
-        return null;
-      }
-      const { content } = urlInfo;
-      const magicSource = createMagicSource(content);
-      for (const { from, to } of patches) {
-        const start = content.indexOf(from);
-        const occurrenceCount =
-          start === -1 ? 0 : content.indexOf(from, start + 1) === -1 ? 1 : 2;
-        if (occurrenceCount !== 1) {
-          const fileRelativeUrl = urlToRelativeUrl(
-            urlInfo.url,
-            urlInfo.context.rootDirectoryUrl,
-          );
-          throw new Error(
-            `patch cannot apply on "${fileRelativeUrl}": ${JSON.stringify(from)} found ${occurrenceCount === 0 ? "nowhere" : "more than once"} in the file. The file may have changed since the patch was written.`,
-          );
-        }
-        magicSource.replace({
-          start,
-          end: start + from.length,
-          replacement: to,
-        });
-      }
-      return magicSource.toContentAndSourcemap();
-    },
-  };
-  return [patchesPlugin];
-};
-
-const assertPatches = (patches, key) => {
-  if (!Array.isArray(patches)) {
-    throw new TypeError(
-      `patches["${key}"] must be an array of { from, to }, got ${patches}`,
-    );
-  }
-  for (const patch of patches) {
-    if (
-      !patch ||
-      typeof patch.from !== "string" ||
-      patch.from === "" ||
-      typeof patch.to !== "string"
-    ) {
-      throw new TypeError(
-        `patches["${key}"] entries must be { from: string, to: string } with a non-empty "from"`,
-      );
-    }
-  }
-};
-
-// "./x", "../x", "/x", "file:///x" and "**/x" are url patterns; anything
-// else names a path inside a package, looked up in node_modules
-const resolvePatchKey = (key, rootDirectoryUrl) => {
-  if (
-    key.startsWith("./") ||
-    key.startsWith("../") ||
-    key.startsWith("/") ||
-    key.startsWith("file:") ||
-    key.startsWith("*")
-  ) {
-    return key;
-  }
-  const segments = key.split("/");
-  const packageName = key.startsWith("@")
-    ? `${segments[0]}/${segments[1]}`
-    : segments[0];
-  const pathInsidePackage = key.slice(packageName.length);
-  let directoryUrl = new URL(rootDirectoryUrl);
-  while (true) {
-    const packageDirectoryUrl = new URL(
-      `./node_modules/${packageName}/`,
-      directoryUrl,
-    );
-    if (existsSync(packageDirectoryUrl)) {
-      return String(new URL(`.${pathInsidePackage}`, packageDirectoryUrl));
-    }
-    const parentDirectoryUrl = new URL("../", directoryUrl);
-    if (parentDirectoryUrl.href === directoryUrl.href) {
-      throw new Error(
-        `patches["${key}"]: package "${packageName}" not found in any node_modules above ${rootDirectoryUrl}`,
-      );
-    }
-    directoryUrl = parentDirectoryUrl;
-  }
-};
-
 /*
  * Some code uses globals specific to Node.js in code meant to run in browsers...
  * This plugin will replace some node globals to things compatible with web:
@@ -10435,7 +10435,6 @@ const getCorePlugins = ({
   directoryListing = true,
   directoryReferenceEffect,
   supervisor,
-  patches,
   injections,
   transpilation = true,
   inlining = true,
@@ -10477,9 +10476,6 @@ const getCorePlugins = ({
     ...(packageBundle
       ? [jsenvPluginWorkspaceBundle({ packageDirectory })]
       : []),
-    // before everything else: what the other plugins read must be the
-    // patched file
-    ...jsenvPluginPatches(patches),
     // before reference analysis: an url written by an injection must hold its
     // final value when references are analyzed
     jsenvPluginInjections(injections),
@@ -13837,6 +13833,9 @@ const prepareEntryPointBuild = async (
 
   let _getOtherEntryBuildInfo;
   const rawJsenvPluginStore = await createJsenvPluginStore([
+    // First, ahead of the plugins given by the caller: what every other plugin
+    // reads must be the patched file (see start_dev_server.js).
+    ...jsenvPluginPatches(patches),
     ...(mappings ? [jsenvPluginMappings(mappings)] : []),
     {
       name: "jsenv:other_entry_point_build_during_craft",
@@ -13871,7 +13870,6 @@ const prepareEntryPointBuild = async (
       magicExtensions,
       magicDirectoryIndex,
       directoryReferenceEffect,
-      patches,
       injections,
       transpilation: {
         babelHelpersAsImport: !explicitJsModuleConversion,

package/dist/start_dev_server/start_dev_server.js

@@ -1,12 +1,12 @@
 import { WebSocketResponse, pickContentType, ServerEvents, serverPluginErrorHandler, fetchDirectory, composeTwoResponses, serverPluginCORS, jsenvAccessControlAllowedHeaders, startServer } from "@jsenv/server";
 import { existsSync, statSync, readFileSync, realpathSync, readdirSync, lstatSync } from "node:fs";
 import { pathToFileURL } from "node:url";
-import { urlToRelativeUrl, registerFileLifecycle, lookupPackageDirectory, readPackageAtOrNull, generateContentFrame, errorToHTML, DATA_URL, CONTENT_TYPE, normalizeImportMap, composeTwoImportMaps, resolveImport, createDetailedMessage, UNICODE, JS_QUOTES, urlToExtension, urlToBasename, applyNodeEsmResolution, URL_META, readCustomConditionsFromProcessArgs, urlIsOrIsInsideOf, collectFiles, registerDirectoryLifecycle, readEntryStatSync, applyFileSystemMagicResolution, getExtensionsToTry, urlToFilename, asUrlWithoutSearch, ensurePathnameTrailingSlash, compareFileUrls, setUrlExtension, stringifyUrlSite, injectQueryParamsIntoSpecifier, isSpecifierForNodeBuiltin, injectQueryParams, urlToFileSystemPath, writeFileSync, moveUrl, ensureWindowsDriveLetter, validateResponseIntegrity, setUrlFilename, getCallerPosition, asSpecifierWithoutSearch, bufferToEtag, isFileSystemPath, urlToPathname, setUrlBasename, createLogger, normalizeUrl, ANSI, RUNTIME_COMPAT, formatError, assertAndNormalizeDirectoryUrl, browserDefaultRuntimeCompat, inferRuntimeCompatFromClosestPackage, createTaskLog } from "./jsenv_core_packages.js";
+import { urlToRelativeUrl, registerFileLifecycle, lookupPackageDirectory, readPackageAtOrNull, generateContentFrame, errorToHTML, URL_META, asUrlWithoutSearch, DATA_URL, CONTENT_TYPE, normalizeImportMap, composeTwoImportMaps, resolveImport, createDetailedMessage, UNICODE, JS_QUOTES, urlToExtension, urlToBasename, applyNodeEsmResolution, readCustomConditionsFromProcessArgs, urlIsOrIsInsideOf, collectFiles, registerDirectoryLifecycle, readEntryStatSync, applyFileSystemMagicResolution, getExtensionsToTry, urlToFilename, ensurePathnameTrailingSlash, compareFileUrls, setUrlExtension, stringifyUrlSite, injectQueryParamsIntoSpecifier, isSpecifierForNodeBuiltin, injectQueryParams, urlToFileSystemPath, writeFileSync, moveUrl, ensureWindowsDriveLetter, validateResponseIntegrity, setUrlFilename, getCallerPosition, asSpecifierWithoutSearch, bufferToEtag, isFileSystemPath, urlToPathname, setUrlBasename, createLogger, normalizeUrl, ANSI, RUNTIME_COMPAT, formatError, assertAndNormalizeDirectoryUrl, browserDefaultRuntimeCompat, inferRuntimeCompatFromClosestPackage, createTaskLog } from "./jsenv_core_packages.js";
 import { createPluginsController } from "@jsenv/server/src/plugins_controller.js";
 import { parseHtml, injectJsenvScript, stringifyHtmlAst, parseCssUrls, getHtmlNodeAttribute, getHtmlNodePosition, getHtmlNodeAttributePosition, setHtmlNodeAttributes, parseSrcSet, getUrlForContentInsideHtml, removeHtmlNodeText, setHtmlNodeText, getHtmlNodeText, analyzeScriptNode, visitHtmlNodes, parseJsUrls, hasCssOpaqueDirective, getUrlForContentInsideJs, renderCssTemplateLiteral, applyBabelPlugins, visitJsAst, getImportMetaPropertyName, visitJsAstUntil, analyzeLinkNode, injectHtmlNodeAsEarlyAsPossible, createHtmlNode, generateUrlForInlineContent, parseJsWithAcorn } from "@jsenv/ast";
+import { createMagicSource, composeTwoSourcemaps, generateSourcemapFileUrl, generateSourcemapDataUrl, SOURCEMAP, applyContentEditsOnSourcemap, composeSourcemaps } from "@jsenv/sourcemap";
 import { jsenvPluginSupervisor } from "@jsenv/plugin-supervisor";
 import { jsenvPluginTranspilation } from "@jsenv/plugin-transpilation";
-import { createMagicSource, composeTwoSourcemaps, generateSourcemapFileUrl, generateSourcemapDataUrl, SOURCEMAP, applyContentEditsOnSourcemap, composeSourcemaps } from "@jsenv/sourcemap";
 import { bundleJsModules } from "@jsenv/plugin-bundling";
 import { randomUUID } from "node:crypto";
 import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/plugins/filesystem/filesystem_error_to_response.js";
@@ -1574,6 +1574,140 @@ const jsenvPluginPageSwitcher = () => {
   };
 };
 
+/*
+ * Text patches applied to files as they are served and built, keyed by file:
+ *
+ *   patches: {
+ *     "preact/dist/preact.mjs": [{ from: "a&&b", to: "a&&b&&c" }],
+ *   }
+ *
+ * A key is a url pattern relative to the root directory ("./main.js",
+ * "**\/*.css"), or a path inside a package ("preact/dist/preact.mjs") found by
+ * walking up from the root directory into node_modules, the way node does,
+ * so the key holds wherever the package manager hoists the package.
+ *
+ * Every `from` must occur exactly once in the file, otherwise the file fails
+ * to cook and says which patch did not apply: a dependency update that moved
+ * the patched code must be looked at, never silently unpatched.
+ */
+
+
+const jsenvPluginPatches = (rawPatches) => {
+  if (!rawPatches || Object.keys(rawPatches).length === 0) {
+    return [];
+  }
+  let findPatches;
+  const patchesPlugin = {
+    name: "jsenv:patches",
+    appliesDuring: "*",
+    init: (context) => {
+      const { rootDirectoryUrl } = context;
+      const patchesByPattern = {};
+      for (const key of Object.keys(rawPatches)) {
+        const patches = rawPatches[key];
+        assertPatches(patches, key);
+        patchesByPattern[resolvePatchKey(key, rootDirectoryUrl)] = patches;
+      }
+      const associations = URL_META.resolveAssociations(
+        { patches: patchesByPattern },
+        rootDirectoryUrl,
+      );
+      findPatches = (url) => {
+        const { patches } = URL_META.applyAssociations({
+          url: asUrlWithoutSearch(url),
+          associations,
+        });
+        return patches;
+      };
+    },
+    transformUrlContent: (urlInfo) => {
+      const patches = findPatches(urlInfo.url);
+      if (!patches) {
+        return null;
+      }
+      const { content } = urlInfo;
+      const magicSource = createMagicSource(content);
+      for (const { from, to } of patches) {
+        const start = content.indexOf(from);
+        const occurrenceCount =
+          start === -1 ? 0 : content.indexOf(from, start + 1) === -1 ? 1 : 2;
+        if (occurrenceCount !== 1) {
+          const fileRelativeUrl = urlToRelativeUrl(
+            urlInfo.url,
+            urlInfo.context.rootDirectoryUrl,
+          );
+          throw new Error(
+            `patch cannot apply on "${fileRelativeUrl}": ${JSON.stringify(from)} found ${occurrenceCount === 0 ? "nowhere" : "more than once"} in the file. The file may have changed since the patch was written.`,
+          );
+        }
+        magicSource.replace({
+          start,
+          end: start + from.length,
+          replacement: to,
+        });
+      }
+      return magicSource.toContentAndSourcemap();
+    },
+  };
+  return [patchesPlugin];
+};
+
+const assertPatches = (patches, key) => {
+  if (!Array.isArray(patches)) {
+    throw new TypeError(
+      `patches["${key}"] must be an array of { from, to }, got ${patches}`,
+    );
+  }
+  for (const patch of patches) {
+    if (
+      !patch ||
+      typeof patch.from !== "string" ||
+      patch.from === "" ||
+      typeof patch.to !== "string"
+    ) {
+      throw new TypeError(
+        `patches["${key}"] entries must be { from: string, to: string } with a non-empty "from"`,
+      );
+    }
+  }
+};
+
+// "./x", "../x", "/x", "file:///x" and "**/x" are url patterns; anything
+// else names a path inside a package, looked up in node_modules
+const resolvePatchKey = (key, rootDirectoryUrl) => {
+  if (
+    key.startsWith("./") ||
+    key.startsWith("../") ||
+    key.startsWith("/") ||
+    key.startsWith("file:") ||
+    key.startsWith("*")
+  ) {
+    return key;
+  }
+  const segments = key.split("/");
+  const packageName = key.startsWith("@")
+    ? `${segments[0]}/${segments[1]}`
+    : segments[0];
+  const pathInsidePackage = key.slice(packageName.length);
+  let directoryUrl = new URL(rootDirectoryUrl);
+  while (true) {
+    const packageDirectoryUrl = new URL(
+      `./node_modules/${packageName}/`,
+      directoryUrl,
+    );
+    if (existsSync(packageDirectoryUrl)) {
+      return String(new URL(`.${pathInsidePackage}`, packageDirectoryUrl));
+    }
+    const parentDirectoryUrl = new URL("../", directoryUrl);
+    if (parentDirectoryUrl.href === directoryUrl.href) {
+      throw new Error(
+        `patches["${key}"]: package "${packageName}" not found in any node_modules above ${rootDirectoryUrl}`,
+      );
+    }
+    directoryUrl = parentDirectoryUrl;
+  }
+};
+
 /*
  * https://github.com/parcel-bundler/parcel/blob/v2/packages/transformers/css/src/CSSTransformer.js
  */
@@ -5762,140 +5896,6 @@ const asInheritedInjections = (injections) => {
   return inheritedInjections;
 };
 
-/*
- * Text patches applied to files as they are served and built, keyed by file:
- *
- *   patches: {
- *     "preact/dist/preact.mjs": [{ from: "a&&b", to: "a&&b&&c" }],
- *   }
- *
- * A key is a url pattern relative to the root directory ("./main.js",
- * "**\/*.css"), or a path inside a package ("preact/dist/preact.mjs") found by
- * walking up from the root directory into node_modules, the way node does,
- * so the key holds wherever the package manager hoists the package.
- *
- * Every `from` must occur exactly once in the file, otherwise the file fails
- * to cook and says which patch did not apply: a dependency update that moved
- * the patched code must be looked at, never silently unpatched.
- */
-
-
-const jsenvPluginPatches = (rawPatches) => {
-  if (!rawPatches || Object.keys(rawPatches).length === 0) {
-    return [];
-  }
-  let findPatches;
-  const patchesPlugin = {
-    name: "jsenv:patches",
-    appliesDuring: "*",
-    init: (context) => {
-      const { rootDirectoryUrl } = context;
-      const patchesByPattern = {};
-      for (const key of Object.keys(rawPatches)) {
-        const patches = rawPatches[key];
-        assertPatches(patches, key);
-        patchesByPattern[resolvePatchKey(key, rootDirectoryUrl)] = patches;
-      }
-      const associations = URL_META.resolveAssociations(
-        { patches: patchesByPattern },
-        rootDirectoryUrl,
-      );
-      findPatches = (url) => {
-        const { patches } = URL_META.applyAssociations({
-          url: asUrlWithoutSearch(url),
-          associations,
-        });
-        return patches;
-      };
-    },
-    transformUrlContent: (urlInfo) => {
-      const patches = findPatches(urlInfo.url);
-      if (!patches) {
-        return null;
-      }
-      const { content } = urlInfo;
-      const magicSource = createMagicSource(content);
-      for (const { from, to } of patches) {
-        const start = content.indexOf(from);
-        const occurrenceCount =
-          start === -1 ? 0 : content.indexOf(from, start + 1) === -1 ? 1 : 2;
-        if (occurrenceCount !== 1) {
-          const fileRelativeUrl = urlToRelativeUrl(
-            urlInfo.url,
-            urlInfo.context.rootDirectoryUrl,
-          );
-          throw new Error(
-            `patch cannot apply on "${fileRelativeUrl}": ${JSON.stringify(from)} found ${occurrenceCount === 0 ? "nowhere" : "more than once"} in the file. The file may have changed since the patch was written.`,
-          );
-        }
-        magicSource.replace({
-          start,
-          end: start + from.length,
-          replacement: to,
-        });
-      }
-      return magicSource.toContentAndSourcemap();
-    },
-  };
-  return [patchesPlugin];
-};
-
-const assertPatches = (patches, key) => {
-  if (!Array.isArray(patches)) {
-    throw new TypeError(
-      `patches["${key}"] must be an array of { from, to }, got ${patches}`,
-    );
-  }
-  for (const patch of patches) {
-    if (
-      !patch ||
-      typeof patch.from !== "string" ||
-      patch.from === "" ||
-      typeof patch.to !== "string"
-    ) {
-      throw new TypeError(
-        `patches["${key}"] entries must be { from: string, to: string } with a non-empty "from"`,
-      );
-    }
-  }
-};
-
-// "./x", "../x", "/x", "file:///x" and "**/x" are url patterns; anything
-// else names a path inside a package, looked up in node_modules
-const resolvePatchKey = (key, rootDirectoryUrl) => {
-  if (
-    key.startsWith("./") ||
-    key.startsWith("../") ||
-    key.startsWith("/") ||
-    key.startsWith("file:") ||
-    key.startsWith("*")
-  ) {
-    return key;
-  }
-  const segments = key.split("/");
-  const packageName = key.startsWith("@")
-    ? `${segments[0]}/${segments[1]}`
-    : segments[0];
-  const pathInsidePackage = key.slice(packageName.length);
-  let directoryUrl = new URL(rootDirectoryUrl);
-  while (true) {
-    const packageDirectoryUrl = new URL(
-      `./node_modules/${packageName}/`,
-      directoryUrl,
-    );
-    if (existsSync(packageDirectoryUrl)) {
-      return String(new URL(`.${pathInsidePackage}`, packageDirectoryUrl));
-    }
-    const parentDirectoryUrl = new URL("../", directoryUrl);
-    if (parentDirectoryUrl.href === directoryUrl.href) {
-      throw new Error(
-        `patches["${key}"]: package "${packageName}" not found in any node_modules above ${rootDirectoryUrl}`,
-      );
-    }
-    directoryUrl = parentDirectoryUrl;
-  }
-};
-
 const jsenvPluginInliningAsDataUrl = () => {
   return {
     name: "jsenv:inlining_as_data_url",
@@ -8335,7 +8335,6 @@ const getCorePlugins = ({
   directoryListing = true,
   directoryReferenceEffect,
   supervisor,
-  patches,
   injections,
   transpilation = true,
   inlining = true,
@@ -8377,9 +8376,6 @@ const getCorePlugins = ({
     ...(packageBundle
       ? [jsenvPluginWorkspaceBundle({ packageDirectory })]
       : []),
-    // before everything else: what the other plugins read must be the
-    // patched file
-    ...jsenvPluginPatches(patches),
     // before reference analysis: an url written by an injection must hold its
     // final value when references are analyzed
     jsenvPluginInjections(injections),
@@ -12751,6 +12747,11 @@ const startDevServer = async ({
   serverStopCallbackSet.add(dependencyWatcher.stop);
 
   const devServerJsenvPluginStore = await createJsenvPluginStore([
+    // First, ahead of the plugins given by the caller: what every other plugin
+    // reads must be the patched file, and a caller's plugin may rewrite a file
+    // (plugin-preact reprints one it instruments) before a patch written
+    // against its text on disk gets to see it.
+    ...jsenvPluginPatches(patches),
     jsenvPluginServerEvents({ clientAutoreload }),
     // The client-monitoring dashboard is a dev-time convenience; a test-plan run
     // doesn't use it and shouldn't pay for the reporter being injected into
@@ -12778,7 +12779,6 @@ const startDevServer = async ({
       magicDirectoryIndex,
       directoryListing,
       supervisor,
-      patches,
       injections,
       transpilation,
       spa,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "41.5.25",
+  "version": "41.5.26",
   "type": "module",
   "description": "Tool to develop, test and build js projects",
   "repository": {
@@ -73,14 +73,14 @@
     "test:snapshot_clear": "npx @jsenv/filesystem clear **/tests/**/side_effects/"
   },
   "dependencies": {
-    "@jsenv/ast": "6.10.6",
-    "@jsenv/js-module-fallback": "1.6.10",
-    "@jsenv/plugin-bundling": "2.10.28",
-    "@jsenv/plugin-minification": "1.7.23",
-    "@jsenv/plugin-supervisor": "1.8.25",
-    "@jsenv/plugin-transpilation": "1.7.10",
+    "@jsenv/ast": "6.10.7",
+    "@jsenv/js-module-fallback": "1.6.11",
+    "@jsenv/plugin-bundling": "2.10.29",
+    "@jsenv/plugin-minification": "1.7.24",
+    "@jsenv/plugin-supervisor": "1.8.26",
+    "@jsenv/plugin-transpilation": "1.7.11",
     "@jsenv/server": "17.6.6",
-    "@jsenv/sourcemap": "1.4.9",
+    "@jsenv/sourcemap": "1.4.10",
     "react-table": "7.8.0"
   },
   "devDependencies": {

package/src/build/build.js

@@ -67,6 +67,7 @@ import {
   createJsenvPluginStore,
 } from "../plugins/jsenv_plugins_controller.js";
 import { isBareSpecifier } from "../helpers/bare_specifier.js";
+import { jsenvPluginPatches } from "../plugins/patches/jsenv_plugin_patches.js";
 import { getCorePlugins } from "../plugins/plugins.js";
 import { jsenvPluginReferenceAnalysis } from "../plugins/reference_analysis/jsenv_plugin_reference_analysis.js";
 import { renderBuildDoneLog } from "./build_content_report.js";
@@ -1219,6 +1220,9 @@ const prepareEntryPointBuild = async (
 
   let _getOtherEntryBuildInfo;
   const rawJsenvPluginStore = await createJsenvPluginStore([
+    // First, ahead of the plugins given by the caller: what every other plugin
+    // reads must be the patched file (see start_dev_server.js).
+    ...jsenvPluginPatches(patches),
     ...(mappings ? [jsenvPluginMappings(mappings)] : []),
     {
       name: "jsenv:other_entry_point_build_during_craft",
@@ -1253,7 +1257,6 @@ const prepareEntryPointBuild = async (
       magicExtensions,
       magicDirectoryIndex,
       directoryReferenceEffect,
-      patches,
       injections,
       transpilation: {
         babelHelpersAsImport: !explicitJsModuleConversion,

package/src/dev/start_dev_server.js

@@ -27,6 +27,7 @@ import { createPackageDirectory } from "../kitchen/package_directory.js";
 import { createJsenvPluginStore } from "../plugins/jsenv_plugins_controller.js";
 import { jsenvPluginClientMonitoring } from "../plugins/client_monitoring/jsenv_plugin_client_monitoring.js";
 import { jsenvPluginPageSwitcher } from "../plugins/page_switcher/jsenv_plugin_page_switcher.js";
+import { jsenvPluginPatches } from "../plugins/patches/jsenv_plugin_patches.js";
 import { getCorePlugins } from "../plugins/plugins.js";
 import { jsenvPluginServerEvents } from "../plugins/server_events/jsenv_plugin_server_events.js";
 import { devServerPluginChromeDevToolsJson } from "./dev_server_plugins/dev_server_plugin_chrome_devtools_json.js";
@@ -284,6 +285,11 @@ export const startDevServer = async ({
   serverStopCallbackSet.add(dependencyWatcher.stop);
 
   const devServerJsenvPluginStore = await createJsenvPluginStore([
+    // First, ahead of the plugins given by the caller: what every other plugin
+    // reads must be the patched file, and a caller's plugin may rewrite a file
+    // (plugin-preact reprints one it instruments) before a patch written
+    // against its text on disk gets to see it.
+    ...jsenvPluginPatches(patches),
     jsenvPluginServerEvents({ clientAutoreload }),
     // The client-monitoring dashboard is a dev-time convenience; a test-plan run
     // doesn't use it and shouldn't pay for the reporter being injected into
@@ -311,7 +317,6 @@ export const startDevServer = async ({
       magicDirectoryIndex,
       directoryListing,
       supervisor,
-      patches,
       injections,
       transpilation,
       spa,

package/src/plugins/plugins.js

@@ -11,7 +11,6 @@ import { jsenvPluginProtocolFile } from "./protocol_file/jsenv_plugin_protocol_f
 import { jsenvPluginProtocolHttp } from "./protocol_http/jsenv_plugin_protocol_http.js";
 import { jsenvPluginDirectoryReferenceEffect } from "./directory_reference_effect/jsenv_plugin_directory_reference_effect.js";
 import { jsenvPluginInjections } from "./injections/jsenv_plugin_injections.js";
-import { jsenvPluginPatches } from "./patches/jsenv_plugin_patches.js";
 import { jsenvPluginInlining } from "./inlining/jsenv_plugin_inlining.js";
 import { jsenvPluginCommonJsGlobals } from "./commonjs_globals/jsenv_plugin_commonjs_globals.js";
 import { jsenvPluginImportMetaScenarios } from "./import_meta_scenarios/jsenv_plugin_import_meta_scenarios.js";
@@ -52,7 +51,6 @@ export const getCorePlugins = ({
   directoryListing = true,
   directoryReferenceEffect,
   supervisor,
-  patches,
   injections,
   transpilation = true,
   inlining = true,
@@ -94,9 +92,6 @@ export const getCorePlugins = ({
     ...(packageBundle
       ? [jsenvPluginWorkspaceBundle({ packageDirectory })]
       : []),
-    // before everything else: what the other plugins read must be the
-    // patched file
-    ...jsenvPluginPatches(patches),
     // before reference analysis: an url written by an injection must hold its
     // final value when references are analyzed
     jsenvPluginInjections(injections),