@nx/workspace 0.0.0-pr-3-ec41644 → 0.0.0-pr-29993-91cbae3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "0.0.0-pr-3-ec41644",
+  "version": "0.0.0-pr-29993-91cbae3",
   "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": {
@@ -38,12 +38,14 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-3-ec41644",
+    "@nx/devkit": "0.0.0-pr-29993-91cbae3",
+    "@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-3-ec41644"
+    "nx": "0.0.0-pr-29993-91cbae3"
   },
   "publishConfig": {
     "access": "public"

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);
@@ -35,6 +36,7 @@ function normalizeOptions(options, tree) {
     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,
@@ -47,6 +49,7 @@ function normalizeOptions(options, tree) {
         hasCypress,
         hasE2E,
         hasPlaywright,
+        hasTypecheck,
         nxCloudHost,
         tmpl: '',
         connectedToCloud,

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

@@ -68,4 +68,4 @@ jobs:
       # - 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<% 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) lint test build<% if(hasE2E){ %> e2e<% } %>
+      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>

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

@@ -33,7 +33,7 @@ pipelines:
             # <%= 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<% 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(hasE2E){ %> e2e<% } %>
+            - <%= packageManagerPrefix %> nx affected --base=origin/<%= mainBranch %> -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>
 
   branches:
     main:
@@ -59,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__

@@ -37,7 +37,7 @@ jobs:
       # - 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<% if(hasE2E){ %>
       # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
-      - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> 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__

@@ -50,4 +50,4 @@ jobs:
       # - 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<% if(hasE2E){ %>
       # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
-      - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> 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__

@@ -31,4 +31,4 @@ variables:
     # - <%= 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<% if(hasE2E){ %>
     # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
-    - <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e<% } %>
+    - <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>

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/normalize-schema.js

@@ -1,23 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSchema = normalizeSchema;
+const devkit_1 = require("@nx/devkit");
 const get_import_path_1 = require("../../../utilities/get-import-path");
 const utils_1 = require("./utils");
 const ts_solution_setup_1 = require("../../../utils/ts-solution-setup");
 async function normalizeSchema(tree, schema, projectConfiguration) {
     const { destination, newProjectName, importPath } = await determineProjectNameAndRootOptions(tree, schema, projectConfiguration);
+    const isNxConfiguredInPackageJson = !tree.exists((0, devkit_1.joinPathFragments)(projectConfiguration.root, 'project.json'));
     return {
         ...schema,
         destination: (0, utils_1.normalizePathSlashes)(schema.destination),
         importPath,
         newProjectName,
         relativeToRootDestination: destination,
+        isNxConfiguredInPackageJson,
     };
 }
 async function determineProjectNameAndRootOptions(tree, options, projectConfiguration) {
     validateName(tree, options.newProjectName, projectConfiguration);
-    const projectNameAndRootOptions = getProjectNameAndRootOptions(tree, options, projectConfiguration);
-    return projectNameAndRootOptions;
+    let destination = (0, utils_1.normalizePathSlashes)(options.destination);
+    if (options.newProjectName &&
+        options.newProjectName.includes('/') &&
+        !options.newProjectName.startsWith('@')) {
+        throw new Error(`You can't specify a new project name with a directory path (${options.newProjectName}). ` +
+            `Please provide a valid name without path segments and the full destination with the "--destination" option.`);
+    }
+    const newProjectName = options.newProjectName ?? options.projectName;
+    if (projectConfiguration.projectType !== 'library') {
+        return { destination, newProjectName };
+    }
+    let importPath = options.importPath;
+    if (importPath) {
+        return { destination, newProjectName, importPath };
+    }
+    if (options.newProjectName?.startsWith('@')) {
+        // keep the existing import path if the name didn't change
+        importPath =
+            options.newProjectName && options.projectName !== options.newProjectName
+                ? newProjectName
+                : undefined;
+    }
+    else if (options.newProjectName) {
+        const npmScope = (0, get_import_path_1.getNpmScope)(tree);
+        importPath = npmScope
+            ? `${npmScope === '@' ? '' : '@'}${npmScope}/${newProjectName}`
+            : newProjectName;
+    }
+    return { destination, newProjectName, importPath };
 }
 function validateName(tree, name, projectConfiguration) {
     if (!name) {
@@ -49,39 +79,3 @@ function validateName(tree, name, projectConfiguration) {
         }
     }
 }
-function getProjectNameAndRootOptions(tree, options, projectConfiguration) {
-    let destination = (0, utils_1.normalizePathSlashes)(options.destination);
-    if (options.newProjectName &&
-        options.newProjectName.includes('/') &&
-        !options.newProjectName.startsWith('@')) {
-        throw new Error(`You can't specify a new project name with a directory path (${options.newProjectName}). ` +
-            `Please provide a valid name without path segments and the full destination with the "--destination" option.`);
-    }
-    const asProvidedOptions = getAsProvidedOptions(tree, { ...options, destination }, projectConfiguration);
-    return asProvidedOptions;
-}
-function getAsProvidedOptions(tree, options, projectConfiguration) {
-    const newProjectName = options.newProjectName ?? options.projectName;
-    const destination = options.destination;
-    if (projectConfiguration.projectType !== 'library') {
-        return { destination, newProjectName };
-    }
-    let importPath = options.importPath;
-    if (importPath) {
-        return { destination, newProjectName, importPath };
-    }
-    if (options.newProjectName?.startsWith('@')) {
-        // keep the existing import path if the name didn't change
-        importPath =
-            options.newProjectName && options.projectName !== options.newProjectName
-                ? newProjectName
-                : undefined;
-    }
-    else if (options.newProjectName) {
-        const npmScope = (0, get_import_path_1.getNpmScope)(tree);
-        importPath = npmScope
-            ? `${npmScope === '@' ? '' : '@'}${npmScope}/${newProjectName}`
-            : newProjectName;
-    }
-    return { destination, newProjectName, importPath };
-}

package/src/generators/move/move.d.ts

@@ -1,4 +1,4 @@
-import { Tree } from '@nx/devkit';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import { Schema } from './schema';
-export declare function moveGenerator(tree: Tree, rawSchema: Schema): Promise<void>;
+export declare function moveGenerator(tree: Tree, rawSchema: Schema): Promise<GeneratorCallback>;
 export default moveGenerator;

package/src/generators/move/move.js

@@ -2,8 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.moveGenerator = moveGenerator;
 const devkit_1 = require("@nx/devkit");
+const package_manager_workspaces_1 = require("../../utilities/package-manager-workspaces");
+const ts_solution_setup_1 = require("../../utilities/typescript/ts-solution-setup");
 const check_destination_1 = require("./lib/check-destination");
 const create_project_configuration_in_new_destination_1 = require("./lib/create-project-configuration-in-new-destination");
+const extract_base_configs_1 = require("./lib/extract-base-configs");
 const move_project_files_1 = require("./lib/move-project-files");
 const normalize_schema_1 = require("./lib/normalize-schema");
 const run_angular_plugin_1 = require("./lib/run-angular-plugin");
@@ -18,9 +21,9 @@ const update_package_json_1 = require("./lib/update-package-json");
 const update_project_root_files_1 = require("./lib/update-project-root-files");
 const update_readme_1 = require("./lib/update-readme");
 const update_storybook_config_1 = require("./lib/update-storybook-config");
-const extract_base_configs_1 = require("./lib/extract-base-configs");
 async function moveGenerator(tree, rawSchema) {
     let projectConfig = (0, devkit_1.readProjectConfiguration)(tree, rawSchema.projectName);
+    const wasIncludedInWorkspaces = (0, package_manager_workspaces_1.isProjectIncludedInPackageManagerWorkspaces)(tree, projectConfig.root);
     const schema = await (0, normalize_schema_1.normalizeSchema)(tree, rawSchema, projectConfig);
     (0, check_destination_1.checkDestination)(tree, schema, rawSchema.destination);
     if (projectConfig.root === '.') {
@@ -48,8 +51,23 @@ async function moveGenerator(tree, rawSchema) {
         (0, extract_base_configs_1.maybeMigrateEslintConfigIfRootProject)(tree, projectConfig);
     }
     await (0, run_angular_plugin_1.runAngularPlugin)(tree, schema);
+    let task;
+    if (wasIncludedInWorkspaces) {
+        // check if the new destination is included in the package manager workspaces
+        const isIncludedInWorkspaces = (0, package_manager_workspaces_1.isProjectIncludedInPackageManagerWorkspaces)(tree, schema.destination);
+        if (!isIncludedInWorkspaces) {
+            // the new destination is not included in the package manager workspaces
+            // so we need to add it and run a package install to ensure the symlink
+            // is created
+            await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, schema.destination);
+            task = () => (0, devkit_1.installPackagesTask)(tree, true);
+        }
+    }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
+    if (task) {
+        return task;
+    }
 }
 exports.default = moveGenerator;

package/src/generators/move/schema.d.ts

@@ -9,4 +9,5 @@ export interface Schema {
 
 export interface NormalizedSchema extends Schema {
   relativeToRootDestination: string;
+  isNxConfiguredInPackageJson?: boolean;
 }

package/src/generators/npm-package/npm-package.js

@@ -4,10 +4,9 @@ exports.npmPackageGenerator = npmPackageGenerator;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const path_1 = require("path");
-const get_import_path_1 = require("../../utilities/get-import-path");
 async function normalizeOptions(tree, options) {
-    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'library');
-    const { projectName, projectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
+    const { projectName, projectRoot, importPath } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
@@ -16,12 +15,13 @@ async function normalizeOptions(tree, options) {
         ...options,
         name: projectName,
         projectRoot,
+        importPath,
     };
 }
 function addFiles(projectRoot, tree, options) {
     const packageJsonPath = (0, path_1.join)(projectRoot, 'package.json');
     (0, devkit_1.writeJson)(tree, packageJsonPath, {
-        name: (0, get_import_path_1.getImportPath)(tree, options.name),
+        name: options.importPath,
         version: '0.0.0',
         scripts: {
             test: 'node index.js',

package/src/generators/preset/preset.js

@@ -73,6 +73,7 @@ async function createPreset(tree, options) {
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
+            useProjectJson: !options.workspaces,
         });
     }
     else if (options.preset === presets_1.Preset.ReactStandalone) {
@@ -106,6 +107,7 @@ async function createPreset(tree, options) {
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
+            useProjectJson: !options.workspaces,
         });
     }
     else if (options.preset === presets_1.Preset.RemixStandalone) {
@@ -137,6 +139,7 @@ async function createPreset(tree, options) {
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
+            useProjectJson: !options.workspaces,
         });
     }
     else if (options.preset === presets_1.Preset.VueStandalone) {
@@ -168,6 +171,7 @@ async function createPreset(tree, options) {
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
+            useProjectJson: !options.workspaces,
         });
     }
     else if (options.preset === presets_1.Preset.NuxtStandalone) {
@@ -200,6 +204,7 @@ async function createPreset(tree, options) {
             addPlugin,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
+            useProjectJson: !options.workspaces,
         });
     }
     else if (options.preset === presets_1.Preset.NextJsStandalone) {
@@ -245,6 +250,7 @@ async function createPreset(tree, options) {
             addPlugin,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
+            useProjectJson: !options.workspaces,
         });
     }
     else if (options.preset === presets_1.Preset.Express) {
@@ -258,6 +264,7 @@ async function createPreset(tree, options) {
             addPlugin,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
+            useProjectJson: !options.workspaces,
         });
     }
     else if (options.preset === presets_1.Preset.ReactNative) {
@@ -274,6 +281,7 @@ async function createPreset(tree, options) {
             bundler: options.bundler ?? 'webpack',
             useTsSolution: options.workspaces,
             formatter: options.formatter,
+            useProjectJson: !options.workspaces,
         });
     }
     else if (options.preset === presets_1.Preset.Expo) {
@@ -288,6 +296,7 @@ async function createPreset(tree, options) {
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
+            useProjectJson: !options.workspaces,
         });
     }
     else if (options.preset === presets_1.Preset.TS) {
@@ -346,6 +355,7 @@ async function createPreset(tree, options) {
             addPlugin,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
+            useProjectJson: !options.workspaces,
         });
     }
     else {

package/src/utilities/package-manager-workspaces.d.ts

@@ -0,0 +1,5 @@
+import { type Tree } from '@nx/devkit';
+export declare function isProjectIncludedInPackageManagerWorkspaces(tree: Tree, projectRoot: string): boolean;
+export declare function getPackageManagerWorkspacesPatterns(tree: Tree): string[];
+export declare function isUsingPackageManagerWorkspaces(tree: Tree): boolean;
+export declare function isWorkspacesEnabled(tree: Tree): boolean;

package/src/utilities/package-manager-workspaces.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isProjectIncludedInPackageManagerWorkspaces = isProjectIncludedInPackageManagerWorkspaces;
+exports.getPackageManagerWorkspacesPatterns = getPackageManagerWorkspacesPatterns;
+exports.isUsingPackageManagerWorkspaces = isUsingPackageManagerWorkspaces;
+exports.isWorkspacesEnabled = isWorkspacesEnabled;
+const devkit_1 = require("@nx/devkit");
+const posix_1 = require("node:path/posix");
+const package_json_1 = require("nx/src/plugins/package-json");
+const picomatch = require("picomatch");
+function isProjectIncludedInPackageManagerWorkspaces(tree, projectRoot) {
+    if (!isUsingPackageManagerWorkspaces(tree)) {
+        return false;
+    }
+    const patterns = getPackageManagerWorkspacesPatterns(tree);
+    return patterns.some((p) => picomatch(p)((0, posix_1.join)(projectRoot, 'package.json')));
+}
+function getPackageManagerWorkspacesPatterns(tree) {
+    return (0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (path) => (0, devkit_1.readJson)(tree, path, { expectComments: true }), (path) => {
+        const content = tree.read(path, 'utf-8');
+        const { load } = require('@zkochan/js-yaml');
+        return load(content, { filename: path });
+    }, (path) => tree.exists(path));
+}
+function isUsingPackageManagerWorkspaces(tree) {
+    return isWorkspacesEnabled(tree);
+}
+function isWorkspacesEnabled(tree) {
+    const packageManager = (0, devkit_1.detectPackageManager)(tree.root);
+    if (packageManager === 'pnpm') {
+        return tree.exists('pnpm-workspace.yaml');
+    }
+    // yarn and npm both use the same 'workspaces' property in package.json
+    if (tree.exists('package.json')) {
+        const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
+        return !!packageJson?.workspaces;
+    }
+    return false;
+}

package/src/utilities/typescript/ts-solution-setup.d.ts

@@ -1,2 +1,3 @@
 import { type Tree } from '@nx/devkit';
 export declare function isUsingTsSolutionSetup(tree?: Tree): boolean;
+export declare function addProjectToTsSolutionWorkspace(tree: Tree, projectDir: string): Promise<void>;

package/src/utilities/typescript/ts-solution-setup.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isUsingTsSolutionSetup = isUsingTsSolutionSetup;
+exports.addProjectToTsSolutionWorkspace = addProjectToTsSolutionWorkspace;
 const devkit_1 = require("@nx/devkit");
+const posix_1 = require("node:path/posix");
 const tree_1 = require("nx/src/generators/tree");
+const package_manager_workspaces_1 = require("../package-manager-workspaces");
 function isUsingPackageManagerWorkspaces(tree) {
     return isWorkspacesEnabled(tree);
 }
@@ -55,3 +58,48 @@ function isUsingTsSolutionSetup(tree) {
     return (isUsingPackageManagerWorkspaces(tree) &&
         isWorkspaceSetupWithTsSolution(tree));
 }
+async function addProjectToTsSolutionWorkspace(tree, projectDir) {
+    const isIncluded = (0, package_manager_workspaces_1.isProjectIncludedInPackageManagerWorkspaces)(tree, projectDir);
+    if (isIncluded) {
+        return;
+    }
+    // If dir is "libs/foo", we try to use "libs/*" but we only do it if it's
+    // safe to do so. So, we first check if adding that pattern doesn't result
+    // in extra projects being matched. If extra projects are matched, or the
+    // dir is just "foo" then we add it as is.
+    const baseDir = (0, posix_1.dirname)(projectDir);
+    let pattern = projectDir;
+    if (baseDir !== '.') {
+        const patterns = (0, package_manager_workspaces_1.getPackageManagerWorkspacesPatterns)(tree);
+        const projectsBefore = await (0, devkit_1.globAsync)(tree, patterns);
+        patterns.push(`${baseDir}/*/package.json`);
+        const projectsAfter = await (0, devkit_1.globAsync)(tree, patterns);
+        if (projectsBefore.length + 1 === projectsAfter.length) {
+            // Adding the pattern to the parent directory only results in one extra
+            // project being matched, which is the project we're adding. It's safe
+            // to add the pattern to the parent directory.
+            pattern = `${baseDir}/*`;
+        }
+    }
+    if (tree.exists('pnpm-workspace.yaml')) {
+        const { load, dump } = require('@zkochan/js-yaml');
+        const workspaceFile = tree.read('pnpm-workspace.yaml', 'utf-8');
+        const yamlData = load(workspaceFile) ?? {};
+        yamlData.packages ??= [];
+        if (!yamlData.packages.includes(pattern)) {
+            yamlData.packages.push(pattern);
+            tree.write('pnpm-workspace.yaml', dump(yamlData, { indent: 2, quotingType: '"', forceQuotes: true }));
+        }
+    }
+    else {
+        // Update package.json
+        const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
+        if (!packageJson.workspaces) {
+            packageJson.workspaces = [];
+        }
+        if (!packageJson.workspaces.includes(pattern)) {
+            packageJson.workspaces.push(pattern);
+            tree.write('package.json', JSON.stringify(packageJson, null, 2));
+        }
+    }
+}

package/src/utils/versions.d.ts

@@ -1,3 +1,3 @@
 export declare const nxVersion: any;
 export declare const typescriptVersion = "~5.7.2";
-export declare const angularCliVersion = "~19.1.0";
+export declare const angularCliVersion = "~19.2.0";

package/src/utils/versions.js

@@ -5,4 +5,4 @@ exports.nxVersion = require('../../package.json').version;
 exports.typescriptVersion = '~5.7.2';
 // TODO: remove when preset generation is reworked and
 // deps are not installed from workspace
-exports.angularCliVersion = '~19.1.0';
+exports.angularCliVersion = '~19.2.0';