fix: testing something new

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 } from './functionsMetaData'
+import { writeFunctionConfiguration, nextVersionNum } from './functionsMetaData'
 import { pack } from './pack'
 import { ApiRouteType } from './types'
 import { getFunctionNameForPage } from './utils'
@@ -132,11 +132,13 @@ 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/helpers/functionsMetaData.ts

@@ -1,5 +1,6 @@
 import { existsSync, readJSON, writeFile } from 'fs-extra'
 import { join } from 'pathe'
+import { satisfies } from 'semver'
 
 import { NEXT_PLUGIN, NEXT_PLUGIN_NAME } from '../constants'
 
@@ -17,8 +18,8 @@ const getNextRuntimeVersion = async (packageJsonPath: string, useNodeModulesPath
 
 const PLUGIN_PACKAGE_PATH = '.netlify/plugins/package.json'
 
-const nextPluginVersion = async () => {
-  const moduleRoot = resolveModuleRoot(NEXT_PLUGIN)
+const nextPluginVersion = async (module?: string) => {
+  const moduleRoot = resolveModuleRoot(module || NEXT_PLUGIN)
   const nodeModulesPath = moduleRoot ? join(moduleRoot, 'package.json') : null
 
   return (
@@ -31,6 +32,8 @@ const nextPluginVersion = async () => {
 
 export const getPluginVersion = async () => `${NEXT_PLUGIN_NAME}@${await nextPluginVersion()}`
 
+export const nextVersionNum = async () => satisfies(await nextPluginVersion('next'), '13.3.3 - 13.4.9')
+
 // The information needed to create a function configuration file
 export interface FunctionInfo {
   // The name of the function, e.g. `___netlify-handler`

packages/runtime/src/templates/getHandler.ts

@@ -17,15 +17,13 @@ const path = require('path')
 const { URLSearchParams, URL } = require('url')
 
 const { Bridge } = require('@vercel/node-bridge/bridge')
-const { satisfies } = require('semver')
 
 const {
   augmentFsModule,
   getMaxAge,
   getMultiValueHeaders,
   getPrefetchResponse,
   normalizePath,
-  nextVersionNum,
 } = require('./handlerUtils')
 const { overrideRequireHooks, applyRequireHooks } = require('./requireHooks')
 const { getNetlifyNextServer } = require('./server')
@@ -42,11 +40,20 @@ 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' }: MakeHandlerParams) => {
+const makeHandler = ({
+  conf,
+  app,
+  pageRoot,
+  NextServer,
+  staticManifest = [],
+  mode = 'ssr',
+  useHooks,
+}: 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)
@@ -63,15 +70,10 @@ 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 is set and Next version before running requireHooks
-  const runRequireHooks = async (hook) =>
-    await nextVersionNum(satisfies)
-      .then((version) => (appDir && version ? hook : null))
-      .catch(() => ({}))
-
-  runRequireHooks(overrideRequireHooks(conf.experimental))
+  // we will need to check if appDir is set and Next version before running requireHook
+  if (appDir && useHooks) return overrideRequireHooks(conf.experimental)
   const NetlifyNextServer: NetlifyNextServerType = getNetlifyNextServer(NextServer)
-  runRequireHooks(applyRequireHooks())
+  if (appDir && useHooks) return applyRequireHooks()
 
   const ONE_YEAR_IN_SECONDS = 31536000
 
@@ -216,6 +218,7 @@ 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 */ `
@@ -227,7 +230,6 @@ export const getHandler = ({
 
   const { Server } = require("http");
   const { promises } = require("fs");
-  const { satisfies } = require('semver')
   // We copy the file here rather than requiring from the node module
   const { Bridge } = require("./bridge");
   const { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, normalizePath, nextVersionNum } = require('./handlerUtils')
@@ -244,7 +246,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' }));`
-      : `(${makeHandler.toString()})({ conf: config, app: "${appDir}", pageRoot, NextServer, staticManifest, mode: 'ssr' });`
+      ? `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} });`
   }
 `

packages/runtime/src/templates/handlerUtils.ts

@@ -1,14 +1,13 @@
 import fs, { createWriteStream, existsSync } from 'fs'
 import { ServerResponse } from 'http'
 import { tmpdir } from 'os'
-import path, { dirname, join, relative } from 'path'
+import path from 'path'
 import { pipeline } from 'stream'
 import { promisify } from 'util'
 
 import { HandlerEvent, HandlerResponse } from '@netlify/functions'
 import { http, https } from 'follow-redirects'
 import NextNodeServer from 'next/dist/server/next-server'
-import { satisfies } from 'semver'
 
 import type { StaticRoute } from '../helpers/types'
 
@@ -275,26 +274,6 @@ 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 () => {
-  const moduleRoot = resolveModuleRoot('next')
-  if (!existsSync(moduleRoot)) {
-    return
-  }
-  const packagePath = join(moduleRoot, 'package.json')
-  const packagePlugin = await fs.promises.readFile(packagePath, 'utf-8').then((contents) => JSON.parse(contents))
-  return packagePlugin?.version
-}
-
-export const nextVersionNum = async (sem?) => (sem ?? satisfies)(await nextPluginVersion(), '13.3.3 - 13.4.9')
-
 export const getMatchedRoute = (
   paths: string,
   routesManifest: Array<StaticRoute>,

packages/runtime/src/templates/server.ts

@@ -17,7 +17,6 @@ import {
   localizeDataRoute,
   unlocalizeRoute,
   getMatchedRoute,
-  nextVersionNum,
 } from './handlerUtils'
 
 interface NetlifyConfig {
@@ -67,8 +66,7 @@ const getNetlifyNextServer = (NextServer: NextServerType) => {
         // 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
-        const version = await nextVersionNum()
-        if (experimental?.appDir && version) this.netlifyPrebundleReact(url, this.nextConfig, parsedUrl)
+        if (experimental?.appDir) 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) {