Skip to content

Commit 7201375

Browse files
committed
test(examples): use preset util functions in all example projects
1 parent 26e31a7 commit 7201375

28 files changed

+135
-256
lines changed
Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
1-
import preset from 'ts-jest/presets/index.js'
1+
import { createJsWithBabelEsmPreset } from 'ts-jest'
22

33
/** @type {import('ts-jest').JestConfigWithTsJest} */
44
export default {
5-
...preset.jsWithBabelESM,
6-
transform: {
7-
'^.+\.[tj]sx?$': [
8-
'ts-jest',
9-
{
10-
babelConfig: true,
11-
isolatedModules: true,
12-
tsconfig: 'tsconfig-esm.json',
13-
useESM: true,
14-
},
15-
],
16-
},
5+
...createJsWithBabelEsmPreset({
6+
babelConfig: true,
7+
tsconfig: 'tsconfig-esm.json',
8+
isolatedModules: true,
9+
})
1710
}
Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
1-
import preset from 'ts-jest/presets/index.js'
1+
import { createJsWithBabelEsmPreset } from 'ts-jest'
22

33
/** @type {import('ts-jest').JestConfigWithTsJest} */
44
export default {
5-
...preset.jsWithBabelESM,
6-
transform: {
7-
'^.+\.[tj]sx?$': [
8-
'ts-jest',
9-
{
10-
babelConfig: true,
11-
tsconfig: 'tsconfig-esm.json',
12-
useESM: true,
13-
},
14-
],
15-
},
5+
...createJsWithBabelEsmPreset({
6+
babelConfig: true,
7+
tsconfig: 'tsconfig-esm.json'
8+
})
169
}
Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
const preset = require('ts-jest/presets')
1+
const { createJsWithBabelPreset } = require('ts-jest')
22

33
/** @type {import('ts-jest').JestConfigWithTsJest} */
44
module.exports = {
5-
...preset.jsWithBabel,
6-
transform: {
7-
'^.+\.[tj]sx?$': [
8-
'ts-jest',
9-
{
10-
babelConfig: true,
11-
isolatedModules: true,
12-
},
13-
],
14-
},
5+
...createJsWithBabelPreset({
6+
babelConfig: true,
7+
isolatedModules: true,
8+
})
159
}
Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1+
const { createJsWithBabelPreset } = require('ts-jest')
2+
13
/** @type {import('ts-jest').JestConfigWithTsJest} */
24
module.exports = {
3-
transform: {
4-
'^.+\.[tj]sx?$': [
5-
'ts-jest',
6-
{
7-
babelConfig: true,
8-
},
9-
],
10-
},
5+
...createJsWithBabelPreset({
6+
babelConfig: true,
7+
})
118
}
Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
1-
import preset from 'ts-jest/presets/index.js'
1+
import { createJsWithTsPreset } from 'ts-jest'
22

33
/** @type {import('ts-jest').JestConfigWithTsJest} */
44
export default {
5-
...preset.jsWithTsESM,
6-
transform: {
7-
'^.+\.[tj]sx?$': [
8-
'ts-jest',
9-
{
10-
isolatedModules: true,
11-
tsconfig: 'tsconfig-esm.json',
12-
useESM: true,
13-
},
14-
],
15-
},
5+
...createJsWithTsPreset({
6+
tsconfig: 'tsconfig-esm.json',
7+
isolatedModules: true,
8+
})
169
}
Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
1-
import preset from 'ts-jest/presets/index.js'
1+
import { createJsWithTsPreset } from 'ts-jest'
22

33
/** @type {import('ts-jest').JestConfigWithTsJest} */
44
export default {
5-
...preset.jsWithTsESM,
6-
transform: {
7-
'^.+\.[tj]sx?$': [
8-
'ts-jest',
9-
{
10-
tsconfig: 'tsconfig-esm.json',
11-
useESM: true,
12-
},
13-
],
14-
},
5+
...createJsWithTsPreset({
6+
tsconfig: 'tsconfig-esm.json'
7+
})
158
}
Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
const preset = require('ts-jest/presets')
1+
const { createJsWithTsPreset } = require('ts-jest')
22

