chore: refactor handler paths

Author: orinokai

.eslintrc.cjs

@@ -19,17 +19,9 @@ module.exports = {
  overrides: [
  ...overrides,
  {
- files: ['src/templates/**'],
+ files: ['src/handlers/**'],
  rules: {
- '@typescript-eslint/no-var-requires': 'off',
- '@typescript-eslint/ban-ts-comment': 'off',
- 'unicorn/no-abusive-eslint-disable': 'off',
- 'eslint-comments/no-unlimited-disable': 'off',
- 'import/no-unresolved': 'off',
- 'import/no-unassigned-import': 'off',
  'import/no-anonymous-default-export': 'off',
- 'n/no-missing-require': 'off',
- 'n/no-missing-import': 'off',
  },
  },
  ],

src/templates/cache-handler.cts renamed to src/handlers/cache.cts

@@ -1,7 +1,7 @@
 import { toComputeResponse, toReqRes } from '@fastly/http-compute-js'
 import type { WorkerRequestHandler } from 'next/dist/server/lib/types.js'
 
-import { RUNTIME_DIR } from '../helpers/constants.js'
+import { TASK_DIR } from '../helpers/constants.js'
 
 let nextHandler: WorkerRequestHandler
 
@@ -16,7 +16,7 @@ export default async (request: Request) => {
  ;[nextHandler] = await getRequestHandlers({
  port: 3000,
  hostname: 'localhost',
- dir: RUNTIME_DIR,
+ dir: TASK_DIR,
  isDev: false,
  })
  }

src/templates/server-handler.ts renamed to src/handlers/server.ts

@@ -1,6 +1,6 @@
 import { readFile } from 'node:fs/promises'
 
-import { RUNTIME_DIR } from './constants.js'
+import { TASK_DIR } from './constants.js'
 
 /**
  * Enable Next.js standalone mode
@@ -10,12 +10,12 @@ export const setBuildConfig = () => {
 }
 
 export const setRequestConfig = async () => {
- const runtimeConfig = JSON.parse(await readFile('./.next/required-server-files.json', 'utf-8'))
+ const runtimeConfig = JSON.parse(await readFile(`${TASK_DIR}/.next/required-server-files.json`, 'utf-8'))
 
  // set the path to the cache handler
  runtimeConfig.config.experimental = {
  ...runtimeConfig.config.experimental,
- incrementalCacheHandlerPath: `${RUNTIME_DIR}/dist/templates/cache-handler.cjs`,
+ incrementalCacheHandlerPath: `${TASK_DIR}/dist/handlers/cache.cjs`,
  }
 
  // set config from the build output

src/helpers/config.ts

@@ -1,20 +1,13 @@
 import { resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
-let dir
-try {
- dir = __dirname
-} catch {
- dir = fileURLToPath(new URL('.', import.meta.url))
-}
-
-export const MODULE_DIR = dir
+export const MODULE_DIR = fileURLToPath(new URL('.', import.meta.url))
 export const PLUGIN_DIR = resolve(`${MODULE_DIR}../..`)
-export const RUNTIME_DIR = resolve(`${MODULE_DIR}../..`)
+export const TASK_DIR = process.cwd()
 
-export const NEXT_BUILD_DIR = '.netlify/.next'
+export const BUILD_DIR = `${TASK_DIR}/.netlify/.next`
 
-export const FUNCTIONS_INTERNAL_DIR = '.netlify/functions-internal'
+export const FUNCTIONS_INTERNAL_DIR = `${TASK_DIR}/.netlify/functions-internal`
 export const FUNCTIONS_URL = '/.netlify/functions'
 
 export const SERVER_HANDLER_NAME = '___netlify-server-handler'

src/helpers/constants.ts

@@ -3,13 +3,13 @@ import { existsSync } from 'node:fs'
 import { NetlifyPluginConstants } from '@netlify/build'
 import { copySync, moveSync } from 'fs-extra/esm'
 
-import { NEXT_BUILD_DIR } from './constants.js'
+import { BUILD_DIR } from './constants.js'
 
 /**
  * Move the Next.js build output to a temporary directory
  */
 export const moveBuildOutput = ({ PUBLISH_DIR }: NetlifyPluginConstants) => {
- moveSync(PUBLISH_DIR, NEXT_BUILD_DIR, { overwrite: true })
+ moveSync(PUBLISH_DIR, BUILD_DIR, { overwrite: true })
 }
 
 /**
@@ -19,5 +19,5 @@ export const moveStaticAssets = ({ PUBLISH_DIR }: NetlifyPluginConstants) => {
  if (existsSync('public')) {
  copySync('public', PUBLISH_DIR)
  }
- copySync(`${NEXT_BUILD_DIR}/static/`, `${PUBLISH_DIR}/_next/static`)
+ copySync(`${BUILD_DIR}/static/`, `${PUBLISH_DIR}/_next/static`)
 }

src/helpers/files.ts

@@ -3,7 +3,7 @@ import { writeFileSync } from 'fs'
 import { nodeFileTrace } from '@vercel/nft'
 import { copySync, emptyDirSync, readJsonSync, writeJSONSync } from 'fs-extra/esm'
 
-import { NEXT_BUILD_DIR, SERVER_HANDLER_DIR, SERVER_HANDLER_NAME, PLUGIN_DIR } from './constants.js'
+import { BUILD_DIR, SERVER_HANDLER_DIR, SERVER_HANDLER_NAME, PLUGIN_DIR } from './constants.js'
 
 const pkg = readJsonSync(`${PLUGIN_DIR}/package.json`)
 
@@ -18,7 +18,7 @@ export const createServerHandler = async () => {
 
  // trace the handler dependencies
  const { fileList } = await nodeFileTrace(
- [`${PLUGIN_DIR}/dist/templates/server-handler.js`, `${PLUGIN_DIR}/dist/templates/cache-handler.cjs`],
+ [`${PLUGIN_DIR}/dist/handlers/server.js`, `${PLUGIN_DIR}/dist/handlers/cache.cjs`],
  { base: PLUGIN_DIR, ignore: ['package.json', 'node_modules/next/**'] },
  )
 
@@ -28,8 +28,8 @@ export const createServerHandler = async () => {
  })
 
  // copy the next.js standalone build output to the handler directory
- copySync(`${NEXT_BUILD_DIR}/standalone/.next`, `${SERVER_HANDLER_DIR}/.next`)
- copySync(`${NEXT_BUILD_DIR}/standalone/node_modules`, `${SERVER_HANDLER_DIR}/node_modules`)
+ copySync(`${BUILD_DIR}/standalone/.next`, `${SERVER_HANDLER_DIR}/.next`)
+ copySync(`${BUILD_DIR}/standalone/node_modules`, `${SERVER_HANDLER_DIR}/node_modules`)
 
  // create the handler metadata file
  writeJSONSync(`${SERVER_HANDLER_DIR}/${SERVER_HANDLER_NAME}.json`, {
@@ -49,6 +49,6 @@ export const createServerHandler = async () => {
  // write the root handler file
  writeFileSync(
  `${SERVER_HANDLER_DIR}/${SERVER_HANDLER_NAME}.js`,
- `import handler from './dist/templates/server-handler.js';export default handler;export const config = { path: '/*' }`,
+ `import handler from './dist/handlers/server.js';export default handler;export const config = {path:'/*'}`,
  )
 }