From 71313b7e868fd4a9ee50de2938551cf0a766dbfd Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 29 May 2021 11:47:36 -0400 Subject: [PATCH 1/3] fix: require.resolve on default test sequencer and test environment They are currently broken in yarn v2 pnp mode. See https://github.com/yarnpkg/berry/runs/2701218390 --- .../jest-config/src/__tests__/normalize.test.ts | 13 +++++++++++++ packages/jest-config/src/normalize.ts | 7 +++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/packages/jest-config/src/__tests__/normalize.test.ts b/packages/jest-config/src/__tests__/normalize.test.ts index 3a29e19d6337..924391a49335 100644 --- a/packages/jest-config/src/__tests__/normalize.test.ts +++ b/packages/jest-config/src/__tests__/normalize.test.ts @@ -754,6 +754,19 @@ describe('testEnvironment', () => { ); }); + it('resolves to node environment by default', async () => { + const {options} = await normalize( + { + rootDir: '/root', + }, + {} as Config.Argv, + ); + + expect(options.testEnvironment).toEqual( + require.resolve('jest-environment-node'), + ); + }); + it('throws on invalid environment names', async () => { await expect( normalize( diff --git a/packages/jest-config/src/normalize.ts b/packages/jest-config/src/normalize.ts index c13e0d3b4d40..71aa54e53d60 100644 --- a/packages/jest-config/src/normalize.ts +++ b/packages/jest-config/src/normalize.ts @@ -608,7 +608,9 @@ export default async function normalize( options.testEnvironment = resolveTestEnvironment({ rootDir: options.rootDir, - testEnvironment: options.testEnvironment || DEFAULT_CONFIG.testEnvironment, + testEnvironment: + options.testEnvironment || + require.resolve(DEFAULT_CONFIG.testEnvironment), }); if (!options.roots && options.testPathDirs) { @@ -1054,7 +1056,8 @@ export default async function normalize( } newOptions.testSequencer = resolveSequencer(newOptions.resolver, { - filePath: options.testSequencer || DEFAULT_CONFIG.testSequencer, + filePath: + options.testSequencer || require.resolve(DEFAULT_CONFIG.testSequencer), rootDir: options.rootDir, }); From 03cb629f1c8cb28e5c62ca0bb06da902a557c355 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 29 May 2021 11:49:37 -0400 Subject: [PATCH 2/3] changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13a4077437eb..e20d55e2357f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ### Fixes +- `[jest-config]` `require.resolve` on default test sequencer and test environment ([#11482](https://github.com/facebook/jest/pull/11482)) + ### Chore & Maintenance ### Performance From b0673d4174890f47cac510708ae6a52cc13228cb Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sat, 29 May 2021 19:41:27 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e20d55e2357f..57c0c7d69d20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,6 @@ ### Fixes -- `[jest-config]` `require.resolve` on default test sequencer and test environment ([#11482](https://github.com/facebook/jest/pull/11482)) - ### Chore & Maintenance ### Performance @@ -14,6 +12,7 @@ ### Fixes +- `[jest-config]` `require.resolve` on default test sequencer and test environment ([#11482](https://github.com/facebook/jest/pull/11482)) - `[jest-mock]` Fixed `fn` and `spyOn` exports ([#11480](https://github.com/facebook/jest/pull/11480)) ## 27.0.2