33
/** @type {import('ts-jest').JestConfigWithTsJest} */
44
module.exports = {
5-
...preset.jsWithTs,
6-
transform: {
7-
'^.+\.[tj]sx?$': [
8-
'ts-jest',
9-
{
10-
isolatedModules: true,
11-
},
12-
],
13-
},
5+
...createJsWithTsPreset({
6+
isolatedModules: true,
7+
})
148
}

examples/js-with-ts/jest.config.cjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const preset = require('ts-jest/presets')
1+
const { createJsWithTsPreset } = require('ts-jest')
22

33
/** @type {import('ts-jest').JestConfigWithTsJest} */
44
module.exports = {
5-
...preset.jsWithTs,
5+
...createJsWithTsPreset()
66
}
Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
1-
import preset from 'ts-jest/presets/index.js'
1+
import { createDefaultEsmPreset } from 'ts-jest'
22

33
/** @type {import('ts-jest').JestConfigWithTsJest} */
44
export default {
5-
...preset.defaultsESM,
6-
transform: {
7-
'^.+\\.tsx?$': [
8-
'ts-jest',
9-
{
10-
isolatedModules: true,
11-
tsconfig: 'tests/project-1/tsconfig-esm.json',
12-
useESM: true,
13-
},
14-
],
15-
},
5+
...createDefaultEsmPreset({
6+
tsconfig: 'tests/project-1/tsconfig-esm.json',
7+
isolatedModules: true,
8+
})
169
}
Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
1-
import preset from 'ts-jest/presets/index.js'
1+
import { createDefaultEsmPreset } from 'ts-jest'
22

33
/** @type {import('ts-jest').JestConfigWithTsJest} */
44
export default {
5-
...preset.defaultsESM,
6-
transform: {
7-
'^.+\\.tsx?$': [
8-
'ts-jest',
9-
{
10-
tsconfig: 'tests/project-1/tsconfig-esm.json',
11-
useESM: true,
12-
},
13-
],
14-
},
5+
...createDefaultEsmPreset({
6+
tsconfig: 'tests/project-1/tsconfig-esm.json',
7+
})
158
}
Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
const preset = require('ts-jest/presets');
1+
const { createDefaultPreset } = require('ts-jest');
22

