diff --git a/packages/compiler-cli/src/ngcc/src/rendering/esm2015_renderer.ts b/packages/compiler-cli/src/ngcc/src/rendering/esm2015_renderer.ts index 10db8b292e..d3a473a4f5 100644 --- a/packages/compiler-cli/src/ngcc/src/rendering/esm2015_renderer.ts +++ b/packages/compiler-cli/src/ngcc/src/rendering/esm2015_renderer.ts @@ -7,13 +7,10 @@ */ import * as ts from 'typescript'; import MagicString from 'magic-string'; -import {NgccReflectionHost} from '../host/ngcc_host'; import {AnalyzedClass} from '../analyzer'; import {Renderer} from './renderer'; export class Esm2015Renderer extends Renderer { - constructor(protected host: NgccReflectionHost) { super(); } - /** * Add the imports at the top of the file */ diff --git a/packages/compiler-cli/src/ngcc/src/rendering/esm5_renderer.ts b/packages/compiler-cli/src/ngcc/src/rendering/esm5_renderer.ts index 5f5d7fdec3..aadfe23a79 100644 --- a/packages/compiler-cli/src/ngcc/src/rendering/esm5_renderer.ts +++ b/packages/compiler-cli/src/ngcc/src/rendering/esm5_renderer.ts @@ -5,12 +5,6 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; -import MagicString from 'magic-string'; -import {NgccReflectionHost} from '../host/ngcc_host'; -import {AnalyzedClass, AnalyzedFile} from '../analyzer'; import {Esm2015Renderer} from './esm2015_renderer'; -export class Esm5Renderer extends Esm2015Renderer { - constructor(host: NgccReflectionHost) { super(host); } -} +export class Esm5Renderer extends Esm2015Renderer {} diff --git a/packages/compiler-cli/src/ngcc/src/rendering/renderer.ts b/packages/compiler-cli/src/ngcc/src/rendering/renderer.ts index 974d428fb8..deb60e58bb 100644 --- a/packages/compiler-cli/src/ngcc/src/rendering/renderer.ts +++ b/packages/compiler-cli/src/ngcc/src/rendering/renderer.ts @@ -5,16 +5,17 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ +import {ConstantPool, Expression, Statement, WrappedNodeExpr, WritePropExpr} from '@angular/compiler'; +import {SourceMapConverter, commentRegex, fromJSON, fromMapFileSource, fromObject, fromSource, generateMapFileComment, mapFileCommentRegex, removeComments, removeMapFileComments} from 'convert-source-map'; +import MagicString from 'magic-string'; import {dirname} from 'path'; +import {SourceMapConsumer, SourceMapGenerator, RawSourceMap} from 'source-map'; import * as ts from 'typescript'; -import MagicString from 'magic-string'; -import {commentRegex, mapFileCommentRegex, fromJSON, fromSource, fromMapFileSource, fromObject, generateMapFileComment, removeComments, removeMapFileComments, SourceMapConverter} from 'convert-source-map'; -import {SourceMapConsumer, SourceMapGenerator, RawSourceMap} from 'source-map'; -import {ConstantPool, Expression, Statement, WrappedNodeExpr, WritePropExpr} from '@angular/compiler'; -import {AnalyzedClass, AnalyzedFile} from '../analyzer'; import {Decorator} from '../../../ngtsc/host'; import {ImportManager, translateStatement} from '../../../ngtsc/transform'; +import {AnalyzedClass, AnalyzedFile} from '../analyzer'; +import {NgccReflectionHost} from '../host/ngcc_host'; interface SourceMapInfo { source: string; @@ -55,12 +56,14 @@ export interface FileInfo { } /** - * A base-class for rendering an `AnalyzedClass`. - * Package formats have output files that must be rendered differently, - * Concrete sub-classes must implement the `addImports`, `addDefinitions` and - * `removeDecorators` abstract methods. + * A base-class for rendering an `AnalyzedFile`. + * + * Package formats have output files that must be rendered differently. Concrete sub-classes must + * implement the `addImports`, `addDefinitions` and `removeDecorators` abstract methods. */ export abstract class Renderer { + constructor(protected host: NgccReflectionHost) {} + /** * Render the source code and source-map for an Analyzed file. * @param file The analyzed file to render. diff --git a/packages/compiler-cli/src/ngcc/test/rendering/renderer_spec.ts b/packages/compiler-cli/src/ngcc/test/rendering/renderer_spec.ts index 8b907f9278..003c02c22b 100644 --- a/packages/compiler-cli/src/ngcc/test/rendering/renderer_spec.ts +++ b/packages/compiler-cli/src/ngcc/test/rendering/renderer_spec.ts @@ -32,7 +32,7 @@ class TestRenderer extends Renderer { } function createTestRenderer() { - const renderer = new TestRenderer(); + const renderer = new TestRenderer({} as Esm2015ReflectionHost); spyOn(renderer, 'addImports').and.callThrough(); spyOn(renderer, 'addDefinitions').and.callThrough(); spyOn(renderer, 'removeDecorators').and.callThrough(); @@ -183,4 +183,4 @@ describe('Renderer', () => { expect(result.map !.contents).toEqual(MERGED_OUTPUT_PROGRAM_MAP.toJSON()); }); }); -}); \ No newline at end of file +});