From 643725ceecec350113d474f021e7e21cce63d346 Mon Sep 17 00:00:00 2001 From: Igor Chulinda Date: Wed, 26 Oct 2016 18:20:35 +0200 Subject: [PATCH 1/2] Small fix for readme due to #36 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5d2982d9b3..8bfc9a2798 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,7 @@ Or even declare options for `tsc` instead of using separate config, like this: } ``` For all available options see [TypeScript docs](https://www.typescriptlang.org/docs/handbook/compiler-options.html). +> **Note:** You can't target `ES6` while using `node v4` in your test environment. ## How to Contribute If you have any suggestions/pull requests to turn this into a useful package, just open an issue and I'll be happy to work with you to improve this. From edb8a3d8475d605876d48360c5dceab8d2e3ce02 Mon Sep 17 00:00:00 2001 From: Igor Chulinda Date: Thu, 27 Oct 2016 16:54:58 +0200 Subject: [PATCH 2/2] Moving tsc to peer dependencies, so we will use users's version. --- package.json | 11 +++++++---- tslint.json | 1 - 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8d2bd095a6..d5e7ea94d9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ts-jest", - "version": "0.1.10", + "version": "0.1.11", "main": "index.js", "types": "./dist/index.d.ts", "description": "A preprocessor with sourcemap support to help use Typescript with Jest", @@ -56,7 +56,6 @@ ] }, "dependencies": { - "typescript": "^2.0.3", "source-map-support": "^0.4.4", "glob-all": "^3.1.0", "lodash.assign": "^4.2.0", @@ -67,14 +66,18 @@ "jest-util": "^16.0.2", "jest-config": "^16.0.2" }, + "peerDependencies": { + "typescript": "~2.0.6", + "jest": "~16.0.2" + }, "devDependencies": { "@types/es6-shim": "latest", "@types/jest": "latest", "@types/react": "latest", "@types/source-map-support": "latest", "@types/node": "latest", - "typescript": "latest", - "tslint": "latest", + "typescript": "next", + "tslint": "next", "react": "latest", "react-test-renderer": "latest", diff --git a/tslint.json b/tslint.json index 7457f46ffb..1fa307a302 100644 --- a/tslint.json +++ b/tslint.json @@ -19,7 +19,6 @@ ], "no-construct": true, "no-debugger": true, - "no-duplicate-key": true, "no-duplicate-variable": true, "no-empty": false, "no-eval": true,