fix: updates templates

kulshekhar · Aug 10, 2018 · f2e1da2 · f2e1da2
1 parent 31847b0
commit f2e1da2
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 31 deletions.
diff --git a/e2e/__templates__/with-babel-6/package-lock.json b/e2e/__templates__/with-babel-6/package-lock.json
diff --git a/e2e/__templates__/with-babel-6/package.json b/e2e/__templates__/with-babel-6/package.json
@@ -4,6 +4,7 @@
  "private": true,
  "devDependencies": {
  "babel-core": "^6.26.3",
+ "closest-file-data": "^0.1.4",
  "jest": "^23.4.2",
  "typescript": "^2.9.2"
  }

diff --git a/e2e/__templates__/with-babel-7/package-lock.json b/e2e/__templates__/with-babel-7/package-lock.json
diff --git a/e2e/__templates__/with-babel-7/package.json b/e2e/__templates__/with-babel-7/package.json
@@ -4,6 +4,8 @@
  "private": true,
  "devDependencies": {
  "@babel/core": "^7.0.0-beta.56",
+ "babel-core": "^7.0.0-bridge.0",
+ "closest-file-data": "^0.1.4",
  "jest": "^23.4.2",
  "typescript": "^2.9.2"
  }

diff --git a/src/ts-jest-transformer.ts b/src/ts-jest-transformer.ts
@@ -33,15 +33,10 @@ export default class TsJestTransformer implements jest.Transformer {
  return;
  }
 
- // default config
- const baseConfig: BabelConfig = {
- presets: ['jest'],
- };
-
  let babelConfig!: BabelConfig;
  if (config.babelJest === true) {
  // lookup babelrc file
- babelConfig = babelCfg.extend(baseConfig, babelCfg.loadDefault(rootDir));
+ babelConfig = babelCfg.extend({}, babelCfg.loadDefault(rootDir));
  } else if (typeof config.babelJest === 'string') {
  // path to a babelrc file
  let filePath = config.babelJest.replace('<rootDir>', `${rootDir}${sep}`);