8000 feat: use ts-jest for TypeScript config resolution by eddyerburgh · Pull Request #139 · vuejs/vue-jest · GitHub
[go: up one dir, main page]
Skip to content

feat: use ts-jest for TypeScript config resolution #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Jan 5, 2019
Merged

feat: use ts-jest for TypeScript config resolution #139

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
297572d
wip
eddyerburgh Dec 29, 2018
74c67ce
Strip comments from TS
eddyerburgh Jan 5, 2019
a849a21
refactor: revert to Jest 23
eddyerburgh Jan 5, 2019
6c101ec
test: remove tests that rely on babel cache
eddyerburgh Jan 5, 2019
6eed3ad
docs: update docs
eddyerburgh Jan 5, 2019
b3d4a8f
docs: add details on passing options to template compilers
eddyerburgh Jan 5, 2019
5c5c452
docs: refactor docs
eddyerburgh Jan 5, 2019
dc16202
test: fix lint errors
eddyerburgh Jan 5, 2019
da41d7b
docs: reword docs
eddyerburgh Jan 5, 2019
46a24bf
docs: tweaks
eddyerburgh Jan 5, 2019
bf14a68
docs: reformat
eddyerburgh Jan 5, 2019
d648c02
docs: reformat
eddyerburgh Jan 5, 2019
65eecb7
docs: revert README changes (for future PR)
eddyerburgh Jan 5, 2019
56539f7
refactor: use Object.assign instead of spread
eddyerburgh Jan 5, 2019
bccf188
feat: rely on babel-core
eddyerburgh Jan 5, 2019
1a459a0
feat: keep @babel/core as dep
eddyerburgh Jan 5, 2019
2c65eaa
feat: use loadPartialConfig
eddyerburgh Jan 5, 2019
77ff594
refactor: rename method
eddyerburgh Jan 5, 2019
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
Prev Previous commit
Next Next commit
refactor: revert to Jest 23
  • Loading branch information
@eddyerburgh
eddyerburgh committed Jan 5, 2019
commit a849a213b21483fc451ba91a2525982f32ade677
6 changes: 0 additions & 6 deletions lib/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
const loadOptions = require('@babel/core').loadOptions
const createTransformer = require('ts-jest').createTransformer

/**
* This module extracts vue-jest relevant parts of a jest config
*
* @param {Object} jestConfig - a complete jest config object
* @returns {Object} vueJestConfig - an object holding vue-jest specific configuration
*/
module.exports.getVueJestConfig = function getVueJestConfig(jestConfig) {
return (
(jestConfig && jestConfig.globals && jestConfig.globals['vue-jest']) || {}
Expand Down
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"@babel/core": "^7.2.2",
"@babel/preset-env": "^7.2.3",
"@vue/test-utils": "^1.0.0-beta.25",
"babel-jest": "^24.0.0-alpha.9",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^23.6.0",
"babel-plugin-istanbul": "^5.1.0",
"clear-module": "^2.1.0",
"coffeescript": "^2.3.2",
Expand All @@ -49,7 +50,7 @@
"hamljs": "^0.6.2",
"husky": "^1.1.4",
"jade": "^1.11.0",
"jest": "^24.0.0-alpha.9",
"jest": "^23.6.0",
"lint-staged": "^8.0.5",
"node-sass": "^4.7.2",
"prettier": "^1.15.2",
Expand Down
Loading
0