Upgrade dependencies (#212)

palantir · Mar 19, 2019 · 0ebaba3 · 0ebaba3
1 parent 691dc3b
commit 0ebaba3
Show file tree

Hide file tree

Showing 19 changed files with 319 additions and 184 deletions.
diff --git a/package.json b/package.json
@@ -12,23 +12,22 @@
     "verify": "run-s build lint test"
   },
   "dependencies": {
-    "tsutils": "^2.13.1"
+    "tsutils": "^3.9.1"
   },
   "peerDependencies": {
     "tslint": "^5.1.0",
-    "typescript": ">=2.1.0 || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev"
+    "typescript": ">=2.8.0"
   },
   "devDependencies": {
-    "@types/colors": "^1.1.3",
-    "@types/glob": "^5.0.30",
-    "@types/node": "^7.0.13",
-    "colors": "^1.1.2",
-    "glob": "^7.1.2",
-    "npm-run-all": "^4.0.2",
+    "@types/glob": "^7.1.1",
+    "@types/node": "^11.11.3",
+    "colors": "^1.3.3",
+    "glob": "^7.1.3",
+    "npm-run-all": "^4.1.5",
     "path": "^0.12.7",
-    "tslint": "^5.5.0",
-    "tslint-language-service": "^0.9.6",
-    "typescript": "~2.6.2"
+    "tslint": "^5.14.0",
+    "typescript-tslint-plugin": "^0.3.1",
+    "typescript": "~3.1.6"
   },
   "repository": {
     "type": "git",

diff --git a/src/rules/jsxAlignmentRule.ts b/src/rules/jsxAlignmentRule.ts
@@ -16,7 +16,7 @@
  */
 
 import * as Lint from "tslint";
-import { isJsxElement, isJsxSelfClosingElement } from "tsutils";
+import { isJsxElement, isJsxSelfClosingElement } from "tsutils/typeguard/3.0";
 import * as ts from "typescript";
 
 export class Rule extends Lint.Rules.AbstractRule {

diff --git a/src/rules/jsxBanElementsRule.ts b/src/rules/jsxBanElementsRule.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import * as Lint from "tslint";
-import { isJsxOpeningElement, isJsxSelfClosingElement } from "tsutils";
+import { isJsxOpeningElement, isJsxSelfClosingElement } from "tsutils/typeguard/3.0";
 import * as ts from "typescript";
 
 interface IOption {

diff --git a/src/rules/jsxBanPropsRule.ts b/src/rules/jsxBanPropsRule.ts
@@ -16,7 +16,7 @@
  */
 
 import * as Lint from "tslint";
-import { isIdentifier, isJsxAttribute } from "tsutils";
+import { isIdentifier, isJsxAttribute } from "tsutils/typeguard/3.0";
 import * as ts from "typescript";
 
 interface IRuleOptions {

diff --git a/src/rules/jsxBooleanValueRule.ts b/src/rules/jsxBooleanValueRule.ts
@@ -16,7 +16,7 @@
  */
 
 import * as Lint from "tslint";
-import { isJsxAttribute } from "tsutils";
+import { isJsxAttribute } from "tsutils/typeguard/3.0";
 import * as ts from "typescript";
 
 const OPTION_ALWAYS = "always";
@@ -80,7 +80,7 @@ function walk(ctx: Lint.WalkContext<string | undefined>): void {
                     const width = node.getWidth(ctx.sourceFile);
                     const start = node.end - width;
                     const fix = Lint.Replacement.replaceFromTo(
-                        start, node.end, node.getFirstToken(ctx.sourceFile).getText(ctx.sourceFile));
+                        start, node.end, node.getFirstToken(ctx.sourceFile)!.getText(ctx.sourceFile));
                     ctx.addFailureAt(start, width, Rule.NEVER_MESSAGE, fix);
                 }
             }

diff --git a/src/rules/jsxCurlySpacingRule.ts b/src/rules/jsxCurlySpacingRule.ts
@@ -16,7 +16,7 @@
  */
 
 import * as Lint from "tslint";
-import { isJsxExpression, isJsxSpreadAttribute } from "tsutils";
+import { isJsxExpression, isJsxSpreadAttribute } from "tsutils/typeguard/3.0";
 import * as ts from "typescript";
 import { getDeleteFixForSpaceBetweenTokens, isMultilineText } from "../utils";
 
@@ -73,9 +73,9 @@ function walk(ctx: Lint.WalkContext<string | undefined>): void {
     });
 
     function validateBraceSpacing(node: ts.Node) {
-        const firstToken = node.getFirstToken();
+        const firstToken = node.getFirstToken()!;
         const secondToken = node.getChildAt(1);
-        const lastToken = node.getLastToken();
+        const lastToken = node.getLastToken()!;
         const secondToLastToken = node.getChildAt(node.getChildCount() - 2);
         const nodeStart = node.getStart();
         const nodeWidth = node.getWidth();

diff --git a/src/rules/jsxEqualsSpacingRule.ts b/src/rules/jsxEqualsSpacingRule.ts
@@ -17,11 +17,11 @@
 
 import * as Lint from "tslint";
 import {
-    getNextToken,
     isJsxAttribute,
     isJsxOpeningElement,
     isJsxSelfClosingElement,
-} from "tsutils";
+} from "tsutils/typeguard/3.0";
+import { getNextToken } from "tsutils/util";
 import * as ts from "typescript";
 import { getDeleteFixForSpaceBetweenTokens } from "../utils";
 

diff --git a/src/rules/jsxKeyRule.ts b/src/rules/jsxKeyRule.ts
@@ -31,7 +31,7 @@ import {
     isParenthesizedExpression,
     isPropertyAccessExpression,
     isReturnStatement,
-} from "tsutils";
+} from "tsutils/typeguard/3.0";
 import * as ts from "typescript";
 
 export class Rule extends Lint.Rules.AbstractRule {

diff --git a/src/rules/jsxNoBindRule.ts b/src/rules/jsxNoBindRule.ts
@@ -16,7 +16,7 @@
  */
 
 import * as Lint from "tslint";
-import { isCallExpression, isJsxAttribute, isJsxExpression } from "tsutils";
+import { isCallExpression, isJsxAttribute, isJsxExpression } from "tsutils/typeguard/3.0";
 import * as ts from "typescript";
 
 export class Rule extends Lint.Rules.AbstractRule {

diff --git a/src/rules/jsxNoLambdaRule.ts b/src/rules/jsxNoLambdaRule.ts
@@ -16,7 +16,7 @@
  */
 
 import * as Lint from "tslint";
-import { isJsxAttribute, isJsxExpression } from "tsutils";
+import { isJsxAttribute, isJsxExpression } from "tsutils/typeguard/3.0";
 import * as ts from "typescript";
 
 export class Rule extends Lint.Rules.AbstractRule {

diff --git a/src/rules/jsxNoMultilineJsRule.ts b/src/rules/jsxNoMultilineJsRule.ts
@@ -16,7 +16,7 @@
  */
 
 import * as Lint from "tslint";
-import { isJsxExpression } from "tsutils";
+import { isJsxExpression } from "tsutils/typeguard/3.0";
 import * as ts from "typescript";
 
 export class Rule extends Lint.Rules.AbstractRule {

diff --git a/src/rules/jsxNoStringRefRule.ts b/src/rules/jsxNoStringRefRule.ts
@@ -16,7 +16,7 @@
  */
 
 import * as Lint from "tslint";
-import { isJsxAttribute, isJsxExpression, isStringLiteral, isTemplateExpression } from "tsutils";
+import { isJsxAttribute, isJsxExpression, isStringLiteral, isTemplateExpression } from "tsutils/typeguard/3.0";
 import * as ts from "typescript";
 
 export class Rule extends Lint.Rules.AbstractRule {

diff --git a/src/rules/jsxSelfCloseRule.ts b/src/rules/jsxSelfCloseRule.ts
@@ -16,7 +16,7 @@
  */
 
 import * as Lint from "tslint";
-import { isJsxElement } from "tsutils";
+import { isJsxElement } from "tsutils/typeguard/3.0";
 import * as ts from "typescript";
 
 export class Rule extends Lint.Rules.AbstractRule {

diff --git a/src/rules/jsxSpaceBeforeTrailingSlashRule.ts b/src/rules/jsxSpaceBeforeTrailingSlashRule.ts
@@ -16,7 +16,7 @@
  */
 
 import * as Lint from "tslint";
-import { isJsxSelfClosingElement } from "tsutils";
+import { isJsxSelfClosingElement } from "tsutils/typeguard/3.0";
 import * as ts from "typescript";
 
 export class Rule extends Lint.Rules.AbstractRule {

diff --git a/src/rules/jsxUseTranslationFunctionRule.ts b/src/rules/jsxUseTranslationFunctionRule.ts
@@ -16,7 +16,7 @@
  */
 
 import * as Lint from "tslint";
-import { isJsxAttribute, isJsxElement, isJsxExpression, isJsxText, isTextualLiteral } from "tsutils";
+import { isJsxAttribute, isJsxElement, isJsxExpression, isJsxText, isTextualLiteral } from "tsutils/typeguard/3.0";
 import * as ts from "typescript";
 
 interface IOptions {

diff --git a/src/rules/jsxWrapMultilineRule.ts b/src/rules/jsxWrapMultilineRule.ts
@@ -16,7 +16,7 @@
  */
 
 import * as Lint from "tslint";
-import { isJsxElement, isJsxFragment, isJsxSelfClosingElement } from "tsutils";
+import { isJsxElement, isJsxFragment, isJsxSelfClosingElement } from "tsutils/typeguard/3.0";
 import * as ts from "typescript";
 
 export class Rule extends Lint.Rules.AbstractRule {

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "version": "2.4.2",
+    "version": "3.1.6",
     "compilerOptions": {
         "declaration": true,
         "lib": ["es6"],
@@ -16,9 +16,10 @@
         "target": "es5",
         "plugins": [
             {
-                "name": "tslint-language-service",
+                "name": "typescript-tslint-plugin",
                 "alwaysShowRuleFailuresAsWarnings": true,
-                "ignoreDefinitionFiles": true
+                "ignoreDefinitionFiles": true,
+                "configFile": "./tslint.json"
             }
         ]
     },

diff --git a/tslint.json b/tslint.json
@@ -1,9 +1,16 @@
 {
     "extends": "tslint:latest",
     "rules": {
-        "file-header": [true, "Copyright \\d{4} Palantir Technologies, Inc."],
-        "max-classes-per-file": [true, 2],
+        "file-header": {
+            "options": ["Copyright \\d{4} Palantir Technologies, Inc."]
+        },
+        "max-classes-per-file": {
+            "options": [2]
+        },
         "no-default-export": true,
+        "no-submodule-imports": {
+            "options": ["tsutils"]
+        },
         "restrict-plus-operands": true,
         "strict-boolean-expressions": true
     }