.

Author: james-elicx

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

@@ -5,6 +5,8 @@ import { type BuildOptions, getPackagePath } from "@opennextjs/aws/build/helper.
 import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
 
+import { normalizePath } from "../../utils/normalize-path.js";
+
 export function patchInstrumentation(updater: ContentUpdater, buildOpts: BuildOptions): Plugin {
   const builtInstrumentationPath = getBuiltInstrumentationPath(buildOpts);
 
@@ -84,7 +86,7 @@ function getBuiltInstrumentationPath(buildOpts: BuildOptions): string | null {
     getPackagePath(buildOpts),
     `.next/server/${INSTRUMENTATION_HOOK_FILENAME}.js`
   );
-  return existsSync(maybeBuiltInstrumentationPath) ? maybeBuiltInstrumentationPath.replace(/\\/g, "/") : null;
+  return existsSync(maybeBuiltInstrumentationPath) ? normalizePath(maybeBuiltInstrumentationPath) : null;
 }
 
 /**

packages/cloudflare/src/cli/commands/populate-cache.ts

@@ -33,6 +33,7 @@ import {
   BINDING_NAME as D1_TAG_BINDING_NAME,
   NAME as D1_TAG_NAME,
 } from "../../api/overrides/tag-cache/d1-next-tag-cache.js";
+import { normalizePath } from "../build/utils/normalize-path.js";
 import type { WranglerTarget } from "../utils/run-wrangler.js";
 import { runWrangler } from "../utils/run-wrangler.js";
 
@@ -58,7 +59,7 @@ export function getCacheAssets(opts: BuildOptions): CacheAsset[] {
 
   for (const file of allFiles) {
     const fullPath = file.fullpathPosix();
-    const relativePath = path.relative(path.join(opts.outputDir, "cache"), fullPath);
+    const relativePath = normalizePath(path.relative(path.join(opts.outputDir, "cache"), fullPath));
 
     if (relativePath.startsWith("__fetch")) {
       const [__fetch, buildId, ...keyParts] = relativePath.split("/");