fix: resolve next-server from next app directory and not from plugin

packages/runtime/src/helpers/files.ts

@@ -340,6 +340,54 @@ const getServerFile = (root: string, includeBase = true) => {
   return findModuleFromBase({ candidates, paths: [root] })
 }
 
+/**
+ * Try to find next-server module in few locations (to support different next versions) and in few context (try to resolve from app location and from this module)
+ */
+export const getNextServerModulePath = (root: string): string | null => {
+  // first let's try to use app location directory to find next-server
+  try {
+    const nextServerModuleLocation = getServerFile(root, false)
+    if (nextServerModuleLocation) {
+      return nextServerModuleLocation
+    }
+  } catch (error) {
+    if (!error.message.includes('Cannot find module')) {
+      // A different error, so rethrow it
+      throw error
+    }
+  }
+
+  // if we didn't find it, let's try to resolve "next" package from this module
+  try {
+    // next >= 11.0.1. Yay breaking changes in patch releases!
+    const nextServerModuleLocation = require.resolve('next/dist/server/next-server')
+    if (nextServerModuleLocation) {
+      return nextServerModuleLocation
+    }
+  } catch (error) {
+    if (!error.message.includes("Cannot find module 'next/dist/server/next-server'")) {
+      // A different error, so rethrow it
+      throw error
+    }
+    // Probably an old version of next, so fall through and find it elsewhere.
+  }
+
+  try {
+    // next < 11.0.1
+    // eslint-disable-next-line n/no-missing-require
+    const nextServerModuleLocation = require.resolve('next/dist/next-server/server/next-server')
+    if (nextServerModuleLocation) {
+      return nextServerModuleLocation
+    }
+  } catch (error) {
+    if (!error.message.includes("Cannot find module 'next/dist/next-server/server/next-server'")) {
+      throw error
+    }
+  }
+
+  return null
+}
+
 /**
  * Find the source file for a given page route
  */

packages/runtime/src/helpers/functions.ts

@@ -21,7 +21,7 @@ import { getHandler } from '../templates/getHandler'
 import { getResolverForPages, getResolverForSourceFiles } from '../templates/getPageResolver'
 
 import { ApiConfig, ApiRouteType, extractConfigFromFile, isEdgeConfig } from './analysis'
-import { getSourceFileForPage } from './files'
+import { getNextServerModulePath, getSourceFileForPage } from './files'
 import { writeFunctionConfiguration } from './functionsMetaData'
 import { getFunctionNameForPage } from './utils'
 
