Skip to content

Commit 0e5b363

Browse files
authored
chore: reduce reliance on esModuleInterop (#8842)
1 parent d69f8d3 commit 0e5b363

File tree

168 files changed

+522
-607
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+522
-607
lines changed

e2e/Utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*
77
*/
88

9-
import fs from 'fs';
10-
import path from 'path';
9+
import * as fs from 'fs';
10+
import * as path from 'path';
1111
import {Config} from '@jest/types';
1212

1313
import {sync as spawnSync, ExecaReturns} from 'execa';

e2e/__tests__/__snapshots__/moduleNameMapper.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ FAIL __tests__/index.js
3030
12 | module.exports = () => 'test';
3131
13 |
3232
33-
at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:501:17)
33+
at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:493:17)
3434
at Object.require (index.js:10:1)
3535
`;

e2e/__tests__/__snapshots__/resolveNoFileExtensions.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ FAIL __tests__/test.js
3333
| ^
3434
9 |
3535
36-
at Resolver.resolveModule (../../packages/jest-resolve/build/index.js:259:17)
36+
at Resolver.resolveModule (../../packages/jest-resolve/build/index.js:255:17)
3737
at Object.require (index.js:8:18)
3838
`;

e2e/__tests__/__snapshots__/transform.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FAIL __tests__/ignoredFile.test.js
66
77
babel-jest: Babel ignores __tests__/ignoredFile.test.js - make sure to include the file in Jest's transformIgnorePatterns as well.
88
9-
at loadBabelConfig (../../../packages/babel-jest/build/index.js:132:13)
9+
at loadBabelConfig (../../../packages/babel-jest/build/index.js:157:13)
1010
`;
1111

1212
exports[`babel-jest instruments only specific files and collects coverage 1`] = `

e2e/__tests__/asyncRegenerator.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
8+
import * as path from 'path';
99
import {run} from '../Utils';
1010
import {json as runWithJson} from '../runJest';
1111

e2e/__tests__/babelPluginJestHoist.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
8+
import * as path from 'path';
99
import {json as runWithJson} from '../runJest';
1010
import {run} from '../Utils';
1111

e2e/__tests__/chaiAssertionLibrary.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
8+
import * as path from 'path';
99
import {wrap} from 'jest-snapshot-serializer-raw';
1010
import runJest from '../runJest';
1111
import {extractSummary, run} from '../Utils';

e2e/__tests__/clearCache.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import fs from 'fs';
9-
import os from 'os';
10-
import path from 'path';
8+
import * as fs from 'fs';
9+
import {tmpdir} from 'os';
10+
import * as path from 'path';
1111
import runJest from '../runJest';
1212

13-
const CACHE = path.resolve(os.tmpdir(), 'clear-cache-directory');
13+
const CACHE = path.resolve(tmpdir(), 'clear-cache-directory');
1414

