Merge branch 'master' into remove-packageJson

Author: ahnpnl

docs/user/config/index.md

@@ -186,7 +186,7 @@ module.exports = {
 To utilize IDE suggestions, you can use `JSDoc` comments to provide suggested `ts-jest` configs for your Jest config:
 
 ```js
-/** @typedef {import('ts-jest')} */
+/** @typedef {import('ts-jest/dist/types')} */
 /** @type {import('@jest/types').Config.InitialOptions} */
 const config = {
   // [...]
@@ -207,7 +207,7 @@ All options have default values which should fit most of the projects. Click on
 | Option | Description | Type | Default |
 |---|---|---|---|
 | [**`compiler`**][compiler] | [TypeScript module to use as compiler.][compiler] | `string` | `"typescript"` |
-| [**`tsConfig` or `tsconfig`**][tsConfig] | [TypeScript compiler related configuration.][tsConfig] | `string`\|`object`\|`boolean` | _auto_ |
+| [**`tsconfig`**][tsconfig] | [TypeScript compiler related configuration.][tsconfig] | `string`\|`object`\|`boolean` | _auto_ |
 | [**`isolatedModules`**][isolatedModules] | [Disable type-checking][isolatedModules] | `boolean` | _disabled_ |
 | [**`astTransformers`**][astTransformers] | [Custom TypeScript AST transformers][astTransformers] | `object` | _auto_ |
 | [**`diagnostics`**][diagnostics] | [Diagnostics related configuration.][diagnostics] | `boolean`\|`object` | _enabled_ |
@@ -259,7 +259,7 @@ npx ts-jest config:migrate package.json
 </div></div>
 
 [compiler]: compiler
-[tsConfig]: tsConfig
+[tsconfig]: tsconfig
 [isolatedModules]: isolatedModules
 [astTransformers]: astTransformers
 [compilerHost]: compilerHost

docs/user/config/tsConfig.md docs/user/config/tsconfig.mddocs/user/config/tsConfig.md renamed to docs/user/config/tsconfig.md

@@ -37,7 +37,7 @@ module.exports = {
   "jest": {
     "globals": {
       "ts-jest": {
-        "tsConfig": "tsconfig.test.json"
+        "tsconfig": "tsconfig.test.json"
       }
     }
   }
@@ -76,7 +76,7 @@ module.exports = {
   "jest": {
     "globals": {
       "ts-jest": {
-        "tsConfig": {
+        "tsconfig": {
           "importHelpers": true
         }
       }
@@ -114,7 +114,7 @@ module.exports = {
   "jest": {
     "globals": {
       "ts-jest": {
-        "tsConfig": false
+        "tsconfig": false
       }
     }
   }

e2e/__cases__/test-helpers/deprecated.spec.ts

@@ -5,7 +5,6 @@ Array [
   "[level:20] creating jest presets not handling JavaScript files",
   "[level:20] creating jest presets not handling JavaScript files",
   "[level:20] creating Importer singleton",
-  "[level:20] checking version of jest: OK",
   "[level:20] created new transformer",
   "[level:30] no matching config-set found, creating a new one",
   "[level:20] loaded module typescript",
@@ -44,7 +43,6 @@ Array [
   "[level:20] creating jest presets not handling JavaScript files",
   "[level:20] creating jest presets not handling JavaScript files",
   "[level:20] creating Importer singleton",
-  "[level:20] checking version of jest: OK",
   "[level:20] created new transformer",
   "[level:30] no matching config-set found, creating a new one",
   "[level:20] loaded module typescript",
@@ -89,7 +87,6 @@ Array [
   "[level:20] creating jest presets not handling JavaScript files",
   "[level:20] creating jest presets not handling JavaScript files",
   "[level:20] creating Importer singleton",
-  "[level:20] checking version of jest: OK",
   "[level:20] created new transformer",
   "[level:30] no matching config-set found, creating a new one",
   "[level:20] loaded module typescript",
@@ -187,63 +184,6 @@ exports[`ts-jest logging deprecation warning with astTransformers config as stri
   ================================================================================
 `;
 
-exports[`ts-jest logging deprecation warning with tsConfig config should pass using template "default" 1`] = `
-  √ jest
-  ↳ exit code: 0
-  ===[ STDOUT ]===================================================================
-  
-  ===[ STDERR ]===================================================================
-  ts-jest[config] (WARN) The option \`tsConfig\` is deprecated and will be removed in ts-jest 27, use \`tsconfig\` instead
-  PASS ./Hello.spec.ts
-    Hello Class
-      √ should create a new Hello
-  
-  Test Suites: 1 passed, 1 total
-  Tests:       1 passed, 1 total
-  Snapshots:   0 total
-  Time:        XXs
-  Ran all test suites.
-  ================================================================================
-`;
-
-exports[`ts-jest logging deprecation warning with tsConfig config should pass using template "with-babel-7" 1`] = `
-  √ jest
-  ↳ exit code: 0
-  ===[ STDOUT ]===================================================================
-  
-  ===[ STDERR ]===================================================================
-  ts-jest[config] (WARN) The option \`tsConfig\` is deprecated and will be removed in ts-jest 27, use \`tsconfig\` instead
-  PASS ./Hello.spec.ts
-    Hello Class
-      √ should create a new Hello
-  
-  Test Suites: 1 passed, 1 total
-  Tests:       1 passed, 1 total
-  Snapshots:   0 total
-  Time:        XXs
-  Ran all test suites.
-  ================================================================================
-`;
-
-exports[`ts-jest logging deprecation warning with tsConfig config should pass using template "with-babel-7-string-config" 1`] = `
-  √ jest
-  ↳ exit code: 0
-  ===[ STDOUT ]===================================================================
-  
-  ===[ STDERR ]===================================================================
-  ts-jest[config] (WARN) The option \`tsConfig\` is deprecated and will be removed in ts-jest 27, use \`tsconfig\` instead
-  PASS ./Hello.spec.ts
-    Hello Class
-      √ should create a new Hello
-  
-  Test Suites: 1 passed, 1 total
-  Tests:       1 passed, 1 total
-  Snapshots:   0 total
-  Time:        XXs
-  Ran all test suites.
-  ================================================================================
-`;
-
 exports[`ts-jest logging with unsupported version test with TS_JEST_DISABLE_VER_CHECKER is not set in process.env should pass using template "with-unsupported-version" 1`] = `
   √ jest
   ↳ exit code: 0

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

@@ -19,11 +19,8 @@ exports[`test-helpers 1`] = `
       9   expect(mocked(bar, true).dummy.deep.deeper(42)).toBeUndefined()
                                                      ~~
   
-  ts-jest[root] (WARN) The \`mocked\` helper has been moved to \`ts-jest/utils\`. Use \`import { mocked } from 'ts-jest/utils'\` instead.
-  PASS ./deprecated.spec.ts
-  
-  Test Suites: 1 failed, 2 passed, 3 total
-  Tests:       4 passed, 4 total
+  Test Suites: 1 failed, 1 passed, 2 total
+  Tests:       3 passed, 3 total
   Snapshots:   0 total
   Time:        XXs
   Ran all test suites.
@@ -49,11 +46,8 @@ exports[`with esModuleInterop set to false 1`] = `
       9   expect(mocked(bar, true).dummy.deep.deeper(42)).toBeUndefined()
                                                      ~~
   
-  ts-jest[root] (WARN) The \`mocked\` helper has been moved to \`ts-jest/utils\`. Use \`import { mocked } from 'ts-jest/utils'\` instead.
-  PASS ./deprecated.spec.ts
-  
-  Test Suites: 1 failed, 2 passed, 3 total
-  Tests:       4 passed, 4 total
+  Test Suites: 1 failed, 1 passed, 2 total
+  Tests:       3 passed, 3 total
   Snapshots:   0 total
   Time:        XXs
   Ran all test suites.

e2e/__tests__/__snapshots__/test-helpers.test.ts.snap

@@ -107,21 +107,5 @@ describe('ts-jest logging', () => {
         })
       })
     })
-
-    describe('with tsConfig config', () => {
-      const testCase = configureTestCase('simple', {
-        tsJestConfig: {
-          tsConfig: true,
-        }
-      })
-
-      testCase.runWithTemplates(allPackageSetsWithPreset, 0, (runTest, { testLabel }) => {
-        it(testLabel, () => {
-          const result = runTest()
-          expect(result.status).toBe(0)
-          expect(result).toMatchSnapshot()
-        })
-      })
-    })
   })
 })

e2e/__tests__/logger.test.ts

@@ -4,7 +4,7 @@ import { resolve } from 'path'
 
 import { createCompilerInstance } from '../compiler/instance'
 import { ConfigSet } from '../config/config-set'
-import type { BabelConfig, TsCompiler, TsJestConfig, TsJestGlobalOptions } from '../types'
+import type { BabelConfig, TsCompiler, TsJestGlobalOptions } from '../types'
 import type { ImportReasons } from '../utils/messages'
 
 export function filePath(relPath: string): string {
@@ -13,19 +13,6 @@ export function filePath(relPath: string): string {
 
 export const rootDir = filePath('')
 
-export function tsJestConfig(options?: Partial<TsJestConfig>): TsJestConfig {
-  return {
-    isolatedModules: false,
-    compiler: 'typescript',
-    transformers: options?.transformers ?? Object.create(null),
-    babelConfig: undefined,
-    tsConfig: undefined,
-    stringifyContentPathRegex: undefined,
-    diagnostics: { ignoreCodes: [], pretty: false, throws: true },
-    ...options,
-  }
-}
-
 function getJestConfig<T extends Config.ProjectConfig>(
   options?: Partial<Config.InitialOptions | Config.ProjectConfig>,
   tsJestOptions?: TsJestGlobalOptions,