@netlify/plugin-nextjs 3.9.0 → 4.0.0-beta.10

package/src/lib/templates/getHandlerFunction.js

@@ -1,209 +0,0 @@
-// TEMPLATE: This file will be copied to the Netlify functions directory
-
-// Render function for the Next.js page
-const { Buffer } = require('buffer')
-const http = require('http')
-const queryString = require('querystring')
-const Stream = require('stream')
-
-// Mock a HTTP IncomingMessage object from the Netlify Function event parameters
-// Based on API Gateway Lambda Compat
-// Source: https://github.com/serverless-nextjs/serverless-next.js/blob/master/packages/compat-layers/apigw-lambda-compat/lib/compatLayer.js
-
-const createRequestObject = ({ event, context }) => {
-  const {
-    requestContext = {},
-    path = '',
-    multiValueQueryStringParameters,
-    pathParameters,
-    httpMethod,
-    multiValueHeaders = {},
-    body,
-    isBase64Encoded,
-  } = event
-
-  const newStream = new Stream.Readable()
-  const req = Object.assign(newStream, http.IncomingMessage.prototype)
-  req.url = (requestContext.path || path || '').replace(new RegExp(`^/${requestContext.stage}`), '') || '/'
-
-  let qs = ''
-
-  if (multiValueQueryStringParameters) {
-    qs += queryString.stringify(multiValueQueryStringParameters)
-  }
-
-  if (pathParameters) {
-    const pathParametersQs = queryString.stringify(pathParameters)
-
-    qs += qs.length === 0 ? pathParametersQs : `&${pathParametersQs}`
-  }
-
-  const hasQueryString = qs.length !== 0
-
-  if (hasQueryString) {
-    req.url += `?${qs}`
-  }
-
-  req.method = httpMethod
-  req.rawHeaders = []
-  req.headers = {}
-
-  // Expose Netlify Function event and callback on request object.
-  // This makes it possible to access the clientContext, for example.
-  // See: https://github.com/netlify/next-on-netlify/issues/20
-  // It also allows users to change the behavior of waiting for empty event
-  // loop.
-  // See: https://github.com/netlify/next-on-netlify/issues/66#issuecomment-719988804
-  req.netlifyFunctionParams = { event, context }
-
-  for (const key of Object.keys(multiValueHeaders)) {
-    for (const value of multiValueHeaders[key]) {
-      req.rawHeaders.push(key)
-      req.rawHeaders.push(value)
-    }
-    req.headers[key.toLowerCase()] = multiValueHeaders[key].toString()
-  }
-
-  req.getHeader = (name) => req.headers[name.toLowerCase()]
-  req.getHeaders = () => req.headers
-
-  req.connection = {}
-
-  if (body) {
-    req.push(body, isBase64Encoded ? 'base64' : undefined)
-  }
-
-  req.push(null)
-
-  return req
-}
-
-// Mock a HTTP ServerResponse object that returns a Netlify Function-compatible
-// response via the onResEnd callback when res.end() is called.
-// Based on API Gateway Lambda Compat
-// Source: https://github.com/serverless-nextjs/serverless-next.js/blob/master/packages/compat-layers/apigw-lambda-compat/lib/compatLayer.js
-
-const createResponseObject = ({ onResEnd }) => {
-  const response = {
-    isBase64Encoded: true,
-    multiValueHeaders: {},
-  }
-
-  const res = new Stream()
-  Object.defineProperty(res, 'statusCode', {
-    get() {
-      return response.statusCode
-    },
-    set(statusCode) {
-      response.statusCode = statusCode
-    },
-  })
-  res.headers = {}
-  res.writeHead = (status, headers) => {
-    response.statusCode = status
-    if (headers) res.headers = Object.assign(res.headers, headers)
-
-    // Return res object to allow for chaining
-    // Fixes: https://github.com/netlify/next-on-netlify/pull/74
-    return res
-  }
-  res.write = (chunk) => {
-    if (!response.body) {
-      response.body = Buffer.from('')
-    }
-
-    response.body = Buffer.concat([
-      Buffer.isBuffer(response.body) ? response.body : Buffer.from(response.body),
-      Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk),
-    ])
-  }
-  res.setHeader = (name, value) => {
-    res.headers[name.toLowerCase()] = value
-  }
-  res.removeHeader = (name) => {
-    delete res.headers[name.toLowerCase()]
-  }
-  res.getHeader = (name) => res.headers[name.toLowerCase()]
-  res.getHeaders = () => res.headers
-  res.hasHeader = (name) => Boolean(res.getHeader(name))
-  res.end = (text) => {
-    if (text) res.write(text)
-    if (!res.statusCode) {
-      res.statusCode = 200
-    }
-
-    if (response.body) {
-      response.body = Buffer.from(response.body).toString('base64')
-    }
-    response.multiValueHeaders = res.headers
-    res.writeHead(response.statusCode)
-
-    // Convert all multiValueHeaders into arrays
-    for (const key of Object.keys(response.multiValueHeaders)) {
-      if (!Array.isArray(response.multiValueHeaders[key])) {
-        response.multiValueHeaders[key] = [response.multiValueHeaders[key]]
-      }
-    }
-
-    res.finished = true
-    res.writableEnded = true
-    // Call onResEnd handler with the response object
-    onResEnd(response)
-  }
-
-  return res
-}
-
-// Render the Next.js page
-const renderNextPage = ({ event, context }, nextPage) => {
-  // The Next.js page is rendered inside a promise that is resolved when the
-  // Next.js page ends the response via `res.end()`
-  const promise = new Promise((resolve) => {
-    // Create a Next.js-compatible request and response object
-    // These mock the ClientRequest and ServerResponse classes from node http
-    // See: https://nodejs.org/api/http.html
-    const req = createRequestObject({ event, context })
-    const res = createResponseObject({
-      onResEnd: (response) => resolve(response),
-    })
-
-    // Check if page is a Next.js page or an API route
-    const isNextPage = nextPage.render instanceof Function
-    const isApiRoute = !isNextPage
-
-    // Perform the render: render() for Next.js page or default() for API route
-    if (isNextPage) return nextPage.render(req, res)
-    if (isApiRoute) return nextPage.default(req, res)
-  })
-
-  // Return the promise
-  return promise
-}
-
-const getHandlerFunction = (nextPage) => async (event, context) => {
-  // x-forwarded-host is undefined on Netlify for proxied apps that need it
-  // fixes https://github.com/netlify/next-on-netlify/issues/46
-  if (!event.multiValueHeaders.hasOwnProperty('x-forwarded-host')) {
-    // eslint-disable-next-line no-param-reassign
-    event.multiValueHeaders['x-forwarded-host'] = [event.headers.host]
-  }
-
-  // Get the request URL
-  const { path } = event
-  console.log('[request]', path)
-
-  // Render the Next.js page
-  const response = await renderNextPage({ event, context }, nextPage)
-
-  // Convert header values to string. Netlify does not support integers as
-  // header values. See: https://github.com/netlify/cli/issues/451
-  Object.keys(response.multiValueHeaders).forEach((key) => {
-    response.multiValueHeaders[key] = response.multiValueHeaders[key].map((value) => String(value))
-  })
-
-  response.multiValueHeaders['Cache-Control'] = ['no-cache']
-
-  return response
-}
-
-exports.getHandlerFunction = getHandlerFunction

