refactor: utility to normalize file paths

Author: james-elicx

packages/cloudflare/src/cli/build/patches/to-investigate/inline-eval-manifest.ts

@@ -1,6 +1,7 @@
 import { Config } from "../../../config";
 import { globSync } from "glob";
 import path from "node:path";
+import { normalizePath } from "../../utils";
 
 /**
  * `evalManifest` relies on readFileSync so we need to patch the function so that it instead returns the content of the manifest files
@@ -12,13 +13,9 @@ import path from "node:path";
 export function inlineEvalManifest(code: string, config: Config): string {
   console.log("# inlineEvalManifest");
   const manifestJss = globSync(
-    path
-      .join(config.paths.standaloneAppDotNext, "**", "*_client-reference-manifest.js")
-      .replaceAll(path.sep, path.posix.sep)
+    normalizePath(path.join(config.paths.standaloneAppDotNext, "**", "*_client-reference-manifest.js"))
   ).map((file) =>
-    file
-      .replaceAll(path.sep, path.posix.sep)
-      .replace(config.paths.standaloneApp.replaceAll(path.sep, path.posix.sep) + path.posix.sep, "")
+    normalizePath(file).replace(normalizePath(config.paths.standaloneApp) + path.posix.sep, "")
   );
   return code.replace(
     /function evalManifest\((.+?), .+?\) {/,

packages/cloudflare/src/cli/build/patches/to-investigate/patch-read-file.ts

@@ -1,6 +1,7 @@
 import { Config } from "../../../config";
 import { globSync } from "glob";
 import path from "node:path";
+import { normalizePath } from "../../utils";
 import { readFileSync } from "node:fs";
 
 export function patchReadFile(code: string, config: Config): string {
@@ -20,11 +21,9 @@ export function patchReadFile(code: string, config: Config): string {
   // (source: https://github.com/vercel/next.js/blob/15aeb92e/packages/next/src/server/load-manifest.ts#L34-L56)
   // Note: we could/should probably just patch readFileSync here or something!
   const manifestJsons = globSync(
-    path.join(config.paths.standaloneAppDotNext, "**", "*-manifest.json").replaceAll(path.sep, path.posix.sep)
+    normalizePath(path.join(config.paths.standaloneAppDotNext, "**", "*-manifest.json"))
   ).map((file) =>
-    file
-      .replaceAll(path.sep, path.posix.sep)
-      .replace(config.paths.standaloneApp.replaceAll(path.sep, path.posix.sep) + path.posix.sep, "")
+    normalizePath(file).replace(normalizePath(config.paths.standaloneApp) + path.posix.sep, "")
   );
   code = code.replace(
     /function loadManifest\((.+?), .+?\) {/,

packages/cloudflare/src/cli/build/utils/index.ts

@@ -1,2 +1,3 @@
 export * from "./ts-parse-file";
 export * from "./copy-prerendered-routes";
+export * from "./normalize-path";

packages/cloudflare/src/cli/build/utils/normalize-path.ts

@@ -0,0 +1,5 @@
+import { posix, sep } from "node:path";
+
+export function normalizePath(path: string) {
+  return path.replaceAll(sep, posix.sep);
+}