From b419ecfa0f4503cbfd259e5c1ebaa5057851b824 Mon Sep 17 00:00:00 2001 From: Max Proske Date: Sat, 19 Nov 2022 00:24:19 -0800 Subject: [PATCH 1/2] Remove `unstable_revalidate` renaming error --- packages/next/server/api-utils/node.ts | 7 ------- test/e2e/prerender.test.ts | 14 -------------- test/e2e/prerender/pages/api/manual-revalidate.js | 3 --- 3 files changed, 24 deletions(-) diff --git a/packages/next/server/api-utils/node.ts b/packages/next/server/api-utils/node.ts index 4c875076d66b..ebaa95abc6fe 100644 --- a/packages/next/server/api-utils/node.ts +++ b/packages/next/server/api-utils/node.ts @@ -509,13 +509,6 @@ export async function apiResolver( } ) => revalidate(urlPath, opts || {}, req, apiContext) - // TODO: remove in next minor (current v12.2) - apiRes.unstable_revalidate = () => { - throw new Error( - `"unstable_revalidate" has been renamed to "revalidate" see more info here: https://nextjs.org/docs/basic-features/data-fetching/incremental-static-regeneration#on-demand-revalidation` - ) - } - const resolver = interopDefault(resolverModule) let wasPiped = false diff --git a/test/e2e/prerender.test.ts b/test/e2e/prerender.test.ts index 3b36acddc698..f98e99341632 100644 --- a/test/e2e/prerender.test.ts +++ b/test/e2e/prerender.test.ts @@ -752,20 +752,6 @@ describe('Prerender', () => { expect(value).toMatch(/Hi \[third\] \[fourth\]/) }) - if (!(global as any).isNextDeploy) { - it('should show error about renaming unstable_revalidate', async () => { - const res = await fetchViaHTTP(next.url, '/api/manual-revalidate', { - pathname: '/blog/first', - deprecated: '1', - }) - expect(res.status).toBe(500) - - expect(next.cliOutput).toContain( - '"unstable_revalidate" has been renamed to "revalidate"' - ) - }) - } - if ((global as any).isNextStart) { // TODO: dev currently renders this page as blocking, meaning it shows the // server error instead of continuously retrying. Do we want to change this? diff --git a/test/e2e/prerender/pages/api/manual-revalidate.js b/test/e2e/prerender/pages/api/manual-revalidate.js index 6d900febd837..0a53bb960929 100644 --- a/test/e2e/prerender/pages/api/manual-revalidate.js +++ b/test/e2e/prerender/pages/api/manual-revalidate.js @@ -1,7 +1,4 @@ export default async function handler(req, res) { - if (req.query.deprecated) { - await res.unstable_revalidate(req.query.pathname) - } // WARNING: don't use user input in production // make sure to use trusted value for revalidating let revalidated = false From 99a3af0875f22c2f6ab5440d40fdb7eaf607049d Mon Sep 17 00:00:00 2001 From: Max Proske Date: Sat, 19 Nov 2022 00:38:52 -0800 Subject: [PATCH 2/2] Remove function stub --- packages/next/shared/lib/utils.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/next/shared/lib/utils.ts b/packages/next/shared/lib/utils.ts index c54292c82c8f..18f912e24648 100644 --- a/packages/next/shared/lib/utils.ts +++ b/packages/next/shared/lib/utils.ts @@ -269,11 +269,6 @@ export type NextApiResponse = ServerResponse & { */ clearPreviewData: (options?: { path?: string }) => NextApiResponse - /** - * @deprecated `unstable_revalidate` has been renamed to `revalidate` - */ - unstable_revalidate: () => void - revalidate: ( urlPath: string, opts?: {