Skip to content

Commit f2e1da2

Browse files
committed
fix: updates templates
1 parent 31847b0 commit f2e1da2

5 files changed

Lines changed: 107 additions & 31 deletions

File tree

e2e/__templates__/with-babel-6/package-lock.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/__templates__/with-babel-6/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"private": true,
55
"devDependencies": {
66
"babel-core": "^6.26.3",
7+
"closest-file-data": "^0.1.4",
78
"jest": "^23.4.2",
89
"typescript": "^2.9.2"
910
}

e2e/__templates__/with-babel-7/package-lock.json

Lines changed: 97 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/__templates__/with-babel-7/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
"private": true,
55
"devDependencies": {
66
"@babel/core": "^7.0.0-beta.56",
7+
"babel-core": "^7.0.0-bridge.0",
8+
"closest-file-data": "^0.1.4",
79
"jest": "^23.4.2",
810
"typescript": "^2.9.2"
911
}

src/ts-jest-transformer.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,10 @@ export default class TsJestTransformer implements jest.Transformer {
3333
return;
3434
}
3535

36-
// default config
37-
const baseConfig: BabelConfig = {
38-
presets: ['jest'],
39-
};
40-
4136
let babelConfig!: BabelConfig;
4237
if (config.babelJest === true) {
4338
// lookup babelrc file
44-
babelConfig = babelCfg.extend(baseConfig, babelCfg.loadDefault(rootDir));
39+
babelConfig = babelCfg.extend({}, babelCfg.loadDefault(rootDir));
4540
} else if (typeof config.babelJest === 'string') {
4641
// path to a babelrc file
4742
let filePath = config.babelJest.replace('<rootDir>', `${rootDir}${sep}`);

0 commit comments

Comments
 (0)