Skip to content
This repository has been archived by the owner on Jan 26, 2019. It is now read-only.

Update ts-jest 22.0.1 -> 23.10.3 #410

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update ts-jest 22.0.1 -> 23.10.3 #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2e3687
Update ts-jest 22.0.1 -> 23.10.3
Oct 1, 2018
ce8861f
Update ts-jest TS config path (tsConfigFile -> tsConfig)
Oct 2, 2018
964a9ff
Transform Typescript with 'ts-jest' instead of 'ts-jest/preprocessor'
Oct 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions config/jest/typescriptTransform.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"resolve": "1.6.0",
"style-loader": "0.19.0",
"sw-precache-webpack-plugin": "0.11.4",
"ts-jest": "22.0.1",
"ts-jest": "23.10.3",
"ts-loader": "^2.3.7",
"tsconfig-paths-webpack-plugin": "^2.0.0",
"tslint": "^5.7.0",
Expand Down
4 changes: 2 additions & 2 deletions scripts/utils/createJestConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ module.exports = (resolve, rootDir, isEjecting) => {
'^.+\\.(js|jsx|mjs)$': isEjecting
? '<rootDir>/node_modules/babel-jest'
: resolve('config/jest/babelTransform.js'),
'^.+\\.tsx?$': resolve('config/jest/typescriptTransform.js'),
'^.+\\.tsx?$': 'ts-jest',
'^.+\\.css$': resolve('config/jest/cssTransform.js'),
'^(?!.*\\.(js|jsx|mjs|css|json)$)': resolve(
'config/jest/fileTransform.js'
Expand All @@ -64,7 +64,7 @@ module.exports = (resolve, rootDir, isEjecting) => {
],
globals: {
'ts-jest': {
tsConfigFile: paths.appTsTestConfig,
tsConfig: paths.appTsTestConfig,
},
},
};
Expand Down