Skip to content

Commit

Permalink
Update typescript example to using ts-jest (#6260)
Browse files Browse the repository at this point in the history
* Update typescript example to using ts-jest

* Fix failing ci builds

* Update changelog
  • Loading branch information
raibima authored and cpojer committed May 28, 2018
1 parent a1adaff commit 0d9e8b1
Show file tree
Hide file tree
Showing 4 changed files with 229 additions and 24 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

* `[jest-jasemine2]` Add dependency on jest-each ([#6308](https://github.com/facebook/jest/pull/#6308))
* `[jest-each]` Move jest-each into core Jest ([#6278](https://github.com/facebook/jest/pull/6278))
* `[examples]` Update typescript example to using ts-jest ([#6260](https://github.com/facebook/jest/pull/6260))

### Fixes

Expand Down
20 changes: 16 additions & 4 deletions examples/typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,28 @@
},
"devDependencies": {
"@types/jest": "^19.2.4",
"jest": "*"
"jest": "*",
"ts-jest": "*"
},
"scripts": {
"test": "jest"
},
"jest": {
"moduleFileExtensions": ["ts", "tsx", "js"],
"moduleFileExtensions": [
"ts",
"tsx",
"js"
],
"transform": {
"^.+\\.(ts|tsx)$": "<rootDir>/preprocessor.js"
"^.+\\.(ts|tsx)$": "ts-jest"
},
"testMatch": ["**/__tests__/*.+(ts|tsx|js)"]
"globals": {
"ts-jest": {
"tsConfigFile": "tsconfig.json"
}
},
"testMatch": [
"**/__tests__/*.+(ts|tsx|js)"
]
}
}
13 changes: 0 additions & 13 deletions examples/typescript/preprocessor.js

This file was deleted.

Loading

0 comments on commit 0d9e8b1

Please sign in to comment.