From 7342447525a84e864e8839fe922eb847ae38f3ce Mon Sep 17 00:00:00 2001 From: LFades Date: Fri, 18 Mar 2022 19:18:34 -0500 Subject: [PATCH 1/6] Added deprecated messages --- packages/next/server/web/adapter.ts | 36 +++++++++++++++++++ .../server/web/spec-extension/fetch-event.ts | 25 ++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/packages/next/server/web/adapter.ts b/packages/next/server/web/adapter.ts index 6252ea738f5cc1f..14bb5afa83afd4a 100644 --- a/packages/next/server/web/adapter.ts +++ b/packages/next/server/web/adapter.ts @@ -47,14 +47,50 @@ class NextRequestHint extends NextRequest { this.sourcePage = params.page } + /** + * @deprecated The first parameter is now the request and the API is now async + * with the form: + * + * ```ts + * export function middleware(request, event) { + * return new Response("Hello " + request.url) + * } + * ``` + * + * Read more: https://nextjs.org/docs/messages/middleware-new-signature + */ get request() { throw new DeprecationError({ page: this.sourcePage }) } + /** + * @deprecated The first parameter is now the request and the API is now async + * with the form: + * + * ```ts + * export function middleware(request, event) { + * return new Response("Hello " + request.url) + * } + * ``` + * + * Read more: https://nextjs.org/docs/messages/middleware-new-signature + */ respondWith() { throw new DeprecationError({ page: this.sourcePage }) } + /** + * @deprecated The first parameter is now the request and the API is now async + * with the form: + * + * ```ts + * export function middleware(request, event) { + * return new Response("Hello " + request.url) + * } + * ``` + * + * Read more: https://nextjs.org/docs/messages/middleware-new-signature + */ waitUntil() { throw new DeprecationError({ page: this.sourcePage }) } diff --git a/packages/next/server/web/spec-extension/fetch-event.ts b/packages/next/server/web/spec-extension/fetch-event.ts index 4e1af9e28a1a08b..0d262b7962d83fe 100644 --- a/packages/next/server/web/spec-extension/fetch-event.ts +++ b/packages/next/server/web/spec-extension/fetch-event.ts @@ -10,13 +10,36 @@ export class NextFetchEvent extends FetchEvent { this.sourcePage = params.page } - // @ts-ignore + /** + * @deprecated The first parameter is now the request and the API is now async + * with the form: + * + * ```ts + * export function middleware(request, event) { + * return new Response("Hello " + request.url) + * } + * ``` + * + * Read more: https://nextjs.org/docs/messages/middleware-new-signature + */ get request() { throw new DeprecationError({ page: this.sourcePage, }) } + /** + * @deprecated `respondWith` is no longer needed and the API is now async + * with the form: + * + * ```ts + * export function middleware(request, event) { + * return new Response("Hello " + request.url) + * } + * ``` + * + * Read more: https://nextjs.org/docs/messages/middleware-new-signature + */ respondWith() { throw new DeprecationError({ page: this.sourcePage, From 6da6827e36e7ee35c03214a70cbff5e0eeefc2b5 Mon Sep 17 00:00:00 2001 From: LFades Date: Fri, 18 Mar 2022 19:27:24 -0500 Subject: [PATCH 2/6] Clean up --- packages/next/server/web/adapter.ts | 36 ------------------- .../server/web/spec-extension/fetch-event.ts | 2 +- 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/packages/next/server/web/adapter.ts b/packages/next/server/web/adapter.ts index 14bb5afa83afd4a..6252ea738f5cc1f 100644 --- a/packages/next/server/web/adapter.ts +++ b/packages/next/server/web/adapter.ts @@ -47,50 +47,14 @@ class NextRequestHint extends NextRequest { this.sourcePage = params.page } - /** - * @deprecated The first parameter is now the request and the API is now async - * with the form: - * - * ```ts - * export function middleware(request, event) { - * return new Response("Hello " + request.url) - * } - * ``` - * - * Read more: https://nextjs.org/docs/messages/middleware-new-signature - */ get request() { throw new DeprecationError({ page: this.sourcePage }) } - /** - * @deprecated The first parameter is now the request and the API is now async - * with the form: - * - * ```ts - * export function middleware(request, event) { - * return new Response("Hello " + request.url) - * } - * ``` - * - * Read more: https://nextjs.org/docs/messages/middleware-new-signature - */ respondWith() { throw new DeprecationError({ page: this.sourcePage }) } - /** - * @deprecated The first parameter is now the request and the API is now async - * with the form: - * - * ```ts - * export function middleware(request, event) { - * return new Response("Hello " + request.url) - * } - * ``` - * - * Read more: https://nextjs.org/docs/messages/middleware-new-signature - */ waitUntil() { throw new DeprecationError({ page: this.sourcePage }) } diff --git a/packages/next/server/web/spec-extension/fetch-event.ts b/packages/next/server/web/spec-extension/fetch-event.ts index 0d262b7962d83fe..7fc8c5e5755fbea 100644 --- a/packages/next/server/web/spec-extension/fetch-event.ts +++ b/packages/next/server/web/spec-extension/fetch-event.ts @@ -11,7 +11,7 @@ export class NextFetchEvent extends FetchEvent { } /** - * @deprecated The first parameter is now the request and the API is now async + * @deprecated The `request` is now the first parameter and the API is now async * with the form: * * ```ts From 255df4c793d7b5abfab110852c02debd831ed9a7 Mon Sep 17 00:00:00 2001 From: Luis Alvarez D Date: Mon, 21 Mar 2022 08:46:16 -0500 Subject: [PATCH 3/6] Update packages/next/server/web/spec-extension/fetch-event.ts Co-authored-by: JJ Kasper --- packages/next/server/web/spec-extension/fetch-event.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/next/server/web/spec-extension/fetch-event.ts b/packages/next/server/web/spec-extension/fetch-event.ts index 7fc8c5e5755fbea..b386f0a3e391521 100644 --- a/packages/next/server/web/spec-extension/fetch-event.ts +++ b/packages/next/server/web/spec-extension/fetch-event.ts @@ -12,14 +12,6 @@ export class NextFetchEvent extends FetchEvent { /** * @deprecated The `request` is now the first parameter and the API is now async - * with the form: - * - * ```ts - * export function middleware(request, event) { - * return new Response("Hello " + request.url) - * } - * ``` - * * Read more: https://nextjs.org/docs/messages/middleware-new-signature */ get request() { From 9b3ce39778f4166ff9873f86b517e8ab2136e109 Mon Sep 17 00:00:00 2001 From: Luis Alvarez D Date: Mon, 21 Mar 2022 08:47:31 -0500 Subject: [PATCH 4/6] Update packages/next/server/web/spec-extension/fetch-event.ts --- packages/next/server/web/spec-extension/fetch-event.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/next/server/web/spec-extension/fetch-event.ts b/packages/next/server/web/spec-extension/fetch-event.ts index b386f0a3e391521..69def252f4b4b96 100644 --- a/packages/next/server/web/spec-extension/fetch-event.ts +++ b/packages/next/server/web/spec-extension/fetch-event.ts @@ -11,7 +11,8 @@ export class NextFetchEvent extends FetchEvent { } /** - * @deprecated The `request` is now the first parameter and the API is now async + * @deprecated The `request` is now the first parameter and the API is now async. + * * Read more: https://nextjs.org/docs/messages/middleware-new-signature */ get request() { From 4b219eeed115ea7f07a3abc340c67ecc5752dded Mon Sep 17 00:00:00 2001 From: LFades Date: Sat, 26 Mar 2022 23:27:32 -0500 Subject: [PATCH 5/6] Updated comment --- .../next/server/web/spec-extension/fetch-event.ts | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/packages/next/server/web/spec-extension/fetch-event.ts b/packages/next/server/web/spec-extension/fetch-event.ts index 69def252f4b4b96..3b7b96801fccb4b 100644 --- a/packages/next/server/web/spec-extension/fetch-event.ts +++ b/packages/next/server/web/spec-extension/fetch-event.ts @@ -13,7 +13,7 @@ export class NextFetchEvent extends FetchEvent { /** * @deprecated The `request` is now the first parameter and the API is now async. * - * Read more: https://nextjs.org/docs/messages/middleware-new-signature + * Read more: https://nextjs.org/docs/messages/middleware-new-signature. */ get request() { throw new DeprecationError({ @@ -22,16 +22,9 @@ export class NextFetchEvent extends FetchEvent { } /** - * @deprecated `respondWith` is no longer needed and the API is now async - * with the form: + * @deprecated Using `respondWith` is no longer needed. * - * ```ts - * export function middleware(request, event) { - * return new Response("Hello " + request.url) - * } - * ``` - * - * Read more: https://nextjs.org/docs/messages/middleware-new-signature + * Read more: https://nextjs.org/docs/messages/middleware-new-signature. */ respondWith() { throw new DeprecationError({ From 04f430d85cf882cc2e56c96d22bd30f06a41c81c Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Mon, 28 Mar 2022 15:53:12 -0500 Subject: [PATCH 6/6] Apply suggestions from code review --- packages/next/server/web/spec-extension/fetch-event.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/next/server/web/spec-extension/fetch-event.ts b/packages/next/server/web/spec-extension/fetch-event.ts index 3b7b96801fccb4b..43374e9bd72f500 100644 --- a/packages/next/server/web/spec-extension/fetch-event.ts +++ b/packages/next/server/web/spec-extension/fetch-event.ts @@ -13,7 +13,7 @@ export class NextFetchEvent extends FetchEvent { /** * @deprecated The `request` is now the first parameter and the API is now async. * - * Read more: https://nextjs.org/docs/messages/middleware-new-signature. + * Read more: https://nextjs.org/docs/messages/middleware-new-signature */ get request() { throw new DeprecationError({ @@ -24,7 +24,7 @@ export class NextFetchEvent extends FetchEvent { /** * @deprecated Using `respondWith` is no longer needed. * - * Read more: https://nextjs.org/docs/messages/middleware-new-signature. + * Read more: https://nextjs.org/docs/messages/middleware-new-signature */ respondWith() { throw new DeprecationError({