Merge pull request #39793 from amcasey/pinned-release-3.3

Make release-3.3 buildable
This commit is contained in:
Andrew Casey 2020-08-10 14:20:37 -07:00 committed by GitHub
commit d4f1477696
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 6601 additions and 6 deletions

3
.gitignore vendored
View file

@ -75,5 +75,4 @@ tests/cases/user/*/**/*.d.ts
!tests/cases/user/discord.js/
tests/baselines/reference/dt
.failed-tests
TEST-results.xml
package-lock.json
TEST-results.xml

1
.npmrc
View file

@ -1 +0,0 @@
package-lock=false

View file

@ -1,9 +1,8 @@
language: node_js
node_js:
- 'node'
- '10'
- '6'
- '8'
sudo: false
@ -21,7 +20,7 @@ branches:
install:
- npm uninstall typescript --no-save
- npm uninstall tslint --no-save
- npm install
- npm ci
cache:
directories:

6588
package-lock.json generated Normal file

File diff suppressed because it is too large Load diff

View file

@ -2797,6 +2797,7 @@ namespace ts {
// If this is a property-parameter, then also declare the property symbol into the
// containing class.
if (isParameterPropertyDeclaration(node)) {
// tslint:disable-next-line no-unnecessary-type-assertion
const classDeclaration = <ClassLikeDeclaration>node.parent.parent;
declareSymbol(classDeclaration.symbol.members!, classDeclaration.symbol, node, SymbolFlags.Property | (node.questionToken ? SymbolFlags.Optional : SymbolFlags.None), SymbolFlags.PropertyExcludes);
}

View file

@ -9684,6 +9684,7 @@ namespace ts {
break;
}
}
// tslint:disable-next-line no-unnecessary-type-assertion
return links.resolvedType!; // TODO: GH#18217
}
@ -25738,7 +25739,9 @@ namespace ts {
if (node.kind === SyntaxKind.VariableDeclaration || node.kind === SyntaxKind.BindingElement) {
checkVarDeclaredNamesNotShadowed(node);
}
// tslint:disable-next-line no-unnecessary-type-assertion
checkCollisionWithRequireExportsInGeneratedCode(node, <Identifier>node.name);
// tslint:disable-next-line no-unnecessary-type-assertion
checkCollisionWithGlobalPromiseInGeneratedCode(node, <Identifier>node.name);
}
}
@ -30401,9 +30404,11 @@ namespace ts {
node.kind === SyntaxKind.FunctionExpression ||
node.kind === SyntaxKind.MethodDeclaration);
if (node.flags & NodeFlags.Ambient) {
// tslint:disable-next-line no-unnecessary-type-assertion
return grammarErrorOnNode(node.asteriskToken!, Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
}
if (!node.body) {
// tslint:disable-next-line no-unnecessary-type-assertion
return grammarErrorOnNode(node.asteriskToken!, Diagnostics.An_overload_signature_cannot_be_declared_as_a_generator);
}
}
@ -30444,6 +30449,7 @@ namespace ts {
// Modifiers are never allowed on properties except for 'async' on a method declaration
if (prop.modifiers) {
// tslint:disable-next-line no-unnecessary-type-assertion
for (const mod of prop.modifiers!) { // TODO: GH#19955
if (mod.kind !== SyntaxKind.AsyncKeyword || prop.kind !== SyntaxKind.MethodDeclaration) {
grammarErrorOnNode(mod, Diagnostics._0_modifier_cannot_be_used_here, getTextOfNode(mod));

View file

@ -251,6 +251,7 @@ namespace ts {
// Explicitly do not passthru either `inline` option
});
if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === SyntaxKind.SourceFile) {
// tslint:disable-next-line no-unnecessary-type-assertion
const sourceFile = declarationTransform.transformed[0] as SourceFile;
exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
}

View file

@ -3489,10 +3489,12 @@ namespace ts {
}
if (member.kind === SyntaxKind.GetAccessor && !getAccessor) {
// tslint:disable-next-line no-unnecessary-type-assertion
getAccessor = <GetAccessorDeclaration>member;
}
if (member.kind === SyntaxKind.SetAccessor && !setAccessor) {
// tslint:disable-next-line no-unnecessary-type-assertion
setAccessor = <SetAccessorDeclaration>member;
}
}