From 11f9604bdb39c631f6987c9ff7ba86e0d5fa1ab0 Mon Sep 17 00:00:00 2001 From: Jan Kaifer Date: Mon, 19 Dec 2022 11:21:27 +0100 Subject: [PATCH 1/4] Add types as a default dependency into tests --- test/lib/next-modes/base.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/lib/next-modes/base.ts b/test/lib/next-modes/base.ts index 685199bf3da9a5d..767f0bd030ad4a2 100644 --- a/test/lib/next-modes/base.ts +++ b/test/lib/next-modes/base.ts @@ -129,6 +129,9 @@ export class NextInstance { const finalDependencies = { react: reactVersion, 'react-dom': reactVersion, + '@types/react': reactVersion, + typescript: 'latest', + '@types/node': 'latest', ...this.dependencies, ...this.packageJson?.dependencies, } From 5bd83a0ebcc34bd08c44c78343d66d48a8b994d3 Mon Sep 17 00:00:00 2001 From: Jan Kaifer Date: Mon, 19 Dec 2022 11:25:40 +0100 Subject: [PATCH 2/4] remove unneeded dependencies in TS tests --- test/e2e/app-dir/app-alias.test.ts | 7 ------- test/e2e/app-dir/app-edge-global.test.ts | 7 ------- test/e2e/app-dir/app-edge.test.ts | 7 ------- test/e2e/app-dir/create-root-layout.test.ts | 7 ------- test/e2e/app-dir/import.test.ts | 7 ------- test/e2e/app-dir/layout-params.test.ts | 7 ------- .../navigation-and-querystring.test.ts | 7 ------- .../use-selected-layout-segment-s.test.ts | 7 ------- test/e2e/new-link-behavior/typescript.test.ts | 5 ----- test/e2e/test-utils-tests/basic/basic.test.ts | 7 +------ 10 files changed, 1 insertion(+), 67 deletions(-) diff --git a/test/e2e/app-dir/app-alias.test.ts b/test/e2e/app-dir/app-alias.test.ts index 1c8583af624e36f..284d4d34eadd304 100644 --- a/test/e2e/app-dir/app-alias.test.ts +++ b/test/e2e/app-dir/app-alias.test.ts @@ -5,13 +5,6 @@ createNextDescribe( 'app-dir alias handling', { files: path.join(__dirname, 'app-alias'), - dependencies: { - react: 'latest', - 'react-dom': 'latest', - typescript: 'latest', - '@types/react': 'latest', - '@types/node': 'latest', - }, packageJson: { type: 'module', }, diff --git a/test/e2e/app-dir/app-edge-global.test.ts b/test/e2e/app-dir/app-edge-global.test.ts index 9f0fbf66cbcfcc8..50afb6dac254314 100644 --- a/test/e2e/app-dir/app-edge-global.test.ts +++ b/test/e2e/app-dir/app-edge-global.test.ts @@ -5,13 +5,6 @@ createNextDescribe( 'app-dir global edge configuration', { files: path.join(__dirname, 'app-edge-global'), - dependencies: { - react: 'latest', - 'react-dom': 'latest', - typescript: 'latest', - '@types/react': 'latest', - '@types/node': 'latest', - }, skipDeployment: true, }, ({ next }) => { diff --git a/test/e2e/app-dir/app-edge.test.ts b/test/e2e/app-dir/app-edge.test.ts index 6c098b83aa4ba64..5c91edffbada1b5 100644 --- a/test/e2e/app-dir/app-edge.test.ts +++ b/test/e2e/app-dir/app-edge.test.ts @@ -6,13 +6,6 @@ createNextDescribe( 'app-dir edge SSR', { files: path.join(__dirname, 'app-edge'), - dependencies: { - react: 'latest', - 'react-dom': 'latest', - typescript: 'latest', - '@types/react': 'latest', - '@types/node': 'latest', - }, skipDeployment: true, }, ({ next }) => { diff --git a/test/e2e/app-dir/create-root-layout.test.ts b/test/e2e/app-dir/create-root-layout.test.ts index 53fa0e8fc3353fb..fc52582fe81efd0 100644 --- a/test/e2e/app-dir/create-root-layout.test.ts +++ b/test/e2e/app-dir/create-root-layout.test.ts @@ -218,13 +218,6 @@ describe('app-dir create root layout', () => { path.join(__dirname, 'create-root-layout/next.config.js') ), }, - dependencies: { - react: 'latest', - 'react-dom': 'latest', - typescript: 'latest', - '@types/react': 'latest', - '@types/node': 'latest', - }, }) }) afterAll(() => next.destroy()) diff --git a/test/e2e/app-dir/import.test.ts b/test/e2e/app-dir/import.test.ts index ed434e39317e38b..93ca23ce6fc21ef 100644 --- a/test/e2e/app-dir/import.test.ts +++ b/test/e2e/app-dir/import.test.ts @@ -5,13 +5,6 @@ createNextDescribe( 'app dir imports', { files: path.join(__dirname, 'import'), - dependencies: { - react: 'latest', - 'react-dom': 'latest', - typescript: 'latest', - '@types/react': 'latest', - '@types/node': 'latest', - }, }, ({ next }) => { ;['js', 'jsx', 'ts', 'tsx'].forEach((ext) => { diff --git a/test/e2e/app-dir/layout-params.test.ts b/test/e2e/app-dir/layout-params.test.ts index 2463baa14fba8cd..9fc9f2f6b68be85 100644 --- a/test/e2e/app-dir/layout-params.test.ts +++ b/test/e2e/app-dir/layout-params.test.ts @@ -5,13 +5,6 @@ createNextDescribe( 'app dir - layout params', { files: path.join(__dirname, './layout-params'), - dependencies: { - react: 'latest', - 'react-dom': 'latest', - typescript: 'latest', - '@types/react': 'latest', - '@types/node': 'latest', - }, }, ({ next }) => { describe('basic params', () => { diff --git a/test/e2e/app-dir/navigation-and-querystring/navigation-and-querystring.test.ts b/test/e2e/app-dir/navigation-and-querystring/navigation-and-querystring.test.ts index 3b3d49d87bc3b32..acfc456bd82e974 100644 --- a/test/e2e/app-dir/navigation-and-querystring/navigation-and-querystring.test.ts +++ b/test/e2e/app-dir/navigation-and-querystring/navigation-and-querystring.test.ts @@ -9,13 +9,6 @@ describe('app-dir navigation and querystring', () => { beforeAll(async () => { next = await createNext({ files: new FileRef(__dirname), - dependencies: { - react: 'latest', - 'react-dom': 'latest', - typescript: 'latest', - '@types/react': 'latest', - '@types/node': 'latest', - }, }) }) afterAll(() => next.destroy()) diff --git a/test/e2e/app-dir/use-selected-layout-segment-s/use-selected-layout-segment-s.test.ts b/test/e2e/app-dir/use-selected-layout-segment-s/use-selected-layout-segment-s.test.ts index 12410ceb089bdcb..eaac38338e97484 100644 --- a/test/e2e/app-dir/use-selected-layout-segment-s/use-selected-layout-segment-s.test.ts +++ b/test/e2e/app-dir/use-selected-layout-segment-s/use-selected-layout-segment-s.test.ts @@ -9,13 +9,6 @@ describe('useSelectedLayoutSegment(s)', () => { beforeAll(async () => { next = await createNext({ files: new FileRef(__dirname), - dependencies: { - react: 'latest', - 'react-dom': 'latest', - typescript: 'latest', - '@types/react': 'latest', - '@types/node': 'latest', - }, }) }) afterAll(() => next.destroy()) diff --git a/test/e2e/new-link-behavior/typescript.test.ts b/test/e2e/new-link-behavior/typescript.test.ts index ac2c22408ba72fa..33a23984f858eca 100644 --- a/test/e2e/new-link-behavior/typescript.test.ts +++ b/test/e2e/new-link-behavior/typescript.test.ts @@ -17,11 +17,6 @@ describe('New Link Behavior', () => { 'tsconfig.json': new FileRef(path.join(appDir, 'tsconfig.json')), 'next.config.js': new FileRef(path.join(appDir, 'next.config.js')), }, - dependencies: { - typescript: '*', - '@types/react': '*', - '@types/node': '*', - }, }) }) afterAll(() => next.destroy()) diff --git a/test/e2e/test-utils-tests/basic/basic.test.ts b/test/e2e/test-utils-tests/basic/basic.test.ts index e37b2145639ceaf..76e21218de1ea72 100644 --- a/test/e2e/test-utils-tests/basic/basic.test.ts +++ b/test/e2e/test-utils-tests/basic/basic.test.ts @@ -7,12 +7,7 @@ describe('createNext', () => { beforeAll(async () => { next = await createNext({ - files: new FileRef(__dirname), - dependencies: { - typescript: 'latest', - '@types/react': 'latest', - '@types/node': 'latest', - }, + files: __dirname, }) }) afterAll(() => next.destroy()) From a0cd09652b46e4087918c3bb5bc38c0fc7c841c3 Mon Sep 17 00:00:00 2001 From: Jan Kaifer Date: Mon, 19 Dec 2022 11:47:18 +0100 Subject: [PATCH 3/4] remove unused import --- test/e2e/test-utils-tests/basic/basic.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/test-utils-tests/basic/basic.test.ts b/test/e2e/test-utils-tests/basic/basic.test.ts index 76e21218de1ea72..a9b63c7ed246794 100644 --- a/test/e2e/test-utils-tests/basic/basic.test.ts +++ b/test/e2e/test-utils-tests/basic/basic.test.ts @@ -1,4 +1,4 @@ -import { createNext, FileRef } from 'e2e-utils' +import { createNext } from 'e2e-utils' import { NextInstance } from 'test/lib/next-modes/base' import { fetchViaHTTP } from 'next-test-utils' From 9b6678abf803c266f49c98e0e36feea67c1599ca Mon Sep 17 00:00:00 2001 From: Jan Kaifer Date: Mon, 19 Dec 2022 11:48:29 +0100 Subject: [PATCH 4/4] fix tests expecting missing ts deps --- test/production/ci-missing-typescript-deps/index.test.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/production/ci-missing-typescript-deps/index.test.ts b/test/production/ci-missing-typescript-deps/index.test.ts index 3fafe41576137ae..5b19755ecb454a7 100644 --- a/test/production/ci-missing-typescript-deps/index.test.ts +++ b/test/production/ci-missing-typescript-deps/index.test.ts @@ -14,6 +14,9 @@ describe('ci-missing-typescript-deps', () => { CI: '1', }, skipStart: true, + dependencies: { + typescript: undefined, + }, }) try { let error