package/src/lib/templates/getTemplate.js

@@ -1,15 +0,0 @@
-const getTemplate = ({ filePath, isODB }) => {
-  if (isODB) {
-    return `// Auto-generated file. DO NOT MODIFY.
-const { getHandlerFunction } = require('./getHandlerFunction')
-const { builder } = require('@netlify/functions')
-exports.handler = builder(getHandlerFunction(require("./nextPage/${filePath}")))
-`
-  }
-  return `// Auto-generated file. DO NOT MODIFY.
-const { getHandlerFunction } = require('./getHandlerFunction')
-exports.handler = getHandlerFunction(require("./nextPage/${filePath}"))
-  `
-}
-
-module.exports = getTemplate

package/src/lib/templates/imageFunction.js

@@ -1,135 +0,0 @@
-const { builder } = require('@netlify/functions')
-const etag = require('etag')
-const config = require('./imageconfig.json')
-const imageType = require('image-type')
-const isSvg = require('is-svg')
-const fetch = require('node-fetch')
-const sharp = require('sharp')
-// 6MB is hard max Lambda response size
-const MAX_RESPONSE_SIZE = 6291456
-
-function getImageType(buffer) {
-  const type = imageType(buffer)
-  if (type) {
-    return type
-  }
-  if (isSvg(buffer)) {
-    return { ext: 'svg', mime: 'image/svg' }
-  }
-  return null
-}
-
-const IGNORED_FORMATS = new Set(['svg', 'gif'])
-const OUTPUT_FORMATS = new Set(['png', 'jpg', 'webp', 'avif'])
-
-// Function used to mimic next/image
-const handler = async (event) => {
-  const [, , url, w = 500, q = 75] = event.path.split('/')
-  // Work-around a bug in redirect handling. Remove when fixed.
-  const parsedUrl = decodeURIComponent(url).replace('+', '%20')
-  const width = Number.parseInt(w)
-
-  if (!width) {
-    return {
-      statusCode: 400,
-      body: 'Invalid image parameters',
-    }
-  }
-
-  const quality = Number.parseInt(q) || 60
-
-  let imageUrl
-  let isRemoteImage = false
-  // Relative image
-  if (parsedUrl.startsWith('/')) {
-    const protocol = event.headers['x-nf-connection-proto'] || event.headers['x-forwarded-proto'] || 'http'
-    imageUrl = `${protocol}://${event.headers.host || event.hostname}${parsedUrl}`
-  } else {
-    isRemoteImage = true
-    // Remote images need to be in the allowlist
-    let allowedDomains = config.domains || []
-
-    if (process.env.NEXT_IMAGE_ALLOWED_DOMAINS) {
-      console.log('Combining `NEXT_IMAGE_ALLOWED_DOMAINS` with any domains found in `next.config.js`')
-      allowedDomains = allowedDomains.concat(
-        process.env.NEXT_IMAGE_ALLOWED_DOMAINS.split(',').map((domain) => domain.trim()),
-      )
-    }
-
-    if (!allowedDomains.includes(new URL(parsedUrl).hostname)) {
-      return {
-        statusCode: 403,
-        body: 'Image is not from a permitted domain',
-      }
-    }
-    imageUrl = parsedUrl
-  }
-
-  const imageData = await fetch(imageUrl)
-
-  if (!imageData.ok) {
-    console.error(`Failed to download image ${imageUrl}. Status ${imageData.status} ${imageData.statusText}`)
-    return {
-      statusCode: imageData.status,
-      body: imageData.statusText,
-    }
-  }
-
-  const bufferData = await imageData.buffer()
-
-  const type = getImageType(bufferData)
-
-  if (!type) {
-    return { statusCode: 400, body: 'Source does not appear to be an image' }
-  }
-
-  let { ext } = type
-
-  // For unsupported formats (gif, svg) we redirect to the original
-  if (IGNORED_FORMATS.has(ext)) {
-    return {
-      statusCode: 302,
-      headers: {
-        Location: isRemoteImage ? imageUrl : parsedUrl,
-      },
-    }
-  }
-
-  if (process.env.FORCE_WEBP_OUTPUT === 'true' || process.env.FORCE_WEBP_OUTPUT === '1') {
-    ext = 'webp'
-  }
-
-  if (!OUTPUT_FORMATS.has(ext)) {
-    ext = 'jpg'
-  }
-
-  // The format methods are just to set options: they don't
-  // make it return that format.
-  const { info, data: imageBuffer } = await sharp(bufferData)
-    .rotate()
-    .jpeg({ quality, force: ext === 'jpg' })
-    .png({ quality, force: ext === 'png' })
-    .webp({ quality, force: ext === 'webp' })
-    .avif({ quality, force: ext === 'avif' })
-    .resize(width, null, { withoutEnlargement: true })
-    .toBuffer({ resolveWithObject: true })
-
-  if (imageBuffer.length > MAX_RESPONSE_SIZE) {
-    return {
-      statusCode: 400,
-      body: 'Requested image is too large. Maximum size is 6MB.',
-    }
-  }
-
-  return {
-    statusCode: 200,
-    headers: {
-      'Content-Type': `image/${info.format}`,
-      etag: etag(imageBuffer),
-    },
-    body: imageBuffer.toString('base64'),
-    isBase64Encoded: true,
-  }
-}
-
-exports.handler = builder(handler)

package/src/next-on-netlify.js

@@ -1,22 +0,0 @@
-#!/usr/bin/env node
-const { program } = require('commander')
-
-const nextOnNetlify = require('./index')
-
-program.option('--max-log-lines [number]', 'lines of build output to show for each section', 50)
-
-program
-  .command('watch')
-  .description('re-runs next-on-netlify on changes')
-  .action(async () => {
-    await nextOnNetlify({ watch: true })
-  })
-
-program
-  .command('build', { isDefault: true })
-  .description('runs next-on-netlify')
-  .action(async () => {
-    await nextOnNetlify()
-  })
-
-program.parse(process.argv)