Merge branch 'main' into tn/blob

Author: taty2010

.editorconfig

@@ -5,6 +5,6 @@ indent_style = space
 indent_size = 2
 end_of_line = lf
 charset = utf-8
-max_line_length = 120
+max_line_length = 100
 trim_trailing_whitespace = true
 insert_final_newline = true

.eslintrc.cjs

@@ -6,11 +6,11 @@ module.exports = {
  sourceType: 'module',
  },
  rules: {
+ 'arrow-body-style': 'off',
  'no-param-reassign': ['error', { props: false }],
  'no-underscore-dangle': 'off',
- 'n/no-sync': 'off',
- 'n/prefer-global/process': 'off',
  'no-magic-numbers': 'off',
+ 'n/prefer-global/process': 'off',
  'unicorn/numeric-separators-style': 'off',
  'unicorn/filename-case': ['error', { case: 'kebabCase' }],
  'import/no-namespace': 'off',
@@ -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',
  },
  },
  ],

.prettierrc.cjs

@@ -0,0 +1,4 @@
+module.exports = {
+ ...require('@netlify/eslint-config-node/.prettierrc.json'),
+ printWidth: 100,
+}

.prettierrc.json

@@ -34,14 +34,13 @@
  },
  "homepage": "https://github.com/netlify/next-runtime-minimal#readme",
  "dependencies": {
- "@fastly/http-compute-js": "^1.1.0",
+ "@fastly/http-compute-js": "github:orinokai/http-compute-js",
  "@netlify/blobs": "^1.6.0",
  "@netlify/build": "^29.20.6",
  "@netlify/functions": "^2.0.1",
- "chalk": "^5.3.0",
+ "@vercel/nft": "^0.24.3",
  "fs-extra": "^11.1.1",
- "outdent": "^0.8.0",
- "esbuild": "^0.19.4"
+ "globby": "^13.2.2"
  },
  "devDependencies": {
  "@netlify/eslint-config-node": "^7.0.1",

package-lock.json

@@ -0,0 +1,29 @@
+import type { CacheHandler, CacheHandlerContext } from 'next/dist/server/lib/incremental-cache/index.js'
+
+/**
+ * Netlify Cache Handler
+ * (CJS format because Next.js doesn't support ESM yet)
+ */
+export default class NetlifyCacheHandler implements CacheHandler {
+ options: CacheHandlerContext
+
+ constructor(options: CacheHandlerContext) {
+ this.options = options
+ }
+
+ // eslint-disable-next-line require-await, class-methods-use-this
+ public async get(key: string, ctx: any) {
+ console.log('NetlifyCacheHandler.get', key, JSON.stringify(ctx, null, 2))
+ return null
+ }
+
+ // eslint-disable-next-line require-await, class-methods-use-this
+ public async set(key: string, data: any, ctx: any) {
+ console.log('NetlifyCacheHandler.set', key, JSON.stringify(data, null, 2), JSON.stringify(ctx, null, 2))
+ }
+
+ // eslint-disable-next-line class-methods-use-this, require-await
+ public async revalidateTag(tag: string) {
+ console.log('NetlifyCacheHandler.revalidateTag', tag)
+ }
+}

package.json

@@ -0,0 +1,40 @@
+import { toComputeResponse, toReqRes } from '@fastly/http-compute-js'
+import type { WorkerRequestHandler } from 'next/dist/server/lib/types.js'
+
+import { TASK_DIR } from '../helpers/constants.js'
+
+let nextHandler: WorkerRequestHandler
+
+export default async (request: Request) => {
+ if (!nextHandler) {
+ // set the server config
+ const { setRequestConfig } = await import('../helpers/config.js')
+ await setRequestConfig()
+
+ // let Next.js initialize and create the request handler
+ const { getRequestHandlers } = await import('next/dist/server/lib/start-server.js')
+ ;[nextHandler] = await getRequestHandlers({
+ port: 3000,
+ hostname: 'localhost',
+ dir: TASK_DIR,
+ isDev: false,
+ })
+ }
+
+ const { req, res } = toReqRes(request)
+
+ try {
+ console.log('Next server request:', req.url)
+ await nextHandler(req, res)
+ } catch (error) {
+ console.error(error)
+ res.statusCode = 500
+ res.end('Internal Server Error')
+ }
+
+ // log the response from Next.js
+ const response = { headers: res.getHeaders(), statusCode: res.statusCode }
+ console.log('Next server response:', JSON.stringify(response, null, 2))
+
+ return toComputeResponse(res)
+}

src/handlers/cache.cts

@@ -1,37 +1,27 @@
-import { readFileSync } from 'fs'
+import { readFile } from 'node:fs/promises'
 
-import type { NetlifyConfig } from '@netlify/build'
-import { copySync, moveSync } from 'fs-extra/esm'
-
-import { MODULE_DIR, NETLIFY_PUBLISH_DIR, NETLIFY_TEMP_DIR } from './constants.js'
+import { TASK_DIR } from './constants.js'
 
 /**
- * Modify the user's next.config.js to use standalone mode and cache handler
+ * Enable standalone mode at build-time
  */
-export const modifyNextConfig = () => {
- // revert any previous changes
- revertNextConfig()
-
- // TODO: find a better way to do this because there's a ton of different ways
- // to configure next.config.js and the user could be using any of them
- // https://github.com/netlify/next-runtime-minimal/issues/12
- moveSync('next.config.js', `${NETLIFY_TEMP_DIR}/next.config.js`)
- copySync(`${MODULE_DIR}/../templates/next-config.cjs`, 'next.config.js')
-}
-
-export const revertNextConfig = () => {
- // check if modified, then revert
- if (readFileSync('next.config.js').includes('Netlify generated code')) {
- moveSync(`${NETLIFY_TEMP_DIR}/next.config.js`, 'next.config.js', { overwrite: true })
- }
+export const setBuildConfig = () => {
+ process.env.NEXT_PRIVATE_STANDALONE = 'true'
 }
 
 /**
- * Modify the user's netlify.toml to use our new publish directory
- * @param config Netlify config
+ * Configure the request-time custom cache handler
  */
-export const modifyNetlifyConfig = (config: NetlifyConfig) => {
- // TODO: once onEnd is fixed, we can remove this
- // https://github.com/netlify/cli/issues/6050
- config.build.publish = NETLIFY_PUBLISH_DIR
+export const setRequestConfig = async () => {
+ // get config from the build output
+ 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: `${TASK_DIR}/dist/handlers/cache.cjs`,
+ }
+
+ // set config
+ process.env.__NEXT_PRIVATE_STANDALONE_CONFIG = JSON.stringify(runtimeConfig.config)
 }