nx 23.2.0-beta.0 → 23.2.0-beta.2

package/dist/src/command-line/migrate/migrate-ui-api.js

@@ -19,6 +19,7 @@ exports.stopMigration = stopMigration;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
+const git_revision_1 = require("../../utils/git-revision");
 const migrate_1 = require("./migrate");
 Object.defineProperty(exports, "isHybridMigration", { enumerable: true, get: function () { return migrate_1.isHybridMigration; } });
 Object.defineProperty(exports, "isPromptOnlyMigration", { enumerable: true, get: function () { return migrate_1.isPromptOnlyMigration; } });
@@ -51,6 +52,9 @@ function finishMigrationProcess(workspacePath, squashCommits, commitMessage) {
     const migrationsJsonPath = (0, path_1.join)(workspacePath, 'migrations.json');
     const parsedMigrationsJson = JSON.parse((0, fs_1.readFileSync)(migrationsJsonPath, 'utf-8'));
     const initialGitRef = parsedMigrationsJson['nx-console'].initialGitRef;
+    if (squashCommits && initialGitRef) {
+        (0, git_revision_1.assertValidGitSha)(initialGitRef.ref);
+    }
     if ((0, fs_1.existsSync)(migrationsJsonPath)) {
         (0, fs_1.rmSync)(migrationsJsonPath);
     }
@@ -59,24 +63,24 @@ function finishMigrationProcess(workspacePath, squashCommits, commitMessage) {
         encoding: 'utf-8',
         windowsHide: true,
     });
-    (0, child_process_1.execSync)(`git commit -m "${commitMessage}" --no-verify`, {
-        cwd: workspacePath,
-        encoding: 'utf-8',
-        windowsHide: true,
-    });
+    commit(workspacePath, commitMessage);
     if (squashCommits && initialGitRef) {
-        (0, child_process_1.execSync)(`git reset --soft ${initialGitRef.ref}`, {
-            cwd: workspacePath,
-            encoding: 'utf-8',
-            windowsHide: true,
-        });
-        (0, child_process_1.execSync)(`git commit -m "${commitMessage}" --no-verify`, {
+        (0, child_process_1.execFileSync)('git', ['reset', '--soft', initialGitRef.ref], {
             cwd: workspacePath,
             encoding: 'utf-8',
             windowsHide: true,
         });
+        commit(workspacePath, commitMessage);
     }
 }
+function commit(workspacePath, commitMessage) {
+    (0, child_process_1.execSync)('git commit --no-verify -F -', {
+        cwd: workspacePath,
+        encoding: 'utf-8',
+        windowsHide: true,
+        input: commitMessage,
+    });
+}
 async function runSingleMigration(workspacePath, migration, configuration) {
     try {
         // Set current migration tracking
@@ -342,7 +346,8 @@ function undoMigration(workspacePath, id) {
         // `existing.ref` is the unmodified HEAD at run time, so `ref^` would
         // reset past unrelated history. Only flip the metadata to skipped.
         if (existing.changedFiles.length > 0) {
-            (0, child_process_1.execSync)(`git reset --hard ${existing.ref}^`, {
+            (0, git_revision_1.assertValidGitSha)(existing.ref);
+            (0, child_process_1.execFileSync)('git', ['reset', '--hard', `${existing.ref}^`], {
                 cwd: workspacePath,
                 encoding: 'utf-8',
                 windowsHide: true,

package/dist/src/command-line/migrate/migrate.d.ts

@@ -1,6 +1,5 @@
 import { MigrationsJson, PackageJsonUpdateForPackage as PackageUpdate } from '../../config/misc-interfaces';
 import { NxJsonConfiguration } from '../../config/nx-json';
-import { FileChange } from '../../generators/tree';
 import { ArrayPackageGroup, PackageJson } from '../../utils/package-json';
 import { PackageManagerCommands } from '../../utils/package-manager';
 import { type MigrateFetchStats, type MigrateMultiMajorChoice } from './migrate-analytics';
@@ -10,6 +9,7 @@ import type { ResolvedAgentic } from './agentic/types';
 import { isHybridMigration, isPromptOnlyMigration } from './migration-shape';
 import { filterDowngradedUpdates } from './update-filters';
 import { normalizeVersion } from './version-utils';
+export * from './execute-migration';
 export { normalizeVersion };
 export interface ResolvedMigrationConfiguration extends MigrationsJson {
     packageGroup?: ArrayPackageGroup;
@@ -174,14 +174,6 @@ export declare function createFetcher(pmc: PackageManagerCommands): ((pkg: strin
 };
 export { filterDowngradedUpdates };
 export declare function generateMigrationsJsonAndUpdatePackageJson(root: string, opts: GenerateMigrations, fetch?: MigratorOptions['fetch']): Promise<void>;
-/**
- * Detects npm peer-dependency resolution failures. Keyed on the `ERESOLVE`
- * error code, which npm consistently emits for this class of failure across
- * v7+ (`npm ERR! code ERESOLVE` / `npm error code ERESOLVE`). Falls back to a
- * small set of stable phrases in case the code line is missing from the
- * captured output.
- */
-export declare function isNpmPeerDepsError(stderr: string): boolean;
 type ExecutableMigration = {
     package: string;
     name: string;
@@ -253,46 +245,10 @@ export declare function executeMigrations(root: string, migrations: ExecutableMi
     committedShasCount: number;
     retainedAtSuccess: string[];
 }>;
-export declare class ChangedDepInstaller {
-    private readonly root;
-    private readonly shouldSkipInstall;
-    private initialDeps;
-    private _skippedInstall;
-    constructor(root: string, shouldSkipInstall?: boolean);
-    get skippedInstall(): boolean;
-    installDepsIfChanged(): Promise<void>;
-}
-export declare function runNxOrAngularMigration(root: string, migration: {
-    package: string;
-    name: string;
-    description?: string;
-    version: string;
-}, isVerbose: boolean, captureGeneratorOutput?: boolean, resolvedCollection?: {
-    collection: MigrationsJson;
-    collectionPath: string;
-}): Promise<{
-    changes: FileChange[];
-    nextSteps: string[];
-    agentContext: string[];
-    logs: string;
-    madeChanges: boolean;
-}>;
-export declare function parseMigrationReturn(value: unknown): {
-    nextSteps: string[];
-    agentContext: string[];
-};
 export declare function migrate(root: string, args: {
     [k: string]: any;
 }, rawArgs: string[]): Promise<number>;
 export declare function runMigration(): Promise<number>;
-export declare function readMigrationCollection(packageName: string, root: string): {
-    collection: MigrationsJson;
-    collectionPath: string;
-};
-export declare function getImplementationPath(collection: MigrationsJson, collectionPath: string, name: string, migrationVersion?: string): {
-    path: string;
-    fnSymbol: string;
-};
 /**
  * Resolves a migration's collection once and derives everything the run loop
  * needs from that single read: the implementation context (`collection` +