opennextjs
diff --git a/‎.github/workflows/e2e-appdir.yml
+3 b/‎.github/workflows/e2e-appdir.yml
+3
diff --git a/‎.github/workflows/e2e-next.yml
+3 b/‎.github/workflows/e2e-next.yml
+3
diff --git a/‎.github/workflows/test-integration.yml
+3 b/‎.github/workflows/test-integration.yml
+3
diff --git a/‎.github/workflows/test.yml
+3 b/‎.github/workflows/test.yml
+3
diff --git a/‎.gitignore
+3-1 b/‎.gitignore
+3-1
diff --git a/‎cypress/e2e/default/revalidate.cy.ts
+1-1 b/‎cypress/e2e/default/revalidate.cy.ts
+1-1
diff --git a/‎demos/default/netlify.toml
+1 b/‎demos/default/netlify.toml
+1
diff --git a/‎demos/middleware/netlify.toml
+3 b/‎demos/middleware/netlify.toml
+3
diff --git a/‎demos/nx-next-monorepo-demo/netlify.toml
+3 b/‎demos/nx-next-monorepo-demo/netlify.toml
+3
diff --git a/‎demos/static-root/netlify.toml
+3 b/‎demos/static-root/netlify.toml
+3
diff --git a/‎packages/runtime/src/helpers/config.ts
+24-2 b/‎packages/runtime/src/helpers/config.ts
+24-2
diff --git a/‎packages/runtime/src/helpers/files.ts
+1-1 b/‎packages/runtime/src/helpers/files.ts
+1-1
diff --git a/‎packages/runtime/src/helpers/flags.ts
+17 b/‎packages/runtime/src/helpers/flags.ts
+17
@@ -6,6 +6,9 @@ on:
   push:
     branches: [main]
 
+env:
+  NEXT_SPLIT_API_ROUTES: true
+
 jobs:
   setup:
     runs-on: ubuntu-latest
 
@@ -8,6 +8,9 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
+env:
+  NEXT_SPLIT_API_ROUTES: true
+
 jobs:
   setup:
     runs-on: ubuntu-latest
 
@@ -9,6 +9,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
+env:
+  NEXT_SPLIT_API_ROUTES: true
+
 jobs:
   build:
     name: Integration tests
 
@@ -11,6 +11,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
+env:
+  NEXT_SPLIT_API_ROUTES: true
+
 jobs:
   build:
     name: Unit tests
 
