Merge branch 'master' into test-renderer

kulshekhar · Nov 8, 2017 · 2f291b0 · 2f291b0
2 parents ba9ba33 + c7e917d
commit 2f291b0
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 13 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -30,7 +30,6 @@ Justin Bay <[email protected]>
 Kulshekhar Kabra <[email protected]>
 Kyle Roach <[email protected]>
 Marshall Bowers <[email protected]>
-Martijn The <[email protected]>
 Matheus Gambati <[email protected]>
 Maxim Samoilov <[email protected]>
 Mohammad Rajabifard <[email protected]>

diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ Modify your project's `package.json` so that the `jest` section looks something
 {
   "jest": {
     "transform": {
-      "^.+\\.tsx?$": "ts-jest"
+      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
     },
     "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
     "moduleFileExtensions": [
@@ -225,7 +225,7 @@ In `package.json`, inside `jest` section, the `transform` should be like this:
 ```json
 "transform": {
   "^.+\\.jsx?$": "<rootDir>/node_modules/babel-jest",
-  "^.+\\.tsx?$": "ts-jest"
+  "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
 }
 ```
 
@@ -236,7 +236,7 @@ Fully completed jest section should look like this:
     "preset": "react-native",
     "transform": {
       "^.+\\.jsx?$": "<rootDir>/node_modules/babel-jest",
-      "^.+\\.tsx?$": "ts-jest"
+      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
     },
     "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
     "moduleFileExtensions": [
@@ -268,7 +268,7 @@ You'll also need to extend your `transform` regex with `html` extension:
 {
   "jest": {
     "transform": {
-      "^.+\\.(tsx?|html)$": "ts-jest"
+      "^.+\\.(tsx?|html)$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
     }
   }
 }

diff --git a/index.js b/index.js
@@ -0,0 +1 @@
+module.exports = require('./dist/index');
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "ts-jest",
-  "version": "21.2.0",
-  "main": "preprocessor.js",
-  "types": "./dist/preprocessor.d.ts",
+  "version": "21.2.1",
+  "main": "index.js",
+  "types": "./dist/index.d.ts",
   "description": "A preprocessor with sourcemap support to help use Typescript with Jest",
   "scripts": {
     "build": "tsc -p .",
@@ -78,7 +78,7 @@
     "yargs": "^10.0.3"
   },
   "peerDependencies": {
-    "jest": "^21.1.0 || ^21.3.0-alpha.1 || ^22.0.0-alpha.1",
+    "jest": "^21.1.0 || ^21.1.0-alpha.1 || ^22.0.0-alpha.1",
     "typescript": "2.x"
   },
   "devDependencies": {

diff --git a/src/install.ts → src/index.ts b/src/install.ts → src/index.ts
@@ -1,6 +1,7 @@
 import * as sourceMapSupport from 'source-map-support';
 import { defaultRetrieveFileHandler } from './default-retrieve-file-handler';
 
+export { transpileIfTypescript } from './transpile-if-ts';
 export function install() {
   const options: sourceMapSupport.Options = {};
 

diff --git a/src/preprocessor.ts b/src/preprocessor.ts
@@ -6,8 +6,6 @@ import { JestConfig, Path, TransformOptions } from './jest-types';
 import { getPostProcessHook } from './postprocess';
 import { getTSConfig, getTSJestConfig } from './utils';
 
-export { install } from './install';
-
 export function process(
   src: string,
   path: Path,

diff --git a/tests/__tests__/transpile-if-ts.spec.ts b/tests/__tests__/transpile-if-ts.spec.ts
@@ -1,4 +1,4 @@
-import { transpileIfTypescript } from '../../src/transpile-if-ts';
+import { transpileIfTypescript } from '../../src';
 
 describe('transpileIfTypescript', () => {
   it('should ignore anything non-TS', () => {

diff --git a/tests/jestconfig-test/jest.json b/tests/jestconfig-test/jest.json
@@ -1,7 +1,7 @@
 {
   "rootDir": "./",
   "transform": {
-    "^.+\\.tsx?$": "ts-jest"
+    "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
   },
   "mapCoverage": true,
   "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",