Merge branch 'main' into template-updates

Author: LekoArts

README.md

@@ -174,6 +174,44 @@ If your site uses pnpm to manage dependencies, currently you must
 public-hoist-pattern[]=*
 ```
 
+## Running the tests
+
+To run the tests, ensure that the dependencies are installed as follows:
+
+```shell
+npm install
+```
+
+Then run the tests:
+
+```shell
+npm test
+```
+
+### End-to-end tests
+
+In order to run the end-to-end (E2E) tests, you'll need to be logged in to Netlify. You can do this using the [Netlify CLI](https://github.com/netlify/cli) with the command:
+
+```shell
+netlify login
+```
+
+Alternatively, you can set an environment variable `NETLIFY_AUTH_TOKEN` to a valid Netlify personal access token. This can be obtained from the [Netlify UI](https://docs.netlify.com/cli/get-started/#obtain-a-token-in-the-netlify-ui).
+
+Then run the E2E tests if logged in:
+
+```shell
+npm run test:next
+```
+
+Or if using an access token:
+
+```shell
+NETLIFY_AUTH_TOKEN=your-token-here npm run test:next
+```
+
+_Note: The E2E tests will be deployed to a Netlify owned site. To deploy to your own site then set the environment variable `NETLIFY_SITE_ID` to your site ID._
+
 ## Feedback
 
 If you think you have found a bug in Next.js on Netlify,

package-lock.json

@@ -48,7 +48,6 @@ export const generateFunctions = async (
   { FUNCTIONS_SRC = DEFAULT_FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, PUBLISH_DIR }: NetlifyPluginConstants,
   appDir: string,
   apiLambdas: APILambda[],
-  featureFlags: Record<string, unknown>,
 ): Promise<void> => {
   const publish = resolve(PUBLISH_DIR)
   const functionsDir = resolve(INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC)
@@ -70,7 +69,6 @@ export const generateFunctions = async (
       publishDir,
       appDir: relative(functionDir, appDir),
       nextServerModuleRelativeLocation,
-      featureFlags,
     })
 
     await ensureDir(join(functionsDir, functionName))

packages/runtime/src/helpers/functions.ts

@@ -172,7 +172,7 @@ const plugin: NetlifyPlugin = {
           extendedRoutes.map(packSingleFunction),
         )
 
-    await generateFunctions(constants, appDir, apiLambdas, featureFlags)
+    await generateFunctions(constants, appDir, apiLambdas)
     await generatePagesResolver(constants)
 
     await configureHandlerFunctions({

packages/runtime/src/index.ts

@@ -4,7 +4,6 @@ import type { Bridge as NodeBridge } from '@vercel/node-bridge/bridge'
 import { outdent as javascript } from 'outdent'
 
 import type { NextConfig } from '../helpers/config'
-import { splitApiRoutes as isSplitApiRoutesEnabled } from '../helpers/flags'
 
 import type { NextServerType } from './handlerUtils'
 import type { NetlifyNextServerType } from './server'
@@ -31,11 +30,10 @@ type MakeApiHandlerParams = {
   app: string
   pageRoot: string
   NextServer: NextServerType
-  splitApiRoutes: boolean
 }
 
 // We return a function and then call `toString()` on it to serialise it as the launcher function
-const makeApiHandler = ({ conf, app, pageRoot, NextServer, splitApiRoutes }: MakeApiHandlerParams) => {
+const makeApiHandler = ({ conf, app, pageRoot, NextServer }: MakeApiHandlerParams) => {
   // Change working directory into the site root, unless using Nx, which moves the
   // dist directory and handles this itself
   const dir = path.resolve(__dirname, app)
@@ -90,7 +88,6 @@ const makeApiHandler = ({ conf, app, pageRoot, NextServer, splitApiRoutes }: Mak
       },
       {
         revalidateToken: customContext?.odb_refresh_hooks,
-        splitApiRoutes,
       },
     )
     const requestHandler = nextServer.getRequestHandler()
@@ -137,13 +134,11 @@ export const getApiHandler = ({
   publishDir = '../../../.next',
   appDir = '../../..',
   nextServerModuleRelativeLocation,
-  featureFlags,
 }: {
   schedule?: string
   publishDir?: string
   appDir?: string
   nextServerModuleRelativeLocation: string | undefined
-  featureFlags: Record<string, unknown>
 }): string =>
   // This is a string, but if you have the right editor plugin it should format as js (e.g. bierner.comment-tagged-templates in VS Code)
   javascript/* javascript */ `
@@ -166,8 +161,6 @@ export const getApiHandler = ({
   let staticManifest
   const path = require("path");
   const pageRoot = path.resolve(path.join(__dirname, "${publishDir}", "server"));
-  const handler = (${makeApiHandler.toString()})({ conf: config, app: "${appDir}", pageRoot, NextServer, splitApiRoutes: ${isSplitApiRoutesEnabled(
-    featureFlags,
-  )} })
+  const handler = (${makeApiHandler.toString()})({ conf: config, app: "${appDir}", pageRoot, NextServer })
   exports.handler = ${schedule ? `schedule(${JSON.stringify(schedule)}, handler);` : 'handler'}
 `

packages/runtime/src/templates/getApiHandler.ts

@@ -101,7 +101,6 @@ const makeHandler = ({ conf, app, pageRoot, NextServer, staticManifest = [], mod
       },
       {
         revalidateToken: customContext?.odb_refresh_hooks,
-        splitApiRoutes: false,
       },
     )
     const requestHandler = nextServer.getRequestHandler()

packages/runtime/src/templates/getHandler.ts

@@ -13,7 +13,6 @@ import {
 
 interface NetlifyConfig {
   revalidateToken?: string
-  splitApiRoutes: boolean
 }
 
 const getNetlifyNextServer = (NextServer: NextServerType) => {
@@ -39,25 +38,16 @@ const getNetlifyNextServer = (NextServer: NextServerType) => {
         // preserve the URL before Next.js mutates it for i18n
         const { url, headers } = req
 
-        if (this.netlifyConfig.splitApiRoutes) {
-          if (headers['x-prerender-revalidate'] && this.netlifyConfig.revalidateToken) {
-            // handle on-demand revalidation by purging the ODB cache
-            await this.netlifyRevalidate(url)
+        if (headers['x-prerender-revalidate'] && this.netlifyConfig.revalidateToken) {
+          // handle on-demand revalidation by purging the ODB cache
+          await this.netlifyRevalidate(url)
 
-            res = res as unknown as BaseNextResponse
-            res.statusCode = 200
-            res.setHeader('x-nextjs-cache', 'REVALIDATED')
-            res.send()
-          } else {
-            await handler(req, res, parsedUrl)
-          }
+          res = res as unknown as BaseNextResponse
+          res.statusCode = 200
+          res.setHeader('x-nextjs-cache', 'REVALIDATED')
+          res.send()
         } else {
-          // handle the original res.revalidate() request
-          await handler(req, res, parsedUrl)
-          // handle on-demand revalidation by purging the ODB cache
-          if (res.statusCode === 200 && headers['x-prerender-revalidate'] && this.netlifyConfig.revalidateToken) {
-            await this.netlifyRevalidate(url)
-          }
+          return handler(req, res, parsedUrl)
         }
       }
     }