feat: revert "feat: skip run if @netlify/plugin-nextjs installed (#1536)"

This reverts commit 0b4cf8c.

Author: sarahetter

packages/runtime/src/helpers/utils.ts

@@ -179,7 +179,7 @@ export const findModuleFromBase = ({ paths, candidates }): string | null => {
 
 export const isNextAuthInstalled = (): boolean => {
   try {
-    // eslint-disable-next-line import/no-unassigned-import, n/no-extraneous-require, import/no-extraneous-dependencies
+    // eslint-disable-next-line import/no-unassigned-import
     require('next-auth')
     return true
   } catch {
@@ -188,17 +188,6 @@ export const isNextAuthInstalled = (): boolean => {
   }
 }
 
-export const isOldPluginInstalled = (): boolean => {
-  try {
-    // eslint-disable-next-line import/no-unassigned-import, n/no-missing-require, import/no-unresolved
-    require('@netlify/plugin-nextjs')
-    return true
-  } catch {
-    // Ignore the MODULE_NOT_FOUND error
-    return false
-  }
-}
-
 export const getCustomImageResponseHeaders = (headers: Header[]): Record<string, string> | null => {
   const customImageResponseHeaders = headers.find((header) => header.for?.startsWith('/_next/image/'))
 

packages/runtime/src/index.ts

@@ -19,7 +19,7 @@ import { updateConfig, writeEdgeFunctions, loadMiddlewareManifest } from './help
 import { moveStaticPages, movePublicFiles, patchNextFiles } from './helpers/files'
 import { generateFunctions, setupImageFunction, generatePagesResolver } from './helpers/functions'
 import { generateRedirects, generateStaticRedirects } from './helpers/redirects'
-import { shouldSkip, isNextAuthInstalled, isOldPluginInstalled, getCustomImageResponseHeaders } from './helpers/utils'
+import { shouldSkip, isNextAuthInstalled, getCustomImageResponseHeaders } from './helpers/utils'
 import {
   verifyNetlifyBuildVersion,
   checkNextSiteHasBuilt,
@@ -39,10 +39,6 @@ const plugin: NetlifyPlugin = {
       cache,
     },
   }) {
-    if (isOldPluginInstalled()) {
-      return
-    }
-
     const { publish } = netlifyConfig.build
     if (shouldSkip()) {
       await restoreCache({ cache, publish })
@@ -69,7 +65,7 @@ const plugin: NetlifyPlugin = {
       build: { failBuild },
     },
   }) {
-    if (isOldPluginInstalled() || shouldSkip()) {
+    if (shouldSkip()) {
       return
     }
     const { publish } = netlifyConfig.build
@@ -182,14 +178,6 @@ const plugin: NetlifyPlugin = {
   }) {
     await saveCache({ cache, publish })
 
-    if (isOldPluginInstalled()) {
-      status.show({
-        summary:
-          'Please remove @netlify/plugin-nextjs from your site. It is no longer required and will prevent you using new features. Learn more: https://ntl.fyi/3w85e2E',
-      })
-      return
-    }
-
     if (shouldSkip()) {
       status.show({
         title: 'Next Runtime did not run',

test/index.js

@@ -2,7 +2,6 @@ jest.mock('../packages/runtime/src/helpers/utils', () => {
   return {
     ...jest.requireActual('../packages/runtime/src/helpers/utils'),
     isNextAuthInstalled: jest.fn(),
-    isOldPluginInstalled: jest.fn(),
   }
 })
 
@@ -34,6 +33,8 @@ const {
 } = require('../packages/runtime/src/helpers/config')
 const { dirname } = require('path')
 const { getProblematicUserRewrites } = require('../packages/runtime/src/helpers/verification')
+const { onPostBuild } = require('../packages/runtime/lib')
+const { basePath } = require('../demos/next-i18next/next.config')
 
 const chance = new Chance()
 const FIXTURES_DIR = `${__dirname}/fixtures`
@@ -561,47 +562,6 @@ describe('onBuild()', () => {
 })
 
 describe('onPostBuild', () => {
-  const { isOldPluginInstalled } = require('../packages/runtime/src/helpers/utils')
-
-  test('show warning message to remove old plugin', async () => {
-    isOldPluginInstalled.mockImplementation(() => {
-      return true
-    })
-    const mockStatusFunc = jest.fn()
-
-    await nextRuntime.onPostBuild({
-      ...defaultArgs,
-      utils: { ...utils, status: { show: mockStatusFunc } },
-    })
-
-    expect(mockStatusFunc).toHaveBeenCalledWith({
-      summary:
-        'Please remove @netlify/plugin-nextjs from your site. It is no longer required and will prevent you using new features. Learn more: https://ntl.fyi/3w85e2E',
-    })
-  })
-
-  test('does not show warning message to remove old plugin', async () => {
-    isOldPluginInstalled.mockImplementation(() => {
-      return false
-    })
-    const mockStatusFunc = jest.fn()
-    await moveNextDist()
-
-    await nextRuntime.onPostBuild({
-      ...defaultArgs,
-      utils: {
-        ...utils,
-        status: { show: mockStatusFunc },
-        functions: { list: jest.fn().mockResolvedValue([]) },
-      },
-    })
-
-    expect(mockStatusFunc).not.toHaveBeenCalledWith({
-      summary:
-        'Please remove @netlify/plugin-nextjs from your site. It is no longer required and will prevent you using new features.',
-    })
-  })
-
   test('saves cache with right paths', async () => {
     await moveNextDist()