fix(core): restore older nx core migrations for repair (#31254)

<!-- Please make sure you have read the submission guidelines before
posting an PR -->
<!--
https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-a-pr
-->

<!-- Please make sure that your commit message follows our format -->
<!-- Example: `fix(nx): must begin with lowercase` -->

<!-- If this is a particularly complex change or feature addition, you
can request a dedicated Nx release for this pull request branch. Mention
someone from the Nx team or the `@nrwl/nx-pipelines-reviewers` and they
will confirm if the PR warrants its own release for testing purposes,
and generate it for you if appropriate. -->

## Current Behavior
<!-- This is the behavior we have today -->

These migrations should not have been removed as part of the Nx 21
update

## Expected Behavior
<!-- This is the behavior we should expect with the changes in this PR
-->

The migrations are restored

## Related Issue(s)
<!-- Please link the issue being fixed so it gets closed when this is
merged. -->

Fixes #

Author: FrozenPandaz

docs/generated/manifests/nx-api.json

@@ -3503,6 +3503,66 @@
         "originalFilePath": "/packages/nx",
         "path": "/nx-api/nx/migrations/19-2-0-move-graph-cache-directory",
         "type": "migration"
+      },
+      "/nx-api/nx/migrations/move-default-base-to-nx-json-root": {
+        "description": "Moves affected.defaultBase to defaultBase in `nx.json`",
+        "file": "generated/packages/nx/migrations/move-default-base-to-nx-json-root.json",
+        "hidden": false,
+        "name": "move-default-base-to-nx-json-root",
+        "version": "18.1.0-beta.3",
+        "originalFilePath": "/packages/nx",
+        "path": "/nx-api/nx/migrations/move-default-base-to-nx-json-root",
+        "type": "migration"
+      },
+      "/nx-api/nx/migrations/18.0.0-disable-adding-plugins-for-existing-workspaces": {
+        "description": "Updates nx.json to disabled adding plugins when generating projects in an existing Nx workspace",
+        "file": "generated/packages/nx/migrations/18.0.0-disable-adding-plugins-for-existing-workspaces.json",
+        "hidden": false,
+        "name": "18.0.0-disable-adding-plugins-for-existing-workspaces",
+        "version": "18.0.0-beta.2",
+        "originalFilePath": "/packages/nx",
+        "path": "/nx-api/nx/migrations/18.0.0-disable-adding-plugins-for-existing-workspaces",
+        "type": "migration"
+      },
+      "/nx-api/nx/migrations/17.3.0-update-nx-wrapper": {
+        "description": "Updates the nx wrapper.",
+        "file": "generated/packages/nx/migrations/17.3.0-update-nx-wrapper.json",
+        "hidden": false,
+        "name": "17.3.0-update-nx-wrapper",
+        "version": "17.3.0-beta.6",
+        "originalFilePath": "/packages/nx",
+        "path": "/nx-api/nx/migrations/17.3.0-update-nx-wrapper",
+        "type": "migration"
+      },
+      "/nx-api/nx/migrations/rm-default-collection-npm-scope": {
+        "description": "Migration for v17.0.0-rc.1",
+        "file": "generated/packages/nx/migrations/rm-default-collection-npm-scope.json",
+        "hidden": false,
+        "name": "rm-default-collection-npm-scope",
+        "version": "17.0.0-rc.1",
+        "originalFilePath": "/packages/nx",
+        "path": "/nx-api/nx/migrations/rm-default-collection-npm-scope",
+        "type": "migration"
+      },
+      "/nx-api/nx/migrations/17.0.0-use-minimal-config-for-tasks-runner-options": {
+        "description": "Use minimal config for tasksRunnerOptions",
+        "file": "generated/packages/nx/migrations/17.0.0-use-minimal-config-for-tasks-runner-options.json",
+        "hidden": false,
+        "name": "17.0.0-use-minimal-config-for-tasks-runner-options",
+        "version": "17.0.0-beta.3",
+        "originalFilePath": "/packages/nx",
+        "path": "/nx-api/nx/migrations/17.0.0-use-minimal-config-for-tasks-runner-options",
+        "type": "migration"
+      },
+      "/nx-api/nx/migrations/17.0.0-move-cache-directory": {
+        "description": "Updates the default cache directory to .nx/cache",
+        "file": "generated/packages/nx/migrations/17.0.0-move-cache-directory.json",
+        "hidden": false,
+        "name": "17.0.0-move-cache-directory",
+        "version": "17.0.0-beta.1",
+        "originalFilePath": "/packages/nx",
+        "path": "/nx-api/nx/migrations/17.0.0-move-cache-directory",
+        "type": "migration"
       }
     },
     "path": "/nx-api/nx"

