Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { NextResponse } from 'next/server'

export function middleware() {
export function proxy() {
return NextResponse.next()
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NextResponse } from 'next/server'

export function middleware(request) {
export function proxy(request) {
if (request.nextUrl.pathname.startsWith('/middleware-redirect')) {
return NextResponse.redirect(new URL('/action-after-redirect', request.url))
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Ensure that https://github.com/vercel/next.js/issues/56286 is fixed.
import { NextResponse } from 'next/server'

export async function middleware(req) {
export async function proxy(req) {
if (req.nextUrl.pathname.includes('rewrite-to-static-first')) {
req.nextUrl.pathname = '/static/first'
return NextResponse.rewrite(req.nextUrl)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NextResponse } from 'next/server'

export async function middleware(request) {
export async function proxy(request) {
// This middleware is used to test Suspensey CSS
if (
request.url.includes('_next/static/css/app/suspensey-css/slow/page.css')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { respond } from 'compat-next-server-module'

export async function middleware(request) {
export async function proxy(request) {
return await respond()
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { headers as nextHeaders, draftMode } from 'next/headers'
/**
* @param {import('next/server').NextRequest} request
*/
export async function middleware(request) {
export async function proxy(request) {
const headersFromRequest = new Headers(request.headers)
// It should be able to import and use `headers` inside middleware
const headersFromNext = await nextHeaders()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { NextResponse } from 'next/server'
* @param {import('next/server').NextRequest} request
* @returns {Promise<NextResponse | undefined>}
*/
export async function middleware(request) {
export async function proxy(request) {
if (request.nextUrl.pathname === '/searchparams-normalization-bug') {
const headers = new Headers(request.headers)
headers.set('test', request.nextUrl.searchParams.get('val') || '')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { ProxyConfig } from 'next/server'

export default async function middleware() {
export default async function proxy() {
// This import should not be instrumented.
// `trackDynamicImport` will throw if it's used in the edge runtime,
// so it's enough to just do an import() here and see if it succeeds.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { NextRequest } from 'next/server'
import { NextResponse } from 'next/server'

export function middleware(request: NextRequest) {
export function proxy(request: NextRequest) {
// Clone the request headers and set a new header `x-hello-from-middleware1`
const requestHeaders = new Headers(request.headers)
requestHeaders.set('x-sentinel', 'hello')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NextResponse, type NextRequest } from 'next/server'
import { draftMode } from 'next/headers'

export async function middleware(req: NextRequest) {
export async function proxy(req: NextRequest) {
const { isEnabled } = await draftMode()
console.log('draftMode().isEnabled from middleware:', isEnabled)
return NextResponse.next()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type NextRequest, NextResponse } from 'next/server'

export function middleware(request: NextRequest) {
export function proxy(request: NextRequest) {
const url = request.nextUrl

let originalPathname = url.pathname
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { AsyncLocalStorage } from 'async_hooks'

const storage = new AsyncLocalStorage<{}>()

export async function middleware(request: NextRequest) {
export async function proxy(request: NextRequest) {
storage.run({}, () => {})

return NextResponse.next()
Expand Down
3 changes: 0 additions & 3 deletions test/e2e/app-dir/front-redirect-issue/middleware.ts

This file was deleted.

3 changes: 3 additions & 0 deletions test/e2e/app-dir/front-redirect-issue/proxy.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function proxy() {
return
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { NextResponse } from 'next/server'
* @param {import('next/server').NextRequest} request
* @returns {NextResponse | undefined}
*/
export function middleware(request) {
export function proxy(request) {
if (
request.nextUrl.pathname ===
'/hooks/use-selected-layout-segment/rewritten-middleware'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NextResponse, type NextRequest } from 'next/server'

export default async function middleware(request: NextRequest) {
export default async function proxy(request: NextRequest) {
const locale = 'en'
const { pathname } = request.nextUrl
const pathnameHasLocale =
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NextResponse } from 'next/server'

export default function middleware(req) {
export default function proxy(req) {
if (!req.nextUrl.pathname.startsWith('/en')) {
return NextResponse.rewrite(new URL(`/en${req.nextUrl.pathname}`, req.url))
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// used to test that if Middleware is present, non-route requests are still not logged
export function middleware() {}
export function proxy() {}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NextResponse } from 'next/server'

export default function middleware(req, res) {
export default function proxy(req, res) {
const url = req.nextUrl.clone()
url.pathname = '/'
return NextResponse.rewrite(url)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NextResponse } from 'next/server'

export async function middleware(request) {
export async function proxy(request) {
if (
request.nextUrl.pathname.includes('payment') &&
!request.nextUrl.pathname.includes('whoops')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { NextResponse } from 'next/server'

export function middleware(request: Request) {
export function proxy(request: Request) {
return NextResponse.rewrite(new URL('/render/next', request.url))
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NextRequest, NextResponse } from 'next/server'

export function middleware(request: NextRequest) {
export function proxy(request: NextRequest) {
const url = request.nextUrl.clone()

if (url.pathname === '/about') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ import { redirect } from 'next/navigation'
// Redirect can't be called in middleware, but it should be able to be imported.
console.log({ redirect })

export default function middleware() {}
export default function proxy() {}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if (NEXT_RSC_UNION_QUERY !== '_rsc') {
* @param {import('next/server').NextRequest} request
* @returns {NextResponse | undefined}
*/
export function middleware(request) {
export function proxy(request) {
const rscQuery = request.nextUrl.searchParams.get(NEXT_RSC_UNION_QUERY)

// Test that the RSC query is not present in the middleware
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { after } from 'next/server'

export function middleware(
export function proxy(
/** @type {import ('next/server').NextRequest} */ request
) {
const url = new URL(request.url)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { cookies } from 'next/headers'
import { NextResponse, after } from 'next/server'
import { cliLog } from './utils/log'

export async function middleware(
export async function proxy(
/** @type {import ('next/server').NextRequest} */ request
) {
const url = new URL(request.url)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { cookies } from 'next/headers'
import { NextResponse, after } from 'next/server'
import { cliLog } from './utils/log'

export async function middleware(
export async function proxy(
/** @type {import ('next/server').NextRequest} */ request
) {
const url = new URL(request.url)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NextResponse } from 'next/server'

export function middleware(request) {
export function proxy(request) {
const response = NextResponse.next()
const nonce = 'test-nonce'
response.headers.set('x-nonce', nonce)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NextResponse } from 'next/server'
import type { NextRequest } from 'next/server'

export function middleware(request: NextRequest) {
export function proxy(request: NextRequest) {
if (request.nextUrl.pathname === '/favicon.ico') {
return NextResponse.next({
headers: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NextResponse } from 'next/server'
import type { NextRequest } from 'next/server'

export function middleware(request: NextRequest) {
export function proxy(request: NextRequest) {
if (Math.random() > -1 && request.nextUrl.pathname === '/rewrite') {
return NextResponse.rewrite(new URL('/rewritten', request.url))
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NextResponse } from 'next/server'
import type { NextRequest } from 'next/server'

export function middleware(request: NextRequest) {
export function proxy(request: NextRequest) {
if (Math.random() > -1 && request.nextUrl.pathname === '/rewrite') {
return NextResponse.rewrite(new URL('/rewritten', request.url))
}
Expand Down
3 changes: 0 additions & 3 deletions test/e2e/app-dir/pages-to-app-routing/middleware.ts

This file was deleted.

3 changes: 3 additions & 0 deletions test/e2e/app-dir/pages-to-app-routing/proxy.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import type { NextRequest } from 'next/server'

export function proxy(request: NextRequest) {}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { cookies } from 'next/headers'
import { after, type NextRequest } from 'next/server'

export async function middleware(request: NextRequest) {
export async function proxy(request: NextRequest) {
const url = new URL(request.url)

const cookieStore = await cookies()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { NextRequest } from 'next/server'
import { NextResponse } from 'next/server'

export function middleware(request: NextRequest) {
export function proxy(request: NextRequest) {
return NextResponse.rewrite(
new URL('/en' + request.nextUrl.pathname, request.url)
)
Expand Down
5 changes: 0 additions & 5 deletions test/e2e/app-dir/proxy-with-middleware/middleware.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const config = {
],
}

export default function middleware(req) {
export default function proxy(req) {
const url = new URL(req.url)

if (url.pathname === '/hello/wyatt') {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NextResponse } from 'next/server'
import type { NextRequest } from 'next/server'

export function middleware(request: NextRequest) {
export function proxy(request: NextRequest) {
if (request.nextUrl.pathname.startsWith('/middleware-rewrite-before')) {
return NextResponse.rewrite(
new URL('/middleware-rewrite-after', request.url)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NextResponse } from 'next/server'
import type { NextRequest } from 'next/server'

export function middleware(request: NextRequest) {
export function proxy(request: NextRequest) {
console.log('middleware called')
if (request.nextUrl.pathname === '/old-about') {
const url = request.nextUrl.clone()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NextResponse } from 'next/server'
import type { NextRequest } from 'next/server'

export function middleware(request: NextRequest) {
export function proxy(request: NextRequest) {
const { pathname, search } = request.nextUrl

if (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NextResponse } from 'next/server'
import type { NextRequest } from 'next/server'

export function middleware(request: NextRequest) {
export function proxy(request: NextRequest) {
if (request.nextUrl.pathname.startsWith('/search-params/target-page')) {
const searchParam = request.nextUrl.searchParams.get('searchParam')
if (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { NextRequest, NextResponse } from 'next/server'

export default function middleware(request: NextRequest) {
export default function proxy(request: NextRequest) {
return NextResponse.rewrite(request.url)
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type NextRequest, NextResponse } from 'next/server'

export const middleware = (request: NextRequest) => {
export const proxy = (request: NextRequest) => {
if (request.nextUrl.pathname.includes('/not-broken')) {
const destination = new URL(
'/rewrite' + request.nextUrl.pathname + request.nextUrl.search,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { NextResponse } from 'next/server'

export async function middleware() {
export async function proxy() {
return NextResponse.next()
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NextResponse } from 'next/server'

export function middleware(req: Request) {
export function proxy(req: Request) {
return NextResponse.next({
headers: {
'middleware-x-forwarded-host':
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NextRequest, NextResponse } from 'next/server'

export async function middleware(request: NextRequest) {
export async function proxy(request: NextRequest) {
return NextResponse.next()
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/** @type {import('next').NextConfig} */
module.exports = {
// Explicitly configure deprecated options
skipMiddlewareUrlNormalize: true,
skipProxyUrlNormalize: true,
experimental: {
middlewarePrefetch: 'strict',
proxyPrefetch: 'strict',
instrumentationHook: true,
middlewareClientMaxBodySize: '5mb',
externalMiddlewareRewritesResolve: true,
proxyClientMaxBodySize: '5mb',
externalProxyRewritesResolve: true,
},
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { NextResponse } from 'next/server'
/**
* @param {NextRequest} req
*/
export default async function middleware(req) {
export default async function proxy(req) {
const res = NextResponse.next()
res.headers.set('x-incoming-content-type', req.headers.get('content-type'))

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NextResponse } from 'next/server'

export const config = { matcher: ['/foo'] }
export async function middleware(req) {
export async function proxy(req) {
return NextResponse.next()
}
4 changes: 0 additions & 4 deletions test/e2e/i18n-preferred-locale-detection/app/middleware.js

This file was deleted.

Loading
Loading