@nx/workspace 20.4.0-canary.20250123-7524356 → 20.4.0-canary.20250125-15fc599

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "20.4.0-canary.20250123-7524356",
+  "version": "20.4.0-canary.20250125-15fc599",
   "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.4.0-canary.20250123-7524356",
+    "@nx/devkit": "20.4.0-canary.20250125-15fc599",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "20.4.0-canary.20250123-7524356"
+    "nx": "20.4.0-canary.20250125-15fc599"
   },
   "publishConfig": {
     "access": "public"

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,13 +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',
+            updateImportPath: projectType === 'library',
         });
     }
 }

package/src/generators/move/lib/normalize-schema.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSchema = normalizeSchema;
 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);
     return {
@@ -14,11 +15,11 @@ async function normalizeSchema(tree, schema, projectConfiguration) {
     };
 }
 async function determineProjectNameAndRootOptions(tree, options, projectConfiguration) {
-    validateName(options.newProjectName, projectConfiguration);
+    validateName(tree, options.newProjectName, projectConfiguration);
     const projectNameAndRootOptions = getProjectNameAndRootOptions(tree, options, projectConfiguration);
     return projectNameAndRootOptions;
 }
-function validateName(name, projectConfiguration) {
+function validateName(tree, name, projectConfiguration) {
     if (!name) {
         return;
     }
@@ -34,13 +35,14 @@ function validateName(name, projectConfiguration) {
      */
     const libraryPattern = '(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$';
     const appPattern = '^[a-zA-Z][^:]*$';
-    if (projectConfiguration.projectType === 'application') {
+    const projectType = (0, ts_solution_setup_1.getProjectType)(tree, projectConfiguration.root, projectConfiguration.projectType);
+    if (projectType === 'application') {
         const validationRegex = new RegExp(appPattern);
         if (!validationRegex.test(name)) {
             throw new Error(`The new project name should match the pattern "${appPattern}". The provided value "${name}" does not match.`);
         }
     }
-    else if (projectConfiguration.projectType === 'library') {
+    else if ((0, ts_solution_setup_1.getProjectType)(tree, projectConfiguration.root, projectConfiguration.projectType) === 'library') {
         const validationRegex = new RegExp(libraryPattern);
         if (!validationRegex.test(name)) {
             throw new Error(`The new project name should match the pattern "${libraryPattern}". The provided value "${name}" does not match.`);

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

@@ -1,19 +1,3 @@
-import { ProjectConfiguration, Tree } from '@nx/devkit';
-import { Schema } from '../schema';
-/**
- * This helper function ensures that we don't move libs or apps
- * outside of the folders they should be in.
- *
- * This will break if someone isn't using the default libs/apps
- * folders. In that case, they're on their own :/
- */
-export declare function getDestination(host: Tree, schema: Schema, project: ProjectConfiguration): string;
-/**
- * Joins path segments replacing slashes with dashes
- *
- * @param path
- */
-export declare function getNewProjectName(path: string): string;
 /**
  * Normalizes slashes (removes duplicates)
  *

package/src/generators/move/lib/utils.js

@@ -1,38 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDestination = getDestination;
-exports.getNewProjectName = getNewProjectName;
 exports.normalizePathSlashes = normalizePathSlashes;
 const devkit_1 = require("@nx/devkit");
-/**
- * This helper function ensures that we don't move libs or apps
- * outside of the folders they should be in.
- *
- * This will break if someone isn't using the default libs/apps
- * folders. In that case, they're on their own :/
- */
-function getDestination(host, schema, project) {
-    const projectType = project.projectType;
-    const workspaceLayout = (0, devkit_1.getWorkspaceLayout)(host);
-    let rootFolder = workspaceLayout.libsDir;
-    if (projectType === 'application') {
-        rootFolder = workspaceLayout.appsDir;
-    }
-    return (0, devkit_1.joinPathFragments)(rootFolder, schema.destination);
-}
-/**
- * Joins path segments replacing slashes with dashes
- *
- * @param path
- */
-function getNewProjectName(path) {
-    // strip leading '/' or './' or '../' and trailing '/' and replaces '/' with '-'
-    return (0, devkit_1.normalizePath)(path)
-        .replace(/(^\.{0,2}\/|\.{1,2}\/|\/$)/g, '')
-        .split('/')
-        .filter((x) => !!x)
-        .join('-');
-}
 /**
  * Normalizes slashes (removes duplicates)
  *

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

@@ -70,6 +70,9 @@ function generatePreset(host, opts) {
                 : null,
             parsedArgs.interactive ? '--interactive=true' : '--interactive=false',
             opts.routing !== undefined ? `--routing=${opts.routing}` : null,
+            opts.unitTestRunner !== undefined
+                ? `--unitTestRunner=${opts.unitTestRunner}`
+                : null,
             opts.e2eTestRunner !== undefined
                 ? `--e2eTestRunner=${opts.e2eTestRunner}`
                 : null,

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

@@ -18,6 +18,7 @@ interface Schema {
     standaloneApi?: boolean;
     routing?: boolean;
     packageManager?: PackageManager;
+    unitTestRunner?: 'jest' | 'vitest' | 'none';
     e2eTestRunner?: 'cypress' | 'playwright' | 'detox' | 'jest' | 'none';
     ssr?: boolean;
     serverRouting?: boolean;

package/src/generators/new/schema.json

@@ -73,6 +73,11 @@
       "type": "boolean",
       "default": true
     },
+    "unitTestRunner": {
+      "description": "The tool to use for running unit tests.",
+      "type": "string",
+      "enum": ["jest", "vitest", "none"]
+    },
     "e2eTestRunner": {
       "description": "The tool to use for running e2e tests.",
       "type": "string",

package/src/generators/preset/preset.js

@@ -30,6 +30,7 @@ async function createPreset(tree, options) {
             standalone: options.standaloneApi,
             routing: options.routing,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
+            unitTestRunner: options.unitTestRunner,
             bundler: options.bundler,
             ssr: options.ssr,
             serverRouting: options.serverRouting,
@@ -48,6 +49,7 @@ async function createPreset(tree, options) {
             rootProject: true,
             standalone: options.standaloneApi,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
+            unitTestRunner: options.unitTestRunner,
             bundler: options.bundler,
             ssr: options.ssr,
             serverRouting: options.serverRouting,
@@ -65,6 +67,8 @@ async function createPreset(tree, options) {
             linter: options.linter,
             bundler: options.bundler ?? 'webpack',
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
+            unitTestRunner: options.unitTestRunner ??
+                (options.bundler === 'vite' ? 'vitest' : 'jest'),
             addPlugin,
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
@@ -74,15 +78,16 @@ async function createPreset(tree, options) {
     else if (options.preset === presets_1.Preset.ReactStandalone) {
         const { applicationGenerator: reactApplicationGenerator } = require('@nx' +
             '/react');
+        const bundler = options.bundler ?? 'vite';
         return reactApplicationGenerator(tree, {
             name: options.name,
             directory: '.',
             style: options.style,
             linter: options.linter,
             rootProject: true,
-            bundler: options.bundler ?? 'vite',
+            bundler,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
-            unitTestRunner: options.bundler === 'vite' ? 'vitest' : 'jest',
+            unitTestRunner: options.unitTestRunner ?? (bundler === 'vite' ? 'vitest' : 'jest'),
             addPlugin,
             nxCloudToken: options.nxCloudToken,
             formatter: options.formatter,
@@ -96,7 +101,7 @@ async function createPreset(tree, options) {
             directory: (0, path_1.join)('apps', options.name),
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
-            unitTestRunner: 'vitest',
+            unitTestRunner: options.unitTestRunner ?? 'vitest',
             addPlugin,
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
@@ -112,7 +117,7 @@ async function createPreset(tree, options) {
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             rootProject: true,
-            unitTestRunner: 'vitest',
+            unitTestRunner: options.unitTestRunner ?? 'vitest',
             addPlugin,
             nxCloudToken: options.nxCloudToken,
             formatter: options.formatter,
@@ -127,6 +132,7 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
+            unitTestRunner: options.unitTestRunner,
             addPlugin,
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
@@ -143,7 +149,7 @@ async function createPreset(tree, options) {
             linter: options.linter,
             rootProject: true,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
-            unitTestRunner: 'vitest',
+            unitTestRunner: options.unitTestRunner ?? 'vitest',
             addPlugin,
             nxCloudToken: options.nxCloudToken,
         });
@@ -157,6 +163,7 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
+            unitTestRunner: options.unitTestRunner,
             addPlugin,
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
@@ -173,7 +180,7 @@ async function createPreset(tree, options) {
             linter: options.linter,
             rootProject: true,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
-            unitTestRunner: 'vitest',
+            unitTestRunner: options.unitTestRunner ?? 'vitest',
             addPlugin,
             nxCloudToken: options.nxCloudToken,
         });
@@ -189,6 +196,7 @@ async function createPreset(tree, options) {
             appDir: options.nextAppDir,
             src: options.nextSrcDir,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
+            unitTestRunner: options.unitTestRunner,
             addPlugin,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
@@ -205,6 +213,7 @@ async function createPreset(tree, options) {
             appDir: options.nextAppDir,
             src: options.nextSrcDir,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
+            unitTestRunner: options.unitTestRunner,
             rootProject: true,
             addPlugin,
             formatter: options.formatter,
@@ -232,6 +241,7 @@ async function createPreset(tree, options) {
             directory: (0, path_1.join)('apps', options.name),
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            unitTestRunner: options.unitTestRunner,
             addPlugin,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
@@ -244,6 +254,7 @@ async function createPreset(tree, options) {
             directory: (0, path_1.join)('apps', options.name),
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            unitTestRunner: options.unitTestRunner,
             addPlugin,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
@@ -257,6 +268,7 @@ async function createPreset(tree, options) {
             directory: (0, path_1.join)('apps', options.name),
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'detox',
+            unitTestRunner: options.unitTestRunner,
             addPlugin,
             nxCloudToken: options.nxCloudToken,
             bundler: options.bundler ?? 'webpack',
@@ -271,6 +283,7 @@ async function createPreset(tree, options) {
             directory: (0, path_1.join)('apps', options.name),
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'detox',
+            unitTestRunner: options.unitTestRunner,
             addPlugin,
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
@@ -312,6 +325,7 @@ async function createPreset(tree, options) {
             docker: options.docker,
             rootProject: true,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            unitTestRunner: options.unitTestRunner,
             addPlugin,
         });
     }
@@ -328,6 +342,7 @@ async function createPreset(tree, options) {
             docker: options.docker,
             rootProject: false,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            unitTestRunner: options.unitTestRunner,
             addPlugin,
             useTsSolution: options.workspaces,
             formatter: options.formatter,

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

@@ -17,6 +17,7 @@ export interface Schema {
   nextSrcDir?: boolean;
   routing?: boolean;
   standaloneApi?: boolean;
+  unitTestRunner?: 'jest' | 'vitest' | 'none';
   e2eTestRunner?: 'cypress' | 'playwright' | 'jest' | 'detox' | 'none';
   js?: boolean;
   ssr?: boolean;

package/src/generators/preset/schema.json

@@ -90,6 +90,11 @@
       "type": "boolean",
       "default": true
     },
+    "unitTestRunner": {
+      "description": "The tool to use for running unit tests.",
+      "type": "string",
+      "enum": ["jest", "vitest", "none"]
+    },
     "e2eTestRunner": {
       "description": "The tool to use for running e2e tests.",
       "type": "string",

package/src/utils/ts-solution-setup.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export declare function getProjectType(tree: Tree, projectRoot: string, projectType?: 'library' | 'application'): 'library' | 'application';

package/src/utils/ts-solution-setup.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProjectType = getProjectType;
+const devkit_1 = require("@nx/devkit");
+// This is copied from `@nx/js` to avoid circular dependencies.
+function getProjectType(tree, projectRoot, projectType) {
+    if (projectType)
+        return projectType;
+    if ((0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.lib.json'))
+        return 'library';
+    if ((0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.app.json'))
+        return 'application';
+    // If there are no exports, assume it is an application since both buildable and non-buildable libraries have exports.
+    const packageJsonPath = (0, devkit_1.joinPathFragments)(projectRoot, 'package.json');
+    const packageJson = tree.exists(packageJsonPath)
+        ? (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'))
+        : null;
+    if (!packageJson?.exports)
+        return 'application';
+    return 'library';
+}