Skip to content

Commit 91b9d28

Browse files
committed
feat(@angular/cli): integrate file formatting into update migrations
This adds formatting to `ng update`
1 parent eb9c003 commit 91b9d28

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

packages/angular/cli/src/command-builder/schematics-command-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import { EventCustomDimension } from '../analytics/analytics-parameters';
2020
import { getProjectByCwd, getSchematicDefaults } from '../utilities/config';
2121
import { assertIsError } from '../utilities/error';
2222
import { memoize } from '../utilities/memoize';
23+
import { formatFiles } from '../utilities/prettier';
2324
import { isTTY } from '../utilities/tty';
2425
import {
2526
CommandModule,
@@ -29,7 +30,6 @@ import {
2930
OtherOptions,
3031
} from './command-module';
3132
import { Option, parseJsonSchemaToOptions } from './utilities/json-schema';
32-
import { formatFiles } from './utilities/prettier';
3333
import { SchematicEngineHost } from './utilities/schematic-engine-host';
3434
import { subscribeToWorkflow } from './utilities/schematic-workflow';
3535

packages/angular/cli/src/commands/update/utilities/migration.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { subscribeToWorkflow } from '../../../command-builder/utilities/schemati
1919
import { colors, figures } from '../../../utilities/color';
2020
import { assertIsError } from '../../../utilities/error';
2121
import { writeErrorToLogFile } from '../../../utilities/log-file';
22+
import { formatFiles } from '../../../utilities/prettier';
2223
import { askChoices } from '../../../utilities/prompt';
2324
import { isTTY } from '../../../utilities/tty';
2425
import { coerceVersionNumber } from './cli-version';
@@ -230,6 +231,18 @@ async function executePackageMigrations(
230231
break;
231232
}
232233

234+
if (files.size) {
235+
try {
236+
await formatFiles(process.cwd(), files);
237+
} catch (error) {
238+
assertIsError(error);
239+
240+
logger.warn(
241+
`WARNING: Formatting of files failed with the following error: ${error.message}`,
242+
);
243+
}
244+
}
245+
233246
logger.info(` Migration completed (${modifiedFilesText}).`);
234247

235248
// Commit migration

packages/angular/cli/src/command-builder/utilities/prettier.ts renamed to packages/angular/cli/src/utilities/prettier.ts

File renamed without changes.

0 commit comments

Comments
 (0)