Skip to content

Pr 32946 followup#33027

Closed
filipesilva wants to merge 3 commits intoangular:masterfrom
filipesilva:pr32946
Closed

Pr 32946 followup#33027
filipesilva wants to merge 3 commits intoangular:masterfrom
filipesilva:pr32946

Conversation

@filipesilva
Copy link
Copy Markdown
Contributor

Followup to #32946

IgorMinar and others added 2 commits October 4, 2019 18:07
BREAKING CHANGE: typescript 3.4 and 3.5 are no longer supported, please update to typescript 3.6

Fixes #32380
@googlebot
Copy link
Copy Markdown

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

} else {
const moduleInfo =
ts.resolveModuleName(moduleName, containingFile.fileName, this.compilerHost);
ts.resolveModuleName(moduleName, containingFile.fileName, this.program.getCompilerOptions(), this.compilerHost);
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

resolveModuleName now takes the compiler options before the ModuleResolutionHost.

messageText: string;
position?: Position;
next?: DiagnosticMessageChain;
next?: DiagnosticMessageChain[];
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

ts.DiagnosticMessageChain is now a tree microsoft/TypeScript@ba9d8e2


const compilerFactory: CompilerFactory =
defaultPlatform.injector.get(CompilerFactory, null);
defaultPlatform.injector.get(CompilerFactory, null)!;
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

These could be null, but it seems like they weren't properly detected before. Since this is a spec and it was passing before, it seems ok to add a non-null assertion.

@mary-poppins
Copy link
Copy Markdown

@mary-poppins
Copy link
Copy Markdown

@filipesilva filipesilva mentioned this pull request Oct 7, 2019
3 tasks
Copy link
Copy Markdown
Contributor

@IgorMinar IgorMinar left a comment

Choose a reason for hiding this comment

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

thanks for the updates

redirectedReference: ts.ResolvedProjectReference,
options: ts.CompilerOptions) => (ts.ResolvedModule | undefined)[];

>>>>>>> feat: typescript 3.6 support
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.

oops.. rushed rebase..

}

<<<<<<< HEAD
export enum DirectiveDefFlags {
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.

I believe that this is not the right change: DirectiveDefFlags is unused, so my intent was to completely remove it.

@filipesilva
Copy link
Copy Markdown
Contributor Author

filipesilva commented Oct 8, 2019

Moved fixes and comments into #32946

@filipesilva filipesilva closed this Oct 8, 2019
@angular-automatic-lock-bot
Copy link
Copy Markdown

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot Bot locked and limited conversation to collaborators Nov 8, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants