Skip to content

Commit a986729

Browse files
ahnpnlahnpnl
authored
feat: mark ConfigSet as legacy (#3456)
BREAKING CHANGE Any imports `ts-jest/dist/config/config-set` should change to `ts-jest/dist/legacy/config/config-set`
1 parent 1e880ff commit a986729

9 files changed

Lines changed: 33 additions & 31 deletions

File tree

‎src/__helpers__/fakers.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type { Config } from '@jest/types'
44
import type { Logger } from 'bs-logger'
55

66
import { TsCompiler } from '../compiler'
7-
import { ConfigSet } from '../config'
7+
import { ConfigSet } from '../legacy/config/config-set'
88
import type { StringMap, TsJestGlobalOptions } from '../types'
99
import type { ImportReasons } from '../utils/messages'
1010

‎src/compiler/ts-compiler.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import type {
2323
TranspileOutput,
2424
} from 'typescript'
2525

26-
import type { ConfigSet } from '../config'
2726
import { LINE_FEED, TS_TSX_REGEX } from '../constants'
27+
import type { ConfigSet } from '../legacy/config/config-set'
2828
import type {
2929
DepGraphInfo,
3030
StringMap,

‎src/compiler/ts-jest-compiler.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { TransformedSource } from '@jest/transform'
22

3-
import type { ConfigSet } from '../config'
3+
import type { ConfigSet } from '../legacy/config/config-set'
44
import type { CompilerInstance, StringMap, TsJestCompileOptions } from '../types'
55

66
import { TsCompiler } from './ts-compiler'

‎src/config/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
export * from './config-set'
21
export * from './paths-to-module-name-mapper'

src/config/__snapshots__/config-set.spec.ts.snap renamed to src/legacy/config/__snapshots__/config-set.spec.ts.snap

File renamed without changes.

src/config/config-set.spec.ts renamed to src/legacy/config/config-set.spec.ts

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ import type { Transformer } from '@jest/transform'
44
import { LogLevels, testing } from 'bs-logger'
55
import ts from 'typescript'
66

7-
import { createConfigSet } from '../__helpers__/fakers'
8-
import { logTargetMock } from '../__helpers__/mocks'
9-
import type { AstTransformerDesc, TsJestGlobalOptions } from '../types'
10-
import { stringify } from '../utils'
11-
import * as _backports from '../utils/backports'
12-
import { getPackageVersion } from '../utils/get-package-version'
13-
import { normalizeSlashes } from '../utils/normalize-slashes'
14-
import { sha1 } from '../utils/sha1'
7+
import { createConfigSet } from '../../__helpers__/fakers'
8+
import { logTargetMock } from '../../__helpers__/mocks'
9+
import type { AstTransformerDesc, TsJestGlobalOptions } from '../../types'
10+
import { stringify } from '../../utils'
11+
import * as _backports from '../../utils/backports'
12+
import { getPackageVersion } from '../../utils/get-package-version'
13+
import { normalizeSlashes } from '../../utils/normalize-slashes'
14+
import { sha1 } from '../../utils/sha1'
1515

1616
import { ConfigSet, MY_DIGEST } from './config-set'
1717

18-
jest.mock('../utils/backports')
18+
jest.mock('../../utils/backports')
1919
jest.mock('../index')
20-
jest.mock('../utils/get-package-version')
20+
jest.mock('../../utils/get-package-version')
2121

2222
const backports = jest.mocked(_backports)
2323

@@ -305,7 +305,7 @@ describe('babelJestTransformer', () => {
305305

306306
it('should return babelJestTransformer with loaded config object', () => {
307307
/* eslint-disable-next-line jest/no-mocks-import */
308-
const babelConfig = require('../__mocks__/babel-foo.config')
308+
const babelConfig = require('../../__mocks__/babel-foo.config')
309309
const cs = createConfigSet({
310310
jestConfig: {
311311
globals: {
@@ -668,7 +668,9 @@ describe('resolvePath', () => {
668668
// eslint-disable-next-line @typescript-eslint/no-explicit-any
669669
const cs = createConfigSet({ jestConfig: { rootDir: '/root', cwd: '/cwd' } as any, resolve: null })
670670
const doResolve = (path: string) => cs.resolvePath(path, { throwIfMissing: false, nodeResolve: true })
671-
expect(doResolve('json5')).toBe(resolve(__dirname, '../../node_modules/json5', require('json5/package.json').main))
671+
expect(doResolve('json5')).toBe(
672+
resolve(__dirname, '../../../node_modules/json5', require('json5/package.json').main),
673+
)
672674
expect(doResolve('./bar.js')).toBe(resolve('/cwd/bar.js'))
673675
expect(doResolve('<rootDir>bar.js')).toBe(resolve('/root/bar.js'))
674676
expect(doResolve('<rootDir>/bar.js')).toBe(resolve('/root//bar.js'))

src/config/config-set.ts renamed to src/legacy/config/config-set.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import { globsToMatcher } from 'jest-util'
1717
import json5 from 'json5'
1818
import type * as ts from 'typescript'
1919

20-
import { DEFAULT_JEST_TEST_MATCH, JS_JSX_EXTENSIONS } from '../constants'
21-
import type { RawCompilerOptions } from '../raw-compiler-options'
20+
import { DEFAULT_JEST_TEST_MATCH, JS_JSX_EXTENSIONS } from '../../constants'
21+
import type { RawCompilerOptions } from '../../raw-compiler-options'
2222
import type {
2323
AstTransformer,
2424
AstTransformerDesc,
@@ -29,20 +29,20 @@ import type {
2929
TsJestDiagnosticsCfg,
3030
TsJestGlobalOptions,
3131
TTypeScript,
32-
} from '../types'
33-
import { TsCompilerInstance } from '../types'
34-
import { rootLogger, stringify } from '../utils'
35-
import { backportJestConfig } from '../utils/backports'
36-
import { importer } from '../utils/importer'
37-
import { Errors, ImportReasons, interpolate } from '../utils/messages'
38-
import { normalizeSlashes } from '../utils/normalize-slashes'
39-
import { sha1 } from '../utils/sha1'
40-
import { TSError } from '../utils/ts-error'
32+
} from '../../types'
33+
import { TsCompilerInstance } from '../../types'
34+
import { rootLogger, stringify } from '../../utils'
35+
import { backportJestConfig } from '../../utils/backports'
36+
import { importer } from '../../utils/importer'
37+
import { Errors, ImportReasons, interpolate } from '../../utils/messages'
38+
import { normalizeSlashes } from '../../utils/normalize-slashes'
39+
import { sha1 } from '../../utils/sha1'
40+
import { TSError } from '../../utils/ts-error'
4141

4242
/**
4343
* @internal
4444
*/
45-
export const MY_DIGEST: string = readFileSync(resolve(__dirname, '..', '..', '.ts-jest-digest'), 'utf8')
45+
export const MY_DIGEST: string = readFileSync(resolve(__dirname, '../../../.ts-jest-digest'), 'utf8')
4646

4747
/**
4848
* @internal
@@ -313,7 +313,7 @@ export class ConfigSet {
313313
this.logger.debug({ tsconfig: this.parsedTsConfig }, 'normalized typescript config via ts-jest option')
314314

315315
// transformers
316-
this.resolvedTransformers.before = [require('../transformers/hoist-jest')]
316+
this.resolvedTransformers.before = [require('../../transformers/hoist-jest')]
317317
const { astTransformers } = options
318318
if (astTransformers) {
319319
const resolveTransformerFunc = (transformerPath: string) => {

‎src/legacy/ts-jest-transformer.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import type { SyncTransformer, TransformedSource } from '@jest/transform'
55
import type { Logger } from 'bs-logger'
66

77
import { TsJestCompiler } from '../compiler'
8-
import { ConfigSet } from '../config'
98
import { DECLARATION_TYPE_EXT, JS_JSX_REGEX, TS_TSX_REGEX } from '../constants'
109
import type { CompilerInstance, DepGraphInfo, ProjectConfigTsJest, TransformOptionsTsJest } from '../types'
1110
import { parse, stringify, JsonableValue, rootLogger } from '../utils'
@@ -14,6 +13,8 @@ import { Deprecations, Errors, interpolate } from '../utils/messages'
1413
import { sha1 } from '../utils/sha1'
1514
import { VersionCheckers } from '../utils/version-checkers'
1615

16+
import { ConfigSet } from './config/config-set'
17+
1718
interface CachedConfigSet {
1819
configSet: ConfigSet
1920
jestConfig: JsonableValue<ProjectConfigTsJest>

‎src/types.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type * as babelJest from 'babel-jest'
44
import type * as _babel from 'babel__core'
55
import type * as _ts from 'typescript'
66

7-
import type { ConfigSet } from './config'
7+
import type { ConfigSet } from './legacy/config/config-set'
88
import type { RawCompilerOptions } from './raw-compiler-options'
99

1010
declare module '@jest/types' {

0 commit comments

Comments
 (0)
⚡