Upgrade jest and deps to v21 (#320)

Upgrade jest and dependencies to v21

appveyor.yml

@@ -21,7 +21,7 @@ install:
   - ps: Install-Product node $env:nodejs_version
   - set CI=true
   - set AppVeyor=true
-  - npm i -g npm@latest tslint
+  - npm i -g npm@5.3 tslint #TODO restore to npm@latest when npm stops breaking builds https://github.com/npm/npm/issues/18380
   - set PATH=%APPDATA%\npm;%PATH%
   - npm install
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-jest",
-  "version": "20.0.14",
+  "version": "21.0.0",
   "main": "index.js",
   "types": "./dist/index.d.ts",
   "description": "A preprocessor with sourcemap support to help use Typescript with Jest",
@@ -66,16 +66,16 @@
     "babel-core": "^6.24.1",
     "babel-plugin-istanbul": "^4.1.4",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
-    "babel-preset-jest": "^20.0.3",
+    "babel-preset-jest": "^21.0.0",
     "fs-extra": "^4.0.0",
-    "jest-config": "^20.0.0",
-    "jest-util": "^20.0.0",
+    "jest-config": "^21.0.0",
+    "jest-util": "^21.0.0",
     "pkg-dir": "^2.0.0",
     "source-map-support": "^0.4.4",
     "yargs": "^8.0.1"
   },
   "peerDependencies": {
-    "jest": "^20.0.0 || ^20.1.0-alpha.1 || ^21.0.0-alpha.1",
+    "jest": "^21.0.0 || ^21.1.0-alpha.1 || ^22.0.0-alpha.1",
     "typescript": "2.x"
   },
   "devDependencies": {
@@ -90,7 +90,7 @@
     "cross-spawn-with-kill": "latest",
     "doctoc": "latest",
     "husky": "^0.14.3",
-    "jest": "^20.0.0",
+    "jest": "^21.0.0",
     "lint-staged": "^4.0.3",
     "prettier": "^1.5.3",
     "react": "latest",

src/utils.ts

@@ -1,13 +1,9 @@
 import * as fs from 'fs';
 import { normalize } from 'jest-config';
+import * as setFromArgv from 'jest-config/build/set_from_argv';
 import * as path from 'path';
 import * as tsc from 'typescript';
 import { TsJestConfig } from './jest-types';
-/* tslint:disable */
-
-const setFromArgv = require('jest-config/build/setFromArgv');
-// import * as setFromArgv from 'jest-config/build/setfromArgv';
-/* tslint:enable */
 
 function parseConfig(argv) {
   if (argv.config && typeof argv.config === 'string') {