@netlify/plugin-nextjs 4.41.3 → 5.0.0-beta.0

package/src/templates/edge-shared/rsc-data.ts

@@ -1,78 +0,0 @@
-import type { EdgeFunction } from 'https://edge.netlify.com'
-
-// These are copied from next/dist/build. This file gets copied as part of the next
-// runtime build and can't reference the next package directly.
-//
-// Latest types at https://github.com/vercel/next.js/blob/4a2df3c3752aeddc50fd5ab053440eccf71ae50b/packages/next/src/build/index.ts#L140
-export declare type SsgRoute = {
-  initialRevalidateSeconds: number | false
-  srcRoute: string | null
-  dataRoute: string | null
-}
-export declare type DynamicSsgRoute = {
-  routeRegex: string
-  fallback: string | null | false
-  dataRoute: string | null
-  dataRouteRegex: string
-}
-export declare type PrerenderManifest = {
-  version: 3
-  routes: {
-    [route: string]: SsgRoute
-  }
-  dynamicRoutes: {
-    [route: string]: DynamicSsgRoute
-  }
-  notFoundRoutes: string[]
-}
-
-const noop = () => {}
-
-// Ensure that routes with and without a trailing slash map to different ODB paths
-const rscifyPath = (route: string) => {
-  if (route.endsWith('/')) {
-    return route.slice(0, -1) + '.rsc/'
-  }
-  return route + '.rsc'
-}
-
-export const getRscDataRouter = ({ routes: staticRoutes, dynamicRoutes }: PrerenderManifest): EdgeFunction => {
-  const staticRouteSet = new Set(
-    Object.entries(staticRoutes)
-      .filter(([, { dataRoute }]) => dataRoute?.endsWith('.rsc'))
-      .map(([route]) => route),
-  )
-
-  const dynamicRouteMatcher = Object.values(dynamicRoutes)
-    .filter(({ dataRoute }) => dataRoute?.endsWith('.rsc'))
-    .map(({ routeRegex }) => new RegExp(routeRegex))
-
-  const matchesDynamicRscDataRoute = (pathname: string) => {
-    return dynamicRouteMatcher.some((matcher) => matcher.test(pathname))
-  }
-
-  const matchesStaticRscDataRoute = (pathname: string) => {
-    const key = pathname.endsWith('/') ? pathname.slice(0, -1) : pathname
-    return staticRouteSet.has(key)
-  }
-
-  const matchesRscRoute = (pathname: string) => {
-    return matchesStaticRscDataRoute(pathname) || matchesDynamicRscDataRoute(pathname)
-  }
-
-  return (request, context) => {
-    const debug = request.headers.has('x-next-debug-logging')
-    const log = debug ? (...args: unknown[]) => console.log(...args) : noop
-    const url = new URL(request.url)
-    // If this is a static RSC request, rewrite to the data route
-    if (request.headers.get('rsc') === '1') {
-      log('Is rsc request')
-      if (matchesRscRoute(url.pathname)) {
-        request.headers.set('x-rsc-route', url.pathname)
-        const target = rscifyPath(url.pathname)
-        log('Rewriting to', target)
-        return context.rewrite(target)
-      }
-    }
-  }
-}

package/src/templates/edge-shared/utils.test.ts

