Merge pull request #39981 from amcasey/pinned-release-3.4
Make release-3.4 buildable
This commit is contained in:
commit
271316cfe9
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -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,7 +1,6 @@
|
|||
language: node_js
|
||||
|
||||
node_js:
|
||||
- 'node'
|
||||
- '10'
|
||||
- '8'
|
||||
|
||||
|
@ -19,7 +18,7 @@ branches:
|
|||
install:
|
||||
- npm uninstall typescript --no-save
|
||||
- npm uninstall tslint --no-save
|
||||
- npm install
|
||||
- npm ci
|
||||
|
||||
cache:
|
||||
directories:
|
||||
|
|
6765
package-lock.json
generated
Normal file
6765
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load diff
|
@ -2815,6 +2815,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);
|
||||
}
|
||||
|
|
|
@ -9825,6 +9825,7 @@ namespace ts {
|
|||
break;
|
||||
}
|
||||
}
|
||||
// tslint:disable-next-line no-unnecessary-type-assertion
|
||||
return links.resolvedType!; // TODO: GH#18217
|
||||
}
|
||||
|
||||
|
@ -26311,7 +26312,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);
|
||||
}
|
||||
}
|
||||
|
@ -30979,9 +30982,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);
|
||||
}
|
||||
}
|
||||
|
@ -31022,6 +31027,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));
|
||||
|
|
|
@ -395,6 +395,7 @@ namespace ts {
|
|||
}
|
||||
);
|
||||
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;
|
||||
}
|
||||
|
|
|
@ -3546,10 +3546,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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue