@opennextjs/cloudflare 1.11.0 → 1.11.1

package/dist/cli/build/build.js

@@ -13,6 +13,7 @@ import { compileInit } from "./open-next/compile-init.js";
 import { compileSkewProtection } from "./open-next/compile-skew-protection.js";
 import { compileDurableObjects } from "./open-next/compileDurableObjects.js";
 import { createServerBundle } from "./open-next/createServerBundle.js";
+import { useNodeMiddleware } from "./utils/middleware.js";
 import { getVersion } from "./utils/version.js";
 /**
  * Builds the application in a format that can be passed to workerd
@@ -45,13 +46,18 @@ export async function build(options, config, projectOpts, wranglerConfig) {
         setStandaloneBuildMode(options);
         buildNextjsApp(options);
     }
+    // Make sure no Node.js middleware is used
+    if (useNodeMiddleware(options)) {
+        logger.error("Node.js middleware is not currently supported. Consider switching to Edge Middleware.");
+        process.exit(1);
+    }
     // Generate deployable bundle
     printHeader("Generating bundle");
     compileCache(options);
     compileEnvFiles(options);
-    compileInit(options, wranglerConfig);
-    compileImages(options);
-    compileSkewProtection(options, config);
+    await compileInit(options, wranglerConfig);
+    await compileImages(options);
+    await compileSkewProtection(options, config);
     // Compile middleware
     await createMiddleware(options, { forceOnlyBuildOnce: true });
     createStaticAssets(options, { useBasePath: true });

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

@@ -1,7 +1,7 @@
 import { createRequire } from "node:module";
 import path from "node:path";
 import { loadBuildId, loadPrerenderManifest } from "@opennextjs/aws/adapters/config/util.js";
-import { esbuildSync, getPackagePath } from "@opennextjs/aws/build/helper.js";
+import { esbuildSync } from "@opennextjs/aws/build/helper.js";
 export function compileDurableObjects(buildOpts) {
     const _require = createRequire(import.meta.url);
     const entryPoints = [
@@ -9,10 +9,10 @@ export function compileDurableObjects(buildOpts) {
         _require.resolve("@opennextjs/cloudflare/durable-objects/sharded-tag-cache"),
         _require.resolve("@opennextjs/cloudflare/durable-objects/bucket-cache-purge"),
     ];
-    const baseManifestPath = path.join(buildOpts.outputDir, "server-functions/default", getPackagePath(buildOpts), ".next");
-    const prerenderManifest = loadPrerenderManifest(baseManifestPath);
+    const buildOutputDotNextDir = path.join(buildOpts.appBuildOutputPath, ".next");
+    const prerenderManifest = loadPrerenderManifest(buildOutputDotNextDir);
     const previewModeId = prerenderManifest.preview.previewModeId;
-    const BUILD_ID = loadBuildId(baseManifestPath);
+    const BUILD_ID = loadBuildId(buildOutputDotNextDir);
     return esbuildSync({
         entryPoints,
         bundle: true,

package/dist/cli/build/utils/middleware.d.ts

@@ -0,0 +1,8 @@
+import * as buildHelper from "@opennextjs/aws/build/helper.js";
+/**
+ * Returns whether the project is using a Node.js middleware.
+ *
+ * @param options
+ * @returns Whether the project is using a Node.js middleware
+ */
+export declare function useNodeMiddleware(options: buildHelper.BuildOptions): boolean;

package/dist/cli/build/utils/middleware.js

@@ -0,0 +1,21 @@
+import path from "node:path";
+import { loadFunctionsConfigManifest, loadMiddlewareManifest } from "@opennextjs/aws/adapters/config/util.js";
+/**
+ * Returns whether the project is using a Node.js middleware.
+ *
+ * @param options
+ * @returns Whether the project is using a Node.js middleware
+ */
+export function useNodeMiddleware(options) {
+    const buildOutputDotNextDir = path.join(options.appBuildOutputPath, ".next");
+    // Look for the edge middleware
+    const middlewareManifest = loadMiddlewareManifest(buildOutputDotNextDir);
+    const edgeMiddleware = middlewareManifest.middleware["/"];
+    if (edgeMiddleware) {
+        // The app uses an edge middleware
+        return false;
+    }
+    // Look for the node middleware
+    const functionsConfigManifest = loadFunctionsConfigManifest(buildOutputDotNextDir);
+    return Boolean(functionsConfigManifest?.functions["/_middleware"]);
+}

package/dist/cli/commands/helpers.js

@@ -71,6 +71,18 @@ export async function getEnvFromPlatformProxy(options, buildOpts) {
  * @returns escaped arg
  */
 export function quoteShellMeta(arg) {
+    if (process.platform === "win32") {
+        if (arg.length === 0) {
+            return '""';
+        }
+        const needsEscaping = /[&|<>^()%!"]/;
+        const needsQuotes = /\s/.test(arg) || needsEscaping.test(arg);
+        let escaped = arg.replace(/"/g, '""');
+        if (/[&|<>^()%!]/.test(arg)) {
+            escaped = escaped.replace(/[&|<>^()%!]/g, "^$&");
+        }
+        return needsQuotes ? `"${escaped}"` : escaped;
+    }
     if (/["\s]/.test(arg) && !/'/.test(arg)) {
         return `'${arg.replace(/(['\\])/g, "\\$1")}'`;
     }

package/dist/cli/commands/utils.js

@@ -1,6 +1,7 @@
 import { existsSync } from "node:fs";
 import { createRequire } from "node:module";
 import path from "node:path";
+import url from "node:url";
 import { compileOpenNextConfig } from "@opennextjs/aws/build/compileConfig.js";
 import { normalizeOptions } from "@opennextjs/aws/build/helper.js";
 import { printHeader, showWarningOnWindows } from "@opennextjs/aws/build/utils.js";
@@ -50,7 +51,7 @@ export async function retrieveCompiledConfig() {
         logger.error("Could not find compiled Open Next config, did you run the build command?");
         process.exit(1);
     }
-    const config = await import(configPath).then((mod) => mod.default);
+    const config = await import(url.pathToFileURL(configPath).href).then((mod) => mod.default);
     ensureCloudflareConfig(config);
     return { config };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"