Skip to content

Commit 0aee256

Browse files
filipesilvafilipesilva
committed
feat: typescript 3.6 support followup
1 parent 346c13b commit 0aee256

7 files changed

Lines changed: 8 additions & 14 deletions

File tree

‎packages/compiler-cli/ngcc/src/host/commonjs_host.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ export class CommonJsReflectionHost extends Esm5ReflectionHost {
186186
return moduleInfo && this.program.getSourceFile(absoluteFrom(moduleInfo.resolvedFileName));
187187
} else {
188188
const moduleInfo =
189-
ts.resolveModuleName(moduleName, containingFile.fileName, this.compilerHost);
189+
ts.resolveModuleName(moduleName, containingFile.fileName, this.program.getCompilerOptions(), this.compilerHost);
190190
return moduleInfo.resolvedModule &&
191191
this.program.getSourceFile(absoluteFrom(moduleInfo.resolvedModule.resolvedFileName));
192192
}

‎packages/compiler-cli/src/ngtsc/shims/src/host.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,11 @@ export class GeneratedShimsHostWrapper implements ts.CompilerHost {
5656
}
5757
}
5858

59-
<<<<<<< HEAD
60-
=======
6159
resolveModuleNames?:
6260
(moduleNames: string[], containingFile: string, reusedNames: string[],
6361
redirectedReference: ts.ResolvedProjectReference,
6462
options: ts.CompilerOptions) => (ts.ResolvedModule | undefined)[];
6563

66-
>>>>>>> feat: typescript 3.6 support
6764
resolveTypeReferenceDirectives?:
6865
(names: string[], containingFile: string) => ts.ResolvedTypeReferenceDirective[];
6966

‎packages/compiler-cli/src/transformers/api.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const SOURCE = 'angular' as 'angular';
1616
export interface DiagnosticMessageChain {
1717
messageText: string;
1818
position?: Position;
19-
next?: DiagnosticMessageChain;
19+
next?: DiagnosticMessageChain[];
2020
}
2121

2222
export interface Diagnostic {

‎packages/core/src/render3/interfaces/definition.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,10 @@ export interface DirectiveType<T> extends Type<T> {
8181
ngFactoryDef: () => T;
8282
}
8383

84-
<<<<<<< HEAD
8584
export enum DirectiveDefFlags {
8685
ContentQuery = 0b10
8786
}
8887

89-
=======
90-
>>>>>>> feat: typescript 3.6 support
9188
/**
9289
* A subclass of `Type` which has a static `ngPipeDef`:`PipeDef` field making it
9390
* consumable for rendering.

‎packages/core/test/application_ref_spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ class SomeComponent {
375375
}, 1);
376376

377377
const compilerFactory: CompilerFactory =
378-
defaultPlatform.injector.get(CompilerFactory, null);
378+
defaultPlatform.injector.get(CompilerFactory, null)!;
379379
const moduleFactory = compilerFactory.createCompiler().compileModuleSync(
380380
createModule([{provide: APP_INITIALIZER, useValue: () => promise, multi: true}]));
381381
defaultPlatform.bootstrapModuleFactory(moduleFactory).then(_ => {
@@ -385,7 +385,7 @@ class SomeComponent {
385385

386386
it('should rethrow sync errors even if the exceptionHandler is not rethrowing', async(() => {
387387
const compilerFactory: CompilerFactory =
388-
defaultPlatform.injector.get(CompilerFactory, null);
388+
defaultPlatform.injector.get(CompilerFactory, null)!;
389389
const moduleFactory = compilerFactory.createCompiler().compileModuleSync(createModule(
390390
[{provide: APP_INITIALIZER, useValue: () => { throw 'Test'; }, multi: true}]));
391391
expect(() => defaultPlatform.bootstrapModuleFactory(moduleFactory)).toThrow('Test');
@@ -397,7 +397,7 @@ class SomeComponent {
397397
it('should rethrow promise errors even if the exceptionHandler is not rethrowing',
398398
async(() => {
399399
const compilerFactory: CompilerFactory =
400-
defaultPlatform.injector.get(CompilerFactory, null);
400+
defaultPlatform.injector.get(CompilerFactory, null)!;
401401
const moduleFactory = compilerFactory.createCompiler().compileModuleSync(createModule(
402402
[{provide: APP_INITIALIZER, useValue: () => Promise.reject('Test'), multi: true}]));
403403
defaultPlatform.bootstrapModuleFactory(moduleFactory)

‎packages/language-service/src/types.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ export interface DiagnosticMessageChain {
295295
/**
296296
* The next message in the chain.
297297
*/
298-
next?: DiagnosticMessageChain;
298+
next?: DiagnosticMessageChain[];
299299
}
300300

301301
/**

‎packages/platform-server/test/integration_spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ class HiddenModule {
628628
it('using renderModuleFactory should work',
629629
async(inject([PlatformRef], (defaultPlatform: PlatformRef) => {
630630
const compilerFactory: CompilerFactory =
631-
defaultPlatform.injector.get(CompilerFactory, null);
631+
defaultPlatform.injector.get(CompilerFactory, null)!;
632632
const moduleFactory =
633633
compilerFactory.createCompiler().compileModuleSync(AsyncServerModule);
634634
renderModuleFactory(moduleFactory, {document: doc}).then(output => {
@@ -836,7 +836,7 @@ class HiddenModule {
836836
it('adds transfer script tag when using renderModuleFactory',
837837
async(inject([PlatformRef], (defaultPlatform: PlatformRef) => {
838838
const compilerFactory: CompilerFactory =
839-
defaultPlatform.injector.get(CompilerFactory, null);
839+
defaultPlatform.injector.get(CompilerFactory, null)!;
840840
const moduleFactory =
841841
compilerFactory.createCompiler().compileModuleSync(TransferStoreModule);
842842
renderModuleFactory(moduleFactory, {document: '<app></app>'}).then(output => {

0 commit comments

Comments
 (0)