fix: reset

Author: taty2010

packages/runtime/src/helpers/functions.ts

@@ -28,7 +28,7 @@ import { getResolverForPages, getResolverForSourceFiles } from '../templates/get
 import { ApiConfig, extractConfigFromFile, isEdgeConfig } from './analysis'
 import { getRequiredServerFiles } from './config'
 import { getDependenciesOfFile, getServerFile, getSourceFileForPage } from './files'
-import { writeFunctionConfiguration, nextVersionNum } from './functionsMetaData'
+import { writeFunctionConfiguration } from './functionsMetaData'
 import { pack } from './pack'
 import { ApiRouteType } from './types'
 import { getFunctionNameForPage } from './utils'
@@ -132,13 +132,11 @@ export const generateFunctions = async (
   }
 
   const writeHandler = async (functionName: string, functionTitle: string, isODB: boolean) => {
-    const useHooks = await nextVersionNum()
     const handlerSource = getHandler({
       isODB,
       publishDir,
       appDir: relative(functionDir, appDir),
       nextServerModuleRelativeLocation,
-      useHooks,
     })
     await ensureDir(join(functionsDir, functionName))
 

packages/runtime/src/templates/getHandler.ts

@@ -40,20 +40,11 @@ type MakeHandlerParams = {
   NextServer: NextServerType
   staticManifest: Array<[string, string]>
   mode: 'ssr' | 'odb'
-  useHooks: boolean
 }
 
 // We return a function and then call `toString()` on it to serialise it as the launcher function
 // eslint-disable-next-line max-lines-per-function
-const makeHandler = ({
-  conf,
-  app,
-  pageRoot,
-  NextServer,
-  staticManifest = [],
-  mode = 'ssr',
-  useHooks,
-}: MakeHandlerParams) => {
+const makeHandler = ({ conf, app, pageRoot, NextServer, staticManifest = [], mode = 'ssr' }: MakeHandlerParams) => {
   // 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)
@@ -70,10 +61,15 @@ const makeHandler = ({
   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 is set and Next version before running requireHook
-  if (appDir && useHooks) return 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(() => ({}))
+
+  if (appDir) overrideRequireHooks(conf.experimental)
   const NetlifyNextServer: NetlifyNextServerType = getNetlifyNextServer(NextServer)
-  if (appDir && useHooks) return applyRequireHooks()
+  if (appDir) applyRequireHooks()
 
   const ONE_YEAR_IN_SECONDS = 31536000
 
@@ -218,7 +214,6 @@ export const getHandler = ({
   publishDir = '../../../.next',
   appDir = '../../..',
   nextServerModuleRelativeLocation,
-  useHooks,
 }): 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 */ `
@@ -246,7 +241,7 @@ export const getHandler = ({
   const pageRoot = path.resolve(path.join(__dirname, "${publishDir}", "server"));
   exports.handler = ${
     isODB
-      ? `builder((${makeHandler.toString()})({ conf: config, app: "${appDir}", pageRoot, NextServer, staticManifest, mode: 'odb', useHooks: ${useHooks} }));`
-      : `(${makeHandler.toString()})({ conf: config, app: "${appDir}", pageRoot, NextServer, staticManifest, mode: 'ssr', useHooks: ${useHooks} });`
+      ? `builder((${makeHandler.toString()})({ conf: config, app: "${appDir}", pageRoot, NextServer, staticManifest, mode: 'odb'}));`
+      : `(${makeHandler.toString()})({ conf: config, app: "${appDir}", pageRoot, NextServer, staticManifest, mode: 'ssr'});`
   }
 `