@nx/devkit 21.0.0-beta.0 → 21.0.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "21.0.0-beta.0",
+  "version": "21.0.0-beta.10",
   "private": false,
   "description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more. Learn more about [extending Nx by leveraging the Nx Devkit](https://nx.dev/extending-nx/intro/getting-started) on our docs.",
   "repository": {

package/src/executors/read-target-options.js

@@ -17,7 +17,7 @@ function readTargetOptions({ project, target, configuration }, context) {
     if (!targetConfiguration) {
         throw new Error(`Unable to find target ${target} for project ${project}`);
     }
-    const [nodeModule, executorName] = targetConfiguration.executor.split(':');
+    const [nodeModule, executorName] = (0, devkit_internals_1.parseExecutor)(targetConfiguration.executor);
     const { schema } = (0, devkit_internals_1.getExecutorInformation)(nodeModule, executorName, context.root, context.projectsConfigurations?.projects);
     const defaultProject = (0, devkit_internals_1.calculateDefaultProjectName)(context.cwd, context.root, { version: 2, projects: context.projectsConfigurations.projects }, context.nxJsonConfiguration);
     return (0, devkit_internals_1.combineOptionsForExecutor)({}, configuration ?? targetConfiguration.defaultConfiguration ?? '', targetConfiguration, schema, defaultProject, (0, path_1.relative)(context.root, context.cwd));

package/src/generators/format-files.js

@@ -18,6 +18,13 @@ async function formatFiles(tree, options = {
     let prettier;
     try {
         prettier = await Promise.resolve().then(() => require('prettier'));
+        /**
+         * Even after we discovered prettier in node_modules, we need to be sure that the user is intentionally using prettier
+         * before proceeding to format with it.
+         */
+        if (!(0, devkit_internals_1.isUsingPrettierInTree)(tree)) {
+            return;
+        }
     }
     catch { }
     if (options.sortRootTsconfigPaths) {

package/src/generators/project-name-and-root-utils.d.ts

@@ -31,8 +31,11 @@ export type ProjectNameAndRootOptions = {
     /**
      * Normalized import path for the project.
      */
-    importPath?: string;
+    importPath: string;
 };
 export declare function determineProjectNameAndRootOptions(tree: Tree, options: ProjectGenerationOptions): Promise<ProjectNameAndRootOptions>;
 export declare function resolveImportPath(tree: Tree, projectName: string, projectRoot: string): string;
-export declare function ensureProjectName(tree: Tree, options: Omit<ProjectGenerationOptions, 'projectType'>, projectType: 'application' | 'library'): Promise<void>;
+export declare function ensureRootProjectName(options: {
+    directory: string;
+    name?: string;
+}, projectType: 'application' | 'library'): Promise<void>;

package/src/generators/project-name-and-root-utils.js

@@ -2,16 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineProjectNameAndRootOptions = determineProjectNameAndRootOptions;
 exports.resolveImportPath = resolveImportPath;
-exports.ensureProjectName = ensureProjectName;
+exports.ensureRootProjectName = ensureRootProjectName;
 const enquirer_1 = require("enquirer");
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const path_1 = require("path");
 async function determineProjectNameAndRootOptions(tree, options) {
-    validateOptions(options);
+    // root projects must provide name option
+    if (options.directory === '.' && !options.name) {
+        throw new Error(`When generating a root project, you must also specify the name option.`);
+    }
     const directory = (0, devkit_exports_1.normalizePath)(options.directory);
     const name = options.name ??
         directory.match(/(@[^@/]+(\/[^@/]+)+)/)?.[1] ??
         directory.substring(directory.lastIndexOf('/') + 1);
+    validateOptions(options.name, name, options.directory);
     let projectSimpleName;
     let projectFileName;
     if (name.startsWith('@')) {
@@ -44,11 +48,10 @@ async function determineProjectNameAndRootOptions(tree, options) {
             projectRoot = (0, devkit_exports_1.joinPathFragments)(relativeCwd, name);
         }
     }
-    let importPath = undefined;
-    if (options.projectType === 'library') {
-        importPath =
-            options.importPath ?? resolveImportPath(tree, name, projectRoot);
+    if (projectRoot.startsWith('..')) {
+        throw new Error(`The resolved project root "${projectRoot}" is outside of the workspace root "${devkit_exports_1.workspaceRoot}".`);
     }
+    const importPath = options.importPath ?? resolveImportPath(tree, name, projectRoot);
     return {
         projectName: name,
         names: {
@@ -74,50 +77,36 @@ function resolveImportPath(tree, projectName, projectRoot) {
     }
     return importPath;
 }
-async function ensureProjectName(tree, options, projectType) {
-    if (!options.name) {
-        if (options.directory === '.' && getRelativeCwd() === '') {
-            const result = await (0, enquirer_1.prompt)({
-                type: 'input',
-                name: 'name',
-                message: `What do you want to name the ${projectType}?`,
-            }).then(({ name }) => (options.name = name));
-        }
-        const { projectName } = await determineProjectNameAndRootOptions(tree, {
-            ...options,
-            projectType,
+async function ensureRootProjectName(options, projectType) {
+    if (!options.name && options.directory === '.' && getRelativeCwd() === '') {
+        const result = await (0, enquirer_1.prompt)({
+            type: 'input',
+            name: 'name',
+            message: `What do you want to name the ${projectType}?`,
         });
-        options.name = projectName;
+        options.name = result.name;
     }
 }
-function validateOptions(options) {
-    if (options.directory === '.') {
-        /**
-         * Root projects must provide name option
-         */
-        if (!options.name) {
-            throw new Error(`Root projects must also specify name option.`);
+function validateOptions(providedName, derivedName, directory) {
+    /**
+     * The provided name and the derived name from the provided directory must match one of two cases:
+     *
+     * 1. Valid npm package names (e.g., '@scope/name' or 'name').
+     * 2. Names starting with a letter and can contain any character except whitespace and ':'.
+     *
+     * The second case is to support the legacy behavior (^[a-zA-Z].*$) with the difference
+     * that it doesn't allow the ":" character. It was wrong to allow it because it would
+     * conflict with the notation for tasks.
+     */
+    const pattern = '(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$';
+    const validationRegex = new RegExp(pattern);
+    if (providedName) {
+        if (!validationRegex.test(providedName)) {
+            throw new Error(`The name should match the pattern "${pattern}". The provided value "${providedName}" does not match.`);
         }
     }
-    else {
-        /**
-         * Both directory and name (if present) must match one of two cases:
-         *
-         * 1. Valid npm package names (e.g., '@scope/name' or 'name').
-         * 2. Names starting with a letter and can contain any character except whitespace and ':'.
-         *
-         * The second case is to support the legacy behavior (^[a-zA-Z].*$) with the difference
-         * that it doesn't allow the ":" character. It was wrong to allow it because it would
-         * conflict with the notation for tasks.
-         */
-        const pattern = '(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$';
-        const validationRegex = new RegExp(pattern);
-        if (options.name && !validationRegex.test(options.name)) {
-            throw new Error(`The name should match the pattern "${pattern}". The provided value "${options.name}" does not match.`);
-        }
-        if (!validationRegex.test(options.directory)) {
-            throw new Error(`The directory should match the pattern "${pattern}". The provided value "${options.directory}" does not match.`);
-        }
+    else if (!validationRegex.test(derivedName)) {
+        throw new Error(`The derived name from the provided directory should match the pattern "${pattern}". The derived name "${derivedName}" from the provided value "${directory}" does not match.`);
     }
 }
 function getImportPath(npmScope, name) {

package/src/generators/target-defaults-utils.js

@@ -46,7 +46,7 @@ async function addE2eCiTargetDefaults(tree, e2ePlugin, buildTarget, pathToE2ECon
     const ciTargetName = typeof foundPluginForApplication === 'string'
         ? 'e2e-ci'
         : foundPluginForApplication.options?.ciTargetName ?? 'e2e-ci';
-    const ciTargetNameGlob = `${ciTargetName}--**/*`;
+    const ciTargetNameGlob = `${ciTargetName}--**/**`;
     nxJson.targetDefaults ??= {};
     const e2eCiTargetDefaults = nxJson.targetDefaults[ciTargetNameGlob];
     if (!e2eCiTargetDefaults) {

package/src/generators/update-ts-configs-to-js.js

@@ -26,9 +26,9 @@ function updateTsConfigsToJs(tree, options) {
     }
     if (updateConfigPath) {
         (0, devkit_exports_1.updateJson)(tree, updateConfigPath, (json) => {
-            json.include = uniq([...json.include, 'src/**/*.js']);
+            json.include = uniq([...(json.include ?? []), 'src/**/*.js']);
             json.exclude = uniq([
-                ...json.exclude,
+                ...(json.exclude ?? []),
                 'src/**/*.spec.js',
                 'src/**/*.test.js',
             ]);

package/src/utils/calculate-hash-for-create-nodes.d.ts

@@ -1,2 +1,3 @@
 import { CreateNodesContext, CreateNodesContextV2 } from 'nx/src/devkit-exports';
 export declare function calculateHashForCreateNodes(projectRoot: string, options: object, context: CreateNodesContext | CreateNodesContextV2, additionalGlobs?: string[]): Promise<string>;
+export declare function calculateHashesForCreateNodes(projectRoots: string[], options: object, context: CreateNodesContext | CreateNodesContextV2, additionalGlobs?: string[][]): Promise<string[]>;

package/src/utils/calculate-hash-for-create-nodes.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateHashForCreateNodes = calculateHashForCreateNodes;
+exports.calculateHashesForCreateNodes = calculateHashesForCreateNodes;
 const path_1 = require("path");
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const devkit_internals_1 = require("nx/src/devkit-internals");
@@ -13,3 +14,15 @@ async function calculateHashForCreateNodes(projectRoot, options, context, additi
         (0, devkit_internals_1.hashObject)(options),
     ]);
 }
+async function calculateHashesForCreateNodes(projectRoots, options, context, additionalGlobs = []) {
+    if (additionalGlobs.length &&
+        additionalGlobs.length !== projectRoots.length) {
+        throw new Error('If additionalGlobs is provided, it must be the same length as projectRoots');
+    }
+    return (0, devkit_internals_1.hashMultiGlobWithWorkspaceContext)(context.workspaceRoot, projectRoots.map((projectRoot, idx) => [
+        (0, path_1.join)(projectRoot, '**/*'),
+        ...(additionalGlobs.length ? additionalGlobs[idx] : []),
+    ])).then((hashes) => {
+        return hashes.map((hash) => (0, devkit_exports_1.hashArray)([hash, (0, devkit_internals_1.hashObject)(options)]));
+    });
+}

package/src/utils/package-json.js

@@ -176,14 +176,18 @@ function removeDependenciesFromPackageJson(tree, dependencies, devDependencies,
     const currentPackageJson = (0, devkit_exports_1.readJson)(tree, packageJsonPath);
     if (requiresRemovingOfPackages(currentPackageJson, dependencies, devDependencies)) {
         (0, devkit_exports_1.updateJson)(tree, packageJsonPath, (json) => {
-            for (const dep of dependencies) {
-                delete json.dependencies[dep];
+            if (json.dependencies) {
+                for (const dep of dependencies) {
+                    delete json.dependencies[dep];
+                }
+                json.dependencies = sortObjectByKeys(json.dependencies);
             }
-            for (const devDep of devDependencies) {
-                delete json.devDependencies[devDep];
+            if (json.devDependencies) {
+                for (const devDep of devDependencies) {
+                    delete json.devDependencies[devDep];
+                }
+                json.devDependencies = sortObjectByKeys(json.devDependencies);
             }
-            json.dependencies = sortObjectByKeys(json.dependencies);
-            json.devDependencies = sortObjectByKeys(json.devDependencies);
             return json;
         });
     }

package/src/utils/replace-package.js

@@ -102,6 +102,7 @@ function replaceMentions(tree, oldPackageName, newPackageName) {
             'package-lock.json',
             'pnpm-lock.yaml',
             'bun.lockb',
+            'bun.lock',
             'CHANGELOG.md',
         ];
         if (ignoredFiles.includes((0, path_1.basename)(path))) {