fixup! restrict context

Author: vicb

packages/cloudflare/src/cli/build/bundle-server.ts

@@ -10,6 +10,7 @@ import { build, Plugin } from "esbuild";
 import { patchVercelOgLibrary } from "./patches/ast/patch-vercel-og-library.js";
 import { patchWebpackRuntime } from "./patches/ast/webpack-runtime.js";
 import * as patches from "./patches/index.js";
+import { patchLoadInstrumentation } from "./patches/plugins/load-instrumentation.js";
 import { handleOptionalDependencies } from "./patches/plugins/optional-deps.js";
 import { fixRequire } from "./patches/plugins/require.js";
 import { inlineRequirePagePlugin } from "./patches/plugins/require-page.js";
@@ -82,6 +83,7 @@ export async function bundleServer(buildOpts: BuildOptions): Promise<void> {
       setWranglerExternal(),
       fixRequire(),
       handleOptionalDependencies(optionalDependencies),
+      patchLoadInstrumentation(),
     ],
     external: ["./middleware/handler.mjs"],
     alias: {
@@ -192,7 +194,6 @@ export async function updateWorkerBundledCode(
       (code) => patches.inlineMiddlewareManifestRequire(code, buildOpts),
     ],
     ["exception bubbling", patches.patchExceptionBubbling],
-    ["`loadInstrumentationModule` function", patches.patchLoadInstrumentationModule],
     [
       "`patchAsyncStorage` call",
       (code) =>

packages/cloudflare/src/cli/build/patches/ast/webpack-runtime.ts

@@ -27,6 +27,7 @@ export function buildInlineChunksRule(chunks: number[]) {
   return `
 rule:
   pattern: ($CHUNK_ID, $_PROMISES) => { $$$ }
+  inside: {pattern: $_.$_.require = $$$_, stopBy: end}
   all:
     - has: {pattern: $INSTALL(require("./chunks/" + $$$)), stopBy: end}
     - has: {pattern: $SELF_ID != $CHUNK_ID, stopBy: end}

packages/cloudflare/src/cli/build/patches/plugins/load-instrumentation.ts

@@ -0,0 +1,33 @@
+import { readFile } from "node:fs/promises";
+
+import type { PluginBuild } from "esbuild";
+
+import { patchCode } from "../ast/util.js";
+
+export const instrumentationRule = `
+rule:
+  kind: method_definition
+  all:
+    - has: {field: name, regex: ^loadInstrumentationModule$}
+    - has: {pattern: dynamicRequire, stopBy: end}
+
+fix: async loadInstrumentation() { }
+`;
+
+export function patchLoadInstrumentation() {
+  console.error("#############################");
+  return {
+    name: "patch-load-instrumentation",
+
+    setup: async (build: PluginBuild) => {
+      build.onLoad({ filter: /.*/ }, async ({ path }) => {
+        const code = await readFile(path, "utf-8");
+        console.error({ path });
+        if (/async loadInstrumentationModule\(/.test(code)) {
+          console.error({ path });
+          return { contents: patchCode(code, instrumentationRule) };
+        }
+      });
+    },
+  };
+}

packages/cloudflare/src/cli/build/patches/to-investigate/patch-load-instrumentation-module.ts

@@ -32,7 +32,7 @@ export function patchLoadInstrumentationModule(code: string) {
     });
 
   loadInstrumentationModuleDeclarations.forEach((loadInstrumentationModuleDeclaration) => {
-    loadInstrumentationModuleDeclaration.setBodyText("");
+    loadInstrumentationModuleDeclaration.setBodyText("/** emptied */");
   });
   return file.print();
 }