Merge branch 'master' into next

CHANGELOG.md

@@ -1,6 +1,10 @@
 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)

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.

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

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,