patch instr

fix instr

fix

Author: sommeeeer

packages/cloudflare/src/cli/build/patches/plugins/instrumentation.spec.ts

@@ -1,7 +1,7 @@
 import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { describe, expect, test } from "vitest";
 
-import { getNext14Rule, getNext15Rule } from "./instrumentation.js";
+import { getNext14Rule, getNext15Rule, getNext154Rule } from "./instrumentation.js";
 
 describe("LoadInstrumentationModule (Next15)", () => {
 	const code = `
@@ -96,3 +96,59 @@ describe("prepareImpl (Next14)", () => {
     `);
 	});
 });
+
+describe("getInstrumenationModule (Next154)", () => {
+	const code = `
+    async function getInstrumentationModule(projectDir, distDir) {
+      if (cachedInstrumentationModule) {
+        return cachedInstrumentationModule;
+      }
+      try {
+        cachedInstrumentationModule = (0, _interopdefault.interopDefault)(await require(_nodepath.default.join(projectDir, distDir, "server", \`\${_constants.INSTRUMENTATION_HOOK_FILENAME}.js\`\)));
+        return cachedInstrumentationModule;
+      } catch (err) {
+        if ((0, _iserror.default)(err) && err.code !== "ENOENT" && err.code !== "MODULE_NOT_FOUND" && err.code !== "ERR_MODULE_NOT_FOUND") {
+          throw err;
+        }
+      }
+    }
+  `;
+
+	test("patch when an instrumentation file is not present", async () => {
+		expect(patchCode(code, getNext154Rule(null))).toMatchInlineSnapshot(`
+			"async function getInstrumentationModule(projectDir, distDir) {
+			  if (cachedInstrumentationModule) {
+			    return cachedInstrumentationModule;
+			  }
+			  try {
+			    cachedInstrumentationModule = null;
+			    return cachedInstrumentationModule;
+			  } catch (err) {
+			    if ((0, _iserror.default)(err) && err.code !== "ENOENT" && err.code !== "MODULE_NOT_FOUND" && err.code !== "ERR_MODULE_NOT_FOUND") {
+			      throw err;
+			    }
+			  }
+			}
+			  "
+		`);
+	});
+
+	test("patch when an instrumentation file is present", async () => {
+		expect(patchCode(code, getNext154Rule("/_file_exists_/instrumentation.js"))).toMatchInlineSnapshot(`
+			"async function getInstrumentationModule(projectDir, distDir) {
+			  if (cachedInstrumentationModule) {
+			    return cachedInstrumentationModule;
+			  }
+			  try {
+			    cachedInstrumentationModule = require('/_file_exists_/instrumentation.js');
+			    return cachedInstrumentationModule;
+			  } catch (err) {
+			    if ((0, _iserror.default)(err) && err.code !== "ENOENT" && err.code !== "MODULE_NOT_FOUND" && err.code !== "ERR_MODULE_NOT_FOUND") {
+			      throw err;
+			    }
+			  }
+			}
+			  "
+		`);
+	});
+});

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

@@ -10,6 +10,16 @@ import { normalizePath } from "../../utils/normalize-path.js";
 export function patchInstrumentation(updater: ContentUpdater, buildOpts: BuildOptions): Plugin {
 	const builtInstrumentationPath = getBuiltInstrumentationPath(buildOpts);
 
+	updater.updateContent("patch-instrumentation-next15-4", [
+		{
+			field: {
+				filter: /\.(js|mjs|cjs|jsx|ts|tsx)$/,
+				contentFilter: /async function getInstrumentationModule\(/,
+				callback: ({ contents }) => patchCode(contents, getNext154Rule(builtInstrumentationPath)),
+			},
+		},
+	]);
+
 	updater.updateContent("patch-instrumentation-next15", [
 		{
 			field: {
@@ -36,6 +46,29 @@ export function patchInstrumentation(updater: ContentUpdater, buildOpts: BuildOp
 	};
 }
 
+export function getNext154Rule(builtInstrumentationPath: string | null) {
+	return `
+rule:
+  kind: function_declaration
+  any:
+    - has: {field: name, regex: ^getInstrumentationModule$}
+fix: |-
+  async function getInstrumentationModule(projectDir, distDir) {
+    if (cachedInstrumentationModule) {
+      return cachedInstrumentationModule;
+    }
+    try {
+      cachedInstrumentationModule = ${builtInstrumentationPath ? `require('${builtInstrumentationPath}')` : "null"};
+      return cachedInstrumentationModule;
+    } catch (err) {
+      if ((0, _iserror.default)(err) && err.code !== "ENOENT" && err.code !== "MODULE_NOT_FOUND" && err.code !== "ERR_MODULE_NOT_FOUND") {
+        throw err;
+      }
+    }
+  }
+`;
+}
+
 export function getNext15Rule(builtInstrumentationPath: string | null) {
 	return `
     rule: