@opennextjs/cloudflare 0.3.6 → 0.3.8

package/dist/api/get-cloudflare-context.js

@@ -28,7 +28,10 @@ async function getCloudflareContextInNextDev() {
         // Note: we never want wrangler to be bundled in the Next.js app, that's why the import below looks like it does
         const { getPlatformProxy } = await import(
         /* webpackIgnore: true */ `${"__wrangler".replaceAll("_", "")}`);
-        const { env, cf, ctx } = await getPlatformProxy();
+        const { env, cf, ctx } = await getPlatformProxy({
+            // This allows the selection of a wrangler environment while running in next dev mode
+            environment: process.env.NEXT_DEV_WRANGLER_ENV,
+        });
         global[cloudflareContextInNextDevSymbol] = {
             env,
             cf: cf,

package/dist/cli/build/bundle-server.js

@@ -4,6 +4,7 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { build } from "esbuild";
 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)), "../..");
 /**
@@ -103,8 +104,7 @@ globalThis.__BUILD_TIMESTAMP_MS__ = ${Date.now()};
     await updateWorkerBundledCode(openNextServerBundle, config, openNextOptions);
     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";`);
+        fs.writeFileSync(path.join(outputPath, "handler.mjs"), `export * from "./${normalizePath(packagePath)}/handler.mjs";`);
     }
     console.log(`\x1b[35mWorker saved in \`${getOutputWorkerPath(openNextOptions)}\` 🚀\n\x1b[0m`);
 }
@@ -156,7 +156,7 @@ function createFixRequiresESBuildPlugin(config) {
         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"),
             }));
         },

package/dist/cli/build/open-next/createServerBundle.js

@@ -13,6 +13,7 @@ import { minifyAll } from "@opennextjs/aws/minimize-js.js";
 import { openNextEdgePlugins } from "@opennextjs/aws/plugins/edge.js";
 import { openNextReplacementPlugin } from "@opennextjs/aws/plugins/replacement.js";
 import { openNextResolvePlugin } from "@opennextjs/aws/plugins/resolve.js";
+import { normalizePath } from "../utils/index.js";
 export async function createServerBundle(options) {
     const { config } = options;
     const foundRoutes = new Set();
@@ -147,7 +148,7 @@ async function generateBundle(name, options, fnOptions) {
         outfile: path.join(outputPath, packagePath, `index.${outfileExt}`),
         banner: {
             js: [
-                `globalThis.monorepoPackagePath = "${packagePath}";`,
+                `globalThis.monorepoPackagePath = "${normalizePath(packagePath)}";`,
                 name === "default" ? "" : `globalThis.fnName = "${name}";`,
             ].join(""),
         },
@@ -201,10 +202,7 @@ function addMonorepoEntrypoint(outputPath, packagePath) {
     //       the Lambda function to be able to find the handler at
     //       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) {
     logger.info("Minimizing server function...");

package/dist/cli/build/patches/investigated/patch-cache.js

@@ -1,4 +1,5 @@
 import path from "node:path";
+import { normalizePath } from "../../utils/index.js";
 /**
  * Sets up the OpenNext cache handler in a Next.js build.
  *
@@ -17,6 +18,6 @@ export async function patchCache(code, openNextOptions) {
     const packagePath = path.relative(monorepoRoot, appBuildOutputPath);
     const cacheFile = path.join(outputPath, packagePath, "cache.cjs");
     return code.replace("const { cacheHandler } = this.nextConfig;", `const cacheHandler = null;
-CacheHandler = require('${cacheFile}').default;
+CacheHandler = require('${normalizePath(cacheFile)}').default;
 `);
 }

package/dist/cli/build/patches/to-investigate/wrangler-deps.js

@@ -139,7 +139,7 @@ function patchRequireReactDomServerEdge(config) {
           ReactDOMServer = require('react-dom/server.browser');
       }
       ${parameterName}.exports = ReactDOMServer;
-      }`.replace(/\ns*/g, " "));
+      `.replace(/\ns*/g, " "));
     });
     const updatedCode = file.print();
     writeFileSync(pagesRuntimeFile, updatedCode);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -62,7 +62,7 @@
   },
   "dependencies": {
     "@dotenvx/dotenvx": "1.31.0",
-    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@688",
+    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@695",
     "glob": "^11.0.0",
     "ts-morph": "^23.0.0",
     "enquirer": "^2.4.1"