docs/generated/packages-metadata.json

@@ -3479,6 +3479,66 @@
         "originalFilePath": "/packages/nx",
         "path": "nx/migrations/19-2-0-move-graph-cache-directory",
         "type": "migration"
+      },
+      {
+        "description": "Moves affected.defaultBase to defaultBase in `nx.json`",
+        "file": "generated/packages/nx/migrations/move-default-base-to-nx-json-root.json",
+        "hidden": false,
+        "name": "move-default-base-to-nx-json-root",
+        "version": "18.1.0-beta.3",
+        "originalFilePath": "/packages/nx",
+        "path": "nx/migrations/move-default-base-to-nx-json-root",
+        "type": "migration"
+      },
+      {
+        "description": "Updates nx.json to disabled adding plugins when generating projects in an existing Nx workspace",
+        "file": "generated/packages/nx/migrations/18.0.0-disable-adding-plugins-for-existing-workspaces.json",
+        "hidden": false,
+        "name": "18.0.0-disable-adding-plugins-for-existing-workspaces",
+        "version": "18.0.0-beta.2",
+        "originalFilePath": "/packages/nx",
+        "path": "nx/migrations/18.0.0-disable-adding-plugins-for-existing-workspaces",
+        "type": "migration"
+      },
+      {
+        "description": "Updates the nx wrapper.",
+        "file": "generated/packages/nx/migrations/17.3.0-update-nx-wrapper.json",
+        "hidden": false,
+        "name": "17.3.0-update-nx-wrapper",
+        "version": "17.3.0-beta.6",
+        "originalFilePath": "/packages/nx",
+        "path": "nx/migrations/17.3.0-update-nx-wrapper",
+        "type": "migration"
+      },
+      {
+        "description": "Migration for v17.0.0-rc.1",
+        "file": "generated/packages/nx/migrations/rm-default-collection-npm-scope.json",
+        "hidden": false,
+        "name": "rm-default-collection-npm-scope",
+        "version": "17.0.0-rc.1",
+        "originalFilePath": "/packages/nx",
+        "path": "nx/migrations/rm-default-collection-npm-scope",
+        "type": "migration"
+      },
+      {
+        "description": "Use minimal config for tasksRunnerOptions",
+        "file": "generated/packages/nx/migrations/17.0.0-use-minimal-config-for-tasks-runner-options.json",
+        "hidden": false,
+        "name": "17.0.0-use-minimal-config-for-tasks-runner-options",
+        "version": "17.0.0-beta.3",
+        "originalFilePath": "/packages/nx",
+        "path": "nx/migrations/17.0.0-use-minimal-config-for-tasks-runner-options",
+        "type": "migration"
+      },
+      {
+        "description": "Updates the default cache directory to .nx/cache",
+        "file": "generated/packages/nx/migrations/17.0.0-move-cache-directory.json",
+        "hidden": false,
+        "name": "17.0.0-move-cache-directory",
+        "version": "17.0.0-beta.1",
+        "originalFilePath": "/packages/nx",
+        "path": "nx/migrations/17.0.0-move-cache-directory",
+        "type": "migration"
       }
     ],
     "githubRoot": "https://github.com/nrwl/nx/blob/master",

docs/generated/packages/nx/migrations/17.0.0-move-cache-directory.json

@@ -0,0 +1,13 @@
+{
+  "name": "17.0.0-move-cache-directory",
+  "cli": "nx",
+  "version": "17.0.0-beta.1",
+  "description": "Updates the default cache directory to .nx/cache",
+  "implementation": "/packages/nx/src/migrations/update-17-0-0/move-cache-directory.ts",
+  "aliases": [],
+  "hidden": false,
+  "path": "/packages/nx",
+  "schema": null,
+  "type": "migration",
+  "examplesFile": "#### Sample Code Changes\n\nAdd `.nx/cache` to the `.gitignore` file.\n\n{% tabs %}\n{% tab label=\"Before\" %}\n\n```{% fileName=\".gitignore\" %}\nnode_modules\n```\n\n{% /tab %}\n{% tab label=\"After\" %}\n\n```{% highlightLines=[2] fileName=\".gitignore\" %}\nnode_modules\n.nx/cache\n```\n\n{% /tab %}\n{% /tabs %}\n\nAdd `.nx/cache` to the `.prettierignore` file.\n\n{% tabs %}\n{% tab label=\"Before\" %}\n\n```ts {% fileName=\".prettierignore\" %}\n/dist\n```\n\n{% /tab %}\n{% tab label=\"After\" %}\n\n```ts {% highlightLines=[2] fileName=\".prettierignore\" %}\n/dist\n.nx/cache\n```\n\n{% /tab %}\n{% /tabs %}\n"
+}

