@nx/workspace 21.5.0-canary.20250821-4ba2085 → 21.5.0-canary.20250823-a93e74e

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "21.5.0-canary.20250821-4ba2085",
+  "version": "21.5.0-canary.20250823-a93e74e",
   "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,17 +38,18 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "21.5.0-canary.20250821-4ba2085",
+    "@nx/devkit": "21.5.0-canary.20250823-a93e74e",
     "@zkochan/js-yaml": "0.0.7",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "picomatch": "4.0.2",
+    "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "21.5.0-canary.20250821-4ba2085"
+    "nx": "21.5.0-canary.20250823-a93e74e"
   },
   "devDependencies": {
-    "nx": "21.5.0-canary.20250821-4ba2085"
+    "nx": "21.5.0-canary.20250823-a93e74e"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/new/generate-workspace-files.d.ts

@@ -1,4 +1,4 @@
-import { Tree } from '@nx/devkit';
-import { NormalizedSchema } from './new';
+import { type Tree } from '@nx/devkit';
+import type { NormalizedSchema } from './new';
 export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSchema): Promise<string>;
 //# sourceMappingURL=generate-workspace-files.d.ts.map

package/src/generators/new/generate-workspace-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-workspace-files.d.ts","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-workspace-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EAGL,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AA2IzC,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,mBA6C1B"}
+{"version":3,"file":"generate-workspace-files.d.ts","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-workspace-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAyI9C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,mBAiD1B"}

package/src/generators/new/generate-workspace-files.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateWorkspaceFiles = generateWorkspaceFiles;
 const devkit_1 = require("@nx/devkit");
-const versions_1 = require("../../utils/versions");
-const path_1 = require("path");
-const presets_1 = require("../utils/presets");
-const default_base_1 = require("../../utilities/default-base");
 const connect_to_nx_cloud_1 = require("nx/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud");
 const url_shorten_1 = require("nx/src/nx-cloud/utilities/url-shorten");
+const path_1 = require("path");
+const semver_1 = require("semver");
+const default_base_1 = require("../../utilities/default-base");
+const versions_1 = require("../../utils/versions");
+const presets_1 = require("../utils/presets");
 // map from the preset to the name of the plugin s.t. the README can have a more
 // meaningful generator command.
 const presetToPluginMap = {
@@ -134,7 +135,12 @@ async function generateWorkspaceFiles(tree, options) {
     await createReadme(tree, options, token);
     const [packageMajor] = packageManagerVersion.split('.');
     if (options.packageManager === 'pnpm' && +packageMajor >= 7) {
-        createNpmrc(tree, options);
+        if ((0, semver_1.gte)(packageManagerVersion, '10.6.0')) {
+            addPnpmSettings(tree, options);
+        }
+        else {
+            createNpmrc(tree, options);
+        }
     }
     else if (options.packageManager === 'yarn') {
         if (+packageMajor >= 2) {
@@ -246,6 +252,11 @@ async function createReadme(tree, { name, appName, directory, preset, nxCloud, w
     });
 }
 // ensure that pnpm install add all the missing peer deps
+function addPnpmSettings(tree, options) {
+    tree.write((0, path_1.join)(options.directory, 'pnpm-workspace.yaml'), `autoInstallPeers: true
+strictPeerDependencies: false
+`);
+}
 function createNpmrc(tree, options) {
     tree.write((0, path_1.join)(options.directory, '.npmrc'), 'strict-peer-dependencies=false\nauto-install-peers=true\n');
 }
@@ -325,9 +336,18 @@ function setUpWorkspacesInPackageJson(tree, options) {
             options.workspaces)) {
         const workspaces = options.workspaceGlobs ?? ['packages/*'];
         if (options.packageManager === 'pnpm') {
-            tree.write((0, path_1.join)(options.directory, 'pnpm-workspace.yaml'), `packages: 
+            const pnpmWorkspacePath = (0, path_1.join)(options.directory, 'pnpm-workspace.yaml');
+            let content = `packages:
   ${workspaces.map((workspace) => `- "${workspace}"`).join('\n  ')}
-`);
+`;
+            if (tree.exists(pnpmWorkspacePath)) {
+                // already added to set the peer deps settings for pnpm 10.6.0+
+                const existingContent = tree.read(pnpmWorkspacePath, 'utf-8');
+                if (existingContent.trim().length) {
+                    content = `${content}\n${existingContent}`;
+                }
+            }
+            tree.write(pnpmWorkspacePath, content);
         }
         else {
             (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {

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

@@ -1 +1 @@
-{"version":3,"file":"package-manager-workspaces.d.ts","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/package-manager-workspaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAMvE,wBAAgB,2CAA2C,CACzD,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,GAClB,OAAO,CAQT;AAED,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,EAAE,CAWxE;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAEnE;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAYvD"}
+{"version":3,"file":"package-manager-workspaces.d.ts","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/package-manager-workspaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAMvE,wBAAgB,2CAA2C,CACzD,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,GAClB,OAAO,CAQT;AAED,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,EAAE,CAWxE;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAEnE;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAuBvD"}

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

@@ -28,7 +28,18 @@ function isUsingPackageManagerWorkspaces(tree) {
 function isWorkspacesEnabled(tree) {
     const packageManager = (0, devkit_1.detectPackageManager)(tree.root);
     if (packageManager === 'pnpm') {
-        return tree.exists('pnpm-workspace.yaml');
+        if (!tree.exists('pnpm-workspace.yaml')) {
+            return false;
+        }
+        try {
+            const content = tree.read('pnpm-workspace.yaml', 'utf-8');
+            const { load } = require('@zkochan/js-yaml');
+            const { packages } = load(content) ?? {};
+            return packages !== undefined;
+        }
+        catch {
+            return false;
+        }
     }
     // yarn and npm both use the same 'workspaces' property in package.json
     if (tree.exists('package.json')) {

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

@@ -1 +1 @@
-{"version":3,"file":"ts-solution-setup.d.ts","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/ts-solution-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EAEV,MAAM,YAAY,CAAC;AAgFpB,wBAAgB,sBAAsB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,OAAO,CAO3D;AAED,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,iBAuDnB"}
+{"version":3,"file":"ts-solution-setup.d.ts","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/ts-solution-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,IAAI,EAAiB,MAAM,YAAY,CAAC;AA8D3E,wBAAgB,sBAAsB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,OAAO,CAO3D;AAED,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,iBAuDnB"}

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

@@ -6,21 +6,6 @@ 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);
-}
-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;
-}
 /**
  * The TS solution setup requires:
  * - `tsconfig.base.json`: TS config with common compiler options needed by the
@@ -67,7 +52,7 @@ function isWorkspaceSetupWithTsSolution(tree) {
 }
 function isUsingTsSolutionSetup(tree) {
     tree ??= new tree_1.FsTree(devkit_1.workspaceRoot, false);
-    return (isUsingPackageManagerWorkspaces(tree) &&
+    return ((0, package_manager_workspaces_1.isUsingPackageManagerWorkspaces)(tree) &&
         isWorkspaceSetupWithTsSolution(tree));
 }
 async function addProjectToTsSolutionWorkspace(tree, projectDir) {