chore: more manual fixes

Author: LekoArts

.eslintrc.js

@@ -72,6 +72,10 @@ module.exports = {
         'prefer-destructuring': 0,
         '@typescript-eslint/no-unused-vars': 0,
         'unicorn/no-await-expression-member': 0,
+        'import/no-anonymous-default-export': 0,
+        'no-shadow': 0,
+        '@typescript-eslint/no-var-requires': 0,
+        'require-await': 0,
         // esling-plugin-jest specific rules
         'jest/consistent-test-it': ['error', { fn: 'it', withinDescribe: 'it' }],
         'jest/no-disabled-tests': 0,

package-lock.json

@@ -80,6 +80,7 @@
     "mock-fs": "^5.2.0",
     "netlify-plugin-cypress": "^2.2.1",
     "npm-run-all": "^4.1.5",
+    "outdent": "^0.8.0",
     "pathe": "^1.1.0",
     "playwright-chromium": "1.28.1",
     "prettier": "^2.1.2",

package.json

@@ -1,17 +1,15 @@
 import type { PrerenderManifest } from 'next/dist/build'
 
+import { NEXT_PLUGIN_NAME } from '../../packages/runtime/src/constants'
 import { generateRscDataEdgeManifest } from '../../packages/runtime/src/helpers/edge'
 
-jest.mock('../../packages/runtime/src/helpers/functionsMetaData', () => {
-  const { NEXT_PLUGIN_NAME } = require('../../packages/runtime/src/constants')
-  return {
+jest.mock('../../packages/runtime/src/helpers/functionsMetaData', () => ({
     ...jest.requireActual('../../packages/runtime/src/helpers/functionsMetaData'),
     getPluginVersion: async () => `${NEXT_PLUGIN_NAME}@1.0.0`,
-  }
-})
+  }))
 
 const basePrerenderManifest: PrerenderManifest = {
-  version: 3,
+  version: 4,
   routes: {},
   dynamicRoutes: {},
   notFoundRoutes: [],

test/helpers/edge.spec.ts

@@ -14,7 +14,7 @@ import {
   getSourceFileForPage,
 } from '../../packages/runtime/src/helpers/files'
 import { Rewrites } from '../../packages/runtime/src/helpers/types'
-import { describeCwdTmpDir, moveNextDist } from '../test-utils'
+import { describeCwdTmpDir } from '../test-utils'
 
 const TEST_DIR = resolve(__dirname, '..')
 
@@ -110,7 +110,7 @@ describe('files utility functions', () => {
     }
   })
 
-  it('middleware tester matches root middleware', () => {
+  it('middleware tester does not match undefined', () => {
     const paths = [
       'middl',
       '',

test/helpers/files.spec.ts

@@ -3,7 +3,7 @@ import { makeLocaleOptional, stripLookahead } from '../../packages/runtime/src/h
 
 const makeDataPath = (path: string) => `/_next/data/build-id${path === '/' ? '/index' : path}.json`
 
-function checkPath(path: string, regex: string) {
+const checkPath = (path: string, regex: string) => {
   const re = new RegExp(regex)
   const dataPath = makeDataPath(path)
   const testPath = re.test(path)
@@ -29,7 +29,7 @@ describe('the middleware path matcher', () => {
     // The regex generated by Next for the path "/static" with i18n enabled (>= 13.3.0)
     const regexTwo = '^(?:\\/(_next\\/data\\/[^/]{1,}))?(?:\\/((?!_next\\/)[^/.]{1,}))\\/static(.json)?[\\/#\\?]?$'
 
-    function assertion(input) {
+    const assertion = (input) => {
       expect(checkPath('/static', input)).toBe(false)
       expect(checkPath('/static', makeLocaleOptional(input))).toBe(true)
       expect(checkPath('/en/static', makeLocaleOptional(input))).toBe(true)

test/helpers/matchers.spec.ts

@@ -21,14 +21,15 @@ type FailBuild = NetlifyPluginUtils['build']['failBuild']
 
 const chance = new Chance()
 
+const { existsSync } = require('fs')
+
 jest.mock('fs', () => ({
     ...jest.requireActual('fs'),
     existsSync: jest.fn(),
   }))
 
 describe('checkNextSiteHasBuilt', () => {
   let failBuildMock
-  const { existsSync } = require('fs')
 
   beforeEach(() => {
     failBuildMock = jest.fn() as unknown as FailBuild

test/helpers/verification.spec.ts

@@ -10,6 +10,7 @@ import { join , relative } from 'pathe'
 import { dir as getTmpDir } from 'tmp-promise'
 
 // @ts-expect-error - TODO: Convert runtime export to ES6
+// eslint-disable-next-line import/default
 import nextRuntimeFactory from '../packages/runtime/src'
 import { HANDLER_FUNCTION_NAME, ODB_FUNCTION_NAME, IMAGE_FUNCTION_NAME } from '../packages/runtime/src/constants'
 import { watchForMiddlewareChanges } from '../packages/runtime/src/helpers/compiler'
@@ -44,6 +45,7 @@ const utils = {
       throw new Error(message)
     },
   },
+  // eslint-disable-next-line no-void
   run: async () => void 0,
   cache: {
     save: jest.fn(),
@@ -101,15 +103,15 @@ afterEach(async () => {
 })
 
 describe('preBuild()', () => {
-  it('fails if publishing the root of the project', () => {
+  it('fails if publishing the root of the project', async () => {
     defaultArgs.netlifyConfig.build.publish = path.resolve('.')
-    expect(nextRuntime.onPreBuild(defaultArgs)).rejects.toThrow(
+    await expect(nextRuntime.onPreBuild(defaultArgs)).rejects.toThrow(
       /Your publish directory is pointing to the base directory of your site/,
     )
   })
 
-  it('fails if the build version is too old', () => {
-    expect(
+  it('fails if the build version is too old', async () => {
+    await expect(
       nextRuntime.onPreBuild({
         ...defaultArgs,
         constants: { IS_LOCAL: true, NETLIFY_BUILD_VERSION: '18.15.0' },
@@ -118,7 +120,7 @@ describe('preBuild()', () => {
   })
 
   it('passes if the build version is new enough', async () => {
-    expect(
+    await expect(
       nextRuntime.onPreBuild({
         ...defaultArgs,
         constants: { IS_LOCAL: true, NETLIFY_BUILD_VERSION: '18.16.1' },
@@ -320,7 +322,7 @@ describe('onBuild()', () => {
     const failBuild = jest.fn().mockImplementation((err) => {
       throw new Error(err)
     })
-    expect(() => nextRuntime.onBuild({ ...defaultArgs, utils: { ...utils, build: { failBuild } } })).rejects.toThrow(
+    await expect(() => nextRuntime.onBuild({ ...defaultArgs, utils: { ...utils, build: { failBuild } } })).rejects.toThrow(
       `In most cases it should be set to ".next", unless you have chosen a custom "distDir" in your Next config.`,
     )
     expect(failBuild).toHaveBeenCalled()
@@ -334,7 +336,7 @@ describe('onBuild()', () => {
     })
     netlifyConfig.build.publish = path.resolve('out')
 
-    expect(() => nextRuntime.onBuild({ ...defaultArgs, utils: { ...utils, build: { failBuild } } })).rejects.toThrow(
+    await expect(() => nextRuntime.onBuild({ ...defaultArgs, utils: { ...utils, build: { failBuild } } })).rejects.toThrow(
       `Your publish directory is set to "out", but in most cases it should be ".next".`,
     )
     expect(failBuild).toHaveBeenCalled()