nx 16.7.0-beta.1 → 16.7.0-beta.4

package/.eslintrc.json

@@ -81,6 +81,7 @@
             "buildTargets": ["build-base"],
             "ignoredDependencies": [
               "typescript",
+              "@nrwl/angular",
               "@angular-devkit/build-angular",
               "@angular-devkit/core",
               "@angular-devkit/architect",

package/bin/init-local.js

@@ -16,7 +16,6 @@ function initLocal(workspace) {
     process.env.NX_CLI_SET = 'true';
     try {
         perf_hooks_1.performance.mark('init-local');
-        require('nx/src/utils/perf-logging');
         monkeyPatchRequire();
         if (workspace.type !== 'nx' && shouldDelegateToAngularCLI()) {
             console.warn((0, strip_indents_1.stripIndents) `Using Nx to run Angular CLI commands is deprecated and will be removed in a future version.

package/bin/nx.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const find_workspace_root_1 = require("../src/utils/find-workspace-root");
 const chalk = require("chalk");
+const dotenv_1 = require("dotenv");
 const init_local_1 = require("./init-local");
 const output_1 = require("../src/utils/output");
 const installation_directory_1 = require("../src/utils/installation-directory");
@@ -12,12 +13,18 @@ const package_json_1 = require("../src/utils/package-json");
 const child_process_1 = require("child_process");
 const path_1 = require("path");
 const assert_supported_platform_1 = require("../src/native/assert-supported-platform");
+const perf_hooks_1 = require("perf_hooks");
 function main() {
     if (process.argv[2] !== 'report' &&
         process.argv[2] !== '--version' &&
         process.argv[2] !== '--help') {
         (0, assert_supported_platform_1.assertSupportedPlatform)();
     }
+    require('nx/src/utils/perf-logging');
+    perf_hooks_1.performance.mark('loading dotenv files:start');
+    loadDotEnvFiles();
+    perf_hooks_1.performance.mark('loading dotenv files:end');
+    perf_hooks_1.performance.measure('loading dotenv files', 'loading dotenv files:start', 'loading dotenv files:end');
     const workspace = (0, find_workspace_root_1.findWorkspaceRoot)(process.cwd());
     // new is a special case because there is no local workspace to load
     if (process.argv[2] === 'new' ||
@@ -71,6 +78,19 @@ function main() {
         }
     }
 }
+/**
+ * This loads dotenv files from:
+ * - .env
+ * - .local.env
+ * - .env.local
+ */
+function loadDotEnvFiles() {
+    for (const file of ['.env', '.local.env', '.env.local']) {
+        (0, dotenv_1.config)({
+            path: file,
+        });
+    }
+}
 function handleNoWorkspace(globalNxVersion) {
     output_1.output.log({
         title: `The current directory isn't part of an Nx workspace.`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "16.7.0-beta.1",
+  "version": "16.7.0-beta.4",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -32,7 +32,7 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/tao": "16.7.0-beta.1",
+    "@nrwl/tao": "16.7.0-beta.4",
     "@parcel/watcher": "2.0.4",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.0-rc.46",
@@ -42,7 +42,7 @@
     "cli-cursor": "3.1.0",
     "cli-spinners": "2.6.1",
     "cliui": "^7.0.2",
-    "dotenv": "~10.0.0",
+    "dotenv": "~16.3.1",
     "enquirer": "~2.3.6",
     "fast-glob": "3.2.7",
     "figures": "3.2.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "16.7.0-beta.1",
-    "@nx/nx-darwin-x64": "16.7.0-beta.1",
-    "@nx/nx-freebsd-x64": "16.7.0-beta.1",
-    "@nx/nx-linux-arm-gnueabihf": "16.7.0-beta.1",
-    "@nx/nx-linux-arm64-gnu": "16.7.0-beta.1",
-    "@nx/nx-linux-arm64-musl": "16.7.0-beta.1",
-    "@nx/nx-linux-x64-gnu": "16.7.0-beta.1",
-    "@nx/nx-linux-x64-musl": "16.7.0-beta.1",
-    "@nx/nx-win32-arm64-msvc": "16.7.0-beta.1",
-    "@nx/nx-win32-x64-msvc": "16.7.0-beta.1"
+    "@nx/nx-darwin-arm64": "16.7.0-beta.4",
+    "@nx/nx-darwin-x64": "16.7.0-beta.4",
+    "@nx/nx-freebsd-x64": "16.7.0-beta.4",
+    "@nx/nx-linux-arm-gnueabihf": "16.7.0-beta.4",
+    "@nx/nx-linux-arm64-gnu": "16.7.0-beta.4",
+    "@nx/nx-linux-arm64-musl": "16.7.0-beta.4",
+    "@nx/nx-linux-x64-gnu": "16.7.0-beta.4",
+    "@nx/nx-linux-x64-musl": "16.7.0-beta.4",
+    "@nx/nx-win32-arm64-msvc": "16.7.0-beta.4",
+    "@nx/nx-win32-x64-msvc": "16.7.0-beta.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -176,6 +176,6 @@
     }
   },
   "main": "./bin/nx.js",
-  "types": "./bin/nx.d.ts",
-  "gitHead": "50a145bb64edcf76985184a9a83d1449dcd4f3d9"
+  "type": "commonjs",
+  "gitHead": "dcbba686b182737b66ebbfb9db372769e77ba005"
 }

package/plugins/package-json-workspaces.d.ts

@@ -0,0 +1,13 @@
+import { NxJsonConfiguration } from '../src/config/nx-json';
+import { ProjectConfiguration } from '../src/config/workspace-json-project-json';
+import { NxPluginV2 } from '../src/utils/nx-plugin';
+export declare function getNxPackageJsonWorkspacesPlugin(root: string): NxPluginV2;
+export declare function buildProjectConfigurationFromPackageJson(packageJson: {
+    name: string;
+}, path: string, nxJson: NxJsonConfiguration): ProjectConfiguration & {
+    name: string;
+};
+/**
+ * Get the package.json globs from package manager workspaces
+ */
+export declare function getGlobPatternsFromPackageManagerWorkspaces(root: string, readJson?: <T extends Object>(path: string) => T): string[];

package/plugins/package-json-workspaces.js

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGlobPatternsFromPackageManagerWorkspaces = exports.buildProjectConfigurationFromPackageJson = exports.getNxPackageJsonWorkspacesPlugin = void 0;
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+const nx_json_1 = require("../src/config/nx-json");
+const workspaces_1 = require("../src/config/workspaces");
+const fileutils_1 = require("../src/utils/fileutils");
+const globs_1 = require("../src/utils/globs");
+const logger_1 = require("../src/utils/logger");
+const output_1 = require("../src/utils/output");
+const path_1 = require("../src/utils/path");
+function getNxPackageJsonWorkspacesPlugin(root) {
+    const readJson = (f) => (0, fileutils_1.readJsonFile)((0, node_path_1.join)(root, f));
+    return {
+        name: 'nx-core-build-package-json-nodes',
+        createNodes: [
+            (0, globs_1.combineGlobPatterns)(getGlobPatternsFromPackageManagerWorkspaces(root, readJson)),
+            (pkgJsonPath) => {
+                const json = readJson(pkgJsonPath);
+                return {
+                    projects: {
+                        [json.name]: buildProjectConfigurationFromPackageJson(json, pkgJsonPath, (0, nx_json_1.readNxJson)(root)),
+                    },
+                };
+            },
+        ],
+    };
+}
+exports.getNxPackageJsonWorkspacesPlugin = getNxPackageJsonWorkspacesPlugin;
+function buildProjectConfigurationFromPackageJson(packageJson, path, nxJson) {
+    var _a, _b, _c, _d;
+    const normalizedPath = path.split('\\').join('/');
+    const directory = (0, node_path_1.dirname)(normalizedPath);
+    if (!packageJson.name && directory === '.') {
+        throw new Error('Nx requires the root package.json to specify a name if it is being used as an Nx project.');
+    }
+    let name = (_a = packageJson.name) !== null && _a !== void 0 ? _a : (0, workspaces_1.toProjectName)(normalizedPath);
+    if (nxJson === null || nxJson === void 0 ? void 0 : nxJson.npmScope) {
+        const npmPrefix = `@${nxJson.npmScope}/`;
+        if (name.startsWith(npmPrefix)) {
+            name = name.replace(npmPrefix, '');
+        }
+    }
+    const projectType = ((_b = nxJson === null || nxJson === void 0 ? void 0 : nxJson.workspaceLayout) === null || _b === void 0 ? void 0 : _b.appsDir) != ((_c = nxJson === null || nxJson === void 0 ? void 0 : nxJson.workspaceLayout) === null || _c === void 0 ? void 0 : _c.libsDir) &&
+        ((_d = nxJson === null || nxJson === void 0 ? void 0 : nxJson.workspaceLayout) === null || _d === void 0 ? void 0 : _d.appsDir) &&
+        directory.startsWith(nxJson.workspaceLayout.appsDir)
+        ? 'application'
+        : 'library';
+    return {
+        root: directory,
+        sourceRoot: directory,
+        name,
+        projectType,
+    };
+}
+exports.buildProjectConfigurationFromPackageJson = buildProjectConfigurationFromPackageJson;
+/**
+ * Get the package.json globs from package manager workspaces
+ */
+function getGlobPatternsFromPackageManagerWorkspaces(root, readJson = (path) => (0, fileutils_1.readJsonFile)((0, node_path_1.join)(root, path)) // making this an arg allows us to reuse in devkit
+) {
+    var _a, _b;
+    try {
+        const patterns = [];
+        const packageJson = readJson('package.json');
+        patterns.push(...normalizePatterns(Array.isArray(packageJson.workspaces)
+            ? packageJson.workspaces
+            : (_b = (_a = packageJson.workspaces) === null || _a === void 0 ? void 0 : _a.packages) !== null && _b !== void 0 ? _b : []));
+        if ((0, node_fs_1.existsSync)((0, node_path_1.join)(root, 'pnpm-workspace.yaml'))) {
+            try {
+                const { packages } = (0, fileutils_1.readYamlFile)((0, node_path_1.join)(root, 'pnpm-workspace.yaml'));
+                patterns.push(...normalizePatterns(packages || []));
+            }
+            catch (e) {
+                output_1.output.warn({
+                    title: `${logger_1.NX_PREFIX} Unable to parse pnpm-workspace.yaml`,
+                    bodyLines: [e.toString()],
+                });
+            }
+        }
+        if ((0, node_fs_1.existsSync)((0, node_path_1.join)(root, 'lerna.json'))) {
+            try {
+                const { packages } = readJson('lerna.json');
+                patterns.push(...normalizePatterns((packages === null || packages === void 0 ? void 0 : packages.length) > 0 ? packages : ['packages/*']));
+            }
+            catch (e) {
+                output_1.output.warn({
+                    title: `${logger_1.NX_PREFIX} Unable to parse lerna.json`,
+                    bodyLines: [e.toString()],
+                });
+            }
+        }
+        // Merge patterns from workspaces definitions
+        // TODO(@AgentEnder): update logic after better way to determine root project inclusion
+        // Include the root project
+        return packageJson.nx ? patterns.concat('package.json') : patterns;
+    }
+    catch (_c) {
+        return [];
+    }
+}
+exports.getGlobPatternsFromPackageManagerWorkspaces = getGlobPatternsFromPackageManagerWorkspaces;
+function normalizePatterns(patterns) {
+    return patterns.map((pattern) => removeRelativePath(pattern.endsWith('/package.json')
+        ? pattern
+        : (0, path_1.joinPathFragments)(pattern, 'package.json')));
+}
+function removeRelativePath(pattern) {
+    return pattern.startsWith('./') ? pattern.substring(2) : pattern;
+}

package/plugins/project-json.d.ts

@@ -0,0 +1,4 @@
+import { ProjectConfiguration } from '../src/config/workspace-json-project-json';
+import { NxPluginV2 } from '../src/utils/nx-plugin';
+export declare function getNxProjectJsonPlugin(root: string): NxPluginV2;
+export declare function buildProjectFromProjectJson(json: Partial<ProjectConfiguration>, path: string): ProjectConfiguration;

package/plugins/project-json.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildProjectFromProjectJson = exports.getNxProjectJsonPlugin = void 0;
+const node_path_1 = require("node:path");
+const workspaces_1 = require("../src/config/workspaces");
+const fileutils_1 = require("../src/utils/fileutils");
+function getNxProjectJsonPlugin(root) {
+    return {
+        name: 'nx-core-build-project-json-nodes',
+        createNodes: [
+            '{project.json,**/project.json}',
+            (file) => {
+                const json = (0, fileutils_1.readJsonFile)((0, node_path_1.join)(root, file));
+                const project = buildProjectFromProjectJson(json, file);
+                return {
+                    projects: {
+                        [project.name]: project,
+                    },
+                };
+            },
+        ],
+    };
+}
+exports.getNxProjectJsonPlugin = getNxProjectJsonPlugin;
+function buildProjectFromProjectJson(json, path) {
+    return Object.assign({ name: (0, workspaces_1.toProjectName)(path), root: (0, node_path_1.dirname)(path) }, json);
+}
+exports.buildProjectFromProjectJson = buildProjectFromProjectJson;

package/src/adapter/angular-json.d.ts

@@ -8,3 +8,4 @@ export declare function mergeAngularJsonAndProjects(projects: {
 };
 export declare function toNewFormat(w: any): ProjectsConfigurations;
 export declare function toOldFormat(w: any): any;
+export declare function renamePropertyWithStableKeys(obj: any, from: string, to: string): void;

package/src/adapter/angular-json.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toOldFormat = exports.toNewFormat = exports.mergeAngularJsonAndProjects = exports.isAngularPluginInstalled = exports.shouldMergeAngularProjects = void 0;
+exports.renamePropertyWithStableKeys = exports.toOldFormat = exports.toNewFormat = exports.mergeAngularJsonAndProjects = exports.isAngularPluginInstalled = exports.shouldMergeAngularProjects = void 0;
 const fs_1 = require("fs");
 const path = require("path");
 const fileutils_1 = require("../utils/fileutils");
-const workspaces_1 = require("../config/workspaces");
 function shouldMergeAngularProjects(root, includeProjectsFromAngularJson) {
     if ((0, fs_1.existsSync)(path.join(root, 'angular.json')) &&
         // Include projects from angular.json if explicitly required.
@@ -56,19 +55,19 @@ exports.mergeAngularJsonAndProjects = mergeAngularJsonAndProjects;
 function toNewFormat(w) {
     Object.values(w.projects || {}).forEach((projectConfig) => {
         if (projectConfig.architect) {
-            (0, workspaces_1.renamePropertyWithStableKeys)(projectConfig, 'architect', 'targets');
+            renamePropertyWithStableKeys(projectConfig, 'architect', 'targets');
         }
         if (projectConfig.schematics) {
-            (0, workspaces_1.renamePropertyWithStableKeys)(projectConfig, 'schematics', 'generators');
+            renamePropertyWithStableKeys(projectConfig, 'schematics', 'generators');
         }
         Object.values(projectConfig.targets || {}).forEach((target) => {
             if (target.builder !== undefined) {
-                (0, workspaces_1.renamePropertyWithStableKeys)(target, 'builder', 'executor');
+                renamePropertyWithStableKeys(target, 'builder', 'executor');
             }
         });
     });
     if (w.schematics) {
-        (0, workspaces_1.renamePropertyWithStableKeys)(w, 'schematics', 'generators');
+        renamePropertyWithStableKeys(w, 'schematics', 'generators');
     }
     if (w.version !== 2) {
         w.version = 2;
@@ -82,20 +81,20 @@ function toOldFormat(w) {
             throw new Error("'project.json' files are incompatible with version 1 workspace schemas.");
         }
         if (projectConfig.targets) {
-            (0, workspaces_1.renamePropertyWithStableKeys)(projectConfig, 'targets', 'architect');
+            renamePropertyWithStableKeys(projectConfig, 'targets', 'architect');
         }
         if (projectConfig.generators) {
-            (0, workspaces_1.renamePropertyWithStableKeys)(projectConfig, 'generators', 'schematics');
+            renamePropertyWithStableKeys(projectConfig, 'generators', 'schematics');
         }
         delete projectConfig.name;
         Object.values(projectConfig.architect || {}).forEach((target) => {
             if (target.executor !== undefined) {
-                (0, workspaces_1.renamePropertyWithStableKeys)(target, 'executor', 'builder');
+                renamePropertyWithStableKeys(target, 'executor', 'builder');
             }
         });
     });
     if (w.generators) {
-        (0, workspaces_1.renamePropertyWithStableKeys)(w, 'generators', 'schematics');
+        renamePropertyWithStableKeys(w, 'generators', 'schematics');
     }
     if (w.version !== 1) {
         w.version = 1;
@@ -103,3 +102,20 @@ function toOldFormat(w) {
     return w;
 }
 exports.toOldFormat = toOldFormat;
+// we have to do it this way to preserve the order of properties
+// not to screw up the formatting
+function renamePropertyWithStableKeys(obj, from, to) {
+    const copy = Object.assign({}, obj);
+    Object.keys(obj).forEach((k) => {
+        delete obj[k];
+    });
+    Object.keys(copy).forEach((k) => {
+        if (k === from) {
+            obj[to] = copy[k];
+        }
+        else {
+            obj[k] = copy[k];
+        }
+    });
+}
+exports.renamePropertyWithStableKeys = renamePropertyWithStableKeys;

package/src/command-line/generate/generate.js

@@ -4,8 +4,8 @@ exports.workspaceGenerators = exports.generate = exports.printGenHelp = exports.
 const tslib_1 = require("tslib");
 const chalk = require("chalk");
 const enquirer_1 = require("enquirer");
+const path_1 = require("path");
 const configuration_1 = require("../../config/configuration");
-const workspaces_1 = require("../../config/workspaces");
 const tree_1 = require("../../generators/tree");
 const project_graph_1 = require("../../project-graph/project-graph");
 const logger_1 = require("../../utils/logger");
@@ -31,9 +31,9 @@ function printChanges(fileChanges) {
     });
 }
 exports.printChanges = printChanges;
-function promptForCollection(generatorName, ws, interactive, projectsConfiguration) {
+function promptForCollection(generatorName, interactive, projectsConfiguration) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const localPlugins = yield (0, local_plugins_1.getLocalWorkspacePlugins)(projectsConfiguration);
+        const localPlugins = yield (0, local_plugins_1.getLocalWorkspacePlugins)(projectsConfiguration, (0, configuration_1.readNxJson)());
         const installedCollections = Array.from(new Set((0, installed_plugins_1.findInstalledPlugins)().map((x) => x.name)));
         const choicesMap = new Set();
         const deprecatedChoices = new Set();
@@ -148,7 +148,7 @@ function parseGeneratorString(value) {
         };
     }
 }
-function convertToGenerateOptions(generatorOptions, ws, defaultCollectionName, mode, projectsConfiguration) {
+function convertToGenerateOptions(generatorOptions, defaultCollectionName, mode, projectsConfiguration) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let collectionName = null;
         let generatorName = null;
@@ -161,7 +161,7 @@ function convertToGenerateOptions(generatorOptions, ws, defaultCollectionName, m
                 generatorName = generator;
             }
             else if (!defaultCollectionName) {
-                const generatorString = yield promptForCollection(generatorDescriptor, ws, interactive, projectsConfiguration);
+                const generatorString = yield promptForCollection(generatorDescriptor, interactive, projectsConfiguration);
                 const parsedGeneratorString = parseGeneratorString(generatorString);
                 collectionName = parsedGeneratorString.collection;
                 generatorName = parsedGeneratorString.generator;
@@ -220,12 +220,11 @@ function generate(cwd, args) {
             process.env.NX_VERBOSE_LOGGING = 'true';
         }
         const verbose = process.env.NX_VERBOSE_LOGGING === 'true';
-        const ws = new workspaces_1.Workspaces(workspace_root_1.workspaceRoot);
         const nxJsonConfiguration = (0, configuration_1.readNxJson)();
         const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
         const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
         return (0, params_1.handleErrors)(verbose, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const opts = yield convertToGenerateOptions(args, ws, readDefaultCollection(nxJsonConfiguration), 'generate', projectsConfigurations);
+            const opts = yield convertToGenerateOptions(args, readDefaultCollection(nxJsonConfiguration), 'generate', projectsConfigurations);
             const { normalizedGeneratorName, schema, implementationFactory, generatorConfiguration: { aliases, hidden, ['x-deprecated']: deprecated, ['x-use-standalone-layout']: isStandalonePreset, }, } = (0, generator_utils_1.getGeneratorInformation)(opts.collectionName, opts.generatorName, workspace_root_1.workspaceRoot);
             if (deprecated) {
                 logger_1.logger.warn([
@@ -240,7 +239,7 @@ function generate(cwd, args) {
                 printGenHelp(opts, schema, normalizedGeneratorName, aliases);
                 return 0;
             }
-            const combinedOpts = yield (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName, projectsConfigurations, nxJsonConfiguration, schema, opts.interactive, (0, calculate_default_project_name_1.calculateDefaultProjectName)(cwd, workspace_root_1.workspaceRoot, projectsConfigurations, nxJsonConfiguration), ws.relativeCwd(cwd), verbose);
+            const combinedOpts = yield (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName, projectsConfigurations, nxJsonConfiguration, schema, opts.interactive, (0, calculate_default_project_name_1.calculateDefaultProjectName)(cwd, workspace_root_1.workspaceRoot, projectsConfigurations, nxJsonConfiguration), (0, path_1.relative)(cwd, workspace_root_1.workspaceRoot), verbose);
             if ((0, generator_utils_1.getGeneratorInformation)(opts.collectionName, normalizedGeneratorName, workspace_root_1.workspaceRoot).isNxGenerator) {
                 const host = new tree_1.FsTree(workspace_root_1.workspaceRoot, verbose, `generating (${opts.collectionName}:${normalizedGeneratorName})`);
                 const implementation = implementationFactory();

package/src/command-line/init/command-object.js

@@ -14,7 +14,7 @@ exports.yargsInitCommand = {
 };
 function withInitOptions(yargs) {
     return yargs
-        .options('nxCloud', {
+        .option('nxCloud', {
         type: 'boolean',
         description: 'Set up distributed caching with Nx Cloud.',
     })
@@ -32,18 +32,23 @@ function withInitOptions(yargs) {
         describe: 'Set up Cypress E2E tests in integrated workspaces. Only for CRA projects.',
         type: 'boolean',
         default: false,
+    })
+        .option('useDotNxInstallation', {
+        type: 'boolean',
+        description: 'Initialize an Nx workspace setup in the .nx directory of the current repository.',
+        default: false,
     })
         .option('force', {
         describe: 'Force the migration to continue and ignore custom webpack setup or uncommitted changes. Only for CRA projects.',
         type: 'boolean',
         default: false,
     })
-        .options('vite', {
+        .option('vite', {
         type: 'boolean',
         description: 'Use Vite as the bundler. Only for CRA projects.',
         default: true,
     })
-        .options('cacheable', {
+        .option('cacheable', {
         type: 'string',
         description: 'Comma-separated list of cacheable operations. Only used for internal testing.',
         coerce: shared_options_1.parseCSV,

package/src/command-line/init/implementation/angular/standalone-workspace.js

@@ -48,7 +48,9 @@ function createNxJson(repoRoot, angularJson, cacheableOperations, { eslintProjec
                     karmaProjectConfigFile ? '!{projectRoot}/karma.conf.js' : undefined,
                 ].filter(Boolean)
                 : []),
-            eslintProjectConfigFile ? '!{projectRoot}/.eslintrc.json' : undefined,
+            ...(eslintProjectConfigFile
+                ? ['!{projectRoot}/.eslintrc.json', '!{projectRoot}/eslint.config.js']
+                : []),
         ].filter(Boolean),
     };
     nxJson.targetDefaults = {};
@@ -73,6 +75,9 @@ function createNxJson(repoRoot, angularJson, cacheableOperations, { eslintProjec
         if ((0, fileutils_1.fileExists)((0, path_1.join)(repoRoot, '.eslintrc.json'))) {
             inputs.push('{workspaceRoot}/.eslintrc.json');
         }
+        if ((0, fileutils_1.fileExists)((0, path_1.join)(repoRoot, 'eslint.config.js'))) {
+            inputs.push('{workspaceRoot}/eslint.config.js');
+        }
         nxJson.targetDefaults.lint = { inputs };
     }
     if (workspaceTargets.includes('e2e')) {

package/src/command-line/init/implementation/dot-nx/add-nx-scripts.js

@@ -46,10 +46,15 @@ function writeMinimalNxJson(host, version) {
                 default: {
                     runner: 'nx/tasks-runners/default',
                     options: {
-                        cacheableOperations: [],
+                        cacheableOperations: ['build', 'lint', 'test', 'e2e'],
                     },
                 },
             },
+            targetDefaults: {
+                build: {
+                    dependsOn: ['^build'],
+                },
+            },
             installation: {
                 version: version.trimEnd(),
             },

package/src/command-line/init/implementation/react/index.js

@@ -14,7 +14,6 @@ const check_for_uncommitted_changes_1 = require("./check-for-uncommitted-changes
 const clean_up_files_1 = require("./clean-up-files");
 const read_name_from_package_json_1 = require("./read-name-from-package-json");
 const rename_js_to_jsx_1 = require("./rename-js-to-jsx");
-const setup_e2e_project_1 = require("./setup-e2e-project");
 const tsconfig_setup_1 = require("./tsconfig-setup");
 const write_craco_config_1 = require("./write-craco-config");
 const write_vite_config_1 = require("./write-vite-config");
@@ -129,7 +128,7 @@ function reorgnizeWorkspaceStructure(options) {
 }
 function createTempWorkspace(options) {
     (0, fs_extra_1.removeSync)('temp-workspace');
-    (0, child_process_1.execSync)(`npx ${options.npxYesFlagNeeded ? '-y' : ''} create-nx-workspace@latest temp-workspace --appName=${options.reactAppName} --preset=react-monorepo --style=css --bundler=${options.isVite ? 'vite' : 'webpack'} --packageManager=${options.packageManager} ${options.nxCloud ? '--nxCloud' : '--nxCloud=false'}`, { stdio: [0, 1, 2] });
+    (0, child_process_1.execSync)(`npx ${options.npxYesFlagNeeded ? '-y' : ''} create-nx-workspace@latest temp-workspace --appName=${options.reactAppName} --preset=react-monorepo --style=css --bundler=${options.isVite ? 'vite' : 'webpack'} --packageManager=${options.packageManager} ${options.nxCloud ? '--nxCloud' : '--nxCloud=false'} ${options.addE2e ? '--e2eTestRunner=cypress' : '--e2eTestRunner=none'}`, { stdio: [0, 1, 2] });
     output_1.output.log({ title: '👋 Welcome to Nx!' });
     output_1.output.log({ title: '🧹 Clearing unused files' });
     (0, fs_extra_1.copySync)((0, path_1.join)('temp-workspace', 'apps', options.reactAppName, 'project.json'), 'project.json');
@@ -228,14 +227,6 @@ function cleanUpUnusedFilesAndAddConfigFiles(options) {
     (0, clean_up_files_1.cleanUpFiles)(options.reactAppName, options.isStandalone);
     output_1.output.log({ title: "📃 Extend the app's tsconfig.json from the base" });
     (0, tsconfig_setup_1.setupTsConfig)(options.reactAppName, options.isStandalone);
-    if (options.addE2e && !options.isStandalone) {
-        output_1.output.log({ title: '📃 Setup e2e tests' });
-        (0, setup_e2e_project_1.setupE2eProject)(options.reactAppName);
-    }
-    else {
-        (0, fs_extra_1.removeSync)((0, path_1.join)('apps', `${options.reactAppName}-e2e`));
-        (0, child_process_1.execSync)(`${options.pmc.rm} cypress @nx/cypress eslint-plugin-cypress`);
-    }
     if (options.isStandalone) {
         (0, fs_extra_1.removeSync)('apps');
     }

package/src/command-line/init/init.d.ts

@@ -6,5 +6,6 @@ export interface InitArgs {
     vite: boolean;
     nxCloud?: boolean;
     cacheable?: string[];
+    useDotNxInstallation?: boolean;
 }
 export declare function initHandler(options: InitArgs): Promise<void>;

package/src/command-line/init/init.js

@@ -6,7 +6,6 @@ const child_process_1 = require("child_process");
 const enquirer_1 = require("enquirer");
 const fs_1 = require("fs");
 const semver_1 = require("semver");
-const parser = require("yargs-parser");
 const add_nx_to_monorepo_1 = require("./implementation/add-nx-to-monorepo");
 const add_nx_to_nest_1 = require("./implementation/add-nx-to-nest");
 const add_nx_to_npm_repo_1 = require("./implementation/add-nx-to-npm-repo");
@@ -21,20 +20,11 @@ function initHandler(options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         // strip the 'init' command itself so we don't forward it
         const args = process.argv.slice(3).join(' ');
-        const flags = parser(args, {
-            boolean: ['useDotNxInstallation'],
-            alias: {
-                useDotNxInstallation: ['encapsulated'],
-            },
-            default: {
-                useDotNxInstallation: false,
-            },
-        });
         const version = (_a = process.env.NX_VERSION) !== null && _a !== void 0 ? _a : ((0, semver_1.prerelease)(versions_1.nxVersion) ? 'next' : 'latest');
         if (process.env.NX_VERSION) {
             console.log(`Using version ${process.env.NX_VERSION}`);
         }
-        if (flags.useDotNxInstallation === true) {
+        if (options.useDotNxInstallation === true) {
             setupDotNxInstallation(version);
         }
         else if ((0, fs_1.existsSync)('package.json')) {

package/src/command-line/list/list.js

@@ -7,6 +7,7 @@ const output_1 = require("../../utils/output");
 const plugins_1 = require("../../utils/plugins");
 const local_plugins_1 = require("../../utils/plugins/local-plugins");
 const project_graph_1 = require("../../project-graph/project-graph");
+const nx_json_1 = require("../../config/nx-json");
 /**
  * List available plugins or capabilities within a specific plugin
  *
@@ -21,9 +22,10 @@ function listHandler(args) {
             yield (0, plugins_1.listPluginCapabilities)(args.plugin);
         }
         else {
+            const nxJson = (0, nx_json_1.readNxJson)();
             const corePlugins = (0, plugins_1.fetchCorePlugins)();
             const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
-            const localPlugins = yield (0, local_plugins_1.getLocalWorkspacePlugins)((0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph));
+            const localPlugins = yield (0, local_plugins_1.getLocalWorkspacePlugins)((0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph), nxJson);
             const installedPlugins = yield (0, plugins_1.getInstalledPluginsAndCapabilities)(workspace_root_1.workspaceRoot);
             if (localPlugins.size) {
                 (0, local_plugins_1.listLocalWorkspacePlugins)(localPlugins);

package/src/command-line/report/report.js

@@ -13,6 +13,7 @@ const project_graph_1 = require("../../project-graph/project-graph");
 const semver_1 = require("semver");
 const installed_plugins_1 = require("../../utils/plugins/installed-plugins");
 const installation_directory_1 = require("../../utils/installation-directory");
+const nx_json_1 = require("../../config/nx-json");
 const nxPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(__dirname, '../../../package.json'));
 exports.packagesWeCareAbout = [
     'lerna',
@@ -89,7 +90,7 @@ function getReportData() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const pm = (0, package_manager_1.detectPackageManager)();
         const pmVersion = (0, package_manager_1.getPackageManagerVersion)(pm);
-        const localPlugins = yield findLocalPlugins();
+        const localPlugins = yield findLocalPlugins((0, nx_json_1.readNxJson)());
         const communityPlugins = findInstalledCommunityPlugins();
         let projectGraphError = null;
         if (isNativeAvailable()) {
@@ -124,11 +125,11 @@ function getReportData() {
     });
 }
 exports.getReportData = getReportData;
-function findLocalPlugins() {
+function findLocalPlugins(nxJson) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         try {
             const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
-            const localPlugins = yield (0, local_plugins_1.getLocalWorkspacePlugins)((0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph));
+            const localPlugins = yield (0, local_plugins_1.getLocalWorkspacePlugins)((0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph), nxJson);
             return Array.from(localPlugins.keys());
         }
         catch (_a) {