@nx/workspace 0.0.0-pr-31222-862e973 → 0.0.0-pr-31313-387cdca

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2024 Narwhal Technologies Inc.
+Copyright (c) 2017-2025 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -9,7 +9,7 @@
 
 [![CircleCI](https://circleci.com/gh/nrwl/nx.svg?style=svg)](https://circleci.com/gh/nrwl/nx)
 [![License](https://img.shields.io/npm/l/@nx/workspace.svg?style=flat-square)]()
-[![NPM Version](https://badge.fury.io/js/%40nrwl%2Fworkspace.svg)](https://www.npmjs.com/@nx/workspace)
+[![NPM Version](https://badge.fury.io/js/nx.svg)](https://www.npmjs.com/package/nx)
 [![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)]()
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![Join the chat at https://gitter.im/nrwl-nx/community](https://badges.gitter.im/nrwl-nx/community.svg)](https://gitter.im/nrwl-nx/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

package/generators.json

@@ -10,7 +10,7 @@
       "hidden": true
     },
     "move": {
-      "factory": "./src/generators/move/move#moveGeneratorInternal",
+      "factory": "./src/generators/move/move",
       "schema": "./src/generators/move/schema.json",
       "aliases": ["mv"],
       "description": "Move an application or library to another folder."
@@ -45,7 +45,7 @@
       "description": "Fixes projects configuration"
     },
     "npm-package": {
-      "factory": "./src/generators/npm-package/npm-package#npmPackageGeneratorInternal",
+      "factory": "./src/generators/npm-package/npm-package#npmPackageGenerator",
       "schema": "./src/generators/npm-package/schema.json",
       "description": "Create a minimal NPM package.",
       "x-type": "library"

package/index.d.ts

@@ -3,7 +3,7 @@ export { ProjectType, projectRootDir } from './src/utils/project-type';
 export { renameSync, updateJsonFile, copyFile, createDirectory, } from './src/utilities/fileutils';
 export { names } from '@nx/devkit';
 export { output } from './src/utilities/output';
-export { readWorkspaceConfig, readPackageJson, } from 'nx/src/project-graph/file-utils';
+export { readPackageJson } from 'nx/src/project-graph/file-utils';
 export { getWorkspacePath, editTarget, parseTarget, serializeTarget, } from './src/utils/cli-config-utils';
 export { Linter } from './src/utils/lint';
 export { moveGenerator } from './src/generators/move/move';

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.serializeTarget = exports.parseTarget = exports.editTarget = exports.getWorkspacePath = exports.readPackageJson = exports.readWorkspaceConfig = exports.output = exports.names = exports.createDirectory = exports.copyFile = exports.updateJsonFile = exports.renameSync = exports.projectRootDir = exports.ProjectType = exports.readTsConfig = void 0;
+exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.serializeTarget = exports.parseTarget = exports.editTarget = exports.getWorkspacePath = exports.readPackageJson = exports.output = exports.names = exports.createDirectory = exports.copyFile = exports.updateJsonFile = exports.renameSync = exports.projectRootDir = exports.ProjectType = exports.readTsConfig = void 0;
 var ts_config_1 = require("./src/utilities/ts-config");
 Object.defineProperty(exports, "readTsConfig", { enumerable: true, get: function () { return ts_config_1.readTsConfig; } });
 var project_type_1 = require("./src/utils/project-type");
@@ -16,7 +16,6 @@ Object.defineProperty(exports, "names", { enumerable: true, get: function () { r
 var output_1 = require("./src/utilities/output");
 Object.defineProperty(exports, "output", { enumerable: true, get: function () { return output_1.output; } });
 var file_utils_1 = require("nx/src/project-graph/file-utils");
-Object.defineProperty(exports, "readWorkspaceConfig", { enumerable: true, get: function () { return file_utils_1.readWorkspaceConfig; } });
 Object.defineProperty(exports, "readPackageJson", { enumerable: true, get: function () { return file_utils_1.readPackageJson; } });
 var cli_config_utils_1 = require("./src/utils/cli-config-utils");
 Object.defineProperty(exports, "getWorkspacePath", { enumerable: true, get: function () { return cli_config_utils_1.getWorkspacePath; } });

package/migrations.json

@@ -1,95 +1,41 @@
 {
-  "generators": {
-    "update-16-0-0-add-nx-packages": {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/workspace with @nx/workspace",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
-    },
-    "16-0-0-move-workspace-generators-into-local-plugin": {
-      "version": "16.0.0-beta.4",
-      "description": "Generates a plugin called 'workspace-plugin' containing your workspace generators.",
-      "cli": "nx",
-      "implementation": "./src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin"
-    },
-    "16-0-0-fix-invalid-babelrc": {
-      "version": "16.0.0-beta.9",
-      "description": "Fix .babelrc presets if it contains an invalid entry for @nx/web/babel.",
-      "cli": "nx",
-      "implementation": "./src/migrations/update-16-0-0/fix-invalid-babelrc"
-    }
-  },
+  "generators": {},
   "packageJsonUpdates": {
-    "16.1.0": {
-      "version": "16.1.0-beta.0",
-      "x-prompt": "Do you want to update to TypeScript v5.0?",
-      "requires": {
-        "typescript": ">=4.9.5 <5.0.0"
-      },
-      "packages": {
-        "typescript": {
-          "version": "~5.0.2"
-        }
-      }
-    },
-    "16.4.0": {
-      "version": "16.4.0-beta.11",
-      "x-prompt": "Do you want to update to TypeScript v5.1?",
-      "requires": {
-        "typescript": ">=5.0.0 <5.1.0"
-      },
-      "packages": {
-        "typescript": {
-          "version": "~5.1.3"
-        }
-      }
-    },
-    "17.1.0": {
-      "version": "17.1.0-beta.4",
-      "x-prompt": "Do you want to update to TypeScript v5.2?",
-      "requires": {
-        "typescript": ">=5.1.0 <5.2.0"
-      },
-      "packages": {
-        "typescript": {
-          "version": "~5.2.2"
-        }
-      }
-    },
-    "17.3.0": {
-      "version": "17.3.0-beta.10",
-      "x-prompt": "Do you want to update to TypeScript v5.3?",
+    "19.5.1": {
+      "version": "19.5.0-beta.1",
+      "x-prompt": "Do you want to update to TypeScript v5.5?",
       "requires": {
-        "typescript": ">=5.2.0 <5.3.0"
+        "typescript": ">=5.4.0 <5.5.0"
       },
       "packages": {
         "typescript": {
-          "version": "~5.3.2"
+          "version": "~5.5.2",
+          "alwaysAddToPackageJson": false
         }
       }
     },
-    "18.2.0": {
-      "version": "18.2.0-beta.0",
-      "x-prompt": "Do you want to update to TypeScript v5.4?",
+    "20.2.0": {
+      "version": "20.2.0-beta.5",
+      "x-prompt": "Do you want to update to TypeScript v5.6?",
       "requires": {
-        "typescript": ">=5.3.0 <5.4.0"
+        "typescript": ">=5.5.0 <5.6.0"
       },
       "packages": {
         "typescript": {
-          "version": "~5.4.2",
+          "version": "~5.6.2",
           "alwaysAddToPackageJson": false
         }
       }
     },
-    "19.5.1": {
-      "version": "19.5.0-beta.1",
-      "x-prompt": "Do you want to update to TypeScript v5.5?",
+    "20.4.0": {
+      "version": "20.4.0-beta.1",
+      "x-prompt": "Do you want to update to TypeScript v5.7?",
       "requires": {
-        "typescript": ">=5.4.0 <5.5.0"
+        "typescript": ">=5.6.0 <5.7.0"
       },
       "packages": {
         "typescript": {
-          "version": "~5.5.2",
+          "version": "~5.7.2",
           "alwaysAddToPackageJson": false
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "0.0.0-pr-31222-862e973",
+  "version": "0.0.0-pr-31313-387cdca",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -33,45 +33,23 @@
     "requirements": {},
     "migrations": "./migrations.json",
     "packageGroup": {
-      "@nrwl/js": "*",
-      "@nrwl/jest": "*",
-      "@nrwl/linter": "*",
-      "@nrwl/angular": "*",
-      "@nrwl/cypress": "*",
-      "@nrwl/detox": "*",
-      "@nrwl/devkit": "*",
-      "@nrwl/esbuild": "*",
-      "@nrwl/eslint-plugin-nx": "*",
-      "@nrwl/expo": "*",
-      "@nrwl/express": "*",
-      "@nrwl/nest": "*",
-      "@nrwl/next": "*",
-      "@nrwl/node": "*",
       "nx-cloud": "latest",
-      "@nrwl/nx-plugin": "*",
-      "@nrwl/react-native": "*",
-      "@nrwl/react": "*",
-      "@nrwl/rollup": "*",
-      "@nrwl/storybook": "*",
-      "@nrwl/tao": "*",
-      "@nrwl/vite": "*",
-      "@nrwl/web": "*",
-      "@nrwl/webpack": "*",
       "nx": "*"
     }
   },
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-31222-862e973",
+    "@nx/devkit": "0.0.0-pr-31313-387cdca",
+    "@zkochan/js-yaml": "0.0.7",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
+    "picomatch": "4.0.2",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "0.0.0-pr-31222-862e973",
-    "@nrwl/workspace": "0.0.0-pr-31222-862e973"
+    "nx": "0.0.0-pr-31313-387cdca"
   },
   "publishConfig": {
     "access": "public"
   },
-  "type": "commonjs",
-  "types": "./index.d.ts"
+  "types": "./index.d.ts",
+  "type": "commonjs"
 }

package/src/generators/ci-workflow/ci-workflow.js

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const default_base_1 = require("../../utilities/default-base");
 const path_1 = require("path");
 const nx_cloud_utils_1 = require("nx/src/utils/nx-cloud-utils");
+const ts_solution_setup_1 = require("../../utilities/typescript/ts-solution-setup");
 async function ciWorkflowGenerator(tree, schema) {
     const ci = schema.ci;
     const options = normalizeOptions(schema, tree);
@@ -32,7 +33,10 @@ function normalizeOptions(options, tree) {
         ...packageJson.dependencies,
         ...packageJson.devDependencies,
     };
-    const hasE2E = allDependencies['@nx/cypress'] || allDependencies['@nx/playwright'];
+    const hasCypress = allDependencies['@nx/cypress'];
+    const hasPlaywright = allDependencies['@nx/playwright'];
+    const hasE2E = hasCypress || hasPlaywright;
+    const hasTypecheck = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
     const connectedToCloud = (0, nx_cloud_utils_1.isNxCloudUsed)((0, devkit_1.readJson)(tree, 'nx.json'));
     return {
         workflowName,
@@ -42,7 +46,11 @@ function normalizeOptions(options, tree) {
         packageManagerPrefix,
         packageManagerPreInstallPrefix,
         mainBranch: (0, default_base_1.deduceDefaultBase)(),
+        packageManagerVersion: packageJson?.packageManager?.split('@')[1],
+        hasCypress,
         hasE2E,
+        hasPlaywright,
+        hasTypecheck,
         nxCloudHost,
         tmpl: '',
         connectedToCloud,

package/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__

@@ -23,6 +23,7 @@ jobs:
     steps:
       - checkout: self
         fetchDepth: 0
+        fetchFilter: tree:0
       # Set Azure Devops CLI default settings
       - bash: az devops configure --defaults organization=$(System.TeamFoundationCollectionUri) project=$(System.TeamProject)
         displayName: 'Set default Azure DevOps organization and project'
@@ -55,15 +56,17 @@ jobs:
       # This enables task distribution via Nx Cloud
       # Run this command as early as possible, before dependencies are installed
       # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
-      <% if (connectedToCloud) { %>- script: <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
-      <% } else { %># Connect your workspace by running "nx connect" and uncomment this
+      <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
       # - script: <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
-      <% } %>
-      - script: <%= packageManagerInstall %>
+
+      - script: <%= packageManagerInstall %><% if(hasCypress){ %>
+      - script: <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
+      - script: <%= packageManagerPrefix %> playwright install --with-deps<% } %>
       - script: git branch --track <%= mainBranch %> origin/<%= mainBranch %>
         condition: eq(variables['Build.Reason'], 'PullRequest')
 
       # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
       # - script: <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
-      # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected
-      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) lint test build<% if(hasE2E){ %> e2e-ci<% } %>
+      # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected<% if(hasE2E){ %>
+      # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
+      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>

package/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__

@@ -22,17 +22,18 @@ pipelines:
             # This enables task distribution via Nx Cloud
             # Run this command as early as possible, before dependencies are installed
             # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
-            <% if (connectedToCloud) { %>- <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
-            <% } else { %># Connect your workspace by running "nx connect" and uncomment this
+            <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
             # - <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
-            <% } %>
-            - <%= packageManagerInstall %>
+
+            - <%= packageManagerInstall %><% if(hasCypress){ %>
+            - <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
+            - <%= packageManagerPrefix %> playwright install --with-deps<% } %>
 
             # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
             # <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
-            # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected
-            - <%= packageManagerPrefix %> nx affected --base=origin/<%= mainBranch %> -t lint test build<% if(hasE2E){ %>
-            - <%= packageManagerPrefix %> nx affected --base=origin/<%= mainBranch %> --parallel 1 -t e2e-ci<% } %>
+            # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected<% if(hasE2E){ %>
+            # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
+            - <%= packageManagerPrefix %> nx affected --base=origin/<%= mainBranch %> -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>
 
   branches:
     main:
@@ -58,4 +59,4 @@ pipelines:
             # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
             # - <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
             # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected
-            - <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e-ci<% } %> --base=HEAD~1
+            - <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e-ci<% } %> --base=HEAD~1

package/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__

@@ -24,18 +24,20 @@ jobs:
       # This enables task distribution via Nx Cloud
       # Run this command as early as possible, before dependencies are installed
       # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
-      <% if (connectedToCloud) { %>- run: <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
-      <% } else { %># Connect your workspace by running "nx connect" and uncomment this
+      <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
       # - run: <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
-      <% } %>
-      - run: <%= packageManagerInstall %>
+
+      - run: <%= packageManagerInstall %><% if(hasCypress){ %>
+      - run: <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
+      - run: <%= packageManagerPrefix %> playwright install --with-deps<% } %>
       - nx/set-shas:
           main-branch-name: '<%= mainBranch %>'
 
       # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
       # - run: <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
-      # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected
-      - run: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>
+      # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected<% if(hasE2E){ %>
+      # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
+      - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>
 
 workflows:
   version: 2

package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__

@@ -16,36 +16,42 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          filter: tree:0
           fetch-depth: 0
-      <% if(packageManager == 'pnpm'){ %>
-      - uses: pnpm/action-setup@v4
-        with:
-          version: 9
-      <% } %>
-      <% if(packageManager == 'bun'){ %>
+
+      <% if(packageManager === 'bun'){ %>
       - uses: oven-sh/setup-bun@v1
         with:
           bun-version: latest
+      <% } else if (packageManager === 'yarn' && packageManagerVersion) { %>
+      - run: corepack enable
+      <% } else if(packageManager ==='pnpm'){ %>
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
+        with:<% if (!packageManagerVersion) { %>
+          version: 9.8.0<% } %>
+          run_install: false
       <% } %>
-
       # This enables task distribution via Nx Cloud
       # Run this command as early as possible, before dependencies are installed
       # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
-      <% if (connectedToCloud) { %>- run: <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
-      <% } else { %># Connect your workspace by running "nx connect" and uncomment this
+      <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
       # - run: <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
-      <% } %>
-      <% if(packageManager != 'bun'){ %>
+
+      <% if(packageManager !== 'bun'){ %>
       # Cache node_modules
       - uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: '<%= packageManager %>'
        <% } %>
-      - run: <%= packageManagerInstall %>
+      - run: <%= packageManagerInstall %><% if(hasCypress){ %>
+      - run: <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
+      - run: <%= packageManagerPrefix %> playwright install --with-deps<% } %>
       - uses: nrwl/nx-set-shas@v4
 
       # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
       # - run: <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
-      # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected
-      - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>
+      # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected<% if(hasE2E){ %>
+      # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
+      - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>

package/src/generators/ci-workflow/files/gitlab/.gitlab-ci.yml__tmpl__

@@ -18,15 +18,17 @@ variables:
     # This enables task distribution via Nx Cloud
     # Run this command as early as possible, before dependencies are installed
     # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
-    <% if (connectedToCloud) { %>- <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
-    <% } else { %># Connect your workspace by running "nx connect" and uncomment this
+    <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
     # - <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
-    <% } %>
-    - <%= packageManagerInstall %>
+
+    - <%= packageManagerInstall %><% if(hasCypress){ %>
+    - <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
+    - <%= packageManagerPrefix %> playwright install --with-deps<% } %>
     - NX_HEAD=$CI_COMMIT_SHA
     - NX_BASE=${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$CI_COMMIT_BEFORE_SHA}
 
     # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
     # - <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
-    # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected
-    - <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>
+    # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected<% if(hasE2E){ %>
+    # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
+    - <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>

package/src/generators/convert-to-monorepo/convert-to-monorepo.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.monorepoGenerator = monorepoGenerator;
 const devkit_1 = require("@nx/devkit");
 const move_1 = require("../move/move");
+const ts_solution_setup_1 = require("../../utils/ts-solution-setup");
 async function monorepoGenerator(tree, options) {
     const projects = (0, devkit_1.getProjects)(tree);
     const nxJson = (0, devkit_1.readNxJson)(tree);
@@ -22,7 +23,8 @@ async function monorepoGenerator(tree, options) {
     // Currently, Nx only handles apps+libs or packages. You cannot mix and match them.
     // If the standalone project is an app (React, Angular, etc), then use apps+libs.
     // Otherwise, for TS standalone (lib), use packages.
-    const isRootProjectApp = rootProject.projectType === 'application';
+    const isRootProjectApp = (0, ts_solution_setup_1.getProjectType)(tree, rootProject.root, rootProject.projectType) ===
+        'application';
     const appsDir = isRootProjectApp ? 'apps' : 'packages';
     const libsDir = isRootProjectApp ? 'libs' : 'packages';
     if (rootProject) {
@@ -38,14 +40,14 @@ async function monorepoGenerator(tree, options) {
         });
     }
     for (const project of projectsToMove) {
+        const projectType = (0, ts_solution_setup_1.getProjectType)(tree, project.root, project.projectType);
         await (0, move_1.moveGenerator)(tree, {
             projectName: project.name,
             newProjectName: project.name,
-            destination: project.projectType === 'application'
+            destination: projectType === 'application'
                 ? (0, devkit_1.joinPathFragments)(appsDir, project.root === '.' ? project.name : project.root)
                 : (0, devkit_1.joinPathFragments)(libsDir, project.root === '.' ? project.name : project.root),
-            updateImportPath: project.projectType === 'library',
-            projectNameAndRootFormat: 'as-provided',
+            updateImportPath: projectType === 'library',
         });
     }
 }

package/src/generators/move/lib/create-project-configuration-in-new-destination.js

@@ -48,6 +48,12 @@ function createProjectConfigurationInNewDestination(tree, schema, projectConfig)
     if (isRootProject && projectConfig.sourceRoot) {
         newProject.sourceRoot = (0, devkit_1.joinPathFragments)(schema.relativeToRootDestination, projectConfig.sourceRoot);
     }
-    // Create a new project with the root replaced
-    (0, devkit_1.addProjectConfiguration)(tree, schema.newProjectName, newProject);
+    if (schema.isNxConfiguredInPackageJson) {
+        // Update the existing project configuration in the package.json
+        (0, devkit_1.updateProjectConfiguration)(tree, schema.newProjectName, newProject);
+    }
+    else {
+        // Create a new project with the root replaced
+        (0, devkit_1.addProjectConfiguration)(tree, schema.newProjectName, newProject);
+    }
 }

package/src/generators/move/lib/move-project-files.js

@@ -19,6 +19,7 @@ function moveProjectFiles(tree, schema, project) {
         '.babelrc',
         '.eslintrc.json',
         'eslint.config.js',
+        'eslint.config.cjs',
         /^jest\.config\.((app|lib)\.)?[jt]s$/,
         'vite.config.ts',
         /^webpack.*\.js$/,