Skip to content

Update TypeScript and fix type errors #2488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukastaegert merged 1 commit into from
Oct 2, 2018
Merged

Update TypeScript and fix type errors #2488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 60 additions & 60 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": [
Expand Down
4 changes: 1 addition & 3 deletions src/ast/nodes/VariableDeclaration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

@guybedford guybedford Oct 2, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting this is no longer needed.

@lukastaegert lukastaegert Oct 2, 2018

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dirty-flag is now managed via the context but it seems this file was overlooked. Nice that TypeScript found this!

declarator.include();
}
return anotherPassNeeded;
}

include() {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/collapseSourcemaps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class Link {
names.push(traced.name);
}

tracedSegment[4] = nameIndex;
(<SourceMapSegmentVector>tracedSegment)[4] = nameIndex;
}

tracedLine.push(tracedSegment);
Expand Down