Merge branch 'v2-prototype' into feature/order-watcher-v2

3 files changed, 123 insertions, 39 deletions

diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json
index ec8686262..b136b7e4a 100644
--- a/packages/tslint-config/package.json
+++ b/packages/tslint-config/package.json
@@ -43,7 +43,7 @@
     },
     "dependencies": {
         "lodash": "^4.17.4",
-        "tslint": "5.10.0",
+        "tslint": "5.11.0",
         "tslint-eslint-rules": "^4.1.1",
         "tslint-react": "^3.2.0",
         "tsutils": "2.22.2"
diff --git a/packages/tslint-config/rules/customNoMagicNumbersRule.ts b/packages/tslint-config/rules/customNoMagicNumbersRule.ts
index 0a565b2e6..cb124f738 100644
--- a/packages/tslint-config/rules/customNoMagicNumbersRule.ts
+++ b/packages/tslint-config/rules/customNoMagicNumbersRule.ts
@@ -29,6 +29,7 @@ export class Rule extends Lint.Rules.AbstractRule {
     public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
         const allowedNumbers = this.ruleArguments.length > 0 ? this.ruleArguments : Rule.DEFAULT_ALLOWED;
         return this.applyWithWalker(
+            // tslint:disable-next-line:no-inferred-empty-object-type
             new CustomNoMagicNumbersWalker(sourceFile, this.ruleName, new Set(allowedNumbers.map(String))),
         );
     }
diff --git a/packages/tslint-config/tslint.json b/packages/tslint-config/tslint.json
index fbc71e140..30aaf6538 100644
--- a/packages/tslint-config/tslint.json
+++ b/packages/tslint-config/tslint.json
@@ -1,61 +1,132 @@
 {
-    "extends": ["tslint:latest", "tslint-react", "tslint-eslint-rules"],
+    "extends": [
+        "tslint:latest",
+        "tslint-react",
+        "tslint-eslint-rules"
+    ],
     "rules": {
         "adjacent-overload-signatures": true,
-        "arrow-parens": [true, "ban-single-arg-parens"],
+        "arrow-parens": [
+            true,
+            "ban-single-arg-parens"
+        ],
         "arrow-return-shorthand": true,
         "async-suffix": true,
-        "boolean-naming": true,
-        "no-switch-case-fall-through": true,
-        "switch-default": true,
         "await-promise": true,
-        "custom-no-magic-numbers": [true, 0, 1, 2, 3, -1],
         "binary-expression-operand-order": true,
+        "boolean-naming": true,
         "callable-types": true,
         "class-name": true,
         "completed-docs": [
             true,
             {
-                "functions": { "visibilities": ["exported"] },
-                "methods": { "locations": "instance", "privacies": ["public", "protected"] }
+                "functions": {
+                    "visibilities": [
+                        "exported"
+                    ]
+                },
+                "methods": {
+                    "locations": "instance",
+                    "privacies": [
+                        "public",
+                        "protected"
+                    ]
+                }
             }
         ],
         "curly": true,
-        "eofline": true,
-        "typedef": [true, "call-signature", "parameter", "property-declaration"],
+        "custom-no-magic-numbers": [
+            true,
+            0,
+            1,
+            2,
+            3,
+            -1
+        ],
         "encoding": true,
+        "eofline": true,
         "import-spacing": true,
-        "indent": [true, "spaces", 4],
+        "indent": [
+            true,
+            "spaces",
+            4
+        ],
         "interface-name": false,
         "interface-over-type-literal": true,
-        "linebreak-style": [true, "LF"],
-        "max-classes-per-file": [true, 1],
+        "jsx-alignment": true,
+        "jsx-boolean-value": true,
+        "jsx-curly-spacing": [
+            true,
+            "never"
+        ],
+        "jsx-no-bind": false,
+        "jsx-no-lambda": true,
+        "jsx-no-multiline-js": false,
+        "jsx-no-string-ref": true,
+        "jsx-self-close": true,
+        "jsx-wrap-multiline": false,
+        "linebreak-style": [
+            true,
+            "LF"
+        ],
+        "max-classes-per-file": [
+            true,
+            1
+        ],
+        "max-file-line-count": [
+            true,
+            500
+        ],
         "max-line-length": false,
-        "max-file-line-count": [true, 500],
         "member-access": true,
-        "member-ordering": [true, "public-before-private", "static-before-instance", "variables-before-functions"],
-        "newline-before-return": false,
+        "member-ordering": [
+            true,
+            "public-before-private",
+            "static-before-instance",
+            "variables-before-functions"
+        ],
         "new-parens": true,
+        "newline-before-return": false,
         "no-angle-bracket-type-assertion": true,
         "no-boolean-literal-compare": true,
+        "no-debugger": true,
         "no-default-export": true,
-        "no-return-await": true,
+        "no-duplicate-super": true,
         "no-duplicate-switch-case": true,
-        "no-implicit-dependencies": true,
+        "no-duplicate-variable": true,
         "no-empty-interface": false,
+        "no-eval": true,
         "no-floating-promises": true,
+        "no-implicit-dependencies": [
+            true,
+            "dev"
+        ],
+        "no-inferred-empty-object-type": true,
+        "no-invalid-template-strings": true,
+        "no-invalid-this": true,
+        "no-misused-new": true,
         "no-non-null-assertion": true,
         "no-parameter-reassignment": true,
         "no-redundant-jsdoc": true,
         "no-return-await": true,
-        "no-unused-variable": [true, "check-parameters"],
+        "no-shadowed-variable": true,
+        "no-sparse-arrays": true,
+        "no-string-literal": true,
         "no-string-throw": true,
         "no-submodule-imports": false,
+        "no-switch-case-fall-through": true,
+        "no-this-assignment": false,
+        "no-unbound-method": true,
+        "no-unnecessary-class": true,
         "no-unnecessary-type-assertion": true,
-        "no-implicit-dependencies": [true, "dev"],
+        "no-unsafe-finally": true,
+        "no-unused-variable": [
+            true,
+            "check-parameters"
+        ],
         "number-literal-format": true,
-        "object-literal-sort-keys": false,
         "object-literal-key-quotes": false,
+        "object-literal-sort-keys": false,
         "ordered-imports": [
             true,
             {
@@ -65,24 +136,45 @@
         "prefer-const": true,
         "prefer-for-of": true,
         "prefer-function-over-method": true,
+        "prefer-object-spread": true,
+        "prefer-readonly": true,
         "promise-function-async": true,
-        "quotemark": [true, "single", "avoid-escape", "jsx-double"],
+        "quotemark": [
+            true,
+            "single",
+            "avoid-escape",
+            "jsx-double"
+        ],
         "restrict-plus-operands": true,
-        "semicolon": [true, "always"],
+        "semicolon": [
+            true,
+            "always"
+        ],
         "space-before-function-paren": [
             true,
             {
                 "anonymous": "never",
-                "named": "never",
-                "method": "never",
+                "asyncArrow": "always",
                 "constructor": "never",
-                "asyncArrow": "always"
+                "method": "never",
+                "named": "never"
             }
         ],
         "space-within-parens": false,
+        "switch-default": true,
         "type-literal-delimiter": true,
+        "typedef": [
+            true,
+            "call-signature",
+            "parameter",
+            "property-declaration"
+        ],
         "underscore-private-and-protected": true,
-        "variable-name": [true, "ban-keywords", "allow-pascal-case"],
+        "variable-name": [
+            true,
+            "ban-keywords",
+            "allow-pascal-case"
+        ],
         "whitespace": [
             true,
             "check-branch",
@@ -93,16 +185,7 @@
             "check-type",
             "check-typecast",
             "check-preblock"
-        ],
-        "jsx-alignment": true,
-        "jsx-boolean-value": true,
-        "jsx-curly-spacing": [true, "never"],
-        "jsx-no-lambda": true,
-        "jsx-no-multiline-js": false,
-        "jsx-no-string-ref": true,
-        "jsx-self-close": true,
-        "jsx-wrap-multiline": false,
-        "jsx-no-bind": false
+        ]
     },
     "rulesDirectory": "lib/rules"
-}
+}
\ No newline at end of file