Skip to content

Commit bc6c523

Browse files
ahnpnlthymikee
authored andcommitted
Upgrade dependencies to be compatible with Jest v23 (#166)
- Upgrade `ts-jest`, `@types/jest` in dependencies. - Upgrade `jest` in peer dependencies. - Add changes in v5.2.3 to `CHANGELOG` and also update these changes in master `CHANGELOG`
1 parent 67b72c8 commit bc6c523

File tree

5 files changed

+899
-441
lines changed

5 files changed

+899
-441
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
## Changelog (master)
22

3+
* Chore: Upgrade `ts-jest`, `@types/jest` in dependencies to be compatible with `jest` v23.
4+
* Chore: Upgrade peer dependency `jest` to be compatible with `jest` v23.
5+
6+
### v5.2.3
7+
38
* Chore: Upgrade example app to Angular 6 ([#150](https://github.com/thymikee/jest-preset-angular/pull/150))
49
* Chore: Upgrade dependencies for the repository ([#150](https://github.com/thymikee/jest-preset-angular/pull/150))
10+
* Fix: fix `preprocess.js` to not break on spaces before colon ([#165](https://github.com/thymikee/jest-preset-angular/pull/165))
511

612
### v5.2.2
713

__tests__/preprocessor.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const sources = [
6161
const config = {
6262
globals: {
6363
'ts-jest': {
64-
tsConfigFile: 'example/src/tsconfig.spec.json'
64+
tsConfigFile: './__tests__/tsconfig.spec.json'
6565
},
6666
__TRANSFORM_HTML__: true
6767
}

__tests__/tsconfig.spec.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"extends": "./example/tsconfig.json",
3+
"compilerOptions": {
4+
"outDir": "../out-tsc/spec",
5+
"module": "commonjs",
6+
"target": "es5",
7+
"baseUrl": "",
8+
"allowJs": true
9+
},
10+
"include": [
11+
"**/*.spec.ts",
12+
"**/*.d.ts"
13+
]
14+
}

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
"author": "Michał Pierzchała <[email protected]>",
88
"license": "MIT",
99
"dependencies": {
10-
"@types/jest": "^22.2.3",
10+
"@types/jest": "^23.1.3",
1111
"jest-zone-patch": "^0.0.8",
12-
"ts-jest": "^22.4.4"
12+
"ts-jest": "^23.0.0"
1313
},
1414
"devDependencies": {
15-
"jest": "^22.4.0",
15+
"jest": "^23.2.0",
1616
"typescript": "~2.7.2"
1717
},
1818
"peerDependencies": {
1919
"@angular/core": ">=2.0.0",
2020
"@angular/platform-browser-dynamic": ">=2.0.0",
21-
"jest": "^22.0.0"
21+
"jest": "^23.0.0"
2222
},
2323
"scripts": {
2424
"test": "jest",

0 commit comments

Comments
 (0)