chore: more fixes

Author: LekoArts

.eslintrc.js

@@ -60,17 +60,22 @@ module.exports = {
       },
     },
     {
-      files: ['test/**'],
+      files: ['test/**', 'packages/**/test/**'],
       plugins: ['jest'],
       extends: ['plugin:jest/recommended'],
       rules: {
         // Disable global rules
-        'max-nested-callbacks': 0,
+        'max-nested-callbacks': 'off',
         '@typescript-eslint/no-empty-function': 0,
         'max-lines-per-function': 0,
         'unicorn/no-empty-file': 0,
+        'prefer-destructuring': 0,
+        '@typescript-eslint/no-unused-vars': 0,
+        'unicorn/no-await-expression-member': 0,
         // esling-plugin-jest specific rules
         'jest/consistent-test-it': ['error', { fn: 'it', withinDescribe: 'it' }],
+        'jest/no-disabled-tests': 0,
+        'jest/no-conditional-expect': 0,
       },
     },
   ],

package-lock.json

@@ -71,6 +71,7 @@
     "eslint-plugin-promise": "^6.0.0",
     "eslint-plugin-unicorn": "^43.0.2",
     "execa": "^5.1.1",
+    "fs-extra": "^11.1.1",
     "husky": "^7.0.4",
     "jest": "^27.0.0",
     "jest-extended": "^3.2.0",

package.json