@@ -152,4 +152,6 @@ packages/*/lib
 cypress/screenshots
 
 # Test cases have node module fixtures
-!test/**/node_modules
+!test/**/node_modules
+
+/tmp
@@ -33,7 +33,7 @@ describe('On-demand revalidation', () => {
     cy.request({ url: '/api/revalidate/?select=5', failOnStatusCode: false }).then((res) => {
       expect(res.status).to.eq(500)
       expect(res.body).to.have.property('message')
-      expect(res.body.message).to.include('Invalid response 404')
+      expect(res.body.message).to.include('could not refresh content for path /getStaticProps/withRevalidate/3/, path is not handled by an odb')
     })
   })
   it('revalidates dynamic non-prerendered ISR route with fallback blocking', () => {
 
@@ -10,6 +10,7 @@ CYPRESS_CACHE_FOLDER = "../node_modules/.CypressBinary"
 # set TERM variable for terminal output
 TERM = "xterm"
 NODE_VERSION = "16.15.1"
+NEXT_SPLIT_API_ROUTES = "true"
 
 [[headers]]
 for = "/_next/image/*"
 
@@ -3,6 +3,9 @@ command = "npm run build"
 publish = ".next"
 ignore = "if [ $CACHED_COMMIT_REF == $COMMIT_REF ]; then (exit 1); else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../..; fi;"
 
+[build.environment]
+NEXT_SPLIT_API_ROUTES = "true"
+
 [[plugins]]
 package = "@netlify/plugin-nextjs"
 
 
@@ -3,6 +3,9 @@ command = "npm run build"
 publish = "dist/apps/demo-monorepo/.next"
 ignore = "if [ $CACHED_COMMIT_REF == $COMMIT_REF ]; then (exit 1); else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../..; fi;"
 
+[build.environment]
+NEXT_SPLIT_API_ROUTES = "true"
+
 [dev]
 command = "npm run start"
 targetPort = 4200
 
@@ -3,6 +3,9 @@ command = "next build"
 publish = ".next"
 ignore = "if [ $CACHED_COMMIT_REF == $COMMIT_REF ]; then (exit 1); else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../..; fi;"
 
+[build.environment]
+NEXT_SPLIT_API_ROUTES = "true"
+
 [[plugins]]
 package = "@netlify/plugin-nextjs"
 
 
@@ -8,6 +8,8 @@ import slash from 'slash'
 
 import { HANDLER_FUNCTION_NAME, IMAGE_FUNCTION_NAME, ODB_FUNCTION_NAME } from '../constants'
 
+import { splitApiRoutes } from './flags'
+import type { APILambda } from './functions'
 import type { RoutesManifest } from './types'
 import { escapeStringRegexp } from './utils'
 
@@ -17,6 +19,7 @@ type NetlifyHeaders = NetlifyConfig['headers']
 
 export interface RequiredServerFiles {
   version?: number
+  relativeAppDir?: string
   config?: NextConfigComplete
   appDir?: string
   files?: string[]
@@ -98,10 +101,14 @@ export const configureHandlerFunctions = async ({
   netlifyConfig,
   publish,
   ignore = [],
+  apiLambdas,
+  featureFlags,
 }: {
   netlifyConfig: NetlifyConfig
   publish: string
   ignore: Array<string>
+  apiLambdas: APILambda[]
+  featureFlags: Record<string, unknown>
 }) => {
   const config = await getRequiredServerFiles(publish)
   const files = config.files || []
@@ -117,7 +124,7 @@ export const configureHandlerFunctions = async ({
     (moduleName) => !hasManuallyAddedModule({ netlifyConfig, moduleName }),
   )
 
-  ;[HANDLER_FUNCTION_NAME, ODB_FUNCTION_NAME, '_api_*'].forEach((functionName) => {
+  const configureFunction = (functionName: string) => {
     netlifyConfig.functions[functionName] ||= { included_files: [], external_node_modules: [] }
     netlifyConfig.functions[functionName].node_bundler = 'nft'
     netlifyConfig.functions[functionName].included_files ||= []
@@ -156,7 +163,22 @@ export const configureHandlerFunctions = async ({
         netlifyConfig.functions[functionName].included_files.push(`!${moduleRoot}/**/*`)
       }
     })
-  })
+  }
+
+  configureFunction(HANDLER_FUNCTION_NAME)
+  configureFunction(ODB_FUNCTION_NAME)
+
+  if (splitApiRoutes(featureFlags)) {
+    for (const apiLambda of apiLambdas) {
+      const { functionName, includedFiles } = apiLambda
+      netlifyConfig.functions[functionName] ||= { included_files: [] }
+      netlifyConfig.functions[functionName].node_bundler = 'none'
+      netlifyConfig.functions[functionName].included_files ||= []
+      netlifyConfig.functions[functionName].included_files.push(...includedFiles)
+    }
+  } else {
+    configureFunction('_api_*')
+  }
 }
 
 interface BuildHeaderParams {
 
@@ -371,7 +371,7 @@ export const getDependenciesOfFile = async (file: string) => {
   if (!existsSync(nft)) {
     return []
   }
-  const dependencies = await readJson(nft, 'utf8')
+  const dependencies = (await readJson(nft, 'utf8')) as { files: string[] }
   return dependencies.files.map((dep) => resolve(dirname(file), dep))
 }
 
 
@@ -0,0 +1,17 @@
+import destr from 'destr'
+
+/**
+ * If this flag is enabled, we generate individual Lambda functions for API Routes.
+ * They're packed together in 50mb chunks to avoid hitting the Lambda size limit.
+ *
+ * To prevent bundling times from rising,
+ * we use the "none" bundling strategy where we fully rely on Next.js' `.nft.json` files.
+ * This should to a significant speedup, but is still experimental.
+ *
+ * If disabled, we bundle all API Routes into a single function.
+ * This is can lead to large bundle sizes.
+ *
+ * Disabled by default. Can be overriden using the NEXT_SPLIT_API_ROUTES env var.
+ */
+export const splitApiRoutes = (featureFlags: Record<string, unknown>): boolean =>
+  destr(process.env.NEXT_SPLIT_API_ROUTES) ?? featureFlags.next_split_api_routes ?? false
Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ export const getDependenciesOfFile = async (file: string) => {`
`371`	`371`	`if (!existsSync(nft)) {`
`372`	`372`	`return []`
`373`	`373`	`}`
`374`		`- const dependencies = await readJson(nft, 'utf8')`
	`374`	`+ const dependencies = (await readJson(nft, 'utf8')) as { files: string[] }`
`375`	`375`	`return dependencies.files.map((dep) => resolve(dirname(file), dep))`
`376`	`376`	`}`
`377`	`377`