Unverified Commit 005b13f1 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Move unit tests to one folder and migrate them to TypeScript (#28427)

* Move unit tests to one folder

* Migrate unit tests to TypeScript

* add test types to lint

* Ensure ts(x) tests are run with util

* Add tsx extension to jest config

* bump
parent 6072afc8
...@@ -104,7 +104,7 @@ jobs: ...@@ -104,7 +104,7 @@ jobs:
path: ./* path: ./*
key: ${{ github.sha }} key: ${{ github.sha }}
- run: node run-tests.js --timings --type unit -g 1/1 - run: node run-tests.js --type unit
if: ${{needs.build.outputs.docsChange != 'docs only change'}} if: ${{needs.build.outputs.docsChange != 'docs only change'}}
testIntegration: testIntegration:
......
...@@ -111,7 +111,7 @@ stages: ...@@ -111,7 +111,7 @@ stages:
path: $(System.DefaultWorkingDirectory) path: $(System.DefaultWorkingDirectory)
displayName: Cache Build displayName: Cache Build
- script: | - script: |
node run-tests.js -g 1/1 --timings --azure --type unit node run-tests.js --type unit
displayName: 'Run tests' displayName: 'Run tests'
# TODO: investigate re-enabling when stability matches running in # TODO: investigate re-enabling when stability matches running in
# tests in ubuntu environment # tests in ubuntu environment
......
module.exports = { module.exports = {
testMatch: ['**/*.test.js'], testMatch: ['**/*.test.js', '**/*.test.ts', '**/*.test.tsx'],
verbose: true, verbose: true,
rootDir: 'test', rootDir: 'test',
modulePaths: ['<rootDir>/lib'], modulePaths: ['<rootDir>/lib'],
......
...@@ -10,22 +10,18 @@ ...@@ -10,22 +10,18 @@
"lerna": "lerna", "lerna": "lerna",
"dev": "lerna run dev --stream --parallel", "dev": "lerna run dev --stream --parallel",
"dev2": "while true; do yarn --check-files && yarn dev; done", "dev2": "while true; do yarn --check-files && yarn dev; done",
"testonly": "jest --runInBand", "test-types": "yarn tsc",
"test-unit": "yarn jest test/unit/",
"testonly": "yarn jest --runInBand",
"testheadless": "cross-env HEADLESS=true yarn testonly", "testheadless": "cross-env HEADLESS=true yarn testonly",
"testsafari": "cross-env BROWSER_NAME=safari yarn testonly", "testall": "yarn test -- --ci --forceExit && lerna run --scope @next/codemod test",
"testfirefox": "cross-env BROWSER_NAME=firefox yarn testonly",
"testie": "cross-env BROWSER_NAME=\"internet explorer\" yarn testonly",
"testall": "yarn run testonly -- --ci --forceExit && lerna run --scope @next/codemod test",
"genstats": "cross-env LOCAL_STATS=true node .github/actions/next-stats-action/src/index.js", "genstats": "cross-env LOCAL_STATS=true node .github/actions/next-stats-action/src/index.js",
"pretest": "yarn run lint",
"git-reset": "git reset --hard HEAD", "git-reset": "git reset --hard HEAD",
"git-clean": "git clean -d -x -e node_modules -e packages -f", "git-clean": "git clean -d -x -e node_modules -e packages -f",
"test-take2": "yarn git-reset && yarn git-clean && yarn testall",
"test": "yarn run testall || yarn run test-take2",
"lint-typescript": "lerna run typescript", "lint-typescript": "lerna run typescript",
"lint-eslint": "eslint . --ext js,jsx,ts,tsx --max-warnings=0", "lint-eslint": "eslint . --ext js,jsx,ts,tsx --max-warnings=0",
"lint-no-typescript": "run-p prettier-check lint-eslint", "lint-no-typescript": "run-p prettier-check lint-eslint",
"lint": "run-p lint-typescript prettier-check lint-eslint lint-language", "lint": "run-p test-types lint-typescript prettier-check lint-eslint lint-language",
"lint-fix": "yarn prettier-fix && eslint . --ext js,jsx,ts,tsx --fix --max-warnings=0", "lint-fix": "yarn prettier-fix && eslint . --ext js,jsx,ts,tsx --fix --max-warnings=0",
"lint-language": "alex .", "lint-language": "alex .",
"prettier-check": "prettier --check .", "prettier-check": "prettier --check .",
......
...@@ -12,16 +12,12 @@ const glob = promisify(_glob) ...@@ -12,16 +12,12 @@ const glob = promisify(_glob)
const exec = promisify(execOrig) const exec = promisify(execOrig)
const timings = [] const timings = []
const NUM_RETRIES = 2 const DEFAULT_NUM_RETRIES = 2
const DEFAULT_CONCURRENCY = 2 const DEFAULT_CONCURRENCY = 2
const RESULTS_EXT = `.results.json` const RESULTS_EXT = `.results.json`
const isTestJob = !!process.env.NEXT_TEST_JOB const isTestJob = !!process.env.NEXT_TEST_JOB
const TIMINGS_API = `https://next-timings.jjsweb.site/api/timings` const TIMINGS_API = `https://next-timings.jjsweb.site/api/timings`
const UNIT_TEST_EXT = '.unit.test.js'
const DEV_TEST_EXT = '.dev.test.js'
const PROD_TEST_EXT = '.prod.test.js'
const NON_CONCURRENT_TESTS = [ const NON_CONCURRENT_TESTS = [
'test/integration/basic/test/index.test.js', 'test/integration/basic/test/index.test.js',
'test/acceptance/ReactRefresh.dev.test.js', 'test/acceptance/ReactRefresh.dev.test.js',
...@@ -30,12 +26,17 @@ const NON_CONCURRENT_TESTS = [ ...@@ -30,12 +26,17 @@ const NON_CONCURRENT_TESTS = [
'test/acceptance/ReactRefreshRequire.dev.test.js', 'test/acceptance/ReactRefreshRequire.dev.test.js',
] ]
const testFilters = {
unit: 'unit/',
}
// which types we have configured to run separate // which types we have configured to run separate
const configuredTestTypes = [UNIT_TEST_EXT] const configuredTestTypes = Object.values(testFilters)
async function main() { async function main() {
let numRetries = DEFAULT_NUM_RETRIES
let concurrencyIdx = process.argv.indexOf('-c') let concurrencyIdx = process.argv.indexOf('-c')
const concurrency = let concurrency =
parseInt(process.argv[concurrencyIdx + 1], 10) || DEFAULT_CONCURRENCY parseInt(process.argv[concurrencyIdx + 1], 10) || DEFAULT_CONCURRENCY
const outputTimings = process.argv.indexOf('--timings') !== -1 const outputTimings = process.argv.indexOf('--timings') !== -1
...@@ -50,15 +51,17 @@ async function main() { ...@@ -50,15 +51,17 @@ async function main() {
let filterTestsBy let filterTestsBy
switch (testType) { switch (testType) {
case 'unit': case 'unit': {
filterTestsBy = UNIT_TEST_EXT numRetries = 0
break filterTestsBy = testFilters.unit
case 'dev':
filterTestsBy = DEV_TEST_EXT
break
case 'production':
filterTestsBy = PROD_TEST_EXT
break break
}
// case 'dev':
// filterTestsBy = DEV_TEST_EXT
// break
// case 'production':
// filterTestsBy = PROD_TEST_EXT
// break
case 'all': case 'all':
filterTestsBy = 'none' filterTestsBy = 'none'
break break
...@@ -67,22 +70,22 @@ async function main() { ...@@ -67,22 +70,22 @@ async function main() {
} }
console.log('Running tests with concurrency:', concurrency) console.log('Running tests with concurrency:', concurrency)
let tests = process.argv.filter((arg) => arg.endsWith('.test.js')) let tests = process.argv.filter((arg) => arg.match(/\.test\.(js|ts|tsx)/))
let prevTimings let prevTimings
if (tests.length === 0) { if (tests.length === 0) {
tests = ( tests = (
await glob('**/*.test.js', { await glob('**/*.test.{js,ts,tsx}', {
nodir: true, nodir: true,
cwd: path.join(__dirname, 'test'), cwd: path.join(__dirname, 'test'),
}) })
).filter((test) => { ).filter((test) => {
// only include the specified type
if (filterTestsBy) { if (filterTestsBy) {
return filterTestsBy === 'none' ? true : test.endsWith(filterTestsBy) // only include the specified type
// include all except the separately configured types return filterTestsBy === 'none' ? true : test.startsWith(filterTestsBy)
} else { } else {
return !configuredTestTypes.some((type) => test.endsWith(type)) // include all except the separately configured types
return !configuredTestTypes.some((type) => test.startsWith(type))
} }
}) })
...@@ -183,7 +186,7 @@ async function main() { ...@@ -183,7 +186,7 @@ async function main() {
) )
const children = new Set() const children = new Set()
const runTest = (test = '', usePolling) => const runTest = (test = '', usePolling, isFinalRun) =>
new Promise((resolve, reject) => { new Promise((resolve, reject) => {
const start = new Date().getTime() const start = new Date().getTime()
let outputChunks = [] let outputChunks = []
...@@ -232,7 +235,9 @@ async function main() { ...@@ -232,7 +235,9 @@ async function main() {
child.on('exit', (code) => { child.on('exit', (code) => {
children.delete(child) children.delete(child)
if (code) { if (code) {
outputChunks.forEach((chunk) => process.stdout.write(chunk)) if (isFinalRun) {
outputChunks.forEach((chunk) => process.stdout.write(chunk))
}
reject(new Error(`failed with code: ${code}`)) reject(new Error(`failed with code: ${code}`))
} }
resolve(new Date().getTime() - start) resolve(new Date().getTime() - start)
...@@ -254,21 +259,21 @@ async function main() { ...@@ -254,21 +259,21 @@ async function main() {
for (const test of nonConcurrentTestNames) { for (const test of nonConcurrentTestNames) {
let passed = false let passed = false
for (let i = 0; i < NUM_RETRIES + 1; i++) { for (let i = 0; i < numRetries + 1; i++) {
try { try {
console.log(`Starting ${test} retry ${i}/${NUM_RETRIES}`) console.log(`Starting ${test} retry ${i}/${numRetries}`)
const time = await runTest(test, i > 0) const time = await runTest(test, i > 0, i === numRetries)
timings.push({ timings.push({
file: test, file: test,
time, time,
}) })
passed = true passed = true
console.log( console.log(
`Finished ${test} on retry ${i}/${NUM_RETRIES} in ${time / 1000}s` `Finished ${test} on retry ${i}/${numRetries} in ${time / 1000}s`
) )
break break
} catch (err) { } catch (err) {
if (i < NUM_RETRIES) { if (i < numRetries) {
try { try {
const testDir = path.dirname(path.join(__dirname, test)) const testDir = path.dirname(path.join(__dirname, test))
console.log('Cleaning test files at', testDir) console.log('Cleaning test files at', testDir)
...@@ -279,7 +284,7 @@ async function main() { ...@@ -279,7 +284,7 @@ async function main() {
} }
} }
if (!passed) { if (!passed) {
console.error(`${test} failed to pass within ${NUM_RETRIES} retries`) console.error(`${test} failed to pass within ${numRetries} retries`)
children.forEach((child) => child.kill()) children.forEach((child) => child.kill())
if (isTestJob) { if (isTestJob) {
...@@ -303,21 +308,21 @@ async function main() { ...@@ -303,21 +308,21 @@ async function main() {
await sema.acquire() await sema.acquire()
let passed = false let passed = false
for (let i = 0; i < NUM_RETRIES + 1; i++) { for (let i = 0; i < numRetries + 1; i++) {
try { try {
console.log(`Starting ${test} retry ${i}/${NUM_RETRIES}`) console.log(`Starting ${test} retry ${i}/${numRetries}`)
const time = await runTest(test, i > 0) const time = await runTest(test, i > 0, i === numRetries)
timings.push({ timings.push({
file: test, file: test,
time, time,
}) })
passed = true passed = true
console.log( console.log(
`Finished ${test} on retry ${i}/${NUM_RETRIES} in ${time / 1000}s` `Finished ${test} on retry ${i}/${numRetries} in ${time / 1000}s`
) )
break break
} catch (err) { } catch (err) {
if (i < NUM_RETRIES) { if (i < numRetries) {
try { try {
const testDir = path.dirname(path.join(__dirname, test)) const testDir = path.dirname(path.join(__dirname, test))
console.log('Cleaning test files at', testDir) console.log('Cleaning test files at', testDir)
...@@ -328,7 +333,7 @@ async function main() { ...@@ -328,7 +333,7 @@ async function main() {
} }
} }
if (!passed) { if (!passed) {
console.error(`${test} failed to pass within ${NUM_RETRIES} retries`) console.error(`${test} failed to pass within ${numRetries} retries`)
children.forEach((child) => child.kill()) children.forEach((child) => child.kill())
if (isTestJob) { if (isTestJob) {
......
{
"compilerOptions": {
"module": "esnext",
"target": "es6",
"allowJs": true,
"noEmit": true,
"baseUrl": "../",
"paths": {
"next-test-utils": ["./test/lib/next-test-utils"],
"amp-test-utils": ["./test/lib/amp-test-utils"],
"next-webdriver": ["./test/lib/next-webdriver"]
}
}
}
const rule = require('@next/eslint-plugin-next/lib/rules/google-font-display') import rule from '@next/eslint-plugin-next/lib/rules/google-font-display'
const RuleTester = require('eslint').RuleTester import { RuleTester } from 'eslint'
;(RuleTester as any).setDefaultConfig({
RuleTester.setDefaultConfig({
parserOptions: { parserOptions: {
ecmaVersion: 2020, ecmaVersion: 2020,
sourceType: 'module', sourceType: 'module',
...@@ -11,8 +10,8 @@ RuleTester.setDefaultConfig({ ...@@ -11,8 +10,8 @@ RuleTester.setDefaultConfig({
}, },
}, },
}) })
const ruleTester = new RuleTester()
var ruleTester = new RuleTester()
ruleTester.run('google-font-display', rule, { ruleTester.run('google-font-display', rule, {
valid: [ valid: [
`import Head from "next/head"; `import Head from "next/head";
......
const rule = require('@next/eslint-plugin-next/lib/rules/google-font-preconnect') import rule from '@next/eslint-plugin-next/lib/rules/google-font-preconnect'
const RuleTester = require('eslint').RuleTester import { RuleTester } from 'eslint'
;(RuleTester as any).setDefaultConfig({
RuleTester.setDefaultConfig({
parserOptions: { parserOptions: {
ecmaVersion: 2020, ecmaVersion: 2020,
sourceType: 'module', sourceType: 'module',
...@@ -11,8 +10,8 @@ RuleTester.setDefaultConfig({ ...@@ -11,8 +10,8 @@ RuleTester.setDefaultConfig({
}, },
}, },
}) })
const ruleTester = new RuleTester()
var ruleTester = new RuleTester()
ruleTester.run('google-font-preconnect', rule, { ruleTester.run('google-font-preconnect', rule, {
valid: [ valid: [
`export const Test = () => ( `export const Test = () => (
......
const rule = require('@next/eslint-plugin-next/lib/rules/inline-script-id') import rule from '@next/eslint-plugin-next/lib/rules/inline-script-id'
import { RuleTester } from 'eslint'
const RuleTester = require('eslint').RuleTester ;(RuleTester as any).setDefaultConfig({
RuleTester.setDefaultConfig({
parserOptions: { parserOptions: {
ecmaVersion: 2018, ecmaVersion: 2018,
sourceType: 'module', sourceType: 'module',
......
const rule = require('@next/eslint-plugin-next/lib/rules/link-passhref') import rule from '@next/eslint-plugin-next/lib/rules/link-passhref'
const RuleTester = require('eslint').RuleTester import { RuleTester } from 'eslint'
;(RuleTester as any).setDefaultConfig({
RuleTester.setDefaultConfig({
parserOptions: { parserOptions: {
ecmaVersion: 2018, ecmaVersion: 2018,
sourceType: 'module', sourceType: 'module',
...@@ -11,8 +10,8 @@ RuleTester.setDefaultConfig({ ...@@ -11,8 +10,8 @@ RuleTester.setDefaultConfig({
}, },
}, },
}) })
const ruleTester = new RuleTester()
var ruleTester = new RuleTester()
ruleTester.run('link-passhref', rule, { ruleTester.run('link-passhref', rule, {
valid: [ valid: [
`export const Home = () => ( `export const Home = () => (
......
const rule = require('@next/eslint-plugin-next/lib/rules/next-script-for-ga') import rule from '@next/eslint-plugin-next/lib/rules/next-script-for-ga'
import { RuleTester } from 'eslint'
const RuleTester = require('eslint').RuleTester ;(RuleTester as any).setDefaultConfig({
const ERROR_MSG =
'Use the `next/script` component for loading third party scripts. See: https://nextjs.org/docs/messages/next-script-for-ga.'
RuleTester.setDefaultConfig({
parserOptions: { parserOptions: {
ecmaVersion: 2018, ecmaVersion: 2018,
sourceType: 'module', sourceType: 'module',
...@@ -16,7 +11,11 @@ RuleTester.setDefaultConfig({ ...@@ -16,7 +11,11 @@ RuleTester.setDefaultConfig({
}, },
}) })
var ruleTester = new RuleTester() const ERROR_MSG =
'Use the `next/script` component for loading third party scripts. See: https://nextjs.org/docs/messages/next-script-for-ga.'
const ruleTester = new RuleTester()
ruleTester.run('sync-scripts', rule, { ruleTester.run('sync-scripts', rule, {
valid: [ valid: [
`import Script from 'next/script' `import Script from 'next/script'
......
const rule = require('@next/eslint-plugin-next/lib/rules/no-css-tags') import rule from '@next/eslint-plugin-next/lib/rules/no-css-tags'
const RuleTester = require('eslint').RuleTester import { RuleTester } from 'eslint'
;(RuleTester as any).setDefaultConfig({
RuleTester.setDefaultConfig({
parserOptions: { parserOptions: {
ecmaVersion: 2018, ecmaVersion: 2018,
sourceType: 'module', sourceType: 'module',
...@@ -11,8 +10,8 @@ RuleTester.setDefaultConfig({ ...@@ -11,8 +10,8 @@ RuleTester.setDefaultConfig({
}, },
}, },
}) })
const ruleTester = new RuleTester()
var ruleTester = new RuleTester()
ruleTester.run('no-css-tags', rule, { ruleTester.run('no-css-tags', rule, {
valid: [ valid: [
`import {Head} from 'next/document'; `import {Head} from 'next/document';
......
const rule = require('@next/eslint-plugin-next/lib/rules/no-document-import-in-page') import rule from '@next/eslint-plugin-next/lib/rules/no-document-import-in-page'
import { RuleTester } from 'eslint'
const RuleTester = require('eslint').RuleTester ;(RuleTester as any).setDefaultConfig({
RuleTester.setDefaultConfig({
parserOptions: { parserOptions: {
ecmaVersion: 2018, ecmaVersion: 2018,
sourceType: 'module', sourceType: 'module',
...@@ -12,8 +10,8 @@ RuleTester.setDefaultConfig({ ...@@ -12,8 +10,8 @@ RuleTester.setDefaultConfig({
}, },
}, },
}) })
const ruleTester = new RuleTester()
var ruleTester = new RuleTester()
ruleTester.run('no-document-import-in-page', rule, { ruleTester.run('no-document-import-in-page', rule, {
valid: [ valid: [
{ {
......
const rule = require('@next/eslint-plugin-next/lib/rules/no-duplicate-head') import rule from '@next/eslint-plugin-next/lib/rules/no-duplicate-head'
import { RuleTester } from 'eslint'
const RuleTester = require('eslint').RuleTester ;(RuleTester as any).setDefaultConfig({
RuleTester.setDefaultConfig({
parserOptions: { parserOptions: {
ecmaVersion: 2018, ecmaVersion: 2018,
sourceType: 'module', sourceType: 'module',
...@@ -12,8 +10,8 @@ RuleTester.setDefaultConfig({ ...@@ -12,8 +10,8 @@ RuleTester.setDefaultConfig({
}, },
}, },
}) })
const ruleTester = new RuleTester()
var ruleTester = new RuleTester()
ruleTester.run('no-duplicate-head', rule, { ruleTester.run('no-duplicate-head', rule, {
valid: [ valid: [
{ {
......
const rule = require('@next/eslint-plugin-next/lib/rules/no-head-import-in-document') import rule from '@next/eslint-plugin-next/lib/rules/no-head-import-in-document'
import { RuleTester } from 'eslint'
const RuleTester = require('eslint').RuleTester ;(RuleTester as any).setDefaultConfig({
RuleTester.setDefaultConfig({
parserOptions: { parserOptions: {
ecmaVersion: 2018, ecmaVersion: 2018,
sourceType: 'module', sourceType: 'module',
...@@ -12,8 +10,8 @@ RuleTester.setDefaultConfig({ ...@@ -12,8 +10,8 @@ RuleTester.setDefaultConfig({
}, },
}, },
}) })
const ruleTester = new RuleTester()
var ruleTester = new RuleTester()
ruleTester.run('no-head-import-in-document', rule, { ruleTester.run('no-head-import-in-document', rule, {
valid: [ valid: [
{ {
......
/* eslint-env jest */ /* eslint-env jest */
const rule = require('@next/eslint-plugin-next/lib/rules/no-html-link-for-pages') import rule from '@next/eslint-plugin-next/lib/rules/no-html-link-for-pages'
const { Linter } = require('eslint') import { Linter } from 'eslint'
const assert = require('assert') import assert from 'assert'
const path = require('path') import path from 'path'
const linter = new Linter({ cwd: __dirname }) const linter = new Linter({ cwd: __dirname })
const linterConfig = { const linterConfig: any = {
rules: { rules: {
'no-html-link-for-pages': [2, path.join(__dirname, 'custom-pages')], 'no-html-link-for-pages': [2, path.join(__dirname, 'custom-pages')],
}, },
......
const rule = require('@next/eslint-plugin-next/lib/rules/no-img-element') import rule from '@next/eslint-plugin-next/lib/rules/no-img-element'
import { RuleTester } from 'eslint'
const RuleTester = require('eslint').RuleTester ;(RuleTester as any).setDefaultConfig({
RuleTester.setDefaultConfig({
parserOptions: { parserOptions: {
ecmaVersion: 2018, ecmaVersion: 2018,
sourceType: 'module', sourceType: 'module',
...@@ -12,8 +10,8 @@ RuleTester.setDefaultConfig({ ...@@ -12,8 +10,8 @@ RuleTester.setDefaultConfig({
}, },
}, },
}) })
const ruleTester = new RuleTester()
var ruleTester = new RuleTester()
ruleTester.run('no-img-element', rule, { ruleTester.run('no-img-element', rule, {
valid: [ valid: [
`import { Image } from 'next/image'; `import { Image } from 'next/image';
......
const rule = require('@next/eslint-plugin-next/lib/rules/no-page-custom-font') import rule from '@next/eslint-plugin-next/lib/rules/no-page-custom-font'
const RuleTester = require('eslint').RuleTester import { RuleTester } from 'eslint'
;(RuleTester as any).setDefaultConfig({
RuleTester.setDefaultConfig({
parserOptions: { parserOptions: {
ecmaVersion: 2020, ecmaVersion: 2018,
sourceType: 'module', sourceType: 'module',
ecmaFeatures: { ecmaFeatures: {
modules: true, modules: true,
...@@ -11,8 +10,8 @@ RuleTester.setDefaultConfig({ ...@@ -11,8 +10,8 @@ RuleTester.setDefaultConfig({
}, },
}, },
}) })
const ruleTester = new RuleTester()
var ruleTester = new RuleTester()
ruleTester.run('no-page-custom-font', rule, { ruleTester.run('no-page-custom-font', rule, {
valid: [ valid: [
`import Document, { Html, Head } from "next/document"; `import Document, { Html, Head } from "next/document";
......
const rule = require('@next/eslint-plugin-next/lib/rules/no-script-in-document') import rule from '@next/eslint-plugin-next/lib/rules/no-script-in-document'
import { RuleTester } from 'eslint'
const RuleTester = require('eslint').RuleTester ;(RuleTester as any).setDefaultConfig({
RuleTester.setDefaultConfig({
parserOptions: { parserOptions: {
ecmaVersion: 2018, ecmaVersion: 2018,
sourceType: 'module', sourceType: 'module',
...@@ -12,8 +10,8 @@ RuleTester.setDefaultConfig({ ...@@ -12,8 +10,8 @@ RuleTester.setDefaultConfig({
}, },
}, },
}) })
const ruleTester = new RuleTester()
var ruleTester = new RuleTester()
ruleTester.run('no-script-import-in-document', rule, { ruleTester.run('no-script-import-in-document', rule, {
valid: [ valid: [
{ {
......
const rule = require('@next/eslint-plugin-next/lib/rules/no-script-in-head.js') import rule from '@next/eslint-plugin-next/lib/rules/no-script-in-head'
const RuleTester = require('eslint').RuleTester import { RuleTester } from 'eslint'
;(RuleTester as any).setDefaultConfig({
RuleTester.setDefaultConfig({
parserOptions: { parserOptions: {
ecmaVersion: 2018, ecmaVersion: 2018,
sourceType: 'module', sourceType: 'module',
...@@ -11,8 +10,8 @@ RuleTester.setDefaultConfig({ ...@@ -11,8 +10,8 @@ RuleTester.setDefaultConfig({
}, },
}, },
}) })
const ruleTester = new RuleTester()
var ruleTester = new RuleTester()
ruleTester.run('no-script-in-head', rule, { ruleTester.run('no-script-in-head', rule, {
valid: [ valid: [
`import Script from "next/script"; `import Script from "next/script";
......
const rule = require('@next/eslint-plugin-next/lib/rules/no-sync-scripts') import rule from '@next/eslint-plugin-next/lib/rules/no-sync-scripts'
import { RuleTester } from 'eslint'
const RuleTester = require('eslint').RuleTester ;(RuleTester as any).setDefaultConfig({
RuleTester.setDefaultConfig({
parserOptions: { parserOptions: {
ecmaVersion: 2018, ecmaVersion: 2018,
sourceType: 'module', sourceType: 'module',
...@@ -12,8 +10,8 @@ RuleTester.setDefaultConfig({ ...@@ -12,8 +10,8 @@ RuleTester.setDefaultConfig({
}, },
}, },
}) })
const ruleTester = new RuleTester()
var ruleTester = new RuleTester()
ruleTester.run('sync-scripts', rule, { ruleTester.run('sync-scripts', rule, {
valid: [ valid: [
`import {Head} from 'next/document'; `import {Head} from 'next/document';
......
const rule = require('@next/eslint-plugin-next/lib/rules/no-title-in-document-head') import rule from '@next/eslint-plugin-next/lib/rules/no-title-in-document-head'
const RuleTester = require('eslint').RuleTester import { RuleTester } from 'eslint'
;(RuleTester as any).setDefaultConfig({
RuleTester.setDefaultConfig({
parserOptions: { parserOptions: {
ecmaVersion: 2018, ecmaVersion: 2018,
sourceType: 'module', sourceType: 'module',
...@@ -11,8 +10,8 @@ RuleTester.setDefaultConfig({ ...@@ -11,8 +10,8 @@ RuleTester.setDefaultConfig({
}, },
}, },
}) })
const ruleTester = new RuleTester()
var ruleTester = new RuleTester()
ruleTester.run('no-title-in-document-head', rule, { ruleTester.run('no-title-in-document-head', rule, {
valid: [ valid: [
`import Head from "next/head"; `import Head from "next/head";
......
const rule = require('@next/eslint-plugin-next/lib/rules/no-typos') import rule from '@next/eslint-plugin-next/lib/rules/no-typos'
import { RuleTester } from 'eslint'
const RuleTester = require('eslint').RuleTester ;(RuleTester as any).setDefaultConfig({
RuleTester.setDefaultConfig({
parserOptions: { parserOptions: {
ecmaVersion: 2018, ecmaVersion: 2018,
sourceType: 'module', sourceType: 'module',
...@@ -13,7 +11,8 @@ RuleTester.setDefaultConfig({ ...@@ -13,7 +11,8 @@ RuleTester.setDefaultConfig({
}, },
}) })
var ruleTester = new RuleTester() const ruleTester = new RuleTester()
ruleTester.run('no-typos', rule, { ruleTester.run('no-typos', rule, {
valid: [ valid: [
` `
......
const rule = require('@next/eslint-plugin-next/lib/rules/no-unwanted-polyfillio') import rule from '@next/eslint-plugin-next/lib/rules/no-unwanted-polyfillio'
import { RuleTester } from 'eslint'
const RuleTester = require('eslint').RuleTester ;(RuleTester as any).setDefaultConfig({
RuleTester.setDefaultConfig({
parserOptions: { parserOptions: {
ecmaVersion: 2018, ecmaVersion: 2018,
sourceType: 'module', sourceType: 'module',
...@@ -12,8 +10,8 @@ RuleTester.setDefaultConfig({ ...@@ -12,8 +10,8 @@ RuleTester.setDefaultConfig({
}, },
}, },
}) })
const ruleTester = new RuleTester()
var ruleTester = new RuleTester()
ruleTester.run('unwanted-polyfillsio', rule, { ruleTester.run('unwanted-polyfillsio', rule, {
valid: [ valid: [
`import {Head} from 'next/document'; `import {Head} from 'next/document';
......
...@@ -4,7 +4,7 @@ import { normalizePagePath } from 'next/dist/server/normalize-page-path' ...@@ -4,7 +4,7 @@ import { normalizePagePath } from 'next/dist/server/normalize-page-path'
import { join } from 'path' import { join } from 'path'
const resolveDataDir = join(__dirname, '..', 'isolated', '_resolvedata') const resolveDataDir = join(__dirname, 'isolated', '_resolvedata')
const dirWithPages = join(resolveDataDir, 'readdir', 'pages') const dirWithPages = join(resolveDataDir, 'readdir', 'pages')
describe('findPageFile', () => { describe('findPageFile', () => {
......
...@@ -25,6 +25,6 @@ describe('getDisplayName', () => { ...@@ -25,6 +25,6 @@ describe('getDisplayName', () => {
expect(getDisplayName(ComponentTwo)).toBe('CustomDisplayName') expect(getDisplayName(ComponentTwo)).toBe('CustomDisplayName')
expect(getDisplayName(FunctionalComponent)).toBe('FunctionalComponent') expect(getDisplayName(FunctionalComponent)).toBe('FunctionalComponent')
expect(getDisplayName(() => null)).toBe('Unknown') expect(getDisplayName(() => null)).toBe('Unknown')
expect(getDisplayName('div')).toBe('div') expect(getDisplayName('div' as any)).toBe('div')
}) })
}) })
/* eslint-env jest */ /* eslint-env jest */
import { detectContentType } from '../../../../packages/next/dist/server/image-optimizer.js' import { detectContentType } from 'next/dist/server/image-optimizer'
import { readFile } from 'fs-extra' import { readFile } from 'fs-extra'
import { join } from 'path' import { join } from 'path'
...@@ -7,19 +7,19 @@ const getImage = (filepath) => readFile(join(__dirname, filepath)) ...@@ -7,19 +7,19 @@ const getImage = (filepath) => readFile(join(__dirname, filepath))
describe('detectContentType', () => { describe('detectContentType', () => {
it('should return jpg', async () => { it('should return jpg', async () => {
const buffer = await getImage('../app/public/test.jpg') const buffer = await getImage('./images/test.jpg')
expect(detectContentType(buffer)).toBe('image/jpeg') expect(detectContentType(buffer)).toBe('image/jpeg')
}) })
it('should return png', async () => { it('should return png', async () => {
const buffer = await getImage('../app/public/test.png') const buffer = await getImage('./images/test.png')
expect(detectContentType(buffer)).toBe('image/png') expect(detectContentType(buffer)).toBe('image/png')
}) })
it('should return webp', async () => { it('should return webp', async () => {
const buffer = await getImage('../app/public/animated.webp') const buffer = await getImage('./images/animated.webp')
expect(detectContentType(buffer)).toBe('image/webp') expect(detectContentType(buffer)).toBe('image/webp')
}) })
it('should return svg', async () => { it('should return svg', async () => {
const buffer = await getImage('../app/public/test.svg') const buffer = await getImage('./images/test.svg')
expect(detectContentType(buffer)).toBe('image/svg+xml') expect(detectContentType(buffer)).toBe('image/svg+xml')
}) })
}) })
/* eslint-env jest */ /* eslint-env jest */
import { getMaxAge } from '../../../../packages/next/dist/server/image-optimizer.js' import { getMaxAge } from 'next/dist/server/image-optimizer'
describe('getMaxAge', () => { describe('getMaxAge', () => {
it('should return 0 when no cache-control provided', () => { it('should return 0 when no cache-control provided', () => {
......
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
width="400" height="400" viewBox="0 0 400 400"
preserveAspectRatio="xMidYMid meet">
<g transform="translate(0.000000,400.000000) scale(0.100000,-0.100000)"
fill="#000000" stroke="none">
<path d="M0 2000 l0 -2000 2000 0 2000 0 0 2000 0 2000 -2000 0 -2000 0 0
-2000z m2401 118 l396 -693 -398 -3 c-220 -1 -578 -1 -798 0 l-398 3 396 693
c217 380 398 692 401 692 3 0 184 -312 401 -692z"/>
</g>
</svg>
...@@ -175,7 +175,7 @@ describe('isSerializableProps', () => { ...@@ -175,7 +175,7 @@ describe('isSerializableProps', () => {
}) })
it('can handle obj circular refs', () => { it('can handle obj circular refs', () => {
const obj = { foo: 'bar', test: true } const obj: any = { foo: 'bar', test: true }
obj.child = obj obj.child = obj
expect(() => isSerializableProps('/', 'test', obj)) expect(() => isSerializableProps('/', 'test', obj))
...@@ -192,7 +192,7 @@ describe('isSerializableProps', () => { ...@@ -192,7 +192,7 @@ describe('isSerializableProps', () => {
}) })
it('can handle arr circular refs', () => { it('can handle arr circular refs', () => {
const arr = [{ foo: 'bar' }, true] const arr: any = [{ foo: 'bar' }, true]
arr.push(arr) arr.push(arr)
expect(() => isSerializableProps('/', 'test', { arr })) expect(() => isSerializableProps('/', 'test', { arr }))
...@@ -209,7 +209,7 @@ describe('isSerializableProps', () => { ...@@ -209,7 +209,7 @@ describe('isSerializableProps', () => {
}) })
it('can handle deep obj circular refs', () => { it('can handle deep obj circular refs', () => {
const obj = { foo: 'bar', test: true, leve1: { level2: {} } } const obj: any = { foo: 'bar', test: true, leve1: { level2: {} } }
obj.leve1.level2.child = obj obj.leve1.level2.child = obj
expect(() => isSerializableProps('/', 'test', obj)) expect(() => isSerializableProps('/', 'test', obj))
...@@ -220,7 +220,7 @@ describe('isSerializableProps', () => { ...@@ -220,7 +220,7 @@ describe('isSerializableProps', () => {
}) })
it('can handle deep obj circular refs (with arrays)', () => { it('can handle deep obj circular refs (with arrays)', () => {
const obj = { foo: 'bar', test: true, leve1: { level2: {} } } const obj: any = { foo: 'bar', test: true, leve1: { level2: {} } }
obj.leve1.level2.child = [{ another: [obj] }] obj.leve1.level2.child = [{ another: [obj] }]
expect(() => isSerializableProps('/', 'test', obj)) expect(() => isSerializableProps('/', 'test', obj))
......
/* eslint-env jest */ /* eslint-env jest */
import { join } from 'path' import { join } from 'path'
import { normalizePagePath } from 'next/dist/server/normalize-page-path'
import { SERVER_DIRECTORY, CLIENT_STATIC_FILES_PATH } from 'next/constants' import { SERVER_DIRECTORY, CLIENT_STATIC_FILES_PATH } from 'next/constants'
import { import {
requirePage, requirePage,
getPagePath, getPagePath,
pageNotFoundError, pageNotFoundError,
} from 'next/dist/server/require' } from 'next/dist/server/require'
import { normalizePagePath } from 'next/dist/server/normalize-page-path'
const sep = '/' const sep = '/'
const distDir = join(__dirname, '_resolvedata') const distDir = join(__dirname, '_resolvedata')
...@@ -55,42 +55,42 @@ describe('normalizePagePath', () => { ...@@ -55,42 +55,42 @@ describe('normalizePagePath', () => {
describe('getPagePath', () => { describe('getPagePath', () => {
it('Should not append /index to the / page', () => { it('Should not append /index to the / page', () => {
expect(() => getPagePath('/', distDir)).toThrow( expect(() => getPagePath('/', distDir, false)).toThrow(
'Cannot find module for page: /' 'Cannot find module for page: /'
) )
}) })
it('Should prepend / when a page does not have it', () => { it('Should prepend / when a page does not have it', () => {
const pagePath = getPagePath('_error', distDir) const pagePath = getPagePath('_error', distDir, false)
expect(pagePath).toBe(join(pathToBundles, `${sep}_error.js`)) expect(pagePath).toBe(join(pathToBundles, `${sep}_error.js`))
}) })
it('Should throw with paths containing ../', () => { it('Should throw with paths containing ../', () => {
expect(() => getPagePath('/../../package.json', distDir)).toThrow() expect(() => getPagePath('/../../package.json', distDir, false)).toThrow()
}) })
}) })
describe('requirePage', () => { describe('requirePage', () => {
it('Should not find page /index when using /', async () => { it('Should not find page /index when using /', async () => {
await expect(() => requirePage('/', distDir)).toThrow( await expect(() => requirePage('/', distDir, false)).toThrow(
'Cannot find module for page: /' 'Cannot find module for page: /'
) )
}) })
it('Should require /index.js when using /index', async () => { it('Should require /index.js when using /index', async () => {
const page = await requirePage('/index', distDir) const page = await requirePage('/index', distDir, false)
expect(page.test).toBe('hello') expect(page.test).toBe('hello')
}) })
it('Should require /world.js when using /world', async () => { it('Should require /world.js when using /world', async () => {
const page = await requirePage('/world', distDir) const page = await requirePage('/world', distDir, false)
expect(page.test).toBe('world') expect(page.test).toBe('world')
}) })
it('Should throw when using /../../test.js', async () => { it('Should throw when using /../../test.js', async () => {
expect.assertions(1) expect.assertions(1)
try { try {
await requirePage('/../../test', distDir) await requirePage('/../../test', distDir, false)
} catch (err) { } catch (err) {
// eslint-disable-next-line jest/no-try-expect // eslint-disable-next-line jest/no-try-expect
expect(err.code).toBe('ENOENT') expect(err.code).toBe('ENOENT')
...@@ -100,7 +100,7 @@ describe('requirePage', () => { ...@@ -100,7 +100,7 @@ describe('requirePage', () => {
it('Should throw when using non existent pages like /non-existent.js', async () => { it('Should throw when using non existent pages like /non-existent.js', async () => {
expect.assertions(1) expect.assertions(1)
try { try {
await requirePage('/non-existent', distDir) await requirePage('/non-existent', distDir, false)
} catch (err) { } catch (err) {
// eslint-disable-next-line jest/no-try-expect // eslint-disable-next-line jest/no-try-expect
expect(err.code).toBe('ENOENT') expect(err.code).toBe('ENOENT')
...@@ -110,7 +110,7 @@ describe('requirePage', () => { ...@@ -110,7 +110,7 @@ describe('requirePage', () => {
it('Should bubble up errors in the child component', async () => { it('Should bubble up errors in the child component', async () => {
expect.assertions(1) expect.assertions(1)
try { try {
await requirePage('/non-existent-child', distDir) await requirePage('/non-existent-child', distDir, false)
} catch (err) { } catch (err) {
// eslint-disable-next-line jest/no-try-expect // eslint-disable-next-line jest/no-try-expect
expect(err.code).toBe('MODULE_NOT_FOUND') expect(err.code).toBe('MODULE_NOT_FOUND')
......
...@@ -6,7 +6,7 @@ describe('loadGetInitialProps', () => { ...@@ -6,7 +6,7 @@ describe('loadGetInitialProps', () => {
class TestComponent { class TestComponent {
getInitialProps() {} getInitialProps() {}
} }
const rejectPromise = loadGetInitialProps(TestComponent, {}) const rejectPromise = loadGetInitialProps(TestComponent as any, {})
const error = new Error( const error = new Error(
'"TestComponent.getInitialProps()" is defined as an instance method - visit https://nextjs.org/docs/messages/get-initial-props-as-an-instance-method for more information.' '"TestComponent.getInitialProps()" is defined as an instance method - visit https://nextjs.org/docs/messages/get-initial-props-as-an-instance-method for more information.'
) )
...@@ -14,7 +14,7 @@ describe('loadGetInitialProps', () => { ...@@ -14,7 +14,7 @@ describe('loadGetInitialProps', () => {
}) })
it('should resolve to an empty object if getInitialProps is missing', async () => { it('should resolve to an empty object if getInitialProps is missing', async () => {
const result = await loadGetInitialProps(() => {}, {}) const result = await loadGetInitialProps((() => {}) as any, {})
expect(result).toEqual({}) expect(result).toEqual({})
}) })
...@@ -24,7 +24,7 @@ describe('loadGetInitialProps', () => { ...@@ -24,7 +24,7 @@ describe('loadGetInitialProps', () => {
return { foo: 1 } return { foo: 1 }
} }
} }
const result = await loadGetInitialProps(TestComponent, {}) const result = await loadGetInitialProps(TestComponent as any, {})
expect(result).toEqual({ foo: 1 }) expect(result).toEqual({ foo: 1 })
}) })
...@@ -34,12 +34,12 @@ describe('loadGetInitialProps', () => { ...@@ -34,12 +34,12 @@ describe('loadGetInitialProps', () => {
return 'invalidValue' return 'invalidValue'
} }
} }
const ctx = { const ctx: any = {
res: { res: {
finished: true, finished: true,
}, },
} }
const result = await loadGetInitialProps(TestComponent, ctx) const result = await loadGetInitialProps(TestComponent as any, ctx)
expect(result).toBe('invalidValue') expect(result).toBe('invalidValue')
}) })
...@@ -47,7 +47,7 @@ describe('loadGetInitialProps', () => { ...@@ -47,7 +47,7 @@ describe('loadGetInitialProps', () => {
class TestComponent { class TestComponent {
static async getInitialProps() {} static async getInitialProps() {}
} }
const rejectPromise = loadGetInitialProps(TestComponent, {}) const rejectPromise = loadGetInitialProps(TestComponent as any, {})
const error = new Error( const error = new Error(
'"TestComponent.getInitialProps()" should resolve to an object. But found "undefined" instead.' '"TestComponent.getInitialProps()" should resolve to an object. But found "undefined" instead.'
) )
......
/* eslint-env jest */ /* eslint-env jest */
function interopRequireDefault(mod) { import os from 'os'
return mod.default || mod import path from 'path'
} import loader from 'next/dist/build/webpack/loaders/next-babel-loader'
const loader = interopRequireDefault(
require('next/dist/build/webpack/loaders/next-babel-loader')
)
const os = require('os')
const path = require('path')
const dir = path.resolve(os.tmpdir()) const dir = path.resolve(os.tmpdir())
const babel = async (code, queryOpts = {}) => { const babel = async (code: string, queryOpts = {} as any) => {
const { const {
isServer = false, isServer = false,
resourcePath = 'index.js', resourcePath = 'index.js',
...@@ -19,7 +13,7 @@ const babel = async (code, queryOpts = {}) => { ...@@ -19,7 +13,7 @@ const babel = async (code, queryOpts = {}) => {
} = queryOpts } = queryOpts
let isAsync = false let isAsync = false
return new Promise((resolve, reject) => { return new Promise<string>((resolve, reject) => {
function callback(err, content) { function callback(err, content) {
if (err) { if (err) {
reject(err) reject(err)
......
/* eslint-env jest */ /* eslint-env jest */
import { transform } from '@babel/core' import { transformSync } from '@babel/core'
const trim = (s) => s.join('\n').trim().replace(/^\s+/gm, '') const trim = (s) => s.join('\n').trim().replace(/^\s+/gm, '')
const babel = (code, esm = false, presetOptions = {}, filename = 'noop.js') => const babel = (code, esm = false, presetOptions = {}, filename = 'noop.js') =>
transform(code, { transformSync(code, {
filename, filename,
presets: [[require('next/dist/build/babel/preset'), presetOptions]], presets: [[require('next/dist/build/babel/preset'), presetOptions]],
babelrc: false, babelrc: false,
...@@ -16,7 +16,7 @@ const babel = (code, esm = false, presetOptions = {}, filename = 'noop.js') => ...@@ -16,7 +16,7 @@ const babel = (code, esm = false, presetOptions = {}, filename = 'noop.js') =>
supportsStaticESM: esm, supportsStaticESM: esm,
isDev: false, isDev: false,
}, },
}).code } as any).code
describe('next/babel', () => { describe('next/babel', () => {
describe('jsx-pragma', () => { describe('jsx-pragma', () => {
......
...@@ -9,7 +9,7 @@ describe('Rendering next/head', () => { ...@@ -9,7 +9,7 @@ describe('Rendering next/head', () => {
React.createElement( React.createElement(
React.Fragment, React.Fragment,
{}, {},
React.createElement(Head, {}), React.createElement(Head),
React.createElement('p', {}, 'hello world') React.createElement('p', {}, 'hello world')
) )
) )
......
...@@ -4,7 +4,7 @@ import { parseRelativeUrl } from 'next/dist/shared/lib/router/utils/parse-relati ...@@ -4,7 +4,7 @@ import { parseRelativeUrl } from 'next/dist/shared/lib/router/utils/parse-relati
// convenience function so tests can be aligned neatly // convenience function so tests can be aligned neatly
// and easy to eyeball // and easy to eyeball
const check = (windowUrl, targetUrl, expected) => { const check = (windowUrl, targetUrl, expected) => {
window.location = new URL(windowUrl) window.location = new URL(windowUrl) as any
if (typeof expected === 'string') { if (typeof expected === 'string') {
expect(() => parseRelativeUrl(targetUrl)).toThrow(expected) expect(() => parseRelativeUrl(targetUrl)).toThrow(expected)
} else { } else {
...@@ -17,13 +17,13 @@ const check = (windowUrl, targetUrl, expected) => { ...@@ -17,13 +17,13 @@ const check = (windowUrl, targetUrl, expected) => {
describe('parseRelativeUrl', () => { describe('parseRelativeUrl', () => {
beforeAll(() => { beforeAll(() => {
global.window = { ;(global as any).window = {
location: {}, location: {},
} }
}) })
afterAll(() => { afterAll(() => {
delete global.window delete (global as any).window
}) })
it('should parse relative url', () => { it('should parse relative url', () => {
......
...@@ -4,9 +4,9 @@ import { recursiveReadDir } from 'next/dist/lib/recursive-readdir' ...@@ -4,9 +4,9 @@ import { recursiveReadDir } from 'next/dist/lib/recursive-readdir'
import { recursiveCopy } from 'next/dist/lib/recursive-copy' import { recursiveCopy } from 'next/dist/lib/recursive-copy'
import { join } from 'path' import { join } from 'path'
const resolveDataDir = join(__dirname, '..', 'isolated', '_resolvedata') const resolveDataDir = join(__dirname, 'isolated', '_resolvedata')
const testResolveDataDir = join(__dirname, '..', 'isolated', 'test_resolvedata') const testResolveDataDir = join(__dirname, 'isolated', 'test_resolvedata')
const testpreservefileDir = join(__dirname, '..', 'isolated', 'preservefiles') const testpreservefileDir = join(__dirname, 'isolated', 'preservefiles')
describe('recursiveDelete', () => { describe('recursiveDelete', () => {
it('should work', async () => { it('should work', async () => {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
import { recursiveReadDir } from 'next/dist/lib/recursive-readdir' import { recursiveReadDir } from 'next/dist/lib/recursive-readdir'
import { join } from 'path' import { join } from 'path'
const resolveDataDir = join(__dirname, '..', 'isolated', '_resolvedata') const resolveDataDir = join(__dirname, 'isolated', '_resolvedata')
const dirWithPages = join(resolveDataDir, 'readdir', 'pages') const dirWithPages = join(resolveDataDir, 'readdir', 'pages')
jest.setTimeout(1000 * 60 * 5) jest.setTimeout(1000 * 60 * 5)
......
{
"compilerOptions": {
"strict": false,
"noEmit": true,
"allowJs": true,
"jsx": "react",
"module": "esnext",
"skipLibCheck": true,
"esModuleInterop": true,
"moduleResolution": "node",
"baseUrl": ".",
"paths": {
"next-test-utils": ["test/lib/next-test-utils"],
"amp-test-utils": ["test/lib/amp-test-utils"],
"next-webdriver": ["test/lib/next-webdriver"]
}
},
"include": ["test/**/*.test.ts", "test/**/*.test.tsx", "test/**/test/*"]
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment