Skip to content

Commit 4866282

Browse files
committed
Remove unnecessary setup
1 parent 1189d2b commit 4866282

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

jest.config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@ module.exports = {
44
verbose: true,
55
preset: 'ts-jest/presets/js-with-babel',
66
transform: {
7+
<<<<<<< HEAD
78
'^.+\\.tsx?$': 'ts-jest',
89
'^.+\\.(js|jsx)$': 'babel-jest'
10+
=======
11+
'^.+\\.tsx?$': 'ts-jest'
12+
>>>>>>> Remove unnecessary setup
913
},
1014
setupFiles: ['<rootDir>/testutils/jest-setup-files.js'],
1115
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020
"target": "es2017",
2121
"types": []
2222
},
23-
"include": ["src/*", "src/*.tsx", "test/*"]
23+
"include": ["src/*", "src/*.tsx"]
2424
}

0 commit comments

Comments
 (0)