@@ -1,114 +0,0 @@
-import { assertEquals } from 'https://deno.land/std@0.167.0/testing/asserts.ts'
-import { beforeEach, describe, it } from 'https://deno.land/std@0.167.0/testing/bdd.ts'
-import { redirectTrailingSlash, updateModifiedHeaders } from './utils.ts'
-
-describe('updateModifiedHeaders', () => {
-  it("does not modify the headers if 'x-middleware-override-headers' is not found", () => {
-    const mockHeaders = new Headers()
-    // There shouldn't be a case where x-middleware-override-headers is not set and a header has
-    // been modified with 'x-middleware-request' added to it, this is more to confirm the test case
-    mockHeaders.set('x-middleware-request-foo', 'bar')
-
-    const mockResponse = {
-      headers: mockHeaders,
-    }
-
-    const mockRequest = {
-      headers: new Headers(),
-    }
-
-    updateModifiedHeaders(mockRequest.headers, mockResponse.headers)
-
-    assertEquals(mockRequest.headers.get('x-middleware-request-foo'), null)
-  })
-
-  describe("when the 'x-middleware-override-headers' headers is present", () => {
-    let mockHeaders
-    let mockRequest: { headers: Headers }
-    let mockResponse: { headers: Headers }
-
-    beforeEach(() => {
-      mockHeaders = new Headers()
-      mockHeaders.set('foo', 'bar')
-      mockHeaders.set('x-middleware-request-hello', 'world')
-      mockHeaders.set('x-middleware-request-test', '123')
-      mockHeaders.set('x-middleware-override-headers', 'hello,test')
-
-      mockRequest = {
-        headers: new Headers(),
-      }
-
-      mockResponse = {
-        headers: mockHeaders,
-      }
-
-      updateModifiedHeaders(mockRequest.headers, mockResponse.headers)
-    })
-
-    it("does not modify or add headers that are missing 'x-middleware-request' in the name", () => {
-      assertEquals(mockRequest.headers.get('foo'), null)
-    })
-
-    it("removes 'x-middleware-request-' from headers", () => {
-      assertEquals(mockRequest.headers.get('x-middleware-request-hello'), null)
-      assertEquals(mockRequest.headers.get('x-middleware-request-test'), null)
-
-      assertEquals(mockRequest.headers.get('hello'), 'world')
-      assertEquals(mockRequest.headers.get('test'), '123')
-    })
-
-    it("removes 'x-middleware-override-headers' after cleaning headers", () => {
-      assertEquals(mockRequest.headers.get('x-middleware-override-headers'), null)
-    })
-  })
-})
-
-describe('trailing slash redirects', () => {
-  it('adds a trailing slash to the pathn if trailingSlash is enabled', () => {
-    const url = new URL('https://example.com/foo')
-    const result = redirectTrailingSlash(url, true)
-    assertEquals(result?.status, 308)
-    assertEquals(result?.headers.get('location'), 'https://example.com/foo/')
-  })
-
-  it("doesn't add a trailing slash if trailingSlash is false", () => {
-    const url = new URL('https://example.com/foo')
-    const result = redirectTrailingSlash(url, false)
-    assertEquals(result, undefined)
-  })
-
-  it("doesn't add a trailing slash if the path is a file", () => {
-    const url = new URL('https://example.com/foo.txt')
-    const result = redirectTrailingSlash(url, true)
-    assertEquals(result, undefined)
-  })
-  it('adds a trailing slash if there is a dot in the path', () => {
-    const url = new URL('https://example.com/foo.bar/baz')
-    const result = redirectTrailingSlash(url, true)
-    assertEquals(result?.status, 308)
-    assertEquals(result?.headers.get('location'), 'https://example.com/foo.bar/baz/')
-  })
-  it("doesn't add a trailing slash if the path is /", () => {
-    const url = new URL('https://example.com/')
-    const result = redirectTrailingSlash(url, true)
-    assertEquals(result, undefined)
-  })
-  it('removes a trailing slash from the path if trailingSlash is false', () => {
-    const url = new URL('https://example.com/foo/')
-    const result = redirectTrailingSlash(url, false)
-    assertEquals(result?.status, 308)
-    assertEquals(result?.headers.get('location'), 'https://example.com/foo')
-  })
-  it("doesn't remove a trailing slash if trailingSlash is true", () => {
-    const url = new URL('https://example.com/foo/')
-    const result = redirectTrailingSlash(url, true)
-    assertEquals(result, undefined)
-  })
-
-  it('removes a trailing slash from the path if the path is a file', () => {
-    const url = new URL('https://example.com/foo.txt/')
-    const result = redirectTrailingSlash(url, false)
-    assertEquals(result?.status, 308)
-    assertEquals(result?.headers.get('location'), 'https://example.com/foo.txt')
-  })
-})

package/src/templates/edge-shared/utils.ts

