br

Author: pieh

src/adapter/adapter.ts

@@ -12,14 +12,16 @@ import {
 import { onBuildComplete as onBuildCompleteForMiddleware } from './build/middleware.js'
 import { createNetlifyAdapterContext } from './build/netlify-adapter-context.js'
 import { onBuildComplete as onBuildCompleteForPagesAndAppHandlers } from './build/pages-and-app-handlers.js'
+import { onBuildComplete as onBuildCompleteForRouting } from './build/routing.js'
 import { onBuildComplete as onBuildCompleteForStaticAssets } from './build/static-assets.js'
 
 const adapter: NextAdapter = {
   name: 'Netlify',
   modifyConfig(config) {
     if (config.output !== 'export') {
-      // Enable Next.js standalone mode at build time
-      config.output = 'standalone'
+      // If not export, make sure to not build standalone output as it will become useless
+      // @ts-expect-error types don't unsetting output to not use 'standalone'
+      config.output = undefined
     }
 
     modifyConfigForImageCDN(config)
@@ -31,8 +33,6 @@ const adapter: NextAdapter = {
     await writeFile('./onBuildComplete.json', JSON.stringify(nextAdapterContext, null, 2))
     // debugger
 
-    console.log('onBuildComplete hook called')
-
     const netlifyAdapterContext = createNetlifyAdapterContext(nextAdapterContext)
 
     await onBuildCompleteForImageCDN(nextAdapterContext, netlifyAdapterContext)
@@ -41,6 +41,7 @@ const adapter: NextAdapter = {
     // TODO: verifyNetlifyForms
     await onBuildCompleteForHeaders(nextAdapterContext, netlifyAdapterContext)
     await onBuildCompleteForPagesAndAppHandlers(nextAdapterContext, netlifyAdapterContext)
+    await onBuildCompleteForRouting(nextAdapterContext, netlifyAdapterContext)
 
     if (netlifyAdapterContext.frameworksAPIConfig) {
       // write out config if there is any

src/adapter/build/constants.ts

@@ -15,4 +15,5 @@ export const NETLIFY_FRAMEWORKS_API_FUNCTIONS = '.netlify/v1/functions'
 export const NEXT_RUNTIME_STATIC_ASSETS = '.netlify/static'
 
 export const DISPLAY_NAME_MIDDLEWARE = 'Next.js Middleware Handler'
+export const DISPLAY_NAME_ROUTING = 'Next.js Routing Handler'
 export const DISPLAY_NAME_PAGES_AND_APP = 'Next.js Pages and App Router Handler'

src/adapter/build/middleware.ts

@@ -21,8 +21,7 @@ const MIDDLEWARE_FUNCTION_DIR = join(
 
 export async function onBuildComplete(
   nextAdapterContext: OnBuildCompleteContext,
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  _netlifyAdapterContext: NetlifyAdapterContext,
+  netlifyAdapterContext: NetlifyAdapterContext,
 ) {
   const { middleware } = nextAdapterContext.outputs
   if (!middleware) {
@@ -36,6 +35,8 @@ export async function onBuildComplete(
   }
 
   await writeHandlerFile(middleware, nextAdapterContext.config)
+
+  netlifyAdapterContext.preparedOutputs.middleware = true
 }
 
 const copyHandlerDependenciesForEdgeMiddleware = async (
@@ -186,7 +187,7 @@ const writeHandlerFile = async (
   // compatibility layer mentioned above.
   await writeFile(
     join(MIDDLEWARE_FUNCTION_DIR, `middleware.js`),
-    `
+    /* javascript */ `
     import { init as htmlRewriterInit } from './edge-runtime/vendor/deno.land/x/htmlrewriter@v1.0.0/src/index.ts'
     import { handleMiddleware } from './edge-runtime/middleware.ts';
     import handler from './concatenated-file.js';

src/adapter/build/netlify-adapter-context.ts

@@ -5,7 +5,6 @@ import type { FrameworksAPIConfig, OnBuildCompleteContext } from './types.js'
 
 export function createNetlifyAdapterContext(nextAdapterContext: OnBuildCompleteContext) {
   let buildId: string | undefined
-  let frameworksAPIConfig: FrameworksAPIConfig | undefined
 
   return {
     async getBuildId() {
@@ -14,6 +13,11 @@ export function createNetlifyAdapterContext(nextAdapterContext: OnBuildCompleteC
       }
       return buildId
     },
-    frameworksAPIConfig,
+    frameworksAPIConfig: undefined as FrameworksAPIConfig | undefined,
+    preparedOutputs: {
+      staticAssets: [] as string[],
+      endpoints: [] as string[],
+      middleware: false,
+    },
   }
 }

src/adapter/build/pages-and-app-handlers.ts

@@ -22,8 +22,7 @@ const PAGES_AND_APP_FUNCTION_DIR = join(
 
 export async function onBuildComplete(
   nextAdapterContext: OnBuildCompleteContext,
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  _netlifyAdapterContext: NetlifyAdapterContext,
+  netlifyAdapterContext: NetlifyAdapterContext,
 ) {
   const requiredFiles = new Set<string>()
   const pathnameToEntry: Record<string, string> = {}
@@ -66,68 +65,55 @@ export async function onBuildComplete(
 
   await copyRuntime(join(PAGES_AND_APP_FUNCTION_DIR, RUNTIME_DIR))
 
+  const functionsPaths = Object.keys(pathnameToEntry)
+
   // generate needed runtime files
   const entrypoint = /* javascript */ `
-  import { AsyncLocalStorage } from 'node:async_hooks'
-  import { createRequire } from 'node:module'
-  import { runNextHandler } from './${RUNTIME_DIR}/dist/adapter/run/pages-and-app-handler.js'
+    import { AsyncLocalStorage } from 'node:async_hooks'
+    import { createRequire } from 'node:module'
+    import { runNextHandler } from './${RUNTIME_DIR}/dist/adapter/run/pages-and-app-handler.js'
 
-  globalThis.AsyncLocalStorage = AsyncLocalStorage
+    globalThis.AsyncLocalStorage = AsyncLocalStorage
 
-  const require = createRequire(import.meta.url)
+    const require = createRequire(import.meta.url)
 
-  const pathnameToEntry = ${JSON.stringify(pathnameToEntry, null, 2)}
+    const pathnameToEntry = ${JSON.stringify(pathnameToEntry, null, 2)}
 
-  export default async function handler(request, context) {
-    const url = new URL(request.url)
+    export default async function handler(request, context) {
+      const url = new URL(request.url)
 
-    const entry = pathnameToEntry[url.pathname]
-    if (!entry) {
-      return new Response('Not Found', { status: 404 })
-    }
+      const entry = pathnameToEntry[url.pathname]
+      if (!entry) {
+        return new Response('Not Found', { status: 404 })
+      }
 
-    const nextHandler = require('./' + entry).handler
+      const nextHandler = require('./' + entry).handler
 
-    return runNextHandler(request, context, nextHandler)
-  }
+      return runNextHandler(request, context, nextHandler)
+    }
 
-  export const config = {
-    
-    path: ${JSON.stringify(Object.keys(pathnameToEntry), null, 2)},
-  }
+    export const config = {
+      
+      path: ${JSON.stringify(functionsPaths, null, 2)},
+    }
   `
   await writeFile(
     join(PAGES_AND_APP_FUNCTION_DIR, `${PAGES_AND_APP_FUNCTION_INTERNAL_NAME}.mjs`),
     entrypoint,
   )
 
   // configuration
-  // TODO: ideally allow to set `includedFilesBasePath` via frameworks api config
-  // frameworksAPIConfig.functions ??= { '*': {} }
-  // frameworksAPIConfig.functions[PAGES_AND_APP_FUNCTION_INTERNAL_NAME] = {
-  //   node_bundler: 'none',
-  //   included_files: ['**'],
-  //   // we can't define includedFilesBasePath via Frameworks API
-  //   // included_files_base_path: PAGES_AND_APP_FUNCTION_DIR,
-  // }
-
-  // not using frameworks api because ... it doesn't allow to set includedFilesBasePath
-  await writeFile(
-    join(PAGES_AND_APP_FUNCTION_DIR, `${PAGES_AND_APP_FUNCTION_INTERNAL_NAME}.json`),
-    JSON.stringify(
-      {
-        config: {
-          name: DISPLAY_NAME_PAGES_AND_APP,
-          generator: GENERATOR,
-          node_bundler: 'none',
-          included_files: ['**'],
-          includedFilesBasePath: PAGES_AND_APP_FUNCTION_DIR,
-        },
-      },
-      null,
-      2,
-    ),
-  )
+  netlifyAdapterContext.frameworksAPIConfig ??= {}
+  netlifyAdapterContext.frameworksAPIConfig.functions ??= { '*': {} }
+  netlifyAdapterContext.frameworksAPIConfig.functions[PAGES_AND_APP_FUNCTION_INTERNAL_NAME] = {
+    node_bundler: 'none',
+    included_files: ['**'],
+    // TODO(pieh): allow to set `includedFilesBasePath` via frameworks api config
+    // @ts-expect-error  we can't define includedFilesBasePath via Frameworks API, this only works because of local monkey patching of CLI
+    included_files_base_path: PAGES_AND_APP_FUNCTION_DIR,
+  }
+
+  netlifyAdapterContext.preparedOutputs.endpoints.push(...functionsPaths)
 }
 
 const copyRuntime = async (handlerDirectory: string): Promise<void> => {