33
/** @type {import('ts-jest').JestConfigWithTsJest} */
44
module.exports = {
5-
...preset.defaults,
6-
transform: {
7-
'^.+\\.tsx?$': [
8-
'ts-jest',
9-
{
10-
isolatedModules: true,
11-
},
12-
],
13-
},
5+
...createDefaultPreset({
6+
isolatedModules: true,
7+
})
148
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const preset = require('ts-jest/presets');
1+
const { createDefaultPreset } = require('ts-jest');
22

33
/** @type {import('ts-jest').JestConfigWithTsJest} */
44
module.exports = {
5-
...preset.defaults,
5+
...createDefaultPreset()
66
}
Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
1-
import preset from 'ts-jest/presets/index.js'
1+
import { createDefaultEsmPreset } from 'ts-jest'
22

33
/** @type {import('ts-jest').JestConfigWithTsJest} */
44
export default {
5-
...preset.defaultsESM,
6-
transform: {
7-
'^.+\\.tsx?$': [
8-
'ts-jest',
9-
{
10-
isolatedModules: true,
11-
tsconfig: 'tests/project-2/tsconfig-esm.json',
12-
useESM: true,
13-
},
14-
],
15-
},
5+
...createDefaultEsmPreset({
6+
tsconfig: 'tests/project-2/tsconfig-esm.json',
7+
isolatedModules: true,
8+
})
169
}
Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
1-
import preset from 'ts-jest/presets/index.js'
1+
import { createDefaultEsmPreset } from 'ts-jest'
22

33
/** @type {import('ts-jest').JestConfigWithTsJest} */
44
export default {
5-
...preset.defaultsESM,
6-
transform: {
7-
'^.+\\.tsx?$': [
8-
'ts-jest',
9-
{
10-
tsconfig: 'tests/project-2/tsconfig-esm.json',
11-
useESM: true,
12-
},
13-
],
14-
},
5+
...createDefaultEsmPreset({
6+
tsconfig: 'tests/project-2/tsconfig-esm.json',
7+
})
158
}
Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
const preset = require('ts-jest/presets');
1+
const { createDefaultPreset } = require('ts-jest');
22

33
/** @type {import('ts-jest').JestConfigWithTsJest} */
44
module.exports = {
5-
...preset.defaults,
6-
transform: {
7-
'^.+\\.tsx?$': [
8-
'ts-jest',
9-
{
10-
isolatedModules: true,
11-
},
12-
],
13-
},
5+
...createDefaultPreset({
6+
isolatedModules: true,
7+
})
148
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const preset = require('ts-jest/presets');
1+
const { createDefaultPreset } = require('ts-jest');
22

33
/** @type {import('ts-jest').JestConfigWithTsJest} */
44
module.exports = {
5-
...preset.defaults,
5+
...createDefaultPreset()
66
}
Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
import baseEsmCfg from './jest-esm.config.mjs'
1+
import { createDefaultEsmPreset } from 'ts-jest'
2+
3+
const defaultPreset = createDefaultEsmPreset({
4+
tsconfig: 'tsconfig-esm.spec.json',
5+
isolatedModules: true,
6+
})
27

38
/** @type {import('ts-jest').JestConfigWithTsJest} */
49
export default {
5-
...baseEsmCfg,
10+
...defaultPreset,
11+
setupFilesAfterEnv: ['<rootDir>/src/setupTests.ts'],
12+
testEnvironment: 'jsdom',
613
transform: {
7-
...baseEsmCfg.transform,
8-
'^.+\\.(ts|tsx|js|jsx|mjs|cjs)$': [
9-
'ts-jest',
10-
{
11-
isolatedModules: true,
12-
tsconfig: 'tsconfig-esm.spec.json',
13-
useESM: true,
14-
},
15-
],
14+
...defaultPreset.transform,
15+
'^.+\\.css$': '<rootDir>/config/jest/cssTransform.js',
16+
'^(?!.*\\.(js|jsx|mjs|cjs|ts|tsx|css|json)$)': '<rootDir>/config/jest/fileTransform.js',
1617
},
1718
}
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
import baseCfg from './jest.config.cjs'
1+
import { createDefaultEsmPreset } from 'ts-jest'
2+
3+
const defaultPreset = createDefaultEsmPreset({
4+
tsconfig: 'tsconfig-esm.spec.json',
5+
})
26

37
/** @type {import('ts-jest').JestConfigWithTsJest} */
48
export default {
5-
...baseCfg,
6-
preset: 'ts-jest/presets/js-with-babel-esm',
9+
...defaultPreset,
10+
setupFilesAfterEnv: ['<rootDir>/src/setupTests.ts'],
11+
testEnvironment: 'jsdom',
712
transform: {
8-
...baseCfg.transform,
9-
'^.+\\.(ts|tsx|js|jsx|mjs|cjs)$': [
10-
'ts-jest',
11-
{
12-
tsconfig: 'tsconfig-esm.spec.json',
13-
useESM: true,
14-
},
15-
],
13+
...defaultPreset.transform,
14+
'^.+\\.css$': '<rootDir>/config/jest/cssTransform.js',
15+
'^(?!.*\\.(js|jsx|mjs|cjs|ts|tsx|css|json)$)': '<rootDir>/config/jest/fileTransform.js',
1616
},
1717
}
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
const baseCfg = require('./jest.config.cjs')
2+
const { createDefaultPreset } = require('ts-jest')
3+
4+
const defaultPreset = createDefaultPreset({
5+
tsconfig: 'tsconfig.spec.json',
6+
isolatedModules: true,
7+
})
28

39
/** @type {import('ts-jest').JestConfigWithTsJest} */
410
module.exports = {
511
...baseCfg,
612
transform: {
713
...baseCfg.transform,
8-
'^.+\\.(ts|tsx|js|jsx|mjs|cjs)$': [
9-
'ts-jest',
10-
{
11-
isolatedModules: true,
12-
tsconfig: 'tsconfig.spec.json',
13-
},
14-
],
14+
...defaultPreset.transform,
1515
},
1616
}

0 commit comments

Comments
 (0)