Remove unnecessary cache interception options from configuration files

examples-cloudflare/e2e/app-pages-router/open-next.config.ts

@@ -5,5 +5,4 @@ import memoryQueue from "@opennextjs/cloudflare/overrides/queue/memory-queue";
 export default defineCloudflareConfig({
 	incrementalCache: r2IncrementalCache,
 	queue: memoryQueue,
-	enableCacheInterception: true,
 });

examples-cloudflare/e2e/app-router/open-next.config.ts

@@ -21,7 +21,6 @@ const baseConfig = defineCloudflareConfig({
 	}),
 	// `CACHE_PURGE_ZONE_ID` and `CACHE_PURGE_API_TOKEN` are required to enable cache purge
 	// cachePurge: purgeCache({ type: "durableObject" }),
-	enableCacheInterception: true,
 	queue: queueCache(doQueue),
 });
 

examples-cloudflare/e2e/experimental/open-next.config.ts

@@ -14,5 +14,4 @@ export default defineCloudflareConfig({
 		},
 	}),
 	queue: doQueue,
-	enableCacheInterception: true,
 });

examples-cloudflare/e2e/pages-router/open-next.config.ts

@@ -4,6 +4,5 @@ import memoryQueue from "@opennextjs/cloudflare/overrides/queue/memory-queue";
 
 export default defineCloudflareConfig({
 	incrementalCache: r2IncrementalCache,
-	enableCacheInterception: true,
 	queue: memoryQueue,
 });

examples/app-pages-router/open-next.config.ts

@@ -26,10 +26,6 @@ export default {
 		},
 		loader: "fs-dev",
 	},
-	dangerous: {
-		enableCacheInterception: true,
-		useAdapterOutputs: true,
-	},
 	// You can override the build command here so that you don't have to rebuild next every time you make a change
 	// buildCommand: "echo 'No build command'",
 } satisfies OpenNextConfig;

examples/app-router/open-next.config.ts

@@ -13,8 +13,6 @@ export default {
 
 	dangerous: {
 		middlewareHeadersOverrideNextConfigHeaders: true,
-		useAdapterOutputs: true,
-		enableCacheInterception: true,
 	},
 
 	imageOptimization: {

examples/experimental/open-next.config.ts

@@ -19,11 +19,6 @@ export default {
 		loader: "fs-dev",
 	},
 
-	dangerous: {
-		enableCacheInterception: true,
-		useAdapterOutputs: true,
-	},
-
 	// You can override the build command here so that you don't have to rebuild next every time you make a change
 	//buildCommand: "echo 'No build command'",
 } satisfies OpenNextConfig;

examples/pages-router/open-next.config.ts

@@ -17,11 +17,6 @@ export default {
 		loader: "fs-dev",
 	},
 
-	dangerous: {
-		enableCacheInterception: true,
-		useAdapterOutputs: true,
-	},
-
 	// You can override the build command here so that you don't have to rebuild next every time you make a change
 	//buildCommand: "echo 'No build command'",
 };

packages/cloudflare/src/api/config.ts