1515
describe('jest --clearCache', () => {
1616
test('normal run results in cache directory being written', () => {

e2e/__tests__/cliHandlesExactFilenames.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
8+
import * as path from 'path';
99
import {wrap} from 'jest-snapshot-serializer-raw';
1010
import {skipSuiteOnWindows} from '@jest/test-utils';
1111
import {cleanup, extractSummary, writeFiles} from '../Utils';

e2e/__tests__/console.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
8+
import * as path from 'path';
99
import {wrap} from 'jest-snapshot-serializer-raw';
1010
import {extractSummary, run} from '../Utils';
1111
import runJest from '../runJest';

e2e/__tests__/consoleLogOutputWhenRunInBand.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
8+
import * as path from 'path';
99
import {wrap} from 'jest-snapshot-serializer-raw';
1010
import {cleanup, extractSummary, writeFiles} from '../Utils';
1111
import runJest from '../runJest';

e2e/__tests__/coverageRemapping.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import {readFileSync} from 'fs';
9-
import path from 'path';
9+
import * as path from 'path';
1010
import {cleanup, run} from '../Utils';
1111
import runJest from '../runJest';
1212

e2e/__tests__/coverageReport.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import fs from 'fs';
9-
import path from 'path';
8+
import * as fs from 'fs';
9+
import * as path from 'path';
1010
import {wrap} from 'jest-snapshot-serializer-raw';
1111
import {extractSummary, run} from '../Utils';
1212
import runJest from '../runJest';

e2e/__tests__/coverageThreshold.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
8+
import * as path from 'path';
99
import {wrap} from 'jest-snapshot-serializer-raw';
1010
import {cleanup, extractSummary, writeFiles} from '../Utils';
1111
import runJest from '../runJest';

e2e/__tests__/coverageTransformInstrumented.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import {readFileSync} from 'fs';
9-
import path from 'path';
9+
import * as path from 'path';
1010
import {cleanup, run} from '../Utils';
1111
import runJest from '../runJest';
1212

e2e/__tests__/customReporters.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import os from 'os';
9-
import path from 'path';
8+
import {tmpdir} from 'os';
9+
import * as path from 'path';
1010
import {wrap} from 'jest-snapshot-serializer-raw';
1111
import runJest from '../runJest';
1212
import {cleanup, extractSummary, writeFiles} from '../Utils';
1313

14-
const DIR = path.resolve(os.tmpdir(), 'custom-reporters-test-dir');
14+
const DIR = path.resolve(tmpdir(), 'custom-reporters-test-dir');
1515

1616
beforeEach(() => cleanup(DIR));
1717
afterEach(() => cleanup(DIR));

e2e/__tests__/customTestSequencers.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
8+
import * as path from 'path';
99
import runJest from '../runJest';
1010
import {extractSummary} from '../Utils';
1111
const dir = path.resolve(__dirname, '../custom-test-sequencer');

e2e/__tests__/debug.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
8+
import * as path from 'path';
99
import runJest from '../runJest';
1010

1111
describe('jest --debug', () => {

e2e/__tests__/dependencyClash.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
9-
import os from 'os';
8+
import * as path from 'path';
9+
import {tmpdir} from 'os';
1010
import {skipSuiteOnWindows} from '@jest/test-utils';
1111
import {cleanup, createEmptyPackage, writeFiles} from '../Utils';
1212
import runJest from '../runJest';
1313

1414
skipSuiteOnWindows();
1515

1616
// doing test in a temp directory because we don't want jest node_modules affect it
17-
const tempDir = path.resolve(os.tmpdir(), 'clashing-dependencies-test');
17+
const tempDir = path.resolve(tmpdir(), 'clashing-dependencies-test');
1818
const hasteImplModulePath = path.resolve(
1919
'./packages/jest-haste-map/src/__tests__/haste_impl.js',
2020
);

e2e/__tests__/deprecatedCliOptions.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
8+
import * as path from 'path';
99
import runJest from '../runJest';
1010

1111
const dir = path.resolve(__dirname, '../deprecated-cli-options');

e2e/__tests__/each.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
8+
import * as path from 'path';
99
import {wrap} from 'jest-snapshot-serializer-raw';
1010
import runJest from '../runJest';
1111
import {extractSummary} from '../Utils';

e2e/__tests__/emptyDescribeWithHooks.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
8+
import * as path from 'path';
99
import {skipSuiteOnJasmine} from '@jest/test-utils';
1010
import runJest from '../runJest';
1111
import {extractSummary} from '../Utils';

e2e/__tests__/emptySuiteError.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
'use strict';
99

10-
import path from 'path';
10+
import * as path from 'path';
1111
import runJest from '../runJest';
1212

1313
const DIR = path.resolve(__dirname, '../empty-suite-error');

e2e/__tests__/executeTestsOnceInMpr.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
8+
import * as path from 'path';
99
import {wrap} from 'jest-snapshot-serializer-raw';
1010
import {cleanup, extractSummary, writeFiles} from '../Utils';
1111
import runJest from '../runJest';

e2e/__tests__/expectAsyncMatcher.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
8+
import * as path from 'path';
99
import {wrap} from 'jest-snapshot-serializer-raw';
1010
import runJest from '../runJest';
1111
import {extractSummary, run} from '../Utils';

e2e/__tests__/failures.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
8+
import * as path from 'path';
99
import {wrap} from 'jest-snapshot-serializer-raw';
1010
import {extractSummary, run} from '../Utils';
1111
import runJest from '../runJest';

e2e/__tests__/fatalWorkerError.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
9-
import os from 'os';
8+
import * as path from 'path';
9+
import {tmpdir} from 'os';
1010
import {cleanup, writeFiles} from '../Utils';
1111
import runJest from '../runJest';
1212

13-
const DIR = path.resolve(os.tmpdir(), 'fatal-worker-error');
13+
const DIR = path.resolve(tmpdir(), 'fatal-worker-error');
1414

1515
beforeEach(() => cleanup(DIR));
1616
afterAll(() => cleanup(DIR));

e2e/__tests__/findRelatedFiles.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import os from 'os';
9-
import path from 'path';
8+
import {tmpdir} from 'os';
9+
import * as path from 'path';
1010
import {wrap} from 'jest-snapshot-serializer-raw';
1111
import {cleanup, extractSummary, writeFiles} from '../Utils';
1212
import runJest from '../runJest';
1313

14-
const DIR = path.resolve(os.tmpdir(), 'find-related-tests-test');
14+
const DIR = path.resolve(tmpdir(), 'find-related-tests-test');
1515

1616
beforeEach(() => cleanup(DIR));
1717
afterEach(() => cleanup(DIR));

e2e/__tests__/forceExit.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import os from 'os';
9-
import path from 'path';
8+
import {tmpdir} from 'os';
9+
import * as path from 'path';
1010
import runJest from '../runJest';
1111
import {cleanup, writeFiles} from '../Utils';
1212

13-
const DIR = path.resolve(os.tmpdir(), 'force-exit-test');
13+
const DIR = path.resolve(tmpdir(), 'force-exit-test');
1414

1515
beforeEach(() => cleanup(DIR));
1616
afterEach(() => cleanup(DIR));

e2e/__tests__/globalSetup.test.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
*/
77
'use strict';
88

9-
import fs from 'fs';
10-
import os from 'os';
11-
import path from 'path';
9+
import * as fs from 'fs';
10+
import {tmpdir} from 'os';
11+
import * as path from 'path';
1212
import runJest, {json as runWithJson} from '../runJest';
1313
import {cleanup, run} from '../Utils';
1414

15-
const DIR = path.join(os.tmpdir(), 'jest-global-setup');
16-
const project1DIR = path.join(os.tmpdir(), 'jest-global-setup-project-1');
17-
const project2DIR = path.join(os.tmpdir(), 'jest-global-setup-project-2');
15+
const DIR = path.join(tmpdir(), 'jest-global-setup');
16+
const project1DIR = path.join(tmpdir(), 'jest-global-setup-project-1');
17+
const project2DIR = path.join(tmpdir(), 'jest-global-setup-project-2');
1818
const customTransformDIR = path.join(
19-
os.tmpdir(),
19+
tmpdir(),
2020
'jest-global-setup-custom-transform',
2121
);
22-
const nodeModulesDIR = path.join(os.tmpdir(), 'jest-global-setup-node-modules');
22+
const nodeModulesDIR = path.join(tmpdir(), 'jest-global-setup-node-modules');
2323
const e2eDir = path.resolve(__dirname, '../global-setup');
2424

2525
beforeAll(() => {

e2e/__tests__/globalTeardown.test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
*/
77
'use strict';
88

9-
import fs from 'fs';
10-
import os from 'os';
11-
import path from 'path';
9+
import * as fs from 'fs';
10+
import {tmpdir} from 'os';
11+
import * as path from 'path';
1212
import {createDirectory} from 'jest-util';
1313
import runJest, {json as runWithJson} from '../runJest';
1414
import {cleanup, run} from '../Utils';
1515

16-
const DIR = path.join(os.tmpdir(), 'jest-global-teardown');
17-
const project1DIR = path.join(os.tmpdir(), 'jest-global-teardown-project-1');
18-
const project2DIR = path.join(os.tmpdir(), 'jest-global-teardown-project-2');
16+
const DIR = path.join(tmpdir(), 'jest-global-teardown');
17+
const project1DIR = path.join(tmpdir(), 'jest-global-teardown-project-1');
18+
const project2DIR = path.join(tmpdir(), 'jest-global-teardown-project-2');
1919
const e2eDir = path.resolve(__dirname, '../global-teardown');
2020

2121
beforeAll(() => {

e2e/__tests__/globals.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
9-
import os from 'os';
8+
import * as path from 'path';
9+
import {tmpdir} from 'os';
1010
import {wrap} from 'jest-snapshot-serializer-raw';
1111
import runJest from '../runJest';
1212
import {
@@ -16,7 +16,7 @@ import {
1616
writeFiles,
1717
} from '../Utils';
1818

19-
const DIR = path.resolve(os.tmpdir(), 'globalVariables.test');
19+
const DIR = path.resolve(tmpdir(), 'globalVariables.test');
2020
const TEST_DIR = path.resolve(DIR, '__tests__');
2121

2222
function cleanStderr(stderr) {

e2e/__tests__/hasteMapMockChanged.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import path from 'path';
8+
import * as path from 'path';
99
import JestHasteMap from 'jest-haste-map';
1010
import {cleanup, writeFiles} from '../Utils';
1111

0 commit comments

Comments
 (0)