Skip to content

Commit

Permalink
Upgrade ts-jest, @types/jest (#173)
Browse files Browse the repository at this point in the history
- Upgrade `ts-jest` to 23.0.1
- Upgrade `@types/jest` to 23.3.0
- Upgrade devDependencies for `jest`
  • Loading branch information
ahnpnl authored and thymikee committed Aug 3, 2018
1 parent bc6c523 commit 9781f63
Show file tree
Hide file tree
Showing 4 changed files with 200 additions and 359 deletions.
8 changes: 2 additions & 6 deletions __tests__/tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
{
"extends": "./example/tsconfig.json",
"extends": "../example/tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/spec",
"module": "commonjs",
"target": "es5",
"baseUrl": "",
"allowJs": true
},
"include": [
"**/*.spec.ts",
"**/*.d.ts"
]
}
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"author": "Michał Pierzchała <thymikee@gmail.com>",
"license": "MIT",
"dependencies": {
"@types/jest": "^23.1.3",
"@types/jest": "^23.3.1",
"jest-zone-patch": "^0.0.8",
"ts-jest": "^23.0.0"
"ts-jest": "^23.1.2"
},
"devDependencies": {
"jest": "^23.2.0",
"typescript": "~2.7.2"
"jest": "^23.4.2",
"typescript": "~2.9.2"
},
"peerDependencies": {
"@angular/core": ">=2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion preprocessor.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const process = require('ts-jest/preprocessor.js').process;
const process = require('ts-jest').process;
const TEMPLATE_URL_REGEX = /templateUrl\s*:\s*('|")(\.\/){0,}(.*)('|")/g;
const STYLE_URLS_REGEX = /styleUrls\s*:\s*\[[^\]]*\]/g;
const ESCAPE_TEMPLATE_REGEX = /(\${|\`)/g;
Expand Down
Loading

0 comments on commit 9781f63

Please sign in to comment.