Change of versioning.

kulshekhar · Nov 9, 2016 · 57e8753 · 57e8753
1 parent f8e6f9b
commit 57e8753
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -18,6 +18,10 @@
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
+## Versioning
+From version `"jest": "17.0.0"` we are using same MAJOR.MINOR as [`Jest`](/~https://github.com/facebook/jest).  
+For `"jest": "< 17.0.0"` use `"ts-jest": "0.1.13"`.
+
 ## Usage
 
 To use this in your project, run:
@@ -28,7 +32,9 @@ Modify your project's `package.json` so that the `jest` section looks something
 ```json
 {
   "jest": {
-    "scriptPreprocessor": "<rootDir>/node_modules/ts-jest/preprocessor.js",
+    "transform": {
+      ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+    },
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
     "moduleFileExtensions": [
       "ts",
@@ -44,7 +50,9 @@ By default `jest` does not provide code coverage remapping for transpiled codes,
 ```json
 {
   "jest": {
-    "scriptPreprocessor": "<rootDir>/node_modules/ts-jest/preprocessor.js",
+    "transform": {
+      ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+    },
     "testResultsProcessor": "<rootDir>/node_modules/ts-jest/coverageprocessor.js"
   }
 }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ts-jest",
-  "version": "0.1.13",
+  "version": "17.0.0",
   "main": "index.js",
   "types": "./dist/index.d.ts",
   "description": "A preprocessor with sourcemap support to help use Typescript with Jest",
@@ -36,7 +36,9 @@
   },
   "homepage": "/~https://github.com/kulshekhar/ts-jest#readme",
   "jest": {
-    "scriptPreprocessor": "<rootDir>/node_modules/ts-jest/preprocessor.js",
+    "transform": {
+      ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+    },
     "mocksPattern": "__ts-jest-mocks__",
     "testRegex": "/__tests__/.*\\.(spec)\\.(ts|js)$",
     "coverageReporters": [
@@ -55,8 +57,6 @@
   "dependencies": {
     "glob-all": "^3.1.0",
     "istanbul-lib-instrument": "^1.2.0",
-    "jest-config": "^16.0.2",
-    "jest-util": "^16.0.2",
     "lodash.assign": "^4.2.0",
     "lodash.includes": "^4.3.0",
     "lodash.partition": "^4.6.0",
@@ -66,7 +66,7 @@
   },
   "peerDependencies": {
     "typescript": "~2.0.6",
-    "jest": "~16.0.2"
+    "jest": "~17.0.0"
   },
   "devDependencies": {
     "@types/es6-shim": "latest",
@@ -85,4 +85,4 @@
     "rimraf": "latest",
     "doctoc": "latest"
   }
-}
+}
diff --git a/tests/button/package.json b/tests/button/package.json
@@ -1,6 +1,8 @@
 {
   "jest": {
-    "scriptPreprocessor": "../../preprocessor.js",
+    "transform": {
+      ".(ts|tsx)": "../../preprocessor.js"
+    },
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
     "moduleFileExtensions": [
       "ts",

diff --git a/tests/jestconfig-test/jest.json b/tests/jestconfig-test/jest.json
@@ -1,13 +1,27 @@
 {
   "rootDir": "./",
-  "scriptPreprocessor": "<rootDir>/node_modules/ts-jest/preprocessor.js",
+  "transform": {
+    ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+  },
   "testResultsProcessor": "<rootDir>/node_modules/ts-jest/coverageprocessor.js",
   "testRegex": "/specs/.*\\.spec\\.(ts|tsx|js)$",
   "testEnvironment": "jsdom",
-  "coverageReporters": ["html", "json", "text"],
+  "coverageReporters": [
+    "html",
+    "json",
+    "text"
+  ],
   "coverageDirectory": "test_coverage_dir",
-  "moduleFileExtensions": ["ts", "tsx", "js", "json"],
-  "collectCoverageFrom": ["src/**/*.tsx", "src/**/*.ts"],
+  "moduleFileExtensions": [
+    "ts",
+    "tsx",
+    "js",
+    "json"
+  ],
+  "collectCoverageFrom": [
+    "src/**/*.tsx",
+    "src/**/*.ts"
+  ],
   "coverageThreshold": {
     "global": {
       "statements": 95

diff --git a/tests/simple-async/package.json b/tests/simple-async/package.json
@@ -1,10 +1,14 @@
 {
   "jest": {
     "rootDir": "./",
-    "scriptPreprocessor": "../../preprocessor.js",
+    "transform": {
+      ".(ts|tsx)": "../../preprocessor.js"
+    },
     "testResultsProcessor": "../../coverageprocessor.js",
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
-    "coverageReporters": ["json"],
+    "coverageReporters": [
+      "json"
+    ],
     "collectCoverageFrom": [
       "Hello.ts",
       "NullCoverage.js"

diff --git a/tests/simple/package.json b/tests/simple/package.json
@@ -1,6 +1,8 @@
 {
   "jest": {
-    "scriptPreprocessor": "../../preprocessor.js",
+    "transform": {
+      ".(ts|tsx)": "../../preprocessor.js"
+    },
     "testResultsProcessor": "../../coverageprocessor.js",
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
     "coverageReporters": ["json"],

diff --git a/tests/watch-test/package.json b/tests/watch-test/package.json
@@ -1,6 +1,8 @@
 {
   "jest": {
-    "scriptPreprocessor": "../../preprocessor.js",
+    "transform": {
+      ".(ts|tsx)": "../../preprocessor.js"
+    },
     "testResultsProcessor": "../../coverageprocessor.js",
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
     "coverageReporters": ["json"],