@nx/workspace 20.4.0-beta.0 → 20.4.0-beta.2

package/migrations.json

@@ -63,6 +63,19 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "20.4.0": {
+      "version": "20.4.0-beta.1",
+      "x-prompt": "Do you want to update to TypeScript v5.7?",
+      "requires": {
+        "typescript": ">=5.6.0 <5.7.0"
+      },
+      "packages": {
+        "typescript": {
+          "version": "~5.7.2",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "20.4.0-beta.0",
+  "version": "20.4.0-beta.2",
   "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-beta.0",
+    "@nx/devkit": "20.4.0-beta.2",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "20.4.0-beta.0"
+    "nx": "20.4.0-beta.2"
   },
   "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/update-eslint-config.js

@@ -12,9 +12,11 @@ function updateEslintConfig(tree, schema, project) {
     if (!tree.exists('.eslintrc.json') &&
         !tree.exists('eslint.config.js') &&
         !tree.exists('eslint.config.cjs') &&
+        !tree.exists('eslint.config.mjs') &&
         !tree.exists('.eslintrc.base.json') &&
         !tree.exists('eslint.base.config.js') &&
-        !tree.exists('eslint.base.config.cjs')) {
+        !tree.exists('eslint.base.config.cjs') &&
+        !tree.exists('eslint.base.config.mjs')) {
         return;
     }
     try {

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/preset/schema.d.ts

@@ -11,7 +11,7 @@ export interface Schema {
   standaloneConfig?: boolean;
   framework?: string;
   packageManager?: PackageManager;
-  bundler?: 'vite' | 'webpack' | 'rspack' | 'esbuild';
+  bundler?: 'vite' | 'rsbuild' | 'webpack' | 'rspack' | 'esbuild';
   docker?: boolean;
   nextAppDir?: boolean;
   nextSrcDir?: boolean;

package/src/generators/preset/schema.json

@@ -72,7 +72,7 @@
     "bundler": {
       "description": "The bundler to use for building the application.",
       "type": "string",
-      "enum": ["webpack", "vite", "rspack", "esbuild"],
+      "enum": ["vite", "rspack", "rsbuild", "esbuild", "webpack"],
       "default": "vite"
     },
     "docker": {

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';
+}

package/src/utils/versions.d.ts

@@ -1,3 +1,3 @@
 export declare const nxVersion: any;
-export declare const typescriptVersion = "~5.6.2";
-export declare const angularCliVersion = "~19.0.0";
+export declare const typescriptVersion = "~5.7.2";
+export declare const angularCliVersion = "~19.1.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.6.2';
+exports.typescriptVersion = '~5.7.2';
 // TODO: remove when preset generation is reworked and
 // deps are not installed from workspace
-exports.angularCliVersion = '~19.0.0';
+exports.angularCliVersion = '~19.1.0';