fix: invalid paths in windows bundles (#247)

opennextjs · Jan 10, 2025 · 05ee8d4 · 05ee8d4
1 parent 7028c33
commit 05ee8d4
Show file tree

Hide file tree

Showing 6 changed files with 497 additions and 15 deletions.
diff --git a/.changeset/slow-plants-boil.md b/.changeset/slow-plants-boil.md
@@ -0,0 +1,5 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+fix: invalid paths in windows bundles.
diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json
@@ -72,7 +72,7 @@
   },
   "dependencies": {
     "@dotenvx/dotenvx": "catalog:",
-    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@688",
+    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@695",
     "glob": "catalog:",
     "ts-morph": "catalog:",
     "enquirer": "^2.4.1"

diff --git a/packages/cloudflare/src/cli/build/bundle-server.ts b/packages/cloudflare/src/cli/build/bundle-server.ts
@@ -8,6 +8,7 @@ import { build, Plugin } from "esbuild";
 
 import { Config } from "../config.js";
 import * as patches from "./patches/index.js";
+import { normalizePath } from "./utils/index.js";
 
 /** The dist directory of the Cloudflare adapter package */
 const packageDistDir = path.join(path.dirname(fileURLToPath(import.meta.url)), "../..");
@@ -117,10 +118,9 @@ globalThis.__BUILD_TIMESTAMP_MS__ = ${Date.now()};
 
   const isMonorepo = monorepoRoot !== appPath;
   if (isMonorepo) {
-    const packagePosixPath = packagePath.split(path.sep).join(path.posix.sep);
     fs.writeFileSync(
       path.join(outputPath, "handler.mjs"),
-      `export * from "./${packagePosixPath}/handler.mjs";`
+      `export * from "./${normalizePath(packagePath)}/handler.mjs";`
     );
   }
 
@@ -183,7 +183,7 @@ function createFixRequiresESBuildPlugin(config: Config): Plugin {
     name: "replaceRelative",
     setup(build) {
       // Note: we (empty) shim require-hook modules as they generate problematic code that uses requires
-      build.onResolve({ filter: /^\.\/require-hook$/ }, () => ({
+      build.onResolve({ filter: /^\.(\/|\\)require-hook$/ }, () => ({
         path: path.join(config.paths.internal.templates, "shims", "empty.js"),
       }));
     },

diff --git a/packages/cloudflare/src/cli/build/open-next/createServerBundle.ts b/packages/cloudflare/src/cli/build/open-next/createServerBundle.ts
@@ -17,6 +17,8 @@ import { openNextReplacementPlugin } from "@opennextjs/aws/plugins/replacement.j
 import { openNextResolvePlugin } from "@opennextjs/aws/plugins/resolve.js";
 import type { FunctionOptions, SplittedFunctionOptions } from "@opennextjs/aws/types/open-next.js";
 
+import { normalizePath } from "../utils/index.js";
+
 export async function createServerBundle(options: buildHelper.BuildOptions) {
   const { config } = options;
   const foundRoutes = new Set<string>();
@@ -206,7 +208,7 @@ async function generateBundle(
       outfile: path.join(outputPath, packagePath, `index.${outfileExt}`),
       banner: {
         js: [
-          `globalThis.monorepoPackagePath = "${packagePath}";`,
+          `globalThis.monorepoPackagePath = "${normalizePath(packagePath)}";`,
           name === "default" ? "" : `globalThis.fnName = "${name}";`,
         ].join(""),
       },
@@ -273,10 +275,10 @@ function addMonorepoEntrypoint(outputPath: string, packagePath: string) {
   //       the root of the bundle. We will create a dummy `index.mjs`
   //       that re-exports the real handler.
 
-  // TOOD: use helper
-  // Always use posix path for import path
-  const packagePosixPath = packagePath.split(path.sep).join(path.posix.sep);
-  fs.writeFileSync(path.join(outputPath, "index.mjs"), `export * from "./${packagePosixPath}/index.mjs";`);
+  fs.writeFileSync(
+    path.join(outputPath, "index.mjs"),
+    `export * from "./${normalizePath(packagePath)}/index.mjs";`
+  );
 }
 
 async function minifyServerBundle(outputDir: string) {

diff --git a/packages/cloudflare/src/cli/build/patches/investigated/patch-cache.ts b/packages/cloudflare/src/cli/build/patches/investigated/patch-cache.ts
@@ -2,6 +2,8 @@ import path from "node:path";
 
 import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
 
+import { normalizePath } from "../../utils/index.js";
+
 /**
  * Sets up the OpenNext cache handler in a Next.js build.
  *
@@ -24,7 +26,7 @@ export async function patchCache(code: string, openNextOptions: BuildOptions): P
   return code.replace(
     "const { cacheHandler } = this.nextConfig;",
     `const cacheHandler = null;
-CacheHandler = require('${cacheFile}').default;
+CacheHandler = require('${normalizePath(cacheFile)}').default;
 `
   );
 }