refactor(ivy): ngcc - remove formatProperty
from EntryPointBundle
(#32052)
Remove the `formatProperty` property from the `EntryPointBundle` interface, because the property is not directly related to that type. It was only used in one place, when calling `fileWriter.writeBundle()`, but we can pass `formatProperty` directrly to `writeBundle()`. PR Close #32052
This commit is contained in:

committed by
Alex Rickabaugh

parent
ef12e10e59
commit
ed70f73794
@ -6,7 +6,7 @@
|
||||
* 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 {EntryPoint} from '../packages/entry_point';
|
||||
import {EntryPoint, EntryPointJsonProperty} from '../packages/entry_point';
|
||||
import {EntryPointBundle} from '../packages/entry_point_bundle';
|
||||
import {FileToWrite} from '../rendering/utils';
|
||||
|
||||
@ -14,6 +14,7 @@ import {FileToWrite} from '../rendering/utils';
|
||||
* Responsible for writing out the transformed files to disk.
|
||||
*/
|
||||
export interface FileWriter {
|
||||
writeBundle(entryPoint: EntryPoint, bundle: EntryPointBundle, transformedFiles: FileToWrite[]):
|
||||
void;
|
||||
writeBundle(
|
||||
entryPoint: EntryPoint, bundle: EntryPointBundle, transformedFiles: FileToWrite[],
|
||||
formatProperty: EntryPointJsonProperty): void;
|
||||
}
|
||||
|
@ -7,7 +7,7 @@
|
||||
* found in the LICENSE file at https://angular.io/license
|
||||
*/
|
||||
import {FileSystem, absoluteFrom, dirname} from '../../../src/ngtsc/file_system';
|
||||
import {EntryPoint} from '../packages/entry_point';
|
||||
import {EntryPoint, EntryPointJsonProperty} from '../packages/entry_point';
|
||||
import {EntryPointBundle} from '../packages/entry_point_bundle';
|
||||
import {FileToWrite} from '../rendering/utils';
|
||||
import {FileWriter} from './file_writer';
|
||||
@ -19,7 +19,9 @@ import {FileWriter} from './file_writer';
|
||||
export class InPlaceFileWriter implements FileWriter {
|
||||
constructor(protected fs: FileSystem) {}
|
||||
|
||||
writeBundle(_entryPoint: EntryPoint, _bundle: EntryPointBundle, transformedFiles: FileToWrite[]) {
|
||||
writeBundle(
|
||||
_entryPoint: EntryPoint, _bundle: EntryPointBundle, transformedFiles: FileToWrite[],
|
||||
_formatProperty?: EntryPointJsonProperty) {
|
||||
transformedFiles.forEach(file => this.writeFileAndBackup(file));
|
||||
}
|
||||
|
||||
|
@ -25,12 +25,14 @@ const NGCC_DIRECTORY = '__ivy_ngcc__';
|
||||
* `InPlaceFileWriter`).
|
||||
*/
|
||||
export class NewEntryPointFileWriter extends InPlaceFileWriter {
|
||||
writeBundle(entryPoint: EntryPoint, bundle: EntryPointBundle, transformedFiles: FileToWrite[]) {
|
||||
writeBundle(
|
||||
entryPoint: EntryPoint, bundle: EntryPointBundle, transformedFiles: FileToWrite[],
|
||||
formatProperty: EntryPointJsonProperty) {
|
||||
// The new folder is at the root of the overall package
|
||||
const ngccFolder = join(entryPoint.package, NGCC_DIRECTORY);
|
||||
this.copyBundle(bundle, entryPoint.package, ngccFolder);
|
||||
transformedFiles.forEach(file => this.writeFile(file, entryPoint.package, ngccFolder));
|
||||
this.updatePackageJson(entryPoint, bundle.formatProperty, ngccFolder);
|
||||
this.updatePackageJson(entryPoint, formatProperty, ngccFolder);
|
||||
}
|
||||
|
||||
protected copyBundle(
|
||||
|
Reference in New Issue
Block a user