diff --git a/packages/compiler-cli/ngcc/src/main.ts b/packages/compiler-cli/ngcc/src/main.ts index 35cec79ba7..24967430da 100644 --- a/packages/compiler-cli/ngcc/src/main.ts +++ b/packages/compiler-cli/ngcc/src/main.ts @@ -73,7 +73,7 @@ export function mainNgcc({basePath, targetEntryPointPath, propertiesToConsider = SUPPORTED_FORMAT_PROPERTIES, compileAllFormats = true, createNewEntryPointFormats = false, logger = new ConsoleLogger(LogLevel.info)}: NgccOptions): void { - const transformer = new Transformer(logger, basePath); + const transformer = new Transformer(logger); const host = new DependencyHost(); const resolver = new DependencyResolver(logger, host); const finder = new EntryPointFinder(logger, resolver); diff --git a/packages/compiler-cli/ngcc/src/packages/transformer.ts b/packages/compiler-cli/ngcc/src/packages/transformer.ts index f4a9e76753..3ca19262bf 100644 --- a/packages/compiler-cli/ngcc/src/packages/transformer.ts +++ b/packages/compiler-cli/ngcc/src/packages/transformer.ts @@ -46,7 +46,7 @@ import {EntryPointBundle} from './entry_point_bundle'; * - Some formats may contain multiple "modules" in a single file. */ export class Transformer { - constructor(private logger: Logger, private sourcePath: string) {} + constructor(private logger: Logger) {} /** * Transform the source (and typings) files of a bundle. @@ -85,9 +85,9 @@ export class Transformer { getRenderer(host: NgccReflectionHost, isCore: boolean, bundle: EntryPointBundle): Renderer { switch (bundle.format) { case 'esm2015': - return new EsmRenderer(this.logger, host, isCore, bundle, this.sourcePath); + return new EsmRenderer(this.logger, host, isCore, bundle); case 'esm5': - return new Esm5Renderer(this.logger, host, isCore, bundle, this.sourcePath); + return new Esm5Renderer(this.logger, host, isCore, bundle); default: throw new Error(`Renderer for "${bundle.format}" not yet implemented.`); } diff --git a/packages/compiler-cli/ngcc/src/rendering/esm5_renderer.ts b/packages/compiler-cli/ngcc/src/rendering/esm5_renderer.ts index 9268fef45b..7158b250a1 100644 --- a/packages/compiler-cli/ngcc/src/rendering/esm5_renderer.ts +++ b/packages/compiler-cli/ngcc/src/rendering/esm5_renderer.ts @@ -15,10 +15,8 @@ import {EntryPointBundle} from '../packages/entry_point_bundle'; import {Logger} from '../logging/logger'; export class Esm5Renderer extends EsmRenderer { - constructor( - logger: Logger, host: NgccReflectionHost, isCore: boolean, bundle: EntryPointBundle, - sourcePath: string) { - super(logger, host, isCore, bundle, sourcePath); + constructor(logger: Logger, host: NgccReflectionHost, isCore: boolean, bundle: EntryPointBundle) { + super(logger, host, isCore, bundle); } /** diff --git a/packages/compiler-cli/ngcc/src/rendering/esm_renderer.ts b/packages/compiler-cli/ngcc/src/rendering/esm_renderer.ts index 8e6b4f2f10..04a3b928f9 100644 --- a/packages/compiler-cli/ngcc/src/rendering/esm_renderer.ts +++ b/packages/compiler-cli/ngcc/src/rendering/esm_renderer.ts @@ -17,10 +17,8 @@ import {isDtsPath} from '../../../src/ngtsc/util/src/typescript'; import {Logger} from '../logging/logger'; export class EsmRenderer extends Renderer { - constructor( - logger: Logger, host: NgccReflectionHost, isCore: boolean, bundle: EntryPointBundle, - sourcePath: string) { - super(logger, host, isCore, bundle, sourcePath); + constructor(logger: Logger, host: NgccReflectionHost, isCore: boolean, bundle: EntryPointBundle) { + super(logger, host, isCore, bundle); } /** diff --git a/packages/compiler-cli/ngcc/src/rendering/renderer.ts b/packages/compiler-cli/ngcc/src/rendering/renderer.ts index 39d0a9caa1..b6016a2ce6 100644 --- a/packages/compiler-cli/ngcc/src/rendering/renderer.ts +++ b/packages/compiler-cli/ngcc/src/rendering/renderer.ts @@ -82,7 +82,7 @@ export const RedundantDecoratorMap = Map; export abstract class Renderer { constructor( protected logger: Logger, protected host: NgccReflectionHost, protected isCore: boolean, - protected bundle: EntryPointBundle, protected sourcePath: string) {} + protected bundle: EntryPointBundle) {} renderProgram( decorationAnalyses: DecorationAnalyses, switchMarkerAnalyses: SwitchMarkerAnalyses, diff --git a/packages/compiler-cli/ngcc/test/rendering/esm2015_renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/esm2015_renderer_spec.ts index d36d5838f6..c28d25edb0 100644 --- a/packages/compiler-cli/ngcc/test/rendering/esm2015_renderer_spec.ts +++ b/packages/compiler-cli/ngcc/test/rendering/esm2015_renderer_spec.ts @@ -19,7 +19,6 @@ import {MockLogger} from '../helpers/mock_logger'; function setup(file: {name: string, contents: string}) { const logger = new MockLogger(); - const dir = dirname(file.name); const bundle = makeTestEntryPointBundle('es2015', 'esm2015', false, [file]) !; const typeChecker = bundle.src.program.getTypeChecker(); const host = new Esm2015ReflectionHost(logger, false, typeChecker); @@ -30,7 +29,7 @@ function setup(file: {name: string, contents: string}) { referencesRegistry, [AbsoluteFsPath.fromUnchecked('/')], false) .analyzeProgram(); const switchMarkerAnalyses = new SwitchMarkerAnalyzer(host).analyzeProgram(bundle.src.program); - const renderer = new EsmRenderer(logger, host, false, bundle, dir); + const renderer = new EsmRenderer(logger, host, false, bundle); return { host, program: bundle.src.program, diff --git a/packages/compiler-cli/ngcc/test/rendering/esm5_renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/esm5_renderer_spec.ts index a7d7c17614..8e6e058633 100644 --- a/packages/compiler-cli/ngcc/test/rendering/esm5_renderer_spec.ts +++ b/packages/compiler-cli/ngcc/test/rendering/esm5_renderer_spec.ts @@ -19,7 +19,6 @@ import {MockLogger} from '../helpers/mock_logger'; function setup(file: {name: string, contents: string}) { const logger = new MockLogger(); - const dir = dirname(file.name); const bundle = makeTestEntryPointBundle('module', 'esm5', false, [file]); const typeChecker = bundle.src.program.getTypeChecker(); const host = new Esm5ReflectionHost(logger, false, typeChecker); @@ -30,7 +29,7 @@ function setup(file: {name: string, contents: string}) { referencesRegistry, [AbsoluteFsPath.fromUnchecked('/')], false) .analyzeProgram(); const switchMarkerAnalyses = new SwitchMarkerAnalyzer(host).analyzeProgram(bundle.src.program); - const renderer = new Esm5Renderer(logger, host, false, bundle, dir); + const renderer = new Esm5Renderer(logger, host, false, bundle); return { host, program: bundle.src.program, diff --git a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts index cea122f6af..1e9e3bd387 100644 --- a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts +++ b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts @@ -24,7 +24,7 @@ import {MockLogger} from '../helpers/mock_logger'; class TestRenderer extends Renderer { constructor( logger: Logger, host: Esm2015ReflectionHost, isCore: boolean, bundle: EntryPointBundle) { - super(logger, host, isCore, bundle, '/src'); + super(logger, host, isCore, bundle); } addImports( output: MagicString, imports: {specifier: string, qualifier: string}[], sf: ts.SourceFile) {