@@ -1,315 +0,0 @@
-import type { Context } from 'https://edge.netlify.com'
-import { ElementHandlers, HTMLRewriter } from '../vendor/deno.land/x/html_rewriter@v0.1.0-pre.17/index.ts'
-
-export interface FetchEventResult {
-  response: Response
-  waitUntil: Promise<any>
-}
-
-type NextDataTransform = <T>(data: T) => T
-
-function normalizeDataUrl(redirect: string) {
-  // If the redirect is a data URL, we need to normalize it.
-  // next.js code reference: https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/router/utils/get-next-pathname-info.ts#L46
-  if (redirect.startsWith('/_next/data/') && redirect.includes('.json')) {
-    const paths = redirect
-      .replace(/^\/_next\/data\//, '')
-      .replace(/\.json/, '')
-      .split('/')
-
-    const buildId = paths[0]
-    redirect = paths[1] !== 'index' ? `/${paths.slice(1).join('/')}` : '/'
-  }
-
-  return redirect
-}
-
-/**
- * This is how Next handles rewritten URLs.
- */
-export function relativizeURL(url: string | string, base: string | URL) {
-  const baseURL = typeof base === 'string' ? new URL(base) : base
-  const relative = new URL(url, base)
-  const origin = `${baseURL.protocol}//${baseURL.host}`
-  return `${relative.protocol}//${relative.host}` === origin
-    ? relative.toString().replace(origin, '')
-    : relative.toString()
-}
-
-export const addMiddlewareHeaders = async (
-  originResponse: Promise<Response> | Response,
-  middlewareResponse: Response,
-) => {
-  // If there are extra headers, we need to add them to the response.
-  if ([...middlewareResponse.headers.keys()].length === 0) {
-    return originResponse
-  }
-  // We need to await the response to get the origin headers, then we can add the ones from middleware.
-  const res = await originResponse
-  const response = new Response(res.body, res)
-  middlewareResponse.headers.forEach((value, key) => {
-    if (key === 'set-cookie') {
-      response.headers.append(key, value)
-    } else {
-      response.headers.set(key, value)
-    }
-  })
-  return response
-}
-
-interface ResponseCookies {
-  // This is non-standard that Next.js adds.
-  // See github.com/vercel/next.js/blob/de08f8b3d31ef45131dad97a7d0e95fa01001167/packages/next/src/compiled/@edge-runtime/cookies/index.js#L158
-  readonly _headers: Headers
-}
-
-interface MiddlewareResponse extends Response {
-  originResponse: Response
-  dataTransforms: NextDataTransform[]
-  elementHandlers: Array<[selector: string, handlers: ElementHandlers]>
-  get cookies(): ResponseCookies
-}
-
-interface MiddlewareRequest {
-  request: Request
-  context: Context
-  originalRequest: Request
-  next(): Promise<MiddlewareResponse>
-  rewrite(destination: string | URL, init?: ResponseInit): Response
-}
-
-export interface I18NConfig {
-  defaultLocale: string
-  localeDetection?: false
-  locales: string[]
-}
-
-export interface RequestData {
-  geo?: {
-    city?: string
-    country?: string
-    region?: string
-    latitude?: string
-    longitude?: string
-    timezone?: string
-  }
-  headers: Record<string, string>
-  ip?: string
-  method: string
-  nextConfig?: {
-    basePath?: string
-    i18n?: I18NConfig | null
-    trailingSlash?: boolean
-  }
-  page?: {
-    name?: string
-    params?: { [key: string]: string }
-  }
-  url: string
-  body?: ReadableStream<Uint8Array>
-}
-
-function isMiddlewareRequest(response: Response | MiddlewareRequest): response is MiddlewareRequest {
-  return 'originalRequest' in response
-}
-
-function isMiddlewareResponse(response: Response | MiddlewareResponse): response is MiddlewareResponse {
-  return 'dataTransforms' in response
-}
-
-// Next 13 supports request header mutations and has the side effect of prepending header values with 'x-middleware-request'
-// as part of invoking NextResponse.next() in the middleware. We need to remove that before sending the response the user
-// as the code that removes it in Next isn't run based on how we handle the middleware
-//
-// Related Next.js code:
-// * https://github.com/vercel/next.js/blob/68d06fe015b28d8f81da52ca107a5f4bd72ab37c/packages/next/server/next-server.ts#L1918-L1928
-// * https://github.com/vercel/next.js/blob/43c9d8940dc42337dd2f7d66aa90e6abf952278e/packages/next/server/web/spec-extension/response.ts#L10-L27
-export function updateModifiedHeaders(requestHeaders: Headers, responseHeaders: Headers) {
-  const overriddenHeaders = responseHeaders.get('x-middleware-override-headers')
-
-  if (!overriddenHeaders) {
-    return
-  }
-
-  const headersToUpdate = overriddenHeaders.split(',').map((header) => header.trim())
-
-  for (const header of headersToUpdate) {
-    const oldHeaderKey = 'x-middleware-request-' + header
-    const headerValue = responseHeaders.get(oldHeaderKey) || ''
-
-    requestHeaders.set(header, headerValue)
-    responseHeaders.delete(oldHeaderKey)
-  }
-  responseHeaders.delete('x-middleware-override-headers')
-}
-
-export const buildNextRequest = (
-  request: Request,
-  context: Context,
-  nextConfig?: RequestData['nextConfig'],
-): RequestData => {
-  const { url, method, body, headers } = request
-
-  const { country, subdivision, city, latitude, longitude, timezone } = context.geo
-
-  const geo: RequestData['geo'] = {
-    country: country?.code,
-    region: subdivision?.code,
-    city,
-    latitude: latitude?.toString(),
-    longitude: longitude?.toString(),
-    timezone,
-  }
-
-  return {
-    headers: Object.fromEntries(headers.entries()),
-    geo,
-    url,
-    method,
-    ip: context.ip,
-    body: body ?? undefined,
-    nextConfig,
-  }
-}
-export const buildResponse = async ({
-  result,
-  request,
-  context,
-}: {
-  result: FetchEventResult
-  request: Request
-  context: Context
-}) => {
-  updateModifiedHeaders(request.headers, result.response.headers)
-
-  // They've returned the MiddlewareRequest directly, so we'll call `next()` for them.
-  if (isMiddlewareRequest(result.response)) {
-    result.response = await result.response.next()
-  }
-  if (isMiddlewareResponse(result.response)) {
-    const { response } = result
-    if (request.method === 'HEAD' || request.method === 'OPTIONS') {
-      return response.originResponse
-    }
-
-    // NextResponse doesn't set cookies onto the originResponse, so we need to copy them over
-    // In some cases, it's possible there are no headers set. See https://github.com/netlify/pod-ecosystem-frameworks/issues/475
-    if (response.cookies._headers?.has('set-cookie')) {
-      response.originResponse.headers.set('set-cookie', response.cookies._headers.get('set-cookie')!)
-    }
-
-    // If it's JSON we don't need to use the rewriter, we can just parse it
-    if (response.originResponse.headers.get('content-type')?.includes('application/json')) {
-      const props = await response.originResponse.json()
-      const transformed = response.dataTransforms.reduce((prev, transform) => {
-        return transform(prev)
-      }, props)
-      const body = JSON.stringify(transformed)
-      const headers = new Headers(response.headers)
-      headers.set('content-length', String(body.length))
-      return new Response(body, { ...response, headers })
-    }
-    // This var will hold the contents of the script tag
-    let buffer = ''
-    // Create an HTMLRewriter that matches the Next data script tag
-    const rewriter = new HTMLRewriter()
-
-    if (response.dataTransforms.length > 0) {
-      rewriter.on('script[id="__NEXT_DATA__"]', {
-        text(textChunk) {
-          // Grab all the chunks in the Next data script tag
-          buffer += textChunk.text
-          if (textChunk.lastInTextNode) {
-            try {
-              // When we have all the data, try to parse it as JSON
-              const data = JSON.parse(buffer.trim())
-              // Apply all of the transforms to the props
-              const props = response.dataTransforms.reduce((prev, transform) => transform(prev), data.props)
-              // Replace the data with the transformed props
-              // With `html: true` the input is treated as raw HTML
-              // @see https://developers.cloudflare.com/workers/runtime-apis/html-rewriter/#global-types
-              textChunk.replace(JSON.stringify({ ...data, props }), { html: true })
-            } catch (err) {
-              console.log('Could not parse', err)
-            }
-          } else {
-            // Remove the chunk after we've appended it to the buffer
-            textChunk.remove()
-          }
-        },
-      })
-    }
-
-    if (response.elementHandlers.length > 0) {
-      response.elementHandlers.forEach(([selector, handlers]) => rewriter.on(selector, handlers))
-    }
-    return rewriter.transform(response.originResponse)
-  }
-  const res = new Response(result.response.body, result.response)
-  request.headers.set('x-nf-next-middleware', 'skip')
-
-  const rewrite = res.headers.get('x-middleware-rewrite')
-
-  // Data requests (i.e. requests for /_next/data ) need special handling
-  const isDataReq = request.headers.get('x-nextjs-data')
-
-  if (rewrite) {
-    const rewriteUrl = new URL(rewrite, request.url)
-    const baseUrl = new URL(request.url)
-    const relativeUrl = relativizeURL(rewrite, request.url)
-
-    // Data requests might be rewritten to an external URL
-    // This header tells the client router the redirect target, and if it's external then it will do a full navigation
-    if (isDataReq) {
-      res.headers.set('x-nextjs-rewrite', relativeUrl)
-    }
-    if (rewriteUrl.hostname !== baseUrl.hostname) {
-      // Netlify Edge Functions don't support proxying to external domains, but Next middleware does
-      const proxied = fetch(new Request(rewriteUrl.toString(), request))
-      return addMiddlewareHeaders(proxied, res)
-    }
-    res.headers.set('x-middleware-rewrite', relativeUrl)
-
-    request.headers.set('x-original-path', new URL(request.url, `http://n`).pathname)
-    request.headers.set('x-middleware-rewrite', rewrite)
-
-    return addMiddlewareHeaders(context.rewrite(rewrite), res)
-  }
-
-  const redirect = res.headers.get('Location')
-
-  // Data requests shouldn;t automatically redirect in the browser (they might be HTML pages): they're handled by the router
-  if (redirect && isDataReq) {
-    res.headers.delete('location')
-    res.headers.set('x-nextjs-redirect', relativizeURL(redirect, request.url))
-  }
-
-  const nextRedirect = res.headers.get('x-nextjs-redirect')
-
-  if (nextRedirect && isDataReq) {
-    res.headers.set('x-nextjs-redirect', normalizeDataUrl(nextRedirect))
-  }
-
-  if (res.headers.get('x-middleware-next') === '1') {
-    return addMiddlewareHeaders(context.next(), res)
-  }
-  return res
-}
-
-export const redirectTrailingSlash = (url: URL, trailingSlash: boolean): Response | undefined => {
-  const { pathname } = url
-  if (pathname === '/') {
-    return
-  }
-  if (!trailingSlash && pathname.endsWith('/')) {
-    url.pathname = pathname.slice(0, -1)
-    return Response.redirect(url, 308)
-  }
-  // Add a slash, unless there's a file extension
-  if (trailingSlash && !pathname.endsWith('/') && !pathname.split('/').pop()?.includes('.')) {
-    url.pathname = `${pathname}/`
-    return Response.redirect(url, 308)
-  }
-}
-
-export const isFunction = (f: unknown) => Boolean(f) && typeof f === 'function'

package/src/templates/vendor/import_map.json

@@ -1,13 +0,0 @@
-{
-  "scopes": {
-    "../": {
-      "https://ghuc.cc/worker-tools/resolvable-promise/index.ts": "./raw.githubusercontent.com/worker-tools/resolvable-promise/master/index.ts",
-      "https://deno.land/": "./deno.land/",
-      "https://esm.sh/": "./esm.sh/",
-      "https://raw.githubusercontent.com/": "./raw.githubusercontent.com/"
-    },
-    "./esm.sh/": {
-      "/v91/next@12.2.5/deno/dist/compiled/cookie.js": "./esm.sh/v91/next@12.2.5/deno/dist/compiled/cookie.js"
-    }
-  }
-}