@nx/workspace 24.0.0 → 24.0.2

package/dist/src/generators/move/lib/move-project-files.d.ts

@@ -1,5 +1,6 @@
 import { ProjectConfiguration, Tree } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
+export declare const MOVED_JEST_CONFIG_EXTENSIONS: string;
 /**
  * Moves a project to the given destination path
  *

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

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.MOVED_JEST_CONFIG_EXTENSIONS = void 0;
 exports.moveProjectFiles = moveProjectFiles;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
+exports.MOVED_JEST_CONFIG_EXTENSIONS = ['js', 'ts', 'cts'].join('|');
 /**
  * Moves a project to the given destination path
  *
@@ -20,7 +22,7 @@ function moveProjectFiles(tree, schema, project) {
         '.eslintrc.json',
         'eslint.config.js',
         'eslint.config.cjs',
-        /^jest\.config\.((app|lib)\.)?[jt]s$/,
+        new RegExp(`^jest\\.config\\.((app|lib)\\.)?(${exports.MOVED_JEST_CONFIG_EXTENSIONS})$`),
         /^vite\.config\.m?[jt]s$/,
         /^webpack.*\.js$/,
         'index.html', // Vite
@@ -44,11 +46,18 @@ function moveProjectFiles(tree, schema, project) {
             return knownRootProjectFolders.includes(baseDir);
         }
     };
+    // The workspace Jest config runs every project's config, so it stays
+    const isWorkspaceJestConfig = (file) => new RegExp(`^jest\\.config\\.(${exports.MOVED_JEST_CONFIG_EXTENSIONS})$`).test(file) && tree.read(file, 'utf-8').includes('getJestProjectsAsync()');
     (0, devkit_1.visitNotIgnoredFiles)(tree, project.root, (file) => {
-        if (project.root === '.' && !isKnownRootProjectFile(file))
+        if (project.root === '.' &&
+            (!isKnownRootProjectFile(file) || isWorkspaceJestConfig(file)))
             return;
         // This is a rename but Angular Devkit isn't capable of writing to a file after it's renamed so this is a workaround
-        const relativeFromOriginalSource = (0, path_1.relative)(project.root, file);
+        let relativeFromOriginalSource = (0, path_1.relative)(project.root, file);
+        if (project.root === '.') {
+            // Before Nx 24, @nx/jest:configuration renamed a root project's config to `jest.config.app|lib`
+            relativeFromOriginalSource = relativeFromOriginalSource.replace(new RegExp(`^jest\\.config\\.(app|lib)\\.(?=(${exports.MOVED_JEST_CONFIG_EXTENSIONS})$)`), 'jest.config.');
+        }
         const newFilePath = (0, path_1.join)(schema.relativeToRootDestination, relativeFromOriginalSource);
         const content = tree.read(file);
         tree.write(newFilePath, content);

package/dist/src/generators/move/lib/update-project-root-files.js

@@ -7,6 +7,7 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path = tslib_1.__importStar(require("path"));
 const path_1 = require("path");
+const move_project_files_1 = require("./move-project-files");
 const allowedExt = ['.ts', '.js', '.json', '.cts', '.cjs'];
 /**
  * Updates the files in the root of the project
@@ -37,6 +38,9 @@ function updateFilesForRootProjects(tree, schema, project) {
         .split(path.sep)
         // Include trailing slash because the regex matches the trailing slash in "./"
         .join('/') + '/';
+    // createProjectConfigurationInNewDestination prefixes root paths in the
+    // project configuration with the destination
+    const rootDirPrefixes = ['', './', `${schema.relativeToRootDestination}/`];
     for (const file of tree.children(schema.relativeToRootDestination)) {
         const ext = (0, path_1.extname)(file);
         if (!allowedExt.includes(ext)) {
@@ -48,7 +52,13 @@ function updateFilesForRootProjects(tree, schema, project) {
             continue;
         }
         const oldContent = tree.read((0, path_1.join)(schema.relativeToRootDestination, file), 'utf-8');
-        let newContent = oldContent.replace(regex, newRelativeRoot);
+        let newContent = oldContent
+            .replace(regex, newRelativeRoot)
+            // The moved config is `jest.config.<ext>`, so plain `jest` merges with the
+            // target @nx/jest/plugin infers at the new root
+            .replace(new RegExp(`(["'\`])jest --config jest\\.config\\.(?:app|lib)\\.(?:${move_project_files_1.MOVED_JEST_CONFIG_EXTENSIONS})\\1`, 'g'), '$1jest$1')
+            // moveProjectFiles drops `.app`/`.lib` from the root-level Jest config only
+            .replace(new RegExp(`([^\\s'"\`=]*?)jest\\.config\\.(?:app|lib)\\.(?=(?:${move_project_files_1.MOVED_JEST_CONFIG_EXTENSIONS})(?!\\w))`, 'g'), (reference, dir) => rootDirPrefixes.includes(dir) ? `${dir}jest.config.` : reference);
         if (file === 'tsconfig.json') {
             // Since we skipped updating "extends" earlier, need to point to the base config.
             newContent = newContent.replace(`./tsconfig.base.json`, newRelativeRoot + `tsconfig.base.json`);

package/dist/src/generators/new/generate-preset.d.ts

@@ -14,7 +14,6 @@ export declare function getPresetDependencies({ preset, presetVersion, bundler,
         '@angular-devkit/core'?: undefined;
         '@nx/angular'?: undefined;
         '@nx/rspack'?: undefined;
-        '@nx/angular-rspack'?: undefined;
         '@nx/express'?: undefined;
         '@nx/nest'?: undefined;
         '@nx/vue'?: undefined;
@@ -39,7 +38,6 @@ export declare function getPresetDependencies({ preset, presetVersion, bundler,
         '@angular-devkit/core'?: undefined;
         '@nx/angular'?: undefined;
         '@nx/rspack'?: undefined;
-        '@nx/angular-rspack'?: undefined;
         '@nx/express'?: undefined;
         '@nx/nest'?: undefined;
         '@nx/vue'?: undefined;
@@ -65,7 +63,6 @@ export declare function getPresetDependencies({ preset, presetVersion, bundler,
         '@angular-devkit/core': string;
         '@nx/angular': any;
         '@nx/rspack': any;
-        '@nx/angular-rspack': any;
         typescript: string;
         '@nx/express'?: undefined;
         '@nx/nest'?: undefined;
@@ -91,7 +88,6 @@ export declare function getPresetDependencies({ preset, presetVersion, bundler,
         '@angular-devkit/core'?: undefined;
         '@nx/angular'?: undefined;
         '@nx/rspack'?: undefined;
-        '@nx/angular-rspack'?: undefined;
         '@nx/express': any;
         typescript: string;
         '@nx/nest'?: undefined;
@@ -117,7 +113,6 @@ export declare function getPresetDependencies({ preset, presetVersion, bundler,
         '@angular-devkit/core'?: undefined;
         '@nx/angular'?: undefined;
         '@nx/rspack'?: undefined;
-        '@nx/angular-rspack'?: undefined;
         '@nx/express'?: undefined;
         '@nx/nest': any;
         typescript: string;
@@ -143,7 +138,6 @@ export declare function getPresetDependencies({ preset, presetVersion, bundler,
         '@angular-devkit/core'?: undefined;
         '@nx/angular'?: undefined;
         '@nx/rspack'?: undefined;
-        '@nx/angular-rspack'?: undefined;
         '@nx/express'?: undefined;
         '@nx/nest'?: undefined;
         typescript: string;
@@ -169,7 +163,6 @@ export declare function getPresetDependencies({ preset, presetVersion, bundler,
         '@angular-devkit/core'?: undefined;
         '@nx/angular'?: undefined;
         '@nx/rspack'?: undefined;
-        '@nx/angular-rspack'?: undefined;
         '@nx/express'?: undefined;
         '@nx/nest'?: undefined;
         '@nx/vue': any;
@@ -195,7 +188,6 @@ export declare function getPresetDependencies({ preset, presetVersion, bundler,
         '@angular-devkit/core'?: undefined;
         '@nx/angular'?: undefined;
         '@nx/rspack'?: undefined;
-        '@nx/angular-rspack'?: undefined;
         '@nx/express'?: undefined;
         '@nx/nest'?: undefined;
         '@nx/vue'?: undefined;
@@ -221,7 +213,6 @@ export declare function getPresetDependencies({ preset, presetVersion, bundler,
         '@angular-devkit/core'?: undefined;
         '@nx/angular'?: undefined;
         '@nx/rspack'?: undefined;
-        '@nx/angular-rspack'?: undefined;
         '@nx/express'?: undefined;
         '@nx/nest'?: undefined;
         '@nx/vue'?: undefined;
@@ -247,7 +238,6 @@ export declare function getPresetDependencies({ preset, presetVersion, bundler,
         '@angular-devkit/core'?: undefined;
         '@nx/angular'?: undefined;
         '@nx/rspack'?: undefined;
-        '@nx/angular-rspack'?: undefined;
         '@nx/express'?: undefined;
         '@nx/nest'?: undefined;
         '@nx/vue'?: undefined;
@@ -273,7 +263,6 @@ export declare function getPresetDependencies({ preset, presetVersion, bundler,
         '@angular-devkit/core'?: undefined;
         '@nx/angular'?: undefined;
         '@nx/rspack'?: undefined;
-        '@nx/angular-rspack'?: undefined;
         '@nx/express'?: undefined;
         '@nx/nest'?: undefined;
         '@nx/vue'?: undefined;
@@ -299,7 +288,6 @@ export declare function getPresetDependencies({ preset, presetVersion, bundler,
         '@angular-devkit/core'?: undefined;
         '@nx/angular'?: undefined;
         '@nx/rspack'?: undefined;
-        '@nx/angular-rspack'?: undefined;
         '@nx/express'?: undefined;
         '@nx/nest'?: undefined;
         '@nx/vue'?: undefined;
@@ -325,7 +313,6 @@ export declare function getPresetDependencies({ preset, presetVersion, bundler,
         '@angular-devkit/core'?: undefined;
         '@nx/angular'?: undefined;
         '@nx/rspack'?: undefined;
-        '@nx/angular-rspack'?: undefined;
         '@nx/express'?: undefined;
         '@nx/nest'?: undefined;
         '@nx/vue'?: undefined;
@@ -348,7 +335,6 @@ export declare function getPresetDependencies({ preset, presetVersion, bundler,
         '@angular-devkit/core'?: undefined;
         '@nx/angular'?: undefined;
         '@nx/rspack'?: undefined;
-        '@nx/angular-rspack'?: undefined;
         '@nx/express'?: undefined;
         '@nx/nest'?: undefined;
         '@nx/vue'?: undefined;

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

@@ -16,9 +16,8 @@ function addPresetDependencies(host, options, presetDependencies) {
     const { dependencies, dev } = presetDependencies;
     return (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, dev, (0, path_1.join)(options.directory, 'package.json'), true);
 }
-// Install scripts each preset dependency pulls in transitively. `nx new`
-// installs the preset dependencies before the preset generator runs, so the
-// generators that would otherwise record these decisions come too late.
+// Bootstrap dependencies need build script decisions before generation.
+// pnpm 10 also needs decisions for packages added during preset generation.
 const presetDependencyBuildScripts = {
     '@nx/angular-rspack': {
         // Its @nx/angular-rspack-compiler dependency patches `@angular/build`
@@ -59,6 +58,11 @@ function getPresetBuildScripts(options, { dependencies, dev }) {
             Object.assign(buildScripts, presetDependencyBuildScripts[pkg]);
         }
     }
+    if ((options.preset === presets_1.Preset.AngularMonorepo ||
+        options.preset === presets_1.Preset.AngularStandalone) &&
+        options.bundler === 'rspack') {
+        Object.assign(buildScripts, presetDependencyBuildScripts['@nx/angular-rspack']);
+    }
     // A third-party preset's install script is unvetted, and pnpm 10 does not run
     // it today, so deny it rather than opting in on pnpm 11.
     if (options.isCustomPreset) {
@@ -183,7 +187,6 @@ function getPresetDependencies({ preset, presetVersion, bundler, e2eTestRunner,
                     '@angular-devkit/core': versions_1.angularCliVersion,
                     '@nx/angular': versions_1.nxVersion,
                     '@nx/rspack': bundler === 'rspack' ? versions_1.nxVersion : undefined,
-                    '@nx/angular-rspack': bundler === 'rspack' ? versions_1.nxVersion : undefined,
                     typescript: versions_1.typescriptVersion,
                 },
             };

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

@@ -13,7 +13,6 @@ export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSc
             '@angular-devkit/core'?: undefined;
             '@nx/angular'?: undefined;
             '@nx/rspack'?: undefined;
-            '@nx/angular-rspack'?: undefined;
             '@nx/express'?: undefined;
             '@nx/nest'?: undefined;
             '@nx/vue'?: undefined;
@@ -38,7 +37,6 @@ export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSc
             '@angular-devkit/core'?: undefined;
             '@nx/angular'?: undefined;
             '@nx/rspack'?: undefined;
-            '@nx/angular-rspack'?: undefined;
             '@nx/express'?: undefined;
             '@nx/nest'?: undefined;
             '@nx/vue'?: undefined;
@@ -64,7 +62,6 @@ export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSc
             '@angular-devkit/core': string;
             '@nx/angular': any;
             '@nx/rspack': any;
-            '@nx/angular-rspack': any;
             typescript: string;
             '@nx/express'?: undefined;
             '@nx/nest'?: undefined;
@@ -90,7 +87,6 @@ export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSc
             '@angular-devkit/core'?: undefined;
             '@nx/angular'?: undefined;
             '@nx/rspack'?: undefined;
-            '@nx/angular-rspack'?: undefined;
             '@nx/express': any;
             typescript: string;
             '@nx/nest'?: undefined;
@@ -116,7 +112,6 @@ export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSc
             '@angular-devkit/core'?: undefined;
             '@nx/angular'?: undefined;
             '@nx/rspack'?: undefined;
-            '@nx/angular-rspack'?: undefined;
             '@nx/express'?: undefined;
             '@nx/nest': any;
             typescript: string;
@@ -142,7 +137,6 @@ export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSc
             '@angular-devkit/core'?: undefined;
             '@nx/angular'?: undefined;
             '@nx/rspack'?: undefined;
-            '@nx/angular-rspack'?: undefined;
             '@nx/express'?: undefined;
             '@nx/nest'?: undefined;
             typescript: string;
@@ -168,7 +162,6 @@ export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSc
             '@angular-devkit/core'?: undefined;
             '@nx/angular'?: undefined;
             '@nx/rspack'?: undefined;
-            '@nx/angular-rspack'?: undefined;
             '@nx/express'?: undefined;
             '@nx/nest'?: undefined;
             '@nx/vue': any;
@@ -194,7 +187,6 @@ export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSc
             '@angular-devkit/core'?: undefined;
             '@nx/angular'?: undefined;
             '@nx/rspack'?: undefined;
-            '@nx/angular-rspack'?: undefined;
             '@nx/express'?: undefined;
             '@nx/nest'?: undefined;
             '@nx/vue'?: undefined;
@@ -220,7 +212,6 @@ export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSc
             '@angular-devkit/core'?: undefined;
             '@nx/angular'?: undefined;
             '@nx/rspack'?: undefined;
-            '@nx/angular-rspack'?: undefined;
             '@nx/express'?: undefined;
             '@nx/nest'?: undefined;
             '@nx/vue'?: undefined;
@@ -246,7 +237,6 @@ export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSc
             '@angular-devkit/core'?: undefined;
             '@nx/angular'?: undefined;
             '@nx/rspack'?: undefined;
-            '@nx/angular-rspack'?: undefined;
             '@nx/express'?: undefined;
             '@nx/nest'?: undefined;
             '@nx/vue'?: undefined;
@@ -272,7 +262,6 @@ export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSc
             '@angular-devkit/core'?: undefined;
             '@nx/angular'?: undefined;
             '@nx/rspack'?: undefined;
-            '@nx/angular-rspack'?: undefined;
             '@nx/express'?: undefined;
             '@nx/nest'?: undefined;
             '@nx/vue'?: undefined;
@@ -298,7 +287,6 @@ export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSc
             '@angular-devkit/core'?: undefined;
             '@nx/angular'?: undefined;
             '@nx/rspack'?: undefined;
-            '@nx/angular-rspack'?: undefined;
             '@nx/express'?: undefined;
             '@nx/nest'?: undefined;
             '@nx/vue'?: undefined;
@@ -324,7 +312,6 @@ export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSc
             '@angular-devkit/core'?: undefined;
             '@nx/angular'?: undefined;
             '@nx/rspack'?: undefined;
-            '@nx/angular-rspack'?: undefined;
             '@nx/express'?: undefined;
             '@nx/nest'?: undefined;
             '@nx/vue'?: undefined;
@@ -347,7 +334,6 @@ export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSc
             '@angular-devkit/core'?: undefined;
             '@nx/angular'?: undefined;
             '@nx/rspack'?: undefined;
-            '@nx/angular-rspack'?: undefined;
             '@nx/express'?: undefined;
             '@nx/nest'?: undefined;
             '@nx/vue'?: undefined;

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

@@ -120,11 +120,19 @@ async function generateWorkspaceFiles(tree, options) {
     if (!options.name) {
         throw new Error(`Invalid options, "name" is required.`);
     }
+    options = {
+        ...options,
+        packageManager: options.packageManager ?? (0, devkit_1.detectPackageManager)(tree.root),
+    };
     // we need to check package manager version before the package.json is generated
     // since it might influence the version report
     const packageManagerVersion = (0, devkit_1.getPackageManagerVersion)(options.packageManager, tree.root);
     options = normalizeOptions(options);
     createFiles(tree, options);
+    (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {
+        json.packageManager = `${options.packageManager}@${packageManagerVersion}`;
+        return json;
+    });
     const nxJson = createNxJson(tree, options);
     const token = options.nxCloud !== 'skip'
         ? await (0, internal_1.connectToNxCloud)(tree, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "24.0.0",
+  "version": "24.0.2",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -78,17 +78,17 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "24.0.0",
+    "@nx/devkit": "24.0.2",
     "@zkochan/js-yaml": "0.0.7",
     "chalk": "^4.1.0",
     "picomatch": "4.0.4",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "24.0.0"
+    "nx": "24.0.2"
   },
   "devDependencies": {
-    "nx": "24.0.0"
+    "nx": "24.0.2"
   },
   "publishConfig": {
     "access": "public"