Update TypeScript and fix type errors (#2488)

rollup · Oct 2, 2018 · 8a8721e · 8a8721e
1 parent b9e786d
commit 8a8721e
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 66 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -92,7 +92,7 @@
     "pretty-ms": "^4.0.0",
     "remap-istanbul": "^0.12.0",
     "require-relative": "^0.8.7",
-    "rollup": "^0.66.0",
+    "rollup": "^0.66.2",
     "rollup-plugin-buble": "^0.19.2",
     "rollup-plugin-commonjs": "^9.1.8",
     "rollup-plugin-json": "^3.1.0",
@@ -112,7 +112,7 @@
     "tslib": "^1.9.3",
     "tslint": "^5.11.0",
     "turbocolor": "^2.6.1",
-    "typescript": "^3.0.3",
+    "typescript": "^3.1.1",
     "url-parse": "^1.4.3"
   },
   "files": [

diff --git a/src/ast/nodes/VariableDeclaration.ts b/src/ast/nodes/VariableDeclaration.ts
@@ -36,12 +36,10 @@ export default class VariableDeclaration extends NodeBase {
 	}
 
 	includeWithAllDeclaredVariables() {
-		let anotherPassNeeded = false;
 		this.included = true;
 		for (const declarator of this.declarations) {
-			if (declarator.include()) anotherPassNeeded = true;
+			declarator.include();
 		}
-		return anotherPassNeeded;
 	}
 
 	include() {

diff --git a/src/utils/collapseSourcemaps.ts b/src/utils/collapseSourcemaps.ts
@@ -93,7 +93,7 @@ class Link {
 							names.push(traced.name);
 						}
 
-						tracedSegment[4] = nameIndex;
+						(<SourceMapSegmentVector>tracedSegment)[4] = nameIndex;
 					}
 
 					tracedLine.push(tracedSegment);