@@ -41,6 +41,11 @@ export const generateFunctions = async (
   const functionDir = join(functionsDir, HANDLER_FUNCTION_NAME)
   const publishDir = relative(functionDir, publish)
 
+  const nextServerModuleAbsoluteLocation = getNextServerModulePath(appDir)
+  const nextServerModuleRelativeLocation = nextServerModuleAbsoluteLocation
+    ? relative(functionDir, nextServerModuleAbsoluteLocation)
+    : undefined
+
   for (const { route, config, compiled } of apiRoutes) {
     // Don't write a lambda if the runtime is edge
     if (isEdgeConfig(config.runtime)) {
@@ -51,6 +56,7 @@ export const generateFunctions = async (
       config,
       publishDir,
       appDir: relative(functionDir, appDir),
+      nextServerModuleRelativeLocation,
     })
     const functionName = getFunctionNameForPage(route, config.type === ApiRouteType.BACKGROUND)
     await ensureDir(join(functionsDir, functionName))
@@ -80,7 +86,12 @@ export const generateFunctions = async (
   }
 
   const writeHandler = async (functionName: string, functionTitle: string, isODB: boolean) => {
-    const handlerSource = await getHandler({ isODB, publishDir, appDir: relative(functionDir, appDir) })
+    const handlerSource = await getHandler({
+      isODB,
+      publishDir,
+      appDir: relative(functionDir, appDir),
+      nextServerModuleRelativeLocation,
+    })
     await ensureDir(join(functionsDir, functionName))
 
     // write main handler file (standard or ODB)

packages/runtime/src/templates/getApiHandler.ts

@@ -17,16 +17,16 @@ const { URLSearchParams, URL } = require('url')
 
 const { Bridge } = require('@vercel/node-bridge/bridge')
 
-const { getMultiValueHeaders, getNextServer } = require('./handlerUtils')
+const { getMultiValueHeaders } = require('./handlerUtils')
 /* eslint-enable @typescript-eslint/no-var-requires */
 
 type Mutable<T> = {
   -readonly [K in keyof T]: T[K]
 }
 
 // We return a function and then call `toString()` on it to serialise it as the launcher function
-
-const makeHandler = (conf: NextConfig, app, pageRoot, page) => {
+// eslint-disable-next-line max-params
+const makeHandler = (conf: NextConfig, app, pageRoot, page, NextServer: NextServerType) => {
   // 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)
@@ -64,7 +64,6 @@ const makeHandler = (conf: NextConfig, app, pageRoot, page) => {
     const url = event.rawUrl ? new URL(event.rawUrl) : new URL(path, process.env.URL || 'http://n')
     const port = Number.parseInt(url.port) || 80
 
-    const NextServer: NextServerType = getNextServer()
     const nextServer = new NextServer({
       conf,
       dir,
@@ -118,18 +117,23 @@ export const getApiHandler = ({
   config,
   publishDir = '../../../.next',
   appDir = '../../..',
+  nextServerModuleRelativeLocation,
 }: {
   page: string
   config: ApiConfig
   publishDir?: string
   appDir?: string
-}): string =>
-  // This is a string, but if you have the right editor plugin it should format as js
-  javascript/* javascript */ `
+  nextServerModuleRelativeLocation: string | undefined
+}): string => javascript/* javascript */ `
+  if (!${JSON.stringify(nextServerModuleRelativeLocation)}) {
+    throw new Error('Could not find Next.js server')
+  }
+
   const { Server } = require("http");
   // We copy the file here rather than requiring from the node module
   const { Bridge } = require("./bridge");
-  const { getMultiValueHeaders, getNextServer } = require('./handlerUtils')
+  const { getMultiValueHeaders } = require('./handlerUtils')
+  const NextServer = require(${JSON.stringify(nextServerModuleRelativeLocation)}).default
 
   ${config.type === ApiRouteType.SCHEDULED ? `const { schedule } = require("@netlify/functions")` : ''}
 
@@ -138,7 +142,7 @@ export const getApiHandler = ({
   let staticManifest
   const path = require("path");
   const pageRoot = path.resolve(path.join(__dirname, "${publishDir}", "server"));
-  const handler = (${makeHandler.toString()})(config, "${appDir}", pageRoot, ${JSON.stringify(page)})
+  const handler = (${makeHandler.toString()})(config, "${appDir}", pageRoot, ${JSON.stringify(page)}, NextServer)
   exports.handler = ${
     config.type === ApiRouteType.SCHEDULED ? `schedule(${JSON.stringify(config.schedule)}, handler);` : 'handler'
   }

packages/runtime/src/templates/getHandler.ts

@@ -5,6 +5,9 @@ import { outdent as javascript } from 'outdent'
 
 import type { NextConfig } from '../helpers/config'
 
+import { NextServerType } from './handlerUtils'
+import type { NetlifyNextServerType } from './server'
+
 /* eslint-disable @typescript-eslint/no-var-requires */
 const { promises } = require('fs')
 const { Server } = require('http')
@@ -21,16 +24,24 @@ const {
   getPrefetchResponse,
   normalizePath,
 } = require('./handlerUtils')
-const { NetlifyNextServer } = require('./server')
+const { getNetlifyNextServer } = require('./server')
 /* eslint-enable @typescript-eslint/no-var-requires */
 
 type Mutable<T> = {
   -readonly [K in keyof T]: T[K]
 }
 
 // We return a function and then call `toString()` on it to serialise it as the launcher function
-// eslint-disable-next-line max-params, max-lines-per-function
-const makeHandler = (conf: NextConfig, app, pageRoot, staticManifest: Array<[string, string]> = [], mode = 'ssr') => {
+// eslint-disable-next-line max-lines-per-function
+const makeHandler = (
+  conf: NextConfig,
+  app: string,
+  pageRoot,
+  NextServer: NextServerType,
+  staticManifest: Array<[string, string]> = [],
+  mode = 'ssr',
+  // eslint-disable-next-line max-params
+) => {
   // 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)
@@ -44,6 +55,8 @@ const makeHandler = (conf: NextConfig, app, pageRoot, staticManifest: Array<[str
     require.resolve('./pages.js')
   } catch {}
 
+  const NetlifyNextServer: NetlifyNextServerType = getNetlifyNextServer(NextServer)
+
   const ONE_YEAR_IN_SECONDS = 31536000
 
   // React assumes you want development mode if NODE_ENV is unset.
@@ -86,7 +99,7 @@ const makeHandler = (conf: NextConfig, app, pageRoot, staticManifest: Array<[str
         port,
       },
       {
-        revalidateToken: customContext.odb_refresh_hooks,
+        revalidateToken: customContext?.odb_refresh_hooks,
       },
     )
     const requestHandler = nextServer.getRequestHandler()
@@ -177,15 +190,23 @@ const makeHandler = (conf: NextConfig, app, pageRoot, staticManifest: Array<[str
   }
 }
 
-export const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '../../..' }): string =>
-  // This is a string, but if you have the right editor plugin it should format as js
-  javascript/* javascript */ `
+export const getHandler = ({
+  isODB = false,
+  publishDir = '../../../.next',
+  appDir = '../../..',
+  nextServerModuleRelativeLocation,
+}): string => javascript/* javascript */ `
+  if (!${JSON.stringify(nextServerModuleRelativeLocation)}) {
+    throw new Error('Could not find Next.js server')
+  }
+
   const { Server } = require("http");
   const { promises } = require("fs");
   // We copy the file here rather than requiring from the node module
   const { Bridge } = require("./bridge");
-  const { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, getNextServer, normalizePath } = require('./handlerUtils')
-  const { NetlifyNextServer } = require('./server')
+  const { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, normalizePath } = require('./handlerUtils')
+  const { getNetlifyNextServer } = require('./server')
+  const NextServer = require(${JSON.stringify(nextServerModuleRelativeLocation)}).default
 
   ${isODB ? `const { builder } = require("@netlify/functions")` : ''}
   const { config }  = require("${publishDir}/required-server-files.json")
@@ -197,7 +218,7 @@ export const getHandler = ({ isODB = false, publishDir = '../../../.next', appDi
   const pageRoot = path.resolve(path.join(__dirname, "${publishDir}", "server"));
   exports.handler = ${
     isODB
-      ? `builder((${makeHandler.toString()})(config, "${appDir}", pageRoot, staticManifest, 'odb'));`
-      : `(${makeHandler.toString()})(config, "${appDir}", pageRoot, staticManifest, 'ssr');`
+      ? `builder((${makeHandler.toString()})(config, "${appDir}", pageRoot, NextServer, staticManifest, 'odb'));`
+      : `(${makeHandler.toString()})(config, "${appDir}", pageRoot, NextServer, staticManifest, 'ssr');`
   }
 `

packages/runtime/src/templates/handlerUtils.ts

@@ -160,37 +160,6 @@ export const augmentFsModule = ({
   }) as typeof promises.stat
 }
 
-/**
- * Next.js has an annoying habit of needing deep imports, but then moving those in patch releases. This is our abstraction.
- */
-export const getNextServer = (): NextServerType => {
-  let NextServer: NextServerType
-  try {
-    // next >= 11.0.1. Yay breaking changes in patch releases!
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    NextServer = require('next/dist/server/next-server').default
-  } catch (error) {
-    if (!error.message.includes("Cannot find module 'next/dist/server/next-server'")) {
-      // A different error, so rethrow it
-      throw error
-    }
-    // Probably an old version of next, so fall through and find it elsewhere.
-  }
-
-  if (!NextServer) {
-    try {
-      // next < 11.0.1
-      // eslint-disable-next-line n/no-missing-require, import/no-unresolved, @typescript-eslint/no-var-requires
-      NextServer = require('next/dist/next-server/server/next-server').default
-    } catch (error) {
-      if (!error.message.includes("Cannot find module 'next/dist/next-server/server/next-server'")) {
-        throw error
-      }
-      throw new Error('Could not find Next.js server')
-    }
-  }
-  return NextServer
-}
 /**
  * Prefetch requests are used to check for middleware redirects, and shouldn't trigger SSR.
  */