From 09baf958e826eed5b69e24aa82a4f2c866036b3c Mon Sep 17 00:00:00 2001 From: Daniel Harvey Date: Sat, 11 Jun 2022 23:14:13 +0800 Subject: [PATCH] fix(core): Add missing `formatFiles` to migrations Fixes nrwl/nx#10665 --- .../update-14.1.5-beta.0/update-swcrc-path.ts | 11 ++++++++++- .../nx-plugin/src/generators/migration/migration.ts | 3 +++ .../src/migrations/update-14-2-0/add-json-schema.ts | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/packages/js/src/migrations/update-14.1.5-beta.0/update-swcrc-path.ts b/packages/js/src/migrations/update-14.1.5-beta.0/update-swcrc-path.ts index 99faf583e5f31..6fe831cbea45a 100644 --- a/packages/js/src/migrations/update-14.1.5-beta.0/update-swcrc-path.ts +++ b/packages/js/src/migrations/update-14.1.5-beta.0/update-swcrc-path.ts @@ -1,4 +1,5 @@ import { + formatFiles, joinPathFragments, readProjectConfiguration, Tree, @@ -9,7 +10,9 @@ import { SwcExecutorOptions } from '../../utils/schema'; type OldSwcExecutorOptions = SwcExecutorOptions & { swcrcPath?: string }; -export function updateSwcrcPath(tree: Tree) { +export async function updateSwcrcPath(tree: Tree) { + let changesMade = false; + forEachExecutorOptions( tree, '@nrwl/js:swc', @@ -30,8 +33,14 @@ export function updateSwcrcPath(tree: Tree) { executorOptions.swcrc = newSwcrcPath; updateProjectConfiguration(tree, projectName, projectConfig); + + changesMade = true; } ); + + if (changesMade) { + await formatFiles(tree); + } } export default updateSwcrcPath; diff --git a/packages/nx-plugin/src/generators/migration/migration.ts b/packages/nx-plugin/src/generators/migration/migration.ts index f3dd275d6b053..45f8bcf4b8ae9 100644 --- a/packages/nx-plugin/src/generators/migration/migration.ts +++ b/packages/nx-plugin/src/generators/migration/migration.ts @@ -8,6 +8,7 @@ import { readJson, writeJson, joinPathFragments, + formatFiles, } from '@nrwl/devkit'; import type { Tree } from '@nrwl/devkit'; import type { Schema } from './schema'; @@ -152,6 +153,8 @@ export async function migrationGenerator(host: Tree, schema: Schema) { readJson(host, packageJsonPath) ); } + + await formatFiles(host); } export default migrationGenerator; diff --git a/packages/nx/src/migrations/update-14-2-0/add-json-schema.ts b/packages/nx/src/migrations/update-14-2-0/add-json-schema.ts index 51e1f2128a5b3..50c6bf2b51e9b 100644 --- a/packages/nx/src/migrations/update-14-2-0/add-json-schema.ts +++ b/packages/nx/src/migrations/update-14-2-0/add-json-schema.ts @@ -1,3 +1,4 @@ +import { formatChangedFilesWithPrettierIfAvailable } from 'nx/src/generators/internal-utils/format-changed-files-with-prettier-if-available'; import { ProjectConfiguration } from '../../config/workspace-json-project-json'; import type { Tree } from '../../generators/tree'; import { updateJson } from '../../generators/utils/json'; @@ -43,4 +44,6 @@ export default async function (tree: Tree) { ...projConfig, } as ProjectConfiguration); } + + await formatChangedFilesWithPrettierIfAvailable(tree); }