@@ -9,6 +9,7 @@
   "devDependencies": {
     "@netlify/edge-functions": "^2.0.0",
     "@types/node": "^17.0.25",
+    "chance": "^1.1.11",
     "next": "^13.3.0",
     "npm-run-all": "^4.1.5",
     "typescript": "^4.6.3"

packages/next/package.json

@@ -2,6 +2,7 @@ import Chance from 'chance'
 import { NextURL } from 'next/dist/server/web/next-url'
 import { RequestCookies } from 'next/dist/server/web/spec-extension/cookies'
 import { NextRequest } from 'next/server'
+
 import { MiddlewareRequest } from '../src/middleware/request'
 
 const chance = new Chance()
@@ -75,19 +76,19 @@ describe('MiddlewareRequest', () => {
 
   it('throws an error when MiddlewareRequest is run outside of edge environment', () => {
     delete globalThis.Deno
-    expect(() => new MiddlewareRequest(nextRequest)).toThrowError(
+    expect(() => new MiddlewareRequest(nextRequest)).toThrow(
       'MiddlewareRequest only works in a Netlify Edge Function environment',
     )
   })
 
   it('throws an error when x-nf-request-id header is missing', () => {
     nextRequest.headers.delete('x-nf-request-id')
-    expect(() => new MiddlewareRequest(nextRequest)).toThrowError('Missing x-nf-request-id header')
+    expect(() => new MiddlewareRequest(nextRequest)).toThrow('Missing x-nf-request-id header')
   })
 
   it('throws an error when request context is missing', () => {
     globalThis.NFRequestContextMap.delete(requestId)
-    expect(() => new MiddlewareRequest(nextRequest)).toThrowError(
+    expect(() => new MiddlewareRequest(nextRequest)).toThrow(
       `Could not find request context for request id ${requestId}`,
     )
   })

packages/next/test/request.spec.ts

@@ -1,6 +1,7 @@
-import { extractConfigFromFile } from '../../packages/runtime/src/helpers/analysis'
 import { resolve } from 'pathe'
 
+import { extractConfigFromFile } from '../../packages/runtime/src/helpers/analysis'
+
 describe('static source analysis', () => {
   beforeEach(() => {
     //  Spy on console.error

test/helpers/analysis.spec.ts

@@ -1,6 +1,7 @@
-import { generateCustomHeaders, NextConfig } from '../../packages/runtime/src/helpers/config'
 import type { NetlifyPluginOptions } from '@netlify/build'
 
+import { generateCustomHeaders, NextConfig } from '../../packages/runtime/src/helpers/config'
+
 const netlifyConfig = {
   build: { command: 'npm run build' },
   functions: {},

test/helpers/config.spec.ts

@@ -1,6 +1,7 @@
-import { generateRscDataEdgeManifest } from '../../packages/runtime/src/helpers/edge'
 import type { PrerenderManifest } from 'next/dist/build'
 
+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 {

test/helpers/edge.spec.ts

@@ -1,3 +1,8 @@
+import path, { dirname } from 'path'
+
+import { readFileSync, copy, ensureDir } from 'fs-extra'
+import { resolve , join } from 'pathe'
+
 import {
   matchMiddleware,
   stripLocale,
@@ -8,11 +13,6 @@ import {
   getDependenciesOfFile,
   getSourceFileForPage,
 } from '../../packages/runtime/src/helpers/files'
-import { readFileSync, copy, ensureDir } from 'fs-extra'
-import path from 'path'
-import { dirname } from 'path'
-import { resolve } from 'pathe'
-import { join } from 'pathe'
 import { Rewrites } from '../../packages/runtime/src/helpers/types'
 import { describeCwdTmpDir, moveNextDist } from '../test-utils'
 
@@ -59,7 +59,7 @@ const REWRITES: Rewrites = [
 ]
 
 describe('files utility functions', () => {
-  test('middleware tester matches correct paths', () => {
+  it('middleware tester matches correct paths', () => {
     const middleware = ['middle', 'sub/directory']
     const paths = [
       'middle.html',
@@ -76,7 +76,7 @@ describe('files utility functions', () => {
     }
   })
 
-  test('middleware tester does not match incorrect paths', () => {
+  it('middleware tester does not match incorrect paths', () => {
     const middleware = ['middle', 'sub/directory']
     const paths = [
       'middl',
@@ -93,7 +93,7 @@ describe('files utility functions', () => {
     }
   })
 
-  test('middleware tester matches root middleware', () => {
+  it('middleware tester matches root middleware', () => {
     const middleware = ['']
     const paths = [
       'middl',
@@ -110,7 +110,7 @@ describe('files utility functions', () => {
     }
   })
 
-  test('middleware tester matches root middleware', () => {
+  it('middleware tester matches root middleware', () => {
     const paths = [
       'middl',
       '',
@@ -126,7 +126,7 @@ describe('files utility functions', () => {
     }
   })
 
-  test('stripLocale correctly strips matching locales', () => {
+  it('stripLocale correctly strips matching locales', () => {
     const locales = ['en', 'fr', 'en-GB']
     const paths = [
       ['en/file.html', 'file.html'],
@@ -140,29 +140,29 @@ describe('files utility functions', () => {
     }
   })
 
-  test('stripLocale does not touch non-matching matching locales', () => {
+  it('stripLocale does not touch non-matching matching locales', () => {
     const locales = ['en', 'fr', 'en-GB']
     const paths = ['de/file.html', 'enfile.html', 'en-US/file.html']
     for (const path of paths) {
       expect(stripLocale(path, locales)).toEqual(path)
     }
   })
 
-  test('matchesRedirect correctly matches paths with locales', () => {
+  it('matchesRedirect correctly matches paths with locales', () => {
     const paths = ['en/redirectme.html', 'en/redirectme.json', 'fr/redirectme.html', 'fr/redirectme.json']
     paths.forEach((path) => {
       expect(matchesRedirect(path, REDIRECTS)).toBeTruthy()
     })
   })
 
-  test("matchesRedirect doesn't match paths with invalid locales", () => {
+  it("matchesRedirect doesn't match paths with invalid locales", () => {
     const paths = ['dk/redirectme.html', 'dk/redirectme.json', 'gr/redirectme.html', 'gr/redirectme.json']
     paths.forEach((path) => {
       expect(matchesRedirect(path, REDIRECTS)).toBeFalsy()
     })
   })
 
-  test("matchesRedirect doesn't match internal redirects", () => {
+  it("matchesRedirect doesn't match internal redirects", () => {
     const paths = ['en/notrailingslash']
     paths.forEach((path) => {
       expect(matchesRedirect(path, REDIRECTS)).toBeFalsy()

test/helpers/files.spec.ts

@@ -1,6 +1,7 @@
 import { readJSON } from 'fs-extra'
 import mock from 'mock-fs'
 import { join } from 'pathe'
+
 import { NEXT_PLUGIN_NAME } from '../../packages/runtime/src/constants'
 import { writeFunctionConfiguration } from '../../packages/runtime/src/helpers/functionsMetaData'
 

test/helpers/functionsMetaData.spec.ts

@@ -1,5 +1,6 @@
-import { makeLocaleOptional, stripLookahead } from '../../packages/runtime/src/helpers/matchers'
 import { getEdgeFunctionPatternForPage } from '../../packages/runtime/src/helpers/edge'
+import { makeLocaleOptional, stripLookahead } from '../../packages/runtime/src/helpers/matchers'
+
 const makeDataPath = (path: string) => `/_next/data/build-id${path === '/' ? '/index' : path}.json`
 
 function checkPath(path: string, regex: string) {

test/helpers/matchers.spec.ts

@@ -1,5 +1,6 @@
 import Chance from 'chance'
 import { ExperimentalConfig } from 'next/dist/server/config-shared'
+
 import {
   getCustomImageResponseHeaders,
   getRemotePatterns,