@nx/workspace 20.2.0-beta.4 → 20.2.0-beta.6

package/migrations.json

@@ -50,6 +50,19 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "20.2.0": {
+      "version": "20.2.0-beta.5",
+      "x-prompt": "Do you want to update to TypeScript v5.6?",
+      "requires": {
+        "typescript": ">=5.5.0 <5.6.0"
+      },
+      "packages": {
+        "typescript": {
+          "version": "~5.6.2",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "20.2.0-beta.4",
+  "version": "20.2.0-beta.6",
   "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,12 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "20.2.0-beta.4",
+    "@nx/devkit": "20.2.0-beta.6",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "20.2.0-beta.4"
+    "nx": "20.2.0-beta.6"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/new/generate-preset.js

@@ -9,6 +9,7 @@ const get_npm_package_version_1 = require("../utils/get-npm-package-version");
 const path_1 = require("path");
 const yargsParser = require("yargs-parser");
 const child_process_1 = require("child_process");
+const installation_directory_1 = require("nx/src/utils/installation-directory");
 function addPresetDependencies(host, options) {
     const { dependencies, dev } = getPresetDependencies(options);
     return (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, dev, (0, path_1.join)(options.directory, 'package.json'));
@@ -20,17 +21,22 @@ function generatePreset(host, opts) {
             interactive: true,
         },
     });
-    const spawnOptions = {
+    const newWorkspaceRoot = (0, path_1.join)(host.root, opts.directory);
+    const forkOptions = {
         stdio: 'inherit',
-        shell: true,
-        cwd: (0, path_1.join)(host.root, opts.directory),
-        windowsHide: false,
+        cwd: newWorkspaceRoot,
     };
     const pmc = (0, devkit_1.getPackageManagerCommand)();
-    const executable = `${pmc.exec} nx`;
+    const nxInstallationPaths = (0, installation_directory_1.getNxRequirePaths)(newWorkspaceRoot);
+    const nxBinForNewWorkspaceRoot = require.resolve('nx/bin/nx', {
+        paths: nxInstallationPaths,
+    });
     const args = getPresetArgs(opts);
     return new Promise((resolve, reject) => {
-        (0, child_process_1.spawn)(executable, args, spawnOptions).on('close', (code) => {
+        // This needs to be `fork` instead of `spawn` because `spawn` is failing on Windows with pnpm + yarn
+        // The root cause is unclear. Spawn causes the `@nx/workspace:preset` generator to be called twice
+        // and the second time it fails with `Project {projectName} already exists.`
+        (0, child_process_1.fork)(nxBinForNewWorkspaceRoot, args, forkOptions).on('close', (code) => {
             if (code === 0) {
                 resolve();
             }
@@ -68,6 +74,7 @@ function generatePreset(host, opts) {
                 ? `--e2eTestRunner=${opts.e2eTestRunner}`
                 : null,
             opts.ssr ? `--ssr` : null,
+            opts.serverRouting ? `--server-routing` : null,
             opts.prefix !== undefined ? `--prefix=${opts.prefix}` : null,
             opts.nxCloudToken ? `--nxCloudToken=${opts.nxCloudToken}` : null,
             opts.formatter ? `--formatter=${opts.formatter}` : null,

package/src/generators/new/new.d.ts

@@ -20,6 +20,7 @@ interface Schema {
     packageManager?: PackageManager;
     e2eTestRunner?: 'cypress' | 'playwright' | 'detox' | 'jest' | 'none';
     ssr?: boolean;
+    serverRouting?: boolean;
     prefix?: string;
     useGitHub?: boolean;
     nxCloud?: 'yes' | 'skip' | 'circleci' | 'github';

package/src/generators/new/schema.json

@@ -83,6 +83,10 @@
       "type": "boolean",
       "default": false
     },
+    "serverRouting": {
+      "description": "Use the Angular Server Routing and App Engine APIs (Developer Preview).",
+      "type": "boolean"
+    },
     "prefix": {
       "description": "The prefix to use for Angular component and directive selectors.",
       "type": "string"

package/src/generators/preset/preset.js

@@ -32,6 +32,7 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             bundler: options.bundler,
             ssr: options.ssr,
+            serverRouting: options.serverRouting,
             prefix: options.prefix,
             nxCloudToken: options.nxCloudToken,
         });
@@ -49,6 +50,7 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             bundler: options.bundler,
             ssr: options.ssr,
+            serverRouting: options.serverRouting,
             prefix: options.prefix,
             nxCloudToken: options.nxCloudToken,
         });

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

@@ -20,6 +20,7 @@ export interface Schema {
   e2eTestRunner?: 'cypress' | 'playwright' | 'jest' | 'detox' | 'none';
   js?: boolean;
   ssr?: boolean;
+  serverRouting?: boolean;
   prefix?: string;
   nxCloudToken?: string;
 }

package/src/generators/preset/schema.json

@@ -100,6 +100,10 @@
       "type": "boolean",
       "default": false
     },
+    "serverRouting": {
+      "description": "Use the Angular Server Routing and App Engine APIs (Developer Preview).",
+      "type": "boolean"
+    },
     "prefix": {
       "description": "The prefix to use for Angular component and directive selectors.",
       "type": "string"

package/src/utils/versions.d.ts

@@ -1,3 +1,3 @@
 export declare const nxVersion: any;
-export declare const typescriptVersion = "~5.5.2";
-export declare const angularCliVersion = "~18.2.0";
+export declare const typescriptVersion = "~5.6.2";
+export declare const angularCliVersion = "~19.0.0";

package/src/utils/versions.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularCliVersion = exports.typescriptVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.typescriptVersion = '~5.5.2';
+exports.typescriptVersion = '~5.6.2';
 // TODO: remove when preset generation is reworked and
 // deps are not installed from workspace
-exports.angularCliVersion = '~18.2.0';
+exports.angularCliVersion = '~19.0.0';