From cea5910bd8fa892f8bd8f62d99211ac14530a708 Mon Sep 17 00:00:00 2001 From: Adi Dahiya Date: Wed, 25 Nov 2015 12:29:57 -0500 Subject: [PATCH 1/5] Prepare release v3.1.0-dev.1 --- CHANGELOG.md | 5 +++++ package.json | 8 ++++---- src/tslint.ts | 2 +- test/tsxTests.ts | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 992d43f2bde..4c31e320107 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Change Log === +v3.1.0-dev.1 +--- +* [bugfix] fixed `no-shadowed-variable` false positives when handling destructuring in function params (#727) +- [enhancement] `rulesDirectory` in `tslint.json` now supports multiple file paths (#795) + v3.0.0 --- * [bugfix] `member-access` rule now handles object literals and get/set accessors properly (#801) diff --git a/package.json b/package.json index 7823a16c397..6e8be109f1f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tslint", - "version": "3.0.0", + "version": "3.1.0-dev.1", "description": "a static analysis linter for TypeScript", "bin": { "tslint": "./bin/tslint" @@ -35,11 +35,11 @@ "grunt-ts": "^5.1.0", "grunt-tslint": "latest", "mocha": "^2.2.5", - "tslint": "latest", - "typescript": "latest" + "tslint": "next", + "typescript": "next" }, "peerDependencies": { - "typescript": ">=1.6.2" + "typescript": ">=1.7.0 || >=1.7.0-dev.20151003 || >=1.8.0-dev" }, "license": "Apache-2.0" } diff --git a/src/tslint.ts b/src/tslint.ts index 5910df2f33e..266cf59fc60 100644 --- a/src/tslint.ts +++ b/src/tslint.ts @@ -20,7 +20,7 @@ import {findConfiguration as config} from "./configuration"; const moduleDirectory = path.dirname(module.filename); class Linter { - public static VERSION = "3.0.0"; + public static VERSION = "3.1.0-dev.1"; public static findConfiguration = config; private fileName: string; diff --git a/test/tsxTests.ts b/test/tsxTests.ts index 6a3f732e1b7..a2b32f6c8b6 100644 --- a/test/tsxTests.ts +++ b/test/tsxTests.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + import * as Lint from "./lint"; describe("TSX syntax", () => { @@ -83,8 +84,7 @@ describe("TSX syntax", () => { }); it("with no false positives", () => { - // TODO: one false positive exists because of a compiler bug (see #806) - assert.lengthOf(actualFailures, 4); + assert.lengthOf(actualFailures, 3); }); }); From 9fe8aed009da063223f09978f0a0b11e3d8bf8d8 Mon Sep 17 00:00:00 2001 From: Adi Dahiya Date: Sat, 5 Dec 2015 20:21:15 -0500 Subject: [PATCH 2/5] Prepare release 3.2.0-dev.1 --- CHANGELOG.md | 6 ++++++ package.json | 2 +- src/tslint.ts | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fdbf4cd5903..dc87bc69bc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Change Log === +v3.2.0-dev.1 +--- +* [bugfix] fixed bug in how custom rules directories are registered (#844) +* [enhancement] better support for globs in CLI (#827) +* [new-rule] `no-null-keyword` rule (#722) + v3.1.1 --- * Bump TypeScript peer dependency to `>= 1.7.3` due to `const enum` incompatibility (#832) diff --git a/package.json b/package.json index 273b5f458ba..ba3a029d8d9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tslint", - "version": "3.1.0-dev.1", + "version": "3.2.0-dev.1", "description": "a static analysis linter for TypeScript", "bin": { "tslint": "./bin/tslint" diff --git a/src/tslint.ts b/src/tslint.ts index 77b0b072d17..65cecdaa4dc 100644 --- a/src/tslint.ts +++ b/src/tslint.ts @@ -25,7 +25,7 @@ import {ILinterOptions, LintResult} from "./lint"; import {loadRules} from "./ruleLoader"; class Linter { - public static VERSION = "3.1.0-dev.1"; + public static VERSION = "3.2.0-dev.1"; public static findConfiguration = config; private fileName: string; From aa6cf7df9f098eb0f067a1849731a5c28ea0b5ac Mon Sep 17 00:00:00 2001 From: Adi Dahiya Date: Sat, 5 Dec 2015 20:23:33 -0500 Subject: [PATCH 3/5] Resolve merge conflict in package.json --- package.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package.json b/package.json index ba3a029d8d9..84ffa8c7514 100644 --- a/package.json +++ b/package.json @@ -40,11 +40,7 @@ "typescript": "next" }, "peerDependencies": { -<<<<<<< HEAD - "typescript": ">=1.7.0 || >=1.7.0-dev.20151003 || >=1.8.0-dev" -======= - "typescript": ">=1.7.3" ->>>>>>> master + "typescript": ">=1.7.3 || >=1.7.0-dev.20151003 || >=1.8.0-dev" }, "license": "Apache-2.0" } From 442bf06866b125b1acb7945f5b40a2a20f107a96 Mon Sep 17 00:00:00 2001 From: Adi Dahiya Date: Sun, 6 Dec 2015 20:01:13 -0500 Subject: [PATCH 4/5] Small changelog tweak: put back 3.1.0-dev.1 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc87bc69bc1..066a4b23c71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,9 @@ v3.1.0 --- * [bugfix] build with TS v1.7.3 to fix null pointer exception (#832) * [bugfix] fixed false positive in `no-require-imports` rule (#816) + +v3.1.0-dev.1 +--- * [bugfix] fixed `no-shadowed-variable` false positives when handling destructuring in function params (#727) * [enhancement] `rulesDirectory` in `tslint.json` now supports multiple file paths (#795) From 5d424ed0ba9affc6c4d06984fd74ec22e875629a Mon Sep 17 00:00:00 2001 From: Jason Killian Date: Thu, 10 Dec 2015 11:45:38 -0500 Subject: [PATCH 5/5] Prepare release 3.2.0-dev.2 --- CHANGELOG.md | 4 ++++ package.json | 2 +- src/tslint.ts | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 066a4b23c71..4e6ada3d91d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Change Log === +v3.2.0-dev.2 +--- +* [bugfix] formatters are now exported correctly to work with TS 1.8 (#863) + v3.2.0-dev.1 --- * [bugfix] fixed bug in how custom rules directories are registered (#844) diff --git a/package.json b/package.json index 84ffa8c7514..dbd7a5f9b5c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tslint", - "version": "3.2.0-dev.1", + "version": "3.2.0-dev.2", "description": "a static analysis linter for TypeScript", "bin": { "tslint": "./bin/tslint" diff --git a/src/tslint.ts b/src/tslint.ts index 65cecdaa4dc..c42b26b3631 100644 --- a/src/tslint.ts +++ b/src/tslint.ts @@ -25,7 +25,7 @@ import {ILinterOptions, LintResult} from "./lint"; import {loadRules} from "./ruleLoader"; class Linter { - public static VERSION = "3.2.0-dev.1"; + public static VERSION = "3.2.0-dev.2"; public static findConfiguration = config; private fileName: string;