Merge branch 'master' into next

.gitignore

@@ -1,8 +1,7 @@
 .DS_Store
 .tscache/
-build/
-bin/tslint-cli.js
-lib/
+/build/
+/lib/
 node_modules/
 tscommand*.txt
 # created by grunt-ts for faster compiling

.npmignore

@@ -1,11 +1,15 @@
 .DS_Store
 .gitmodules
+.jscsrc
 .project
+.settings
 .travis.yml
 .tslintrc
+.vscode
+appveyor.yml
 Gruntfile.js
 tslint.json
-build/tslint-tests.js
-src/
-test/
+/build/
+/src/
+/test/
 tscommand*.txt

CHANGELOG.md

@@ -1,6 +1,34 @@
 Change Log
 ===
 
+v3.1.1
+---
+* Bump TypeScript peer dependency to `>= 1.7.3` due to `const enum` incompatibility (#832)
+
+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)
+* [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)
+    * New rule options: `check-accessor` and `check-constructor`
+* All the changes from the following releases, including some **breaking changes**:
+    * `3.0.0-dev.3`
+    * `3.0.0-dev.2`
+    * `3.0.0-dev.1`
+    * `2.6.0-dev.2`
+    * `2.6.0-dev.1`
+
+v3.0.0-dev.3
+---
+* TypeScript is now a peerDependency (#791)
+* [bugfix] `no-unused-variable` rule with `react` option works with self-closing JSX tags (#776)
+* [bugfix] `use-strict` bugfix (#544)
+
 v3.0.0-dev.2
 ---
 * [new-rule-option] "react" option for `no-unused-variable` rule (#698, #725)
@@ -10,12 +38,12 @@ v3.0.0-dev.2
 v3.0.0-dev.1
 ---
 * **BREAKING CHANGES**
-  * Rearchitect tslint to use external modules instead of merged namespaces (#726)
-    * Dependencies need to be handled differently now by custom rules and formatters
-    * See the [PR](https://github.com/palantir/tslint/pull/726) for full details about this change
-  * `no-trailing-comma` rule removed, it is replaced by the `trailing-comma` rule (#687)
-  * Rename `sort-object-literal-keys` rule to `object-literal-sort-keys` (#304, #537)
-  * `Lint.abstract()` has been removed (#700)
+    * Rearchitect TSLint to use external modules instead of merged namespaces (#726)
+        * Dependencies need to be handled differently now by custom rules and formatters
+        * See the [PR](https://github.com/palantir/tslint/pull/726) for full details about this change
+    * `no-trailing-comma` rule removed, it is replaced by the `trailing-comma` rule (#687)
+    * Rename `sort-object-literal-keys` rule to `object-literal-sort-keys` (#304, #537)
+    * `Lint.abstract()` has been removed (#700)
 * [new-rule] `trailing-comma` rule (#557, #687)
 * [new-rule-option] "ban-keywords" option for `variable-name` rule (#735, #748)
 * [bugfix] `typedef` rule now handles `for-of` loops correctly (#743)
@@ -36,7 +64,7 @@ v2.5.1
 * [new-rule-option] "avoid-escape" option for quotemark rule (#543)
 * [bugfix] type declaration for tslint external module #686
 * [enhancement] `AbstractRule` and `AbstractFormatter` are now abstract classes (#631)
-	* Note: `Lint.abstract()` is now deprecated
+    * Note: `Lint.abstract()` is now deprecated
 
 v2.5.0
 ---
@@ -106,15 +134,15 @@ v2.4.0
 * [bug] fix error message in `no-var-keyword` rule
 * [enhancement] CI tests are now run on node v0.12 in addition to v0.10
 * **BREAKING**
-	* `-f` option removed from CLI
+    * `-f` option removed from CLI
 
 v2.3.1-beta
 ---
 * [bugs] #137 #434 #451 #456
 * [new-rule] `no-require-imports` disallows `require()` style imports
 * [new-rule] `no-shadowed-variable` moves over shadowed variable checking from `no-duplicate-variable` into its own rule
 * **BREAKING**
-	* `no-duplicate-variable` now only checks for duplicates within the same block scope; enable `no-shadowed-variable` to get duplicate-variable checking across block scopes
+    * `no-duplicate-variable` now only checks for duplicates within the same block scope; enable `no-shadowed-variable` to get duplicate-variable checking across block scopes
 * [enhancement] `no-duplicate-variable`, `no-shadowed-variable`, and `no-use-before-declare` now support ES6 destructuring
 * [enhancement] tslint CLI now uses a default configuration if no config file is found
 
@@ -131,8 +159,8 @@ v2.2.0-beta
 ---
 * Upgraded Typescript compiler to 1.5.0-beta
 * **BREAKING CHANGES**
-	* due to changes to the typescript compiler API, old custom rules may no longer work and may need to be rewritten
-	* the JSON formatter's line and character positions are now back to being 0-indexed instead of 1-indexed
+    * due to changes to the typescript compiler API, old custom rules may no longer work and may need to be rewritten
+    * the JSON formatter's line and character positions are now back to being 0-indexed instead of 1-indexed
 * [bugs] #328 #334 #319 #351 #365 #254
 * [bug] fixes for tslint behavior around template strings (fixes #357, #349, #332, and more)
 * [new-rule] `align` rule now enforces vertical alignment on parameters, arguments, and statements
@@ -154,16 +182,16 @@ v2.0.1
 ---
 * Upgraded Typescript compiler to 1.4
 * **BREAKING CHANGES**
-	* typedef rule options were modified:
-		* index-signature removed as no longer necessary
-		* property-signature renamed to property-declaration
-		* variable-declarator renamed to variable-declaration
-		* member-variable-declarator renamed to member-variable-declaration
-	* typedef-whitespace rule options were modified:
-		* catch-clause was removed as invalid
-		* further options were added, see readme for more details
-	* due to changes to the typescript compiler API, old custom rules may no longer work and may need to be rewritten
-	* the JSON formatter's line and character positions are now 1-indexed instead of 0-indexed
+    * typedef rule options were modified:
+        * index-signature removed as no longer necessary
+        * property-signature renamed to property-declaration
+        * variable-declarator renamed to variable-declaration
+        * member-variable-declarator renamed to member-variable-declaration
+    * typedef-whitespace rule options were modified:
+        * catch-clause was removed as invalid
+        * further options were added, see readme for more details
+    * due to changes to the typescript compiler API, old custom rules may no longer work and may need to be rewritten
+    * the JSON formatter's line and character positions are now 1-indexed instead of 0-indexed
 
 v1.2.0
 ---
@@ -177,10 +205,10 @@ v1.0.0
 ---
 * upgrade TypeScript compiler to 1.3
 * **BREAKING CHANGES**
-	* all error messages now start with a lower-case character and do not end with a period
-	* all rule options are consistent in nomenclature. The `typedef` and `typedef-whitespace` rules now take in hyphenated options
-	* `unused-variables` rule cannot find unused private variables defined in the constructor due to a bug in 1.3 compiler
-	* `indent` rule has changed to only check for tabs or spaces and not enforce indentation levels
+    * all error messages now start with a lower-case character and do not end with a period
+    * all rule options are consistent in nomenclature. The `typedef` and `typedef-whitespace` rules now take in hyphenated options
+    * `unused-variables` rule cannot find unused private variables defined in the constructor due to a bug in 1.3 compiler
+    * `indent` rule has changed to only check for tabs or spaces and not enforce indentation levels
 
 v0.4.12
 ---

Gruntfile.js

@@ -78,8 +78,17 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks("grunt-ts");
 
     // register custom tasks
-    grunt.registerTask("core", ["clean:core", "ts:core", "tslint:src"]);
-    grunt.registerTask("test", ["clean:test", "ts:test", "tslint:test", "mochaTest"].concat(checkBinTest));
+    grunt.registerTask("core", [
+        "clean:core",
+        "ts:core",
+        "tslint:src"
+    ]);
+    grunt.registerTask("test", [
+        "clean:test",
+        "ts:test",
+        "tslint:test",
+        "mochaTest"
+    ].concat(checkBinTest));
 
     // create default task
     grunt.registerTask("default", ["jscs", "core", "test"]);