Skip to content

Commit

Permalink
Fix for the jest.config.ts compiler to not interfere with `tsconfig…
Browse files Browse the repository at this point in the history
….json` files (#10675)
  • Loading branch information
Gamote committed Oct 22, 2020
1 parent 69ae5b5 commit 0eab327
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -7,6 +7,7 @@
### Fixes

- `[expect]` Fix `objectContaining` to work recursively into sub-objects ([#10508](https://github.com/facebook/jest/pull/10508))
- `[jest-config]` Fix for the `jest.config.ts` compiler to not interfere with `tsconfig.json` files ([#10675](https://github.com/facebook/jest/pull/10675))
- `[jest-message-util]` Update to work properly with Node 15 ([#10660](https://github.com/facebook/jest/pull/10660))
- `[jest-mock]` Allow to mock methods in getters (TypeScript 3.9 export) ([#10156](https://github.com/facebook/jest/pull/10156))

Expand Down
2 changes: 1 addition & 1 deletion e2e/__tests__/__snapshots__/jest.config.js.test.ts.snap
Expand Up @@ -2,7 +2,7 @@

exports[`traverses directory tree up until it finds jest.config 1`] = `
console.log
<<REPLACED>>/jest.config.js/some/nested/directory
<<REPLACED>>/jest-config-js/some/nested/directory
at Object.log (__tests__/a-banana.js:3:27)
Expand Down
15 changes: 14 additions & 1 deletion e2e/__tests__/__snapshots__/jest.config.ts.test.ts.snap
Expand Up @@ -2,7 +2,7 @@

exports[`traverses directory tree up until it finds jest.config 1`] = `
console.log
<<REPLACED>>/jest.config.ts/some/nested/directory
<<REPLACED>>/jest-config-ts/some/nested/directory
at Object.log (__tests__/a-giraffe.js:3:27)
Expand Down Expand Up @@ -34,3 +34,16 @@ Snapshots: 0 total
Time: <<REPLACED>>
Ran all test suites.
`;
exports[`works with tsconfig.json 1`] = `
PASS __tests__/a-giraffe.js
✓ giraffe
`;
exports[`works with tsconfig.json 2`] = `
Test Suites: 1 passed, 1 total
Tests: 1 passed, 1 total
Snapshots: 0 total
Time: <<REPLACED>>
Ran all test suites.
`;
2 changes: 1 addition & 1 deletion e2e/__tests__/jest.config.js.test.ts
Expand Up @@ -10,7 +10,7 @@ import {wrap} from 'jest-snapshot-serializer-raw';
import runJest from '../runJest';
import {cleanup, extractSummary, writeFiles} from '../Utils';

const DIR = path.resolve(__dirname, '../jest.config.js');
const DIR = path.resolve(__dirname, '../jest-config-js');

beforeEach(() => cleanup(DIR));
afterAll(() => cleanup(DIR));
Expand Down
17 changes: 16 additions & 1 deletion e2e/__tests__/jest.config.ts.test.ts
Expand Up @@ -10,7 +10,7 @@ import {wrap} from 'jest-snapshot-serializer-raw';
import runJest from '../runJest';
import {cleanup, extractSummary, writeFiles} from '../Utils';

const DIR = path.resolve(__dirname, '../jest.config.ts');
const DIR = path.resolve(__dirname, '../jest-config-ts');

beforeEach(() => cleanup(DIR));
afterAll(() => cleanup(DIR));
Expand All @@ -29,6 +29,21 @@ test('works with jest.config.ts', () => {
expect(wrap(summary)).toMatchSnapshot();
});

test('works with tsconfig.json', () => {
writeFiles(DIR, {
'__tests__/a-giraffe.js': `test('giraffe', () => expect(1).toBe(1));`,
'jest.config.ts': `export default {testEnvironment: 'jest-environment-node', testRegex: '.*-giraffe.js'};`,
'package.json': '{}',
'tsconfig.json': '{ "compilerOptions": { "module": "esnext" } }',
});

const {stderr, exitCode} = runJest(DIR, ['-w=1', '--ci=false']);
const {rest, summary} = extractSummary(stderr);
expect(exitCode).toBe(0);
expect(wrap(rest)).toMatchSnapshot();
expect(wrap(summary)).toMatchSnapshot();
});

test('traverses directory tree up until it finds jest.config', () => {
writeFiles(DIR, {
'__tests__/a-giraffe.js': `
Expand Down
6 changes: 5 additions & 1 deletion packages/jest-config/src/readConfigFileAndSetRootDir.ts
Expand Up @@ -107,7 +107,11 @@ const loadTSConfigFile = async (

// Register TypeScript compiler instance
try {
registerer = require('ts-node').register();
registerer = require('ts-node').register({
compilerOptions: {
module: 'CommonJS',
},
});
} catch (e) {
if (e.code === 'MODULE_NOT_FOUND') {
throw new Error(
Expand Down

0 comments on commit 0eab327

Please sign in to comment.