From b03482b0de941750f0af9c7b1629e63aaa8dbfa3 Mon Sep 17 00:00:00 2001 From: Jason Killian Date: Tue, 10 May 2016 13:00:15 -0400 Subject: [PATCH 1/2] Prepare Release v3.10.0 (#1238) --- CHANGELOG.md | 20 ++++++++++++++++++++ README.md | 8 +++----- docs/sample.tslint.json | 5 ++--- package.json | 2 +- src/tslint.ts | 2 +- 5 files changed, 27 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1f180a9a5d..b2eef2ba09c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,26 @@ Change Log === +v3.10.0 +--- +* Stable release containing changes from the last dev release (v3.10.0-dev.0) + +v3.10.0-dev.0 +--- +* [new-rule] `new-parens` rule (#1177) +* [new-rule] `no-default-export` rule (#1182) +* [new-rule-option] `order: ...` option for `member-ordering` rule (#1208) +* [new-rule-option] "ignore-for-loop" option for `one-variable-per-declaration` rule (#1204) +* [enhancement] "no-this-in-function-in-method" option renamed to "check-function-in-method" (#1203) +* [bugfix] `semicolon` rule checks export statements (#1155) + +Thanks to our contributors! +* @chrismbarr +* @HamletDRC +* @larshp +* @patsissons +* @YuichiNukiyama + v3.9.0 --- * Stable release containing changes from the last dev release (v3.9.0-dev.0) diff --git a/README.md b/README.md index 91f130645e9..dae5985a2b7 100644 --- a/README.md +++ b/README.md @@ -219,11 +219,8 @@ A sample configuration file with all options is available [here](https://github. * `member-access` enforces using explicit visibility on class members * `"check-accessor"` enforces explicit visibility on get/set accessors (can only be public) * `"check-constructor"` enforces explicit visibility on constructors (can only be public) -* `member-ordering` enforces member ordering. Rule options: - * `public-before-private` All public members must be declared before private members. - * `static-before-instance` All static members must be declared before instance members. - * `variables-before-functions` All member variables need to be declared before member functions. - Member variables initialized to a function literal are treated as member functions. +* `member-ordering` enforces member ordering. The first option should be an object with an `order` key. + Values for `order` can be `fields-first`, `statics-first`, `instance-sandwich`, or a custom order. * `new-parens` enforces parentheses when invoking a constructor via the new keyword. * `no-angle-bracket-type-assertion` disallows usages of `<>` type assertions in favor of using the `as` keyword. * `no-any` diallows usages of `any` as a type decoration. @@ -235,6 +232,7 @@ A sample configuration file with all options is available [here](https://github. * `no-construct` disallows access to the constructors of `String`, `Number`, and `Boolean`. * `no-constructor-vars` disallows the `public` and `private` modifiers for constructor parameters. * `no-debugger` disallows `debugger` statements. +* `no-default-export` disallows default exports in ES6-style modules. Use named exports instead. * `no-duplicate-key` disallows duplicate keys in object literals. * `no-duplicate-variable` disallows duplicate variable declarations in the same block scope. * `no-empty` disallows empty blocks. diff --git a/docs/sample.tslint.json b/docs/sample.tslint.json index ead2b755540..1041bdfd1b9 100644 --- a/docs/sample.tslint.json +++ b/docs/sample.tslint.json @@ -40,9 +40,7 @@ "member-access": true, "member-ordering": [ true, - "public-before-private", - "static-before-instance", - "variables-before-functions" + { "order": "fields-first" } ], "new-parens": true, "no-angle-bracket-type-assertion": true, @@ -62,6 +60,7 @@ "no-construct": true, "no-constructor-vars": true, "no-debugger": true, + "no-default-export": true, "no-duplicate-key": true, "no-duplicate-variable": true, "no-empty": true, diff --git a/package.json b/package.json index 167b965be8f..66e28beb2e6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tslint", - "version": "3.9.0", + "version": "3.10.0", "description": "An extensible static analysis linter for the TypeScript language", "bin": { "tslint": "./bin/tslint" diff --git a/src/tslint.ts b/src/tslint.ts index 3b4884be4a8..8d434872d31 100644 --- a/src/tslint.ts +++ b/src/tslint.ts @@ -33,7 +33,7 @@ import {loadRules} from "./ruleLoader"; import {arrayify} from "./utils"; class Linter { - public static VERSION = "3.9.0"; + public static VERSION = "3.10.0"; public static findConfiguration = findConfiguration; public static findConfigurationPath = findConfigurationPath; From 600e6da4019a8211d0459c89929c4ab60b6a0686 Mon Sep 17 00:00:00 2001 From: Adi Dahiya Date: Tue, 10 May 2016 13:04:36 -0400 Subject: [PATCH 2/2] Stricter regexes for deployment tags --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 7ddef5208ab..745e2896336 100644 --- a/circle.yml +++ b/circle.yml @@ -8,13 +8,13 @@ dependencies: deployment: npm-latest: # match semver tag (e.g. 3.12.7) - tag: /\d\d?\.\d\d?\.\d\d?/ + tag: /^\d\d?\.\d\d?\.\d\d?$/ owner: palantir commands: - ./scripts/npmPublish.sh latest npm-next: # match semver tag with dev prerelease tag (e.g. 3.12.7-dev.2) - tag: /\d\d?\.\d\d?\.\d\d?-dev\.\d\d?/ + tag: /^\d\d?\.\d\d?\.\d\d?-dev\.\d\d?$/ owner: palantir commands: - ./scripts/npmPublish.sh next