fix: use requireHooks based on next -v and appDir

Author: taty2010

packages/runtime/src/templates/getHandler.ts

@@ -24,6 +24,7 @@ const {
   getMultiValueHeaders,
   getPrefetchResponse,
   normalizePath,
+  nextVersionNum,
 } = require('./handlerUtils')
 const { overrideRequireHooks, applyRequireHooks } = require('./requireHooks')
 const { getNetlifyNextServer } = require('./server')
@@ -61,10 +62,15 @@ const makeHandler = ({ conf, app, pageRoot, NextServer, staticManifest = [], mod
   const { appDir }: ExperimentalConfigWithLegacy = conf.experimental
   // Next 13.4 conditionally uses different React versions and we need to make sure we use the same one
   // With the release of 13.5 experimental.appDir is no longer used.
-  // we will need to check if appDir exists to run requireHooks for older versions
-  if (appDir) overrideRequireHooks(conf.experimental)
+  // we will need to check if appDir is set and Next version before running requireHooks
+  const runRequireHooks = async (hook) =>
+    await nextVersionNum()
+      .then((version) => (appDir && version ? hook : null))
+      .catch(() => ({}))
+
+  runRequireHooks(overrideRequireHooks(conf.experimental))
   const NetlifyNextServer: NetlifyNextServerType = getNetlifyNextServer(NextServer)
-  if (appDir) applyRequireHooks()
+  runRequireHooks(applyRequireHooks())
 
   const ONE_YEAR_IN_SECONDS = 31536000
 
@@ -222,7 +228,7 @@ export const getHandler = ({
   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, normalizePath } = require('./handlerUtils')
+  const { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, normalizePath, nextVersionNum } = require('./handlerUtils')
   const { overrideRequireHooks, applyRequireHooks } = require("./requireHooks")
   const { getNetlifyNextServer } = require("./server")
   const NextServer = require(${JSON.stringify(nextServerModuleRelativeLocation)}).default

packages/runtime/src/templates/handlerUtils.ts

@@ -1,13 +1,15 @@
 import fs, { createWriteStream, existsSync } from 'fs'
 import { ServerResponse } from 'http'
 import { tmpdir } from 'os'
-import path from 'path'
+import path, { dirname, join, relative } from 'path'
 import { pipeline } from 'stream'
 import { promisify } from 'util'
 
 import { HandlerEvent, HandlerResponse } from '@netlify/functions'
 import { http, https } from 'follow-redirects'
+import { readJSON } from 'fs-extra'
 import NextNodeServer from 'next/dist/server/next-server'
+import { satisfies } from 'semver'
 
 import type { StaticRoute } from '../helpers/types'
 
@@ -274,6 +276,25 @@ export const localizeDataRoute = (dataRoute: string, localizedRoute: string): st
     .replace(/\/index\.json$/, '.json')
 }
 
+export const resolveModuleRoot = (moduleName) => {
+  try {
+    return dirname(relative(process.cwd(), require.resolve(`${moduleName}/package.json`, { paths: [process.cwd()] })))
+  } catch {
+    return null
+  }
+}
+// Had to copy nextPluginVersion logic from functionsMetaData for it to work within server.ts and getHandler.ts
+const nextPluginVersion = async (module: string) => {
+  const moduleRoot = resolveModuleRoot(module)
+  if (!existsSync(moduleRoot)) {
+    return
+  }
+  const packagePlugin = await readJSON(join(moduleRoot, 'package.json'))
+  return packagePlugin?.version
+}
+
+export const nextVersionNum = async () => satisfies(await nextPluginVersion('next'), '13.3.3 - 13.4.9')
+
 export const getMatchedRoute = (
   paths: string,
   routesManifest: Array<StaticRoute>,

packages/runtime/src/templates/server.ts

@@ -17,6 +17,7 @@ import {
   localizeDataRoute,
   unlocalizeRoute,
   getMatchedRoute,
+  nextVersionNum,
 } from './handlerUtils'
 
 interface NetlifyConfig {
@@ -64,8 +65,10 @@ const getNetlifyNextServer = (NextServer: NextServerType) => {
         const { url, headers } = req
 
         // conditionally use the prebundled React module
+        // PrebundledReact should only apply when appDir is set it falls between the specified Next versions
         const { experimental }: NextConfigWithAppDir = this.nextConfig
-        if (experimental?.appDir) this.netlifyPrebundleReact(url, this.nextConfig, parsedUrl)
+        const version = await nextVersionNum()
+        if (experimental?.appDir && version) this.netlifyPrebundleReact(url, this.nextConfig, parsedUrl)
 
         // intercept on-demand revalidation requests and handle with the Netlify API
         if (headers['x-prerender-revalidate'] && this.netlifyConfig.revalidateToken) {