Skip to content

Commit

Permalink
feat(presets): add presets for legacy mode (#3465)
Browse files Browse the repository at this point in the history
  • Loading branch information
ahnpnl authored Apr 27, 2022
1 parent 4448ac0 commit 543b4ad
Show file tree
Hide file tree
Showing 16 changed files with 134 additions and 26 deletions.
35 changes: 35 additions & 0 deletions e2e/presets/__tests__/presets.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,69 @@ test('presets', () => {
'^.+\\.tsx?$': 'ts-jest',
},
})
expect(presets.defaultsLegacy).toEqual({
transform: {
'^.+\\.tsx?$': 'ts-jest/legacy',
},
})
expect(presets.defaultsESM).toEqual({
extensionsToTreatAsEsm: [...TS_EXT_TO_TREAT_AS_ESM],
transform: {
'^.+\\.tsx?$': 'ts-jest',
},
})
expect(presets.defaultsESMLegacy).toEqual({
extensionsToTreatAsEsm: [...TS_EXT_TO_TREAT_AS_ESM],
transform: {
'^.+\\.tsx?$': 'ts-jest/legacy',
},
})
expect(presets.jsWithTs).toEqual({
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
})
expect(presets.jsWithTsLegacy).toEqual({
transform: {
'^.+\\.[tj]sx?$': 'ts-jest/legacy',
},
})
expect(presets.jsWithTsESM).toEqual({
extensionsToTreatAsEsm: [...JS_EXT_TO_TREAT_AS_ESM, ...TS_EXT_TO_TREAT_AS_ESM],
transform: {
'^.+\\.m?[tj]sx?$': 'ts-jest',
},
})
expect(presets.jsWithTsESMLegacy).toEqual({
extensionsToTreatAsEsm: [...JS_EXT_TO_TREAT_AS_ESM, ...TS_EXT_TO_TREAT_AS_ESM],
transform: {
'^.+\\.m?[tj]sx?$': 'ts-jest/legacy',
},
})
expect(presets.jsWithBabel).toEqual({
transform: {
'^.+\\.tsx?$': 'ts-jest',
'^.+\\.jsx?$': 'babel-jest',
},
})
expect(presets.jsWithBabelLegacy).toEqual({
transform: {
'^.+\\.tsx?$': 'ts-jest/legacy',
'^.+\\.jsx?$': 'babel-jest',
},
})
expect(presets.jsWithBabelESM).toEqual({
extensionsToTreatAsEsm: [...JS_EXT_TO_TREAT_AS_ESM, ...TS_EXT_TO_TREAT_AS_ESM],
transform: {
'^.+\\.tsx?$': 'ts-jest',
'^.+\\.m?[j]sx?$': 'babel-jest',
},
})
expect(presets.jsWithBabelESMLegacy).toEqual({
extensionsToTreatAsEsm: [...JS_EXT_TO_TREAT_AS_ESM, ...TS_EXT_TO_TREAT_AS_ESM],
transform: {
'^.+\\.tsx?$': 'ts-jest/legacy',
'^.+\\.m?[j]sx?$': 'babel-jest',
},
})
})
1 change: 1 addition & 0 deletions presets/default-esm-legacy/jest-preset.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('..').defaultsESMLegacy
1 change: 1 addition & 0 deletions presets/default-legacy/jest-preset.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('..').defaultsLegacy
6 changes: 6 additions & 0 deletions presets/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@ import type { TsJestPresets } from '../dist'

