Skip to content

Commit 501bd08

Browse files
Fix linting
1 parent 7fede7a commit 501bd08

File tree

8 files changed

+41
-36
lines changed

8 files changed

+41
-36
lines changed

jest.globalSetup.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {createRequire} from 'node:module';
22
const require = createRequire(import.meta.url);
33

44
const requireFrom = (from, name) => {
5-
if (parseInt(process.versions.node, 10) < 20) {
5+
if (Number.parseInt(process.versions.node, 10) < 20) {
66
return null;
77
}
88
return require(
@@ -12,7 +12,7 @@ const requireFrom = (from, name) => {
1212
);
1313
};
1414

15-
export default async function () {
15+
export default async function globalSetup() {
1616
globalThis.preloadedDependencies = {
1717
'babel-jest': {
1818
'@babel-8/core': requireFrom('babel-jest', '@babel-8/core'),

packages/babel-jest/src/__tests__/getCacheKey.test.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import babelJest from '../index';
1313
// because this test file is being transpiled, leading to require(esm), which
1414
// we don't support yet.
1515
declare global {
16+
// We need to use `var` to declare a global variable
17+
// eslint-disable-next-line no-var
1618
var preloadedDependencies: {
1719
'babel-jest': {
1820
'@babel-8/core': null | typeof import('@babel-8/core');
@@ -46,13 +48,13 @@ afterEach(() => {
4648

4749
describe.each(
4850
[
49-
{version: '7', babel: require('@babel/core')},
51+
{babel: require('@babel/core'), version: '7'},
5052
{
51-
version: '8',
5253
babel: globalThis.preloadedDependencies['babel-jest']['@babel-8/core'],
54+
version: '8',
5355
},
54-
].filter(v => v.babel),
55-
)(`babel $version`, ({babel}) => {
56+
].filter(v => v.babel !== null),
57+
)('babel $version', ({babel}) => {
5658
describe('getCacheKey', () => {
5759
const sourceText = 'mock source';
5860
const sourcePath = 'mock-source-path.js';

packages/babel-jest/src/__tests__/index.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import babelJest, {createTransformer} from '../index';
1717
// because this test file is being transpiled, leading to require(esm), which
1818
// we don't support yet.
1919
declare global {
20+
// We need to use `var` to declare a global variable
21+
// eslint-disable-next-line no-var
2022
var preloadedDependencies: {
2123
'babel-jest': {
2224
'@babel-8/core': null | typeof import('@babel-8/core');
@@ -26,7 +28,7 @@ declare global {
2628

2729
type BabelCore = typeof import('@babel-8/core');
2830

29-
var mockedBabel!: {
31+
let mockedBabel!: {
3032
transformSync: jest.Mock<BabelCore['transformSync']>;
3133
transformAsync: jest.Mock<BabelCore['transformAsync']>;
3234
loadPartialConfigSync: jest.Mock<BabelCore['loadPartialConfigSync']>;
@@ -35,10 +37,10 @@ var mockedBabel!: {
3537

3638
jest.mock('../babel', () => {
3739
return (mockedBabel = {
38-
transformSync: jest.fn<BabelCore['transformSync']>(),
39-
transformAsync: jest.fn<BabelCore['transformAsync']>(),
40-
loadPartialConfigSync: jest.fn<BabelCore['loadPartialConfigSync']>(),
4140
loadPartialConfigAsync: jest.fn<BabelCore['loadPartialConfigAsync']>(),
41+
loadPartialConfigSync: jest.fn<BabelCore['loadPartialConfigSync']>(),
42+
transformAsync: jest.fn<BabelCore['transformAsync']>(),
43+
transformSync: jest.fn<BabelCore['transformSync']>(),
4244
});
4345
});
4446

@@ -60,13 +62,13 @@ customMultiply({a: 32, dummy: "test"}, 2);
6062

6163
describe.each(
6264
[
63-
{version: '7', babel: require('@babel/core')},
65+
{babel: require('@babel/core'), version: '7'},
6466
{
65-
version: '8',
6667
babel: globalThis.preloadedDependencies['babel-jest']['@babel-8/core'],
68+
version: '8',
6769
},
68-
].filter(v => v.babel),
69-
)(`babel $version`, ({babel}: {babel: BabelCore}) => {
70+
].filter(v => v.babel !== null),
71+
)('babel $version', ({babel}: {babel: BabelCore}) => {
7072
beforeEach(() => {
7173
jest.clearAllMocks();
7274

packages/babel-jest/src/babel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export {
1414

1515
import {
1616
loadPartialConfig,
17-
// @ts-ignore -- Wrong @types/babel__core definition
17+
// @ts-expect-error -- Wrong @types/babel__core definition
1818
loadPartialConfigSync,
1919
} from '@babel/core';
2020

packages/babel-jest/src/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
import {createHash} from 'crypto';
99
import * as path from 'path';
10-
import {
11-
type TransformOptions as BabelTransformOptions,
12-
type PartialConfig,
10+
import type {
11+
TransformOptions as BabelTransformOptions,
12+
PartialConfig,
1313
} from '@babel/core';
1414
import chalk from 'chalk';
1515
import * as fs from 'graceful-fs';
@@ -20,10 +20,10 @@ import type {
2020
TransformerCreator,
2121
} from '@jest/transform';
2222
import {
23-
loadPartialConfigSync,
24-
loadPartialConfigAsync,
2523
transformSync as babelTransform,
2624
transformAsync as babelTransformAsync,
25+
loadPartialConfigAsync,
26+
loadPartialConfigSync,
2727
} from './babel';
2828

2929
interface TransformerConfig extends BabelTransformOptions {

packages/babel-plugin-jest-hoist/src/__tests__/hoistPlugin.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,12 @@ const formatResult = (code: string) => formatCode(code, prettierOptions);
3434
describe.each(
3535
[
3636
{
37-
version: '7',
3837
babel: require('@babel/core'),
3938
presetReact: require('@babel/preset-react').default,
4039
presetTypescript: require('@babel/preset-typescript').default,
40+
version: '7',
4141
},
4242
{
43-
version: '8',
4443
babel: preloadedDependencies['babel-plugin-jest-hoist']['@babel-8/core'],
4544
presetReact:
4645
preloadedDependencies['babel-plugin-jest-hoist'][
@@ -50,8 +49,9 @@ describe.each(
5049
preloadedDependencies['babel-plugin-jest-hoist'][
5150
'@babel-8/preset-typescript'
5251
],
52+
version: '8',
5353
},
54-
].filter(v => v.babel),
54+
].filter(v => v.babel !== null),
5555
)('babel $version', ({babel, presetReact, presetTypescript}) => {
5656
pluginTester({
5757
babel,

packages/babel-plugin-jest-hoist/src/index.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88

99
import type {PluginObj} from '@babel/core';
1010
import type {NodePath} from '@babel/traverse';
11-
import {
12-
type CallExpression,
13-
type Expression,
14-
type Identifier,
15-
type ImportDeclaration,
16-
type MemberExpression,
17-
type Node,
18-
type Statement,
19-
type StringLiteral,
20-
type Super,
21-
type VariableDeclaration,
22-
type VariableDeclarator,
11+
import type {
12+
CallExpression,
13+
Expression,
14+
Identifier,
15+
ImportDeclaration,
16+
MemberExpression,
17+
Node,
18+
Statement,
19+
StringLiteral,
20+
Super,
21+
VariableDeclaration,
22+
VariableDeclarator,
2323
} from '@babel/types';
2424

2525
const JEST_GLOBAL_NAME = 'jest';

packages/babel-preset-jest/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
const jestHoist = require.resolve('babel-plugin-jest-hoist');
99
const currentNodeSyntax = require.resolve('babel-preset-current-node-syntax');
1010

11-
module.exports = api => {
11+
const presetJest = api => {
1212
if (api.version && api.version.startsWith('8.')) {
1313
return {plugins: [jestHoist]};
1414
}
1515
return {plugins: [jestHoist], presets: [currentNodeSyntax]};
1616
};
17+
module.exports = presetJest;

0 commit comments

Comments
 (0)