@@ -42,13 +42,6 @@ export type CloudflareOverrides = {
 	 */
 	cachePurge?: Override<CDNInvalidationHandler>;
 
-	/**
-	 * Enable cache interception
-	 * Should be `false` when PPR is used
-	 * @default false
-	 */
-	enableCacheInterception?: boolean;
-
 	/**
 	 * Route preloading behavior.
 	 * Using a value other than "none" can result in higher CPU usage on cold starts.
@@ -64,14 +57,7 @@ export type CloudflareOverrides = {
  * @returns the OpenNext configuration object
  */
 export function defineCloudflareConfig(config: CloudflareOverrides = {}): OpenNextConfig {
-	const {
-		incrementalCache,
-		tagCache,
-		queue,
-		cachePurge,
-		enableCacheInterception = true,
-		routePreloadingBehavior = "none",
-	} = config;
+	const { incrementalCache, tagCache, queue, cachePurge, routePreloadingBehavior = "none" } = config;
 
 	return {
 		default: {
@@ -91,10 +77,6 @@ export function defineCloudflareConfig(config: CloudflareOverrides = {}): OpenNe
 		cloudflare: {
 			useWorkerdCondition: true,
 		},
-		dangerous: {
-			enableCacheInterception,
-			useAdapterOutputs: true,
-		},
 		middleware: {
 			external: true,
 			override: {

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

@@ -1,25 +1,10 @@
 import { buildNextjsApp, setStandaloneBuildMode } from "@opennextjs/aws/build/buildNextApp.js";
-import { compileCache } from "@opennextjs/aws/build/compileCache.js";
-import { createCacheAssets, createStaticAssets } from "@opennextjs/aws/build/createAssets.js";
-import { createMiddleware } from "@opennextjs/aws/build/createMiddleware.js";
 import * as buildHelper from "@opennextjs/aws/build/helper.js";
-import { patchOriginalNextConfig } from "@opennextjs/aws/build/patch/patches/index.js";
 import { printHeader } from "@opennextjs/aws/build/utils.js";
 import logger from "@opennextjs/aws/logger.js";
-import type { Unstable_Config } from "wrangler";
 
-import { OpenNextConfig } from "../../api/config.js";
 import type { ProjectOptions } from "../project-options.js";
 
-import { bundleServer } from "./bundle-server.js";
-import { compileCacheAssetsManifestSqlFile } from "./open-next/compile-cache-assets-manifest.js";
-import { compileEnvFiles } from "./open-next/compile-env-files.js";
-import { compileImages } from "./open-next/compile-images.js";
-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";
 
 /**
@@ -31,12 +16,7 @@ import { getVersion } from "./utils/version.js";
  * @param config The OpenNext config
  * @param projectOpts The options for the project
  */
-export async function build(
-	options: buildHelper.BuildOptions,
-	config: OpenNextConfig,
-	projectOpts: ProjectOptions,
-	wranglerConfig: Unstable_Config
-): Promise<void> {
+export async function build(options: buildHelper.BuildOptions, projectOpts: ProjectOptions): Promise<void> {
 	// Do not minify the code so that we can apply string replacement patch.
 	options.minify = false;
 
@@ -61,48 +41,7 @@ export async function build(
 		buildNextjsApp(options);
 	}
 
-	if (config.dangerous?.useAdapterOutputs) {
-		logger.info("Using adapter outputs for building OpenNext bundle.");
-		return;
-	}
-
-	// 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");
-
-	await patchOriginalNextConfig(options);
-
-	compileCache(options);
-	compileEnvFiles(options);
-	await compileInit(options, wranglerConfig);
-	await compileImages(options);
-	await compileSkewProtection(options, config);
-
-	// Compile middleware
-	await createMiddleware(options, { forceOnlyBuildOnce: true });
-
-	createStaticAssets(options, { useBasePath: true });
-
-	if (config.dangerous?.disableIncrementalCache !== true) {
-		const { useTagCache, metaFiles } = createCacheAssets(options);
-
-		if (useTagCache) {
-			compileCacheAssetsManifestSqlFile(options, metaFiles);
-		}
-	}
-
-	await createServerBundle(options);
-
-	await compileDurableObjects(options);
-
-	await bundleServer(options, projectOpts);
-
-	logger.info("OpenNext build complete.");
+	logger.info("Using adapter outputs for building OpenNext bundle.");
 }
 
 async function ensureNextjsVersionSupported({ nextVersion }: buildHelper.BuildOptions) {

packages/cloudflare/src/cli/build/open-next/createServerBundle.ts

@@ -7,7 +7,6 @@ import path from "node:path";
 import { loadMiddlewareManifest } from "@opennextjs/aws/adapters/config/util.js";
 import { compileCache } from "@opennextjs/aws/build/compileCache.js";
 import { copyAdapterFiles } from "@opennextjs/aws/build/copyAdapterFiles.js";
-import { copyTracedFiles } from "@opennextjs/aws/build/copyTracedFiles.js";
 import { copyMiddlewareResources, generateEdgeBundle } from "@opennextjs/aws/build/edge/createEdgeBundle.js";
 import * as buildHelper from "@opennextjs/aws/build/helper.js";
 import { installDependencies } from "@opennextjs/aws/build/installDeps.js";
@@ -187,23 +186,11 @@ async function generateBundle(
 	let manifests: any = {};
 
 	// Copy all necessary traced files
-	if (config.dangerous?.useAdapterOutputs) {
-		if (!buildCtx) {
-			throw new Error("should not happen");
-		}
-		tracedFiles = await copyAdapterFiles(options, name, packagePath, buildCtx.outputs);
-		//TODO: we should load manifests here
-	} else {
-		const oldTracedFileOutput = await copyTracedFiles({
-			buildOutputPath: appBuildOutputPath,
-			packagePath,
-			outputDir: outputPath,
-			routes: fnOptions.routes ?? ["app/page.tsx"],
-			skipServerFiles: options.config.dangerous?.useAdapterOutputs === true,
-		});
-		tracedFiles = oldTracedFileOutput.tracedFiles;
-		manifests = oldTracedFileOutput.manifests;
+	if (!buildCtx) {
+		throw new Error("should not happen");
 	}
+	tracedFiles = await copyAdapterFiles(options, name, packagePath, buildCtx.outputs);
+	//TODO: we should load manifests here
 
 	// TODO(vicb): what should `nodePackages` be for the adapter
 	// if (getOpenNextConfig(options).cloudflare?.useWorkerdCondition !== false) {

packages/cloudflare/src/cli/commands/build.ts

@@ -11,7 +11,6 @@ import {
 	getNormalizedOptions,
 	nextAppDir,
 	printHeaders,
-	readWranglerConfig,
 	withWranglerOptions,
 	withWranglerPassthroughArgs,
 } from "./utils.js";
@@ -36,11 +35,8 @@ async function buildCommand(
 
 	const projectOpts = { ...args, minify: !args.noMinify, sourceDir: nextAppDir };
 
-	if (config.dangerous?.useAdapterOutputs) {
-		console.log("Using adapter outputs for building OpenNext bundle.");
-		const require = createRequire(import.meta.url);
-		process.env.NEXT_ADAPTER_PATH = require.resolve("../adapter.js");
-	}
+	const require = createRequire(import.meta.url);
+	process.env.NEXT_ADAPTER_PATH = require.resolve("../adapter.js");
 
 	// Ask whether a `wrangler.jsonc` should be created when no config file exists.
 	// Note: We don't ask when a custom config file is specified via `--config`
@@ -49,9 +45,7 @@ async function buildCommand(
 		await createWranglerConfigIfNotExistent(projectOpts);
 	}
 
-	const wranglerConfig = await readWranglerConfig(args);
-
-	await buildImpl(options, config, projectOpts, wranglerConfig);
+	await buildImpl(options, projectOpts);
 }
 
 /**

packages/open-next/src/adapters/middleware.ts

@@ -40,13 +40,11 @@ const defaultHandler = async (
 
 	const assetResolver = await resolveAssetResolver(middlewareConfig?.assetResolver);
 
-	//#override includeCacheInMiddleware
 	globalThis.tagCache = await resolveTagCache(middlewareConfig?.override?.tagCache);
 
 	globalThis.queue = await resolveQueue(middlewareConfig?.override?.queue);
 
 	globalThis.incrementalCache = await resolveIncrementalCache(middlewareConfig?.override?.incrementalCache);
-	//#endOverride
 
 	const requestId = Math.random().toString(36);
 

packages/open-next/src/build.ts

@@ -47,43 +47,10 @@ export async function build(openNextConfigPath?: string, nodeExternals?: string)
 	// Build Next.js app
 	printHeader("Building Next.js app");
 	setStandaloneBuildMode(options);
-	if (config.dangerous?.useAdapterOutputs) {
-		logger.info("Using adapter outputs for building OpenNext bundle.");
-		process.env.NEXT_ADAPTER_PATH = require.resolve("./adapter.js");
-	}
+	logger.info("Using adapter outputs for building OpenNext bundle.");
+	process.env.NEXT_ADAPTER_PATH = require.resolve("./adapter.js");
 	buildHelper.initOutputDir(options);
 	buildNextjsApp(options);
 
-	if (config.dangerous?.useAdapterOutputs) {
-		logger.info("Using adapter outputs for building OpenNext bundle.");
-		return;
-	}
-
-	// Generate deployable bundle
-	printHeader("Generating bundle");
-
-	// Patch the original Next.js config
-	await patchOriginalNextConfig(options);
-
-	// Compile cache.ts
-	compileCache(options);
-
-	// Compile middleware
-	await createMiddleware(options);
-
-	createStaticAssets(options);
-
-	if (config.dangerous?.disableIncrementalCache !== true) {
-		const { useTagCache } = createCacheAssets(options);
-		if (useTagCache) {
-			await compileTagCacheProvider(options);
-		}
-	}
-
-	await createServerBundle(options);
-	await createRevalidationBundle(options);
-	await createImageOptimizationBundle(options);
-	await createWarmerBundle(options);
-	await generateOutput(options);
-	logger.info("OpenNext build complete.");
+	return;
 }

packages/open-next/src/build/createAssets.ts

@@ -88,9 +88,7 @@ export function createCacheAssets(options: buildHelper.BuildOptions) {
 	const buildId = buildHelper.getBuildId(options);
 	let useTagCache = false;
 
-	const dotNextPath = options.config.dangerous?.useAdapterOutputs
-		? appBuildOutputPath
-		: path.join(appBuildOutputPath, ".next/standalone", packagePath);
+	const dotNextPath = appBuildOutputPath;
 
 	const outputCachePath = path.join(outputDir, "cache", buildId);
 	fs.mkdirSync(outputCachePath, { recursive: true });

packages/open-next/src/build/createMiddleware.ts

@@ -67,7 +67,6 @@ export async function createMiddleware(
 				originResolver: config.middleware.originResolver,
 			},
 			defaultConverter: "aws-cloudfront",
-			includeCache: config.dangerous?.enableCacheInterception,
 			additionalExternals: config.edgeExternals,
 			onlyBuildOnce: forceOnlyBuildOnce === true,
 			name: "middleware",

packages/open-next/src/build/createServerBundle.ts

@@ -16,7 +16,7 @@ import { getCrossPlatformPathRegex } from "../utils/regex.js";
 
 import { compileCache } from "./compileCache.js";
 import { copyAdapterFiles } from "./copyAdapterFiles.js";
-import { copyTracedFiles, getManifests } from "./copyTracedFiles.js";
+import { getManifests } from "./copyTracedFiles.js";
 import { copyMiddlewareResources, generateEdgeBundle } from "./edge/createEdgeBundle.js";
 import * as buildHelper from "./helper.js";
 import { installDependencies } from "./installDeps.js";
@@ -174,23 +174,17 @@ async function generateBundle(
 	buildHelper.copyEnvFile(appBuildOutputPath, packagePath, outputPath);
 
 	let tracedFiles: string[] = [];
-	let manifests: ReturnType<typeof getManifests> | Record<string, never> = {};
+	let manifests: ReturnType<typeof getManifests> = {} as ReturnType<typeof getManifests>;
 
 	// Copy all necessary traced files
-	if (config.dangerous?.useAdapterOutputs) {
-		tracedFiles = await copyAdapterFiles(options, name, packagePath, nextOutputs!);
-		//TODO: we should load manifests here
-	} else {
-		const oldTracedFileOutput = await copyTracedFiles({
-			buildOutputPath: appBuildOutputPath,
-			packagePath,
-			outputDir: outputPath,
-			routes: fnOptions.routes ?? ["app/page.tsx"],
-			skipServerFiles: options.config.dangerous?.useAdapterOutputs === true,
-		});
-		tracedFiles = oldTracedFileOutput.tracedFiles;
-		manifests = oldTracedFileOutput.manifests;
+	if (!nextOutputs) {
+		throw new Error(
+			"createServerBundle was called without adapter outputs. " +
+				"Please ensure NextAdapterOutputs is provided to createServerBundle."
+		);
 	}
+	tracedFiles = await copyAdapterFiles(options, name, packagePath, nextOutputs);
+	//TODO: we should load manifests here
 
 	const additionalCodePatches = codeCustomization?.additionalCodePatches ?? [];