declare const _default: {
defaults: TsJestPresets;
defaultsLegacy: TsJestPresets;
defaultsESM: TsJestPresets;
defaultsESMLegacy: TsJestPresets;
jsWithTs: TsJestPresets;
jsWithTsLegacy: TsJestPresets;
jsWithTsESM: TsJestPresets;
jsWithTsESMLegacy: TsJestPresets;
jsWithBabel: TsJestPresets;
jsWithBabelLegacy: TsJestPresets;
jsWithBabelESM: TsJestPresets;
jsWithBabelESMLegacy: TsJestPresets;
};
export = _default;
41 changes: 36 additions & 5 deletions presets/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,55 @@ module.exports = {
get defaults() {
return createJestPreset()
},
get defaultsLegacy() {
return createJestPreset(true, false)
},
get defaultsESM() {
return createJestPreset(false, { extensionsToTreatAsEsm: TS_EXT_TO_TREAT_AS_ESM })
return createJestPreset(false, false, { extensionsToTreatAsEsm: TS_EXT_TO_TREAT_AS_ESM })
},
get defaultsESMLegacy() {
return createJestPreset(true, false, { extensionsToTreatAsEsm: TS_EXT_TO_TREAT_AS_ESM })
},
get jsWithTs() {
return createJestPreset(true)
return createJestPreset(false, true)
},
get jsWithTsLegacy() {
return createJestPreset(true, true)
},
get jsWithTsESM() {
return createJestPreset(true, { extensionsToTreatAsEsm: [...JS_EXT_TO_TREAT_AS_ESM, ...TS_EXT_TO_TREAT_AS_ESM] })
return createJestPreset(false, true, {
extensionsToTreatAsEsm: [...JS_EXT_TO_TREAT_AS_ESM, ...TS_EXT_TO_TREAT_AS_ESM],
})
},
get jsWithTsESMLegacy() {
return createJestPreset(true, true, {
extensionsToTreatAsEsm: [...JS_EXT_TO_TREAT_AS_ESM, ...TS_EXT_TO_TREAT_AS_ESM],
})
},
get jsWithBabel() {
return createJestPreset(false, {
return createJestPreset(false, false, {
transform: {
'^.+\\.jsx?$': 'babel-jest',
},
})
},
get jsWithBabelLegacy() {
return createJestPreset(true, false, {
transform: {
'^.+\\.jsx?$': 'babel-jest',
},
})
},
get jsWithBabelESM() {
return createJestPreset(false, {
return createJestPreset(false, false, {
extensionsToTreatAsEsm: [...JS_EXT_TO_TREAT_AS_ESM, ...TS_EXT_TO_TREAT_AS_ESM],
transform: {
'^.+\\.m?[j]sx?$': 'babel-jest',
},
})
},
get jsWithBabelESMLegacy() {
return createJestPreset(true, false, {
extensionsToTreatAsEsm: [...JS_EXT_TO_TREAT_AS_ESM, ...TS_EXT_TO_TREAT_AS_ESM],
transform: {
'^.+\\.m?[j]sx?$': 'babel-jest',
Expand Down
1 change: 1 addition & 0 deletions presets/js-with-babel-esm-legacy/jest-preset.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('..').jsWithBabelESMLegacy
1 change: 1 addition & 0 deletions presets/js-with-babel-legacy/jest-preset.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('..').jsWithBabelLegacy
1 change: 1 addition & 0 deletions presets/js-with-ts-esm-legacy/jest-preset.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('..').jsWithTsESMLegacy
1 change: 1 addition & 0 deletions presets/js-with-ts-legacy/jest-preset.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('..').jsWithTsLegacy
9 changes: 5 additions & 4 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { TsJestTransformer } from './legacy'
import { TsJestTransformer } from './legacy/ts-jest-transformer'

export * from './legacy'
export * from './config'
export * from './constants'
export * from './legacy/compiler'
export * from './config'
export * from './legacy/ts-jest-transformer'
export * from './legacy/config/config-set'
export * from './presets/create-jest-preset'
export * from './utils'
export * from './raw-compiler-options'
export * from './utils'
export * from './types'

export default {
Expand Down
2 changes: 0 additions & 2 deletions src/legacy/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { TsJestTransformer } from './ts-jest-transformer'

export * from './ts-jest-transformer'

export default {
createTransformer: (): TsJestTransformer => new TsJestTransformer(),
}
8 changes: 4 additions & 4 deletions src/presets/__snapshots__/create-jest-preset.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`create-jest-preset should return correct preset 1`] = `
Object {
"transform": Object {
"^.+\\\\.tsx?$": "ts-jest",
"^.+\\\\.tsx?$": "ts-jest/legacy",
},
}
`;
Expand All @@ -19,7 +19,7 @@ Object {
exports[`create-jest-preset should return correct preset 3`] = `
Object {
"transform": Object {
"^.+\\\\.[tj]sx?$": "ts-jest",
"^.+\\\\.[tj]sx?$": "ts-jest/legacy",
},
}
`;
Expand All @@ -35,7 +35,7 @@ Object {
exports[`create-jest-preset should return correct preset 5`] = `
Object {
"transform": Object {
"^.+\\\\.tsx?$": "ts-jest",
"^.+\\\\.tsx?$": "ts-jest/legacy",
},
}
`;
Expand Down Expand Up @@ -69,7 +69,7 @@ Object {
"foo",
],
"transform": Object {
"^.+\\\\.m?[tj]sx?$": "ts-jest",
"^.+\\\\.m?[tj]sx?$": "ts-jest/legacy",
"foo": "bar",
},
}
Expand Down
9 changes: 8 additions & 1 deletion src/presets/create-jest-preset.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,37 +11,44 @@ describe('create-jest-preset', () => {

test.each([
{
legacy: true,
allowJs: undefined,
extraOptions: undefined,
},
{
legacy: false,
allowJs: false,
extraOptions: undefined,
},
{
legacy: true,
allowJs: true,
extraOptions: undefined,
},
{
legacy: false,
allowJs: true,
extraOptions: {},
},
{
legacy: true,
allowJs: false,
extraOptions: {},
},
{
legacy: false,
allowJs: false,
extraOptions: baseExtraOptions,
},
{
legacy: true,
allowJs: true,
extraOptions: {
...baseExtraOptions,
extensionsToTreatAsEsm: [...JS_EXT_TO_TREAT_AS_ESM, ...TS_EXT_TO_TREAT_AS_ESM],
},
},
])('should return correct preset', (data) => {
expect(createJestPreset(data.allowJs, data.extraOptions)).toMatchSnapshot()
expect(createJestPreset(data.legacy, data.allowJs, data.extraOptions)).toMatchSnapshot()
})
})
10 changes: 8 additions & 2 deletions src/presets/create-jest-preset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ import { rootLogger } from '../utils'

const logger = rootLogger.child({ namespace: 'jest-preset' })

export function createJestPreset(allowJs = false, extraOptions: Config.InitialOptions = {}): TsJestPresets {
export function createJestPreset(
legacy = false,
allowJs = false,
extraOptions: Config.InitialOptions = {},
): TsJestPresets {
logger.debug({ allowJs }, 'creating jest presets', allowJs ? 'handling' : 'not handling', 'JavaScript files')

const { extensionsToTreatAsEsm, moduleFileExtensions, testMatch } = extraOptions
Expand All @@ -17,7 +21,9 @@ export function createJestPreset(allowJs = false, extraOptions: Config.InitialOp
...(testMatch ? { testMatch } : undefined),
transform: {
...extraOptions.transform,
[allowJs ? (supportESM ? '^.+\\.m?[tj]sx?$' : '^.+\\.[tj]sx?$') : '^.+\\.tsx?$']: 'ts-jest',
[allowJs ? (supportESM ? '^.+\\.m?[tj]sx?$' : '^.+\\.[tj]sx?$') : '^.+\\.tsx?$']: legacy
? 'ts-jest/legacy'
: 'ts-jest',
},
}
}
28 changes: 20 additions & 8 deletions website/docs/getting-started/presets.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,28 @@ title: Presets

### The presets

:::important

Starting from **v28.0.0**, `ts-jest` will gradually switch to `esbuild`/`swc` to transform `ts` to `js`. To make the transition smoothly, we introduce `legacy` presets as a fallback when the new codes don't work yet.

:::

`ts-jest` comes with several presets, covering most of the project's base configuration:

| Preset name | Description |
| ------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `ts-jest/presets/default`<br/>or `ts-jest` | TypeScript files (`.ts`, `.tsx`) will be transformed by `ts-jest` to **CommonJS** syntax, leaving JavaScript files (`.js`, `jsx`) as-is. |
| `ts-jest/presets/default-esm`<br/> | TypeScript files (`.ts`, `.tsx`) will be transformed by `ts-jest` to **ESM** syntax, leaving JavaScript files (`.js`, `jsx`) as-is. |
| `ts-jest/presets/js-with-ts` | TypeScript and JavaScript files (`.ts`, `.tsx`, `.js`, `.jsx`) will be transformed by `ts-jest` to **CommonJS** syntax.<br/>You'll need to set `allowJs` to `true` in your `tsconfig.json` file. |
| `ts-jest/presets/js-with-ts-esm` | TypeScript and JavaScript files (`.ts`, `.tsx`, `.js`, `.jsx`, `.mjs`) will be transformed by `ts-jest` to **ESM** syntax.<br/>You'll need to set `allowJs` to `true` in your `tsconfig.json` file. |
| `ts-jest/presets/js-with-babel` | TypeScript files (`.ts`, `.tsx`) will be transformed by `ts-jest` to **CommonJS** syntax, and JavaScript files (`.js`, `jsx`) will be transformed by `babel-jest`. |
| `ts-jest/presets/js-with-babel-esm` | TypeScript files (`.ts`, `.tsx`) will be transformed by `ts-jest` to **ESM** syntax, and JavaScript files (`.js`, `jsx`, `.mjs`) will be transformed by `babel-jest`. |
| Preset name | Description |
| --------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `ts-jest/presets/default`<br/>or `ts-jest` | TypeScript files (`.ts`, `.tsx`) will be transformed by `ts-jest` to **CommonJS** syntax, leaving JavaScript files (`.js`, `jsx`) as-is. |
| `ts-jest/presets/default-legacy`<br/>or `ts-jest/legacy` (**LEGACY**) | TypeScript files (`.ts`, `.tsx`) will be transformed by `ts-jest` to **CommonJS** syntax, leaving JavaScript files (`.js`, `jsx`) as-is. |
| `ts-jest/presets/default-esm`<br/> | TypeScript files (`.ts`, `.tsx`) will be transformed by `ts-jest` to **ESM** syntax, leaving JavaScript files (`.js`, `jsx`) as-is. |
| `ts-jest/presets/default-esm-legacy`<br/> (**LEGACY**) | TypeScript files (`.ts`, `.tsx`) will be transformed by `ts-jest` to **ESM** syntax, leaving JavaScript files (`.js`, `jsx`) as-is. |
| `ts-jest/presets/js-with-ts` | TypeScript and JavaScript files (`.ts`, `.tsx`, `.js`, `.jsx`) will be transformed by `ts-jest` to **CommonJS** syntax.<br/>You'll need to set `allowJs` to `true` in your `tsconfig.json` file. |
| `ts-jest/presets/js-with-ts-legacy` (**LEGACY**) | TypeScript and JavaScript files (`.ts`, `.tsx`, `.js`, `.jsx`) will be transformed by `ts-jest` to **CommonJS** syntax.<br/>You'll need to set `allowJs` to `true` in your `tsconfig.json` file. |
| `ts-jest/presets/js-with-ts-esm` | TypeScript and JavaScript files (`.ts`, `.tsx`, `.js`, `.jsx`, `.mjs`) will be transformed by `ts-jest` to **ESM** syntax.<br/>You'll need to set `allowJs` to `true` in your `tsconfig.json` file. |
| `ts-jest/presets/js-with-ts-esm-legacy` (**LEGACY**) | TypeScript and JavaScript files (`.ts`, `.tsx`, `.js`, `.jsx`, `.mjs`) will be transformed by `ts-jest` to **ESM** syntax.<br/>You'll need to set `allowJs` to `true` in your `tsconfig.json` file. |
| `ts-jest/presets/js-with-babel` | TypeScript files (`.ts`, `.tsx`) will be transformed by `ts-jest` to **CommonJS** syntax, and JavaScript files (`.js`, `jsx`) will be transformed by `babel-jest`. |
| `ts-jest/presets/js-with-babel-legacy` (**LEGACY**) | TypeScript files (`.ts`, `.tsx`) will be transformed by `ts-jest` to **CommonJS** syntax, and JavaScript files (`.js`, `jsx`) will be transformed by `babel-jest`. |
| `ts-jest/presets/js-with-babel-esm` | TypeScript files (`.ts`, `.tsx`) will be transformed by `ts-jest` to **ESM** syntax, and JavaScript files (`.js`, `jsx`, `.mjs`) will be transformed by `babel-jest`. |
| `ts-jest/presets/js-with-babel-esm-legacy` (**LEGACY**) | TypeScript files (`.ts`, `.tsx`) will be transformed by `ts-jest` to **ESM** syntax, and JavaScript files (`.js`, `jsx`, `.mjs`) will be transformed by `babel-jest`. |

### Basic usage

Expand Down
6 changes: 6 additions & 0 deletions website/docs/guides/esm-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ module.exports = {

#### Use ESM presets

:::important

Starting from **v28.0.0**, `ts-jest` will gradually switch to `esbuild`/`swc` to transform `ts` to `js`. To make the transition smoothly, we introduce `legacy` presets as a fallback when the new codes don't work yet.

:::

```js
// jest.config.js
module.exports = {
Expand Down

0 comments on commit 543b4ad

Please sign in to comment.