docs/generated/packages/nx/migrations/17.0.0-use-minimal-config-for-tasks-runner-options.json

@@ -0,0 +1,13 @@
+{
+  "name": "17.0.0-use-minimal-config-for-tasks-runner-options",
+  "cli": "nx",
+  "version": "17.0.0-beta.3",
+  "description": "Use minimal config for tasksRunnerOptions",
+  "implementation": "/packages/nx/src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options.ts",
+  "aliases": [],
+  "hidden": false,
+  "path": "/packages/nx",
+  "schema": null,
+  "type": "migration",
+  "examplesFile": ""
+}

docs/generated/packages/nx/migrations/17.3.0-update-nx-wrapper.json

@@ -0,0 +1,13 @@
+{
+  "name": "17.3.0-update-nx-wrapper",
+  "cli": "nx",
+  "version": "17.3.0-beta.6",
+  "description": "Updates the nx wrapper.",
+  "implementation": "/packages/nx/src/migrations/update-17-3-0/update-nxw.ts",
+  "aliases": [],
+  "hidden": false,
+  "path": "/packages/nx",
+  "schema": null,
+  "type": "migration",
+  "examplesFile": ""
+}

docs/generated/packages/nx/migrations/18.0.0-disable-adding-plugins-for-existing-workspaces.json

@@ -0,0 +1,14 @@
+{
+  "name": "18.0.0-disable-adding-plugins-for-existing-workspaces",
+  "cli": "nx",
+  "version": "18.0.0-beta.2",
+  "description": "Updates nx.json to disabled adding plugins when generating projects in an existing Nx workspace",
+  "implementation": "/packages/nx/src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces.ts",
+  "x-repair-skip": true,
+  "aliases": [],
+  "hidden": false,
+  "path": "/packages/nx",
+  "schema": null,
+  "type": "migration",
+  "examplesFile": ""
+}

docs/generated/packages/nx/migrations/move-default-base-to-nx-json-root.json

@@ -0,0 +1,12 @@
+{
+  "name": "move-default-base-to-nx-json-root",
+  "version": "18.1.0-beta.3",
+  "description": "Moves affected.defaultBase to defaultBase in `nx.json`",
+  "implementation": "/packages/nx/src/migrations/update-17-2-0/move-default-base.ts",
+  "aliases": [],
+  "hidden": false,
+  "path": "/packages/nx",
+  "schema": null,
+  "type": "migration",
+  "examplesFile": ""
+}

docs/generated/packages/nx/migrations/rm-default-collection-npm-scope.json

@@ -0,0 +1,12 @@
+{
+  "name": "rm-default-collection-npm-scope",
+  "version": "17.0.0-rc.1",
+  "description": "Migration for v17.0.0-rc.1",
+  "implementation": "/packages/nx/src/migrations/update-17-0-0/rm-default-collection-npm-scope.ts",
+  "aliases": [],
+  "hidden": false,
+  "path": "/packages/nx",
+  "schema": null,
+  "type": "migration",
+  "examplesFile": ""
+}

packages/nx/migrations.json

@@ -1,5 +1,40 @@
 {
   "generators": {
+    "17.0.0-move-cache-directory": {
+      "cli": "nx",
+      "version": "17.0.0-beta.1",
+      "description": "Updates the default cache directory to .nx/cache",
+      "implementation": "./src/migrations/update-17-0-0/move-cache-directory"
+    },
+    "17.0.0-use-minimal-config-for-tasks-runner-options": {
+      "cli": "nx",
+      "version": "17.0.0-beta.3",
+      "description": "Use minimal config for tasksRunnerOptions",
+      "implementation": "./src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options"
+    },
+    "rm-default-collection-npm-scope": {
+      "version": "17.0.0-rc.1",
+      "description": "Migration for v17.0.0-rc.1",
+      "implementation": "./src/migrations/update-17-0-0/rm-default-collection-npm-scope"
+    },
+    "17.3.0-update-nx-wrapper": {
+      "cli": "nx",
+      "version": "17.3.0-beta.6",
+      "description": "Updates the nx wrapper.",
+      "implementation": "./src/migrations/update-17-3-0/update-nxw"
+    },
+    "18.0.0-disable-adding-plugins-for-existing-workspaces": {
+      "cli": "nx",
+      "version": "18.0.0-beta.2",
+      "description": "Updates nx.json to disabled adding plugins when generating projects in an existing Nx workspace",
+      "implementation": "./src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces",
+      "x-repair-skip": true
+    },
+    "move-default-base-to-nx-json-root": {
+      "version": "18.1.0-beta.3",
+      "description": "Moves affected.defaultBase to defaultBase in `nx.json`",
+      "implementation": "./src/migrations/update-17-2-0/move-default-base"
+    },
     "19-2-0-move-graph-cache-directory": {
       "cli": "nx",
       "version": "19.2.0-beta.2",

packages/nx/src/migrations/update-17-0-0/move-cache-directory.md

@@ -0,0 +1,41 @@
+#### Sample Code Changes
+
+Add `.nx/cache` to the `.gitignore` file.
+
+{% tabs %}
+{% tab label="Before" %}
+
+```{% fileName=".gitignore" %}
+node_modules
+```
+
+{% /tab %}
+{% tab label="After" %}
+
+```{% highlightLines=[2] fileName=".gitignore" %}
+node_modules
+.nx/cache
+```
+
+{% /tab %}
+{% /tabs %}
+
+Add `.nx/cache` to the `.prettierignore` file.
+
+{% tabs %}
+{% tab label="Before" %}
+
+```ts {% fileName=".prettierignore" %}
+/dist
+```
+
+{% /tab %}
+{% tab label="After" %}
+
+```ts {% highlightLines=[2] fileName=".prettierignore" %}
+/dist
+.nx/cache
+```
+
+{% /tab %}
+{% /tabs %}

packages/nx/src/migrations/update-17-0-0/move-cache-directory.spec.ts

@@ -0,0 +1,71 @@
+import { createTree } from '../../generators/testing-utils/create-tree';
+import { createTreeWithEmptyWorkspace } from '../../generators/testing-utils/create-tree-with-empty-workspace';
+import migrate from './move-cache-directory';
+
+describe('move-cache-directory', () => {
+  it('should add .nx/cache to the gitignore', () => {
+    const tree = createTreeWithEmptyWorkspace();
+    tree.write('.gitignore', 'node_modules');
+    migrate(tree);
+    expect(tree.read('.gitignore', 'utf-8')).toMatchInlineSnapshot(`
+      "node_modules
+      .nx/cache"
+    `);
+  });
+
+  it('should work if .gitignore is not present', () => {
+    const tree = createTreeWithEmptyWorkspace();
+    tree.delete('.gitignore');
+    migrate(tree);
+    expect(tree.read('.gitignore', 'utf-8')).toMatchInlineSnapshot(
+      `".nx/cache"`
+    );
+  });
+
+  it('should not change gitignore if directly ignored', () => {
+    const tree = createTreeWithEmptyWorkspace();
+    tree.write('.gitignore', 'node_modules\n.nx/cache');
+    migrate(tree);
+    expect(tree.read('.gitignore', 'utf-8')).toMatchInlineSnapshot(`
+      "node_modules
+      .nx/cache"
+    `);
+  });
+
+  it('should not change gitignore if ignored by another pattern', () => {
+    const tree = createTreeWithEmptyWorkspace();
+    tree.write('.gitignore', 'node_modules\n.*/cache');
+    migrate(tree);
+    expect(tree.read('.gitignore', 'utf-8')).toMatchInlineSnapshot(`
+      "node_modules
+      .*/cache"
+    `);
+  });
+
+  it('should not update gitignore for lerna repos without nx.json', () => {
+    const tree = createTree();
+    tree.write('.gitignore', 'node_modules');
+    tree.write('lerna.json', '{}');
+    migrate(tree);
+    expect(tree.read('.gitignore', 'utf-8')).toMatchInlineSnapshot(
+      `"node_modules"`
+    );
+  });
+
+  it('should handle prettierignore', () => {
+    const tree = createTree();
+    tree.write('.prettierignore', '/dist');
+    migrate(tree);
+    expect(tree.read('.prettierignore', 'utf-8')).toMatchInlineSnapshot(`
+      "/dist
+      /.nx/cache"
+    `);
+  });
+
+  it('should handle missing prettierignore', () => {
+    const tree = createTree();
+    tree.delete('.prettierignore');
+    migrate(tree);
+    expect(tree.exists('.prettierignore')).toBeFalsy();
+  });
+});