nx 17.0.3 → 17.0.5

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

@@ -5,7 +5,7 @@ const crypto_1 = require("crypto");
 const fs_1 = require("fs");
 const fs_extra_1 = require("fs-extra");
 const http = require("http");
-const minimatch = require("minimatch");
+const minimatch_1 = require("minimatch");
 const node_url_1 = require("node:url");
 const open = require("open");
 const path_1 = require("path");
@@ -15,7 +15,6 @@ const fileutils_1 = require("../../utils/fileutils");
 const output_1 = require("../../utils/output");
 const workspace_root_1 = require("../../utils/workspace-root");
 const client_1 = require("../../daemon/client/client");
-const task_hasher_1 = require("../../hasher/task-hasher");
 const typescript_1 = require("../../plugins/js/utils/typescript");
 const operators_1 = require("../../project-graph/operators");
 const project_graph_1 = require("../../project-graph/project-graph");
@@ -26,6 +25,8 @@ const native_1 = require("../../native");
 const transform_objects_1 = require("../../native/transform-objects");
 const affected_1 = require("../affected/affected");
 const nx_deps_cache_1 = require("../../project-graph/nx-deps-cache");
+const task_hasher_1 = require("../../hasher/task-hasher");
+const create_task_hasher_1 = require("../../hasher/create-task-hasher");
 // maps file extention to MIME types
 const mimeType = {
     '.ico': 'image/x-icon',
@@ -43,7 +44,7 @@ const mimeType = {
     '.eot': 'appliaction/vnd.ms-fontobject',
     '.ttf': 'aplication/font-sfnt',
 };
-function buildEnvironmentJs(exclude, watchMode, localMode, depGraphClientResponse, taskGraphClientResponse, expandedTaskInputsReponse) {
+function buildEnvironmentJs(exclude, watchMode, localMode, depGraphClientResponse, taskGraphClientResponse, expandedTaskInputsReponse, sourceMapsResponse) {
     let environmentJs = `window.exclude = ${JSON.stringify(exclude)};
   window.watch = ${!!watchMode};
   window.environment = 'release';
@@ -59,6 +60,7 @@ function buildEnvironmentJs(exclude, watchMode, localMode, depGraphClientRespons
         projectGraphUrl: 'project-graph.json',
         taskGraphUrl: 'task-graph.json',
         taskInputsUrl: 'task-inputs.json',
+        sourceMapsUrl: 'source-maps.json'
       }
     ],
     defaultWorkspaceId: 'local',
@@ -70,11 +72,13 @@ function buildEnvironmentJs(exclude, watchMode, localMode, depGraphClientRespons
         environmentJs += `window.taskGraphResponse = ${JSON.stringify(taskGraphClientResponse)};
     `;
         environmentJs += `window.expandedTaskInputsResponse = ${JSON.stringify(expandedTaskInputsReponse)};`;
+        environmentJs += `window.sourceMapsResponse = ${JSON.stringify(sourceMapsResponse)};`;
     }
     else {
         environmentJs += `window.projectGraphResponse = null;`;
         environmentJs += `window.taskGraphResponse = null;`;
         environmentJs += `window.expandedTaskInputsResponse = null;`;
+        environmentJs += `window.sourceMapsResponse = null;`;
     }
     return environmentJs;
 }
@@ -133,11 +137,28 @@ async function generateGraph(args, affectedProjects) {
             ],
         });
     }
+    if (args.view === 'project-details' && !args.focus) {
+        output_1.output.error({
+            title: `The project details view requires the --focus option.`,
+        });
+        process.exit(1);
+    }
+    if (args.view === 'project-details' && (args.targets || args.affected)) {
+        output_1.output.error({
+            title: `The project details view can only be used with the --focus option.`,
+            bodyLines: [
+                `You passed ${args.targets ? '--targets ' : ''}${args.affected ? '--affected ' : ''}`,
+            ],
+        });
+        process.exit(1);
+    }
     // TODO: Graph Client should support multiple targets
     const target = Array.isArray(args.targets && args.targets.length >= 1)
         ? args.targets[0]
         : args.targets;
-    const rawGraph = await (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
+    const { projectGraph: rawGraph, sourceMaps } = await (0, project_graph_1.createProjectGraphAndSourceMapsAsync)({
+        exitOnError: true,
+    });
     let prunedGraph = (0, operators_1.pruneExternalNodes)(rawGraph);
     const projects = Object.values(prunedGraph.nodes);
     projects.sort((a, b) => {
@@ -175,7 +196,7 @@ async function generateGraph(args, affectedProjects) {
     if (args.file) {
         // stdout is a magical constant that doesn't actually write a file
         if (args.file === 'stdout') {
-            console.log(JSON.stringify(createJsonOutput(prunedGraph, args.projects, args.targets), null, 2));
+            console.log(JSON.stringify(await createJsonOutput(prunedGraph, rawGraph, args.projects, args.targets), null, 2));
             process.exit(0);
         }
         const workspaceFolder = workspace_root_1.workspaceRoot;
@@ -196,10 +217,10 @@ async function generateGraph(args, affectedProjects) {
                     return isntHtml;
                 },
             });
-            const depGraphClientResponse = await createDepGraphClientResponse(affectedProjects);
+            const { projectGraphClientResponse } = await createProjectGraphAndSourceMapClientResponse(affectedProjects);
             const taskGraphClientResponse = await createTaskGraphClientResponse();
-            const taskInputsReponse = await createExpandedTaskInputResponse(taskGraphClientResponse, depGraphClientResponse);
-            const environmentJs = buildEnvironmentJs(args.exclude || [], args.watch, !!args.file && args.file.endsWith('html') ? 'build' : 'serve', depGraphClientResponse, taskGraphClientResponse, taskInputsReponse);
+            const taskInputsReponse = await createExpandedTaskInputResponse(taskGraphClientResponse, projectGraphClientResponse);
+            const environmentJs = buildEnvironmentJs(args.exclude || [], args.watch, !!args.file && args.file.endsWith('html') ? 'build' : 'serve', projectGraphClientResponse, taskGraphClientResponse, taskInputsReponse, sourceMaps);
             html = html.replace(/src="/g, 'src="static/');
             html = html.replace(/href="styles/g, 'href="static/styles');
             html = html.replace('<base href="/" />', '');
@@ -213,7 +234,7 @@ async function generateGraph(args, affectedProjects) {
         }
         else if (ext === '.json') {
             (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)(fullFilePath));
-            const json = createJsonOutput(prunedGraph, args.projects, args.targets);
+            const json = await createJsonOutput(prunedGraph, rawGraph, args.projects, args.targets);
             json.affectedProjects = affectedProjects;
             json.criticalPath = affectedProjects;
             (0, fileutils_1.writeJsonFile)(fullFilePath, json);
@@ -223,7 +244,7 @@ async function generateGraph(args, affectedProjects) {
                     '- affectedProjects',
                     '- criticalPath',
                     '',
-                    'These fields will be removed in Nx 18. If you need to see which projects were affected, use `nx show projects --affected`.',
+                    'These fields will be removed in Nx 19. If you need to see which projects were affected, use `nx show projects --affected`.',
                 ],
             });
             output_1.output.success({
@@ -245,7 +266,7 @@ async function generateGraph(args, affectedProjects) {
         const { app, url } = await startServer(html, environmentJs, args.host || '127.0.0.1', args.port || 4211, args.watch, affectedProjects, args.focus, args.groupByFolder, args.exclude);
         url.pathname = args.view;
         if (args.focus) {
-            url.pathname += '/' + args.focus;
+            url.pathname += '/' + encodeURIComponent(args.focus);
         }
         if (target) {
             url.pathname += '/' + target;
@@ -279,10 +300,12 @@ async function startServer(html, environmentJs, host, port = 4211, watchForchang
     if (watchForchanges) {
         unregisterFileWatcher = await createFileWatcher();
     }
-    currentDepGraphClientResponse = await createDepGraphClientResponse(affected);
-    currentDepGraphClientResponse.focus = focus;
-    currentDepGraphClientResponse.groupByFolder = groupByFolder;
-    currentDepGraphClientResponse.exclude = exclude;
+    const { projectGraphClientResponse, sourceMapResponse } = await createProjectGraphAndSourceMapClientResponse(affected);
+    currentProjectGraphClientResponse = projectGraphClientResponse;
+    currentProjectGraphClientResponse.focus = focus;
+    currentProjectGraphClientResponse.groupByFolder = groupByFolder;
+    currentProjectGraphClientResponse.exclude = exclude;
+    currentSourceMapsClientResponse = sourceMapResponse;
     const app = http.createServer(async (req, res) => {
         // parse URL
         const parsedUrl = new node_url_1.URL(req.url, `http://${host}:${port}`);
@@ -290,10 +313,11 @@ async function startServer(html, environmentJs, host, port = 4211, watchForchang
         // Avoid https://en.wikipedia.org/wiki/Directory_traversal_attack
         // e.g curl --path-as-is http://localhost:9000/../fileInDanger.txt
         // by limiting the path to current directory only
+        res.setHeader('Access-Control-Allow-Origin', '*');
         const sanitizePath = (0, path_1.basename)(parsedUrl.pathname);
         if (sanitizePath === 'project-graph.json') {
             res.writeHead(200, { 'Content-Type': 'application/json' });
-            res.end(JSON.stringify(currentDepGraphClientResponse));
+            res.end(JSON.stringify(currentProjectGraphClientResponse));
             return;
         }
         if (sanitizePath === 'task-graph.json') {
@@ -311,9 +335,14 @@ async function startServer(html, environmentJs, host, port = 4211, watchForchang
             perf_hooks_1.performance.measure('task input generation', 'task input generation:start', 'task input generation:end');
             return;
         }
+        if (sanitizePath === 'source-maps.json') {
+            res.writeHead(200, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify(currentSourceMapsClientResponse));
+            return;
+        }
         if (sanitizePath === 'currentHash') {
             res.writeHead(200, { 'Content-Type': 'application/json' });
-            res.end(JSON.stringify({ hash: currentDepGraphClientResponse.hash }));
+            res.end(JSON.stringify({ hash: currentProjectGraphClientResponse.hash }));
             return;
         }
         if (sanitizePath === 'environment.js') {
@@ -353,7 +382,7 @@ async function startServer(html, environmentJs, host, port = 4211, watchForchang
         });
     });
 }
-let currentDepGraphClientResponse = {
+let currentProjectGraphClientResponse = {
     hash: null,
     projects: [],
     dependencies: {},
@@ -367,6 +396,7 @@ let currentDepGraphClientResponse = {
     groupByFolder: false,
     exclude: [],
 };
+let currentSourceMapsClientResponse = {};
 function debounce(fn, time) {
     let timeout;
     return (...args) => {
@@ -387,10 +417,13 @@ function createFileWatcher() {
         }
         else if (changes !== null && changes.changedFiles.length > 0) {
             output_1.output.note({ title: 'Recalculating project graph...' });
-            const newGraphClientResponse = await createDepGraphClientResponse();
-            if (newGraphClientResponse.hash !== currentDepGraphClientResponse.hash) {
+            const { projectGraphClientResponse, sourceMapResponse } = await createProjectGraphAndSourceMapClientResponse();
+            if (projectGraphClientResponse.hash !==
+                currentProjectGraphClientResponse.hash &&
+                sourceMapResponse) {
                 output_1.output.note({ title: 'Graph changes updated.' });
-                currentDepGraphClientResponse = newGraphClientResponse;
+                currentProjectGraphClientResponse = projectGraphClientResponse;
+                currentSourceMapsClientResponse = sourceMapResponse;
             }
             else {
                 output_1.output.note({ title: 'No graph changes found.' });
@@ -398,9 +431,10 @@ function createFileWatcher() {
         }
     }, 500));
 }
-async function createDepGraphClientResponse(affected = []) {
+async function createProjectGraphAndSourceMapClientResponse(affected = []) {
     perf_hooks_1.performance.mark('project graph watch calculation:start');
-    let graph = (0, operators_1.pruneExternalNodes)(await (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true }));
+    const { projectGraph, sourceMaps } = await (0, project_graph_1.createProjectGraphAndSourceMapsAsync)({ exitOnError: true });
+    let graph = (0, operators_1.pruneExternalNodes)(projectGraph);
     let fileMap = (0, nx_deps_cache_1.readFileMapCache)().fileMap.projectFileMap;
     perf_hooks_1.performance.mark('project graph watch calculation:end');
     perf_hooks_1.performance.mark('project graph response generation:start');
@@ -408,19 +442,22 @@ async function createDepGraphClientResponse(affected = []) {
     const projects = Object.values(graph.nodes);
     const dependencies = graph.dependencies;
     const hasher = (0, crypto_1.createHash)('sha256');
-    hasher.update(JSON.stringify({ layout, projects, dependencies }));
+    hasher.update(JSON.stringify({ layout, projects, dependencies, sourceMaps }));
     const hash = hasher.digest('hex');
     perf_hooks_1.performance.mark('project graph response generation:end');
     perf_hooks_1.performance.measure('project graph watch calculation', 'project graph watch calculation:start', 'project graph watch calculation:end');
     perf_hooks_1.performance.measure('project graph response generation', 'project graph response generation:start', 'project graph response generation:end');
     return {
-        ...currentDepGraphClientResponse,
-        hash,
-        layout,
-        projects,
-        dependencies,
-        affected,
-        fileMap,
+        projectGraphClientResponse: {
+            ...currentProjectGraphClientResponse,
+            hash,
+            layout,
+            projects,
+            dependencies,
+            affected,
+            fileMap,
+        },
+        sourceMapResponse: sourceMaps,
     };
 }
 async function createTaskGraphClientResponse(pruneExternal = false) {
@@ -435,7 +472,7 @@ async function createTaskGraphClientResponse(pruneExternal = false) {
     perf_hooks_1.performance.mark('task graph generation:start');
     const taskGraphs = getAllTaskGraphsForWorkspace(nxJson, graph);
     perf_hooks_1.performance.mark('task graph generation:end');
-    const planner = new native_1.HashPlanner(workspace_root_1.workspaceRoot, nxJson, (0, transform_objects_1.transformProjectGraphForRust)(graph));
+    const planner = new native_1.HashPlanner(nxJson, (0, native_1.transferProjectGraph)((0, transform_objects_1.transformProjectGraphForRust)(graph)));
     perf_hooks_1.performance.mark('task hash plan generation:start');
     const plans = {};
     for (const individualTaskGraph of Object.values(taskGraphs.taskGraphs)) {
@@ -523,7 +560,7 @@ async function getExpandedTaskInputs(taskId) {
     const allWorkspaceFiles = await (0, all_file_data_1.allFileData)();
     const inputs = taskGraphResponse.plans[taskId];
     if (inputs) {
-        return expandInputs(inputs, currentDepGraphClientResponse.projects.find((p) => p.name === project), allWorkspaceFiles, currentDepGraphClientResponse);
+        return expandInputs(inputs, currentProjectGraphClientResponse.projects.find((p) => p.name === project), allWorkspaceFiles, currentProjectGraphClientResponse);
     }
     return {};
 }
@@ -564,7 +601,7 @@ function expandInputs(inputs, project, allWorkspaceFiles, depGraphClientResponse
         }
         else {
             allWorkspaceFiles
-                .filter((f) => minimatch(f.file, withoutWorkspaceRoot))
+                .filter((f) => (0, minimatch_1.minimatch)(f.file, withoutWorkspaceRoot))
                 .forEach((f) => {
                 matches.push(f.file);
             });
@@ -603,14 +640,22 @@ function expandInputs(inputs, project, allWorkspaceFiles, depGraphClientResponse
         external: externalInputs,
     };
 }
-function createJsonOutput(graph, projects, targets) {
+async function createJsonOutput(prunedGraph, rawGraph, projects, targets) {
     const response = {
-        graph,
+        graph: prunedGraph,
     };
     if (targets?.length) {
         const nxJson = (0, configuration_1.readNxJson)();
         const defaultDependencyConfigs = (0, create_task_graph_1.mapTargetDefaultsToDependencies)(nxJson.targetDefaults);
-        response.tasks = (0, create_task_graph_1.createTaskGraph)(graph, defaultDependencyConfigs, projects, targets, undefined, {});
+        const taskGraph = (0, create_task_graph_1.createTaskGraph)(rawGraph, defaultDependencyConfigs, projects, targets, undefined, {});
+        const hasher = (0, create_task_hasher_1.createTaskHasher)(rawGraph, (0, configuration_1.readNxJson)());
+        let tasks = Object.values(taskGraph.tasks);
+        const hashes = await hasher.hashTasks(tasks, taskGraph);
+        response.tasks = taskGraph;
+        response.taskPlans = tasks.reduce((acc, task, index) => {
+            acc[task.id] = Object.keys(hashes[index].details.nodes).sort();
+            return acc;
+        }, {});
     }
     return response;
 }

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

@@ -2,55 +2,82 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsInitCommand = void 0;
 const shared_options_1 = require("../yargs-utils/shared-options");
+const nx_json_1 = require("../../config/nx-json");
+const useV2 = process.env['NX_ADD_PLUGINS'] !== 'false' &&
+    (0, nx_json_1.readNxJson)().useInferencePlugins !== false;
 exports.yargsInitCommand = {
     command: 'init',
-    describe: 'Adds Nx to any type of workspace. It installs nx, creates an nx.json configuration file and optionally sets up distributed caching. For more info, check https://nx.dev/recipes/adopting-nx.',
+    describe: 'Adds Nx to any type of workspace. It installs nx, creates an nx.json configuration file and optionally sets up remote caching. For more info, check https://nx.dev/recipes/adopting-nx.',
     builder: (yargs) => withInitOptions(yargs),
     handler: async (args) => {
-        await (await Promise.resolve().then(() => require('./init'))).initHandler(args);
+        if (useV2) {
+            await require('./init-v2').initHandler(args);
+        }
+        else {
+            await require('./init-v1').initHandler(args);
+        }
         process.exit(0);
     },
 };
 function withInitOptions(yargs) {
-    return yargs
-        .option('nxCloud', {
-        type: 'boolean',
-        description: 'Set up distributed caching with Nx Cloud.',
-    })
-        .option('interactive', {
-        describe: 'When false disables interactive input prompts for options.',
-        type: 'boolean',
-        default: true,
-    })
-        .option('integrated', {
-        type: 'boolean',
-        description: 'Migrate to an Nx integrated layout workspace. Only for Angular CLI workspaces and CRA projects.',
-        default: false,
-    })
-        .option('addE2e', {
-        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,
-    })
-        .option('vite', {
-        type: 'boolean',
-        description: 'Use Vite as the bundler. Only for CRA projects.',
-        default: true,
-    })
-        .option('cacheable', {
-        type: 'string',
-        description: 'Comma-separated list of cacheable operations. Only used for internal testing.',
-        coerce: shared_options_1.parseCSV,
-        hidden: true,
-    });
+    if (useV2) {
+        return yargs
+            .option('nxCloud', {
+            type: 'boolean',
+            description: 'Set up distributed caching with Nx Cloud.',
+        })
+            .option('interactive', {
+            describe: 'When false disables interactive input prompts for options.',
+            type: 'boolean',
+            default: true,
+        })
+            .option('useDotNxInstallation', {
+            type: 'boolean',
+            description: 'Initialize an Nx workspace setup in the .nx directory of the current repository.',
+            default: false,
+        });
+    }
+    else {
+        return yargs
+            .option('nxCloud', {
+            type: 'boolean',
+            description: 'Set up remote caching with Nx Cloud.',
+        })
+            .option('interactive', {
+            describe: 'When false disables interactive input prompts for options.',
+            type: 'boolean',
+            default: true,
+        })
+            .option('integrated', {
+            type: 'boolean',
+            description: 'Migrate to an Nx integrated layout workspace. Only for Angular CLI workspaces and CRA projects.',
+            default: false,
+        })
+            .option('addE2e', {
+            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,
+        })
+            .option('vite', {
+            type: 'boolean',
+            description: 'Use Vite as the bundler. Only for CRA projects.',
+            default: true,
+        })
+            .option('cacheable', {
+            type: 'string',
+            description: 'Comma-separated list of cacheable operations. Only used for internal testing.',
+            coerce: shared_options_1.parseCSV,
+            hidden: true,
+        });
+    }
 }

package/src/command-line/init/implementation/add-nx-to-monorepo.d.ts

@@ -1,4 +1,6 @@
-import { InitArgs } from '../init';
-type Options = Pick<InitArgs, 'nxCloud' | 'interactive' | 'cacheable'>;
+import { InitArgs } from '../init-v1';
+type Options = Pick<InitArgs, 'nxCloud' | 'interactive' | 'cacheable'> & {
+    legacy?: boolean;
+};
 export declare function addNxToMonorepo(options: Options): Promise<void>;
 export {};

package/src/command-line/init/implementation/add-nx-to-monorepo.js

@@ -9,6 +9,7 @@ const fileutils_1 = require("../../../utils/fileutils");
 const output_1 = require("../../../utils/output");
 const package_manager_1 = require("../../../utils/package-manager");
 const utils_1 = require("./utils");
+const connect_to_nx_cloud_1 = require("../../connect/connect-to-nx-cloud");
 async function addNxToMonorepo(options) {
     const repoRoot = process.cwd();
     output_1.output.log({ title: '🐳 Nx initialization' });
@@ -47,16 +48,24 @@ async function addNxToMonorepo(options) {
                 },
             ]))[scriptName];
         }
-        useNxCloud = options.nxCloud ?? (await (0, utils_1.askAboutNxCloud)());
+        useNxCloud =
+            options.nxCloud ?? (await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)());
     }
     else {
         targetDefaults = [];
         cacheableOperations = options.cacheable ?? [];
         useNxCloud =
             options.nxCloud ??
-                (options.interactive ? await (0, utils_1.askAboutNxCloud)() : false);
+                (options.interactive
+                    ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
+                    : false);
     }
     (0, utils_1.createNxJsonFile)(repoRoot, targetDefaults, cacheableOperations, scriptOutputs);
+    if (!options.legacy) {
+        packageJsonFiles.forEach((packageJsonPath) => {
+            (0, utils_1.markPackageJsonAsNxProject)((0, path_1.join)(repoRoot, packageJsonPath), cacheableOperations);
+        });
+    }
     (0, utils_1.updateGitIgnore)(repoRoot);
     (0, utils_1.addDepsToPackageJson)(repoRoot);
     output_1.output.log({ title: '📦 Installing dependencies' });

package/src/command-line/init/implementation/add-nx-to-nest.d.ts

@@ -1,4 +1,4 @@
-import { InitArgs } from '../init';
+import { InitArgs } from '../init-v1';
 import { PackageJson } from '../../../utils/package-json';
 type Options = Pick<InitArgs, 'nxCloud' | 'interactive' | 'cacheable'>;
 export declare function addNxToNest(options: Options, packageJson: PackageJson): Promise<void>;

package/src/command-line/init/implementation/add-nx-to-nest.js

@@ -9,6 +9,7 @@ const output_1 = require("../../../utils/output");
 const package_manager_1 = require("../../../utils/package-manager");
 const utils_1 = require("./utils");
 const versions_1 = require("../../../utils/versions");
+const connect_to_nx_cloud_1 = require("../../connect/connect-to-nx-cloud");
 async function addNxToNest(options, packageJson) {
     const repoRoot = process.cwd();
     output_1.output.log({ title: '🐳 Nx initialization' });
@@ -61,20 +62,23 @@ async function addNxToNest(options, packageJson) {
                 },
             ]))[scriptName];
         }
-        useNxCloud = options.nxCloud ?? (await (0, utils_1.askAboutNxCloud)());
+        useNxCloud =
+            options.nxCloud ?? (await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)());
     }
     else {
         cacheableOperations = options.cacheable ?? [];
         useNxCloud =
             options.nxCloud ??
-                (options.interactive ? await (0, utils_1.askAboutNxCloud)() : false);
+                (options.interactive
+                    ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
+                    : false);
     }
-    (0, utils_1.createNxJsonFile)(repoRoot, [], [...cacheableOperations, ...nestCacheableScripts], {});
+    (0, utils_1.createNxJsonFile)(repoRoot, [], [...cacheableOperations, ...nestCacheableScripts], scriptOutputs);
     const pmc = (0, package_manager_1.getPackageManagerCommand)();
     (0, utils_1.updateGitIgnore)(repoRoot);
     (0, utils_1.addDepsToPackageJson)(repoRoot);
     addNestPluginToPackageJson(repoRoot);
-    (0, utils_1.markRootPackageJsonAsNxProject)(repoRoot, cacheableOperations, scriptOutputs, pmc);
+    (0, utils_1.markRootPackageJsonAsNxProjectLegacy)(repoRoot, cacheableOperations, pmc);
     createProjectJson(repoRoot, packageJson, nestCLIConfiguration);
     removeFile(repoRoot, 'nest-cli.json');
     updatePackageJsonScripts(repoRoot, isJS);
@@ -171,9 +175,8 @@ function createProjectJson(repoRoot, packageJson, nestCLIOptions) {
         // lint
         json.targets['lint'] = {
             executor: '@nx/eslint:lint',
-            outputs: ['{options.outputFile}'],
             options: {
-                lintFilePatterns: ['src/**/*.ts', 'test/**/*.ts'],
+                lintFilePatterns: ['./src', './test'],
             },
         };
         // test and e2e

package/src/command-line/init/implementation/add-nx-to-npm-repo.d.ts

@@ -1,4 +1,6 @@
-import { InitArgs } from '../init';
-type Options = Pick<InitArgs, 'nxCloud' | 'interactive' | 'cacheable'>;
+import { InitArgs } from '../init-v1';
+type Options = Pick<InitArgs, 'nxCloud' | 'interactive' | 'cacheable'> & {
+    legacy?: boolean;
+};
 export declare function addNxToNpmRepo(options: Options): Promise<void>;
 export {};

package/src/command-line/init/implementation/add-nx-to-npm-repo.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addNxToNpmRepo = void 0;
 const enquirer = require("enquirer");
+const path_1 = require("path");
 const fileutils_1 = require("../../../utils/fileutils");
 const output_1 = require("../../../utils/output");
 const package_manager_1 = require("../../../utils/package-manager");
 const utils_1 = require("./utils");
+const connect_to_nx_cloud_1 = require("../../connect/connect-to-nx-cloud");
 async function addNxToNpmRepo(options) {
     const repoRoot = process.cwd();
     output_1.output.log({ title: '🐳 Nx initialization' });
@@ -36,19 +38,27 @@ async function addNxToNpmRepo(options) {
                 },
             ]))[scriptName];
         }
-        useNxCloud = options.nxCloud ?? (await (0, utils_1.askAboutNxCloud)());
+        useNxCloud =
+            options.nxCloud ?? (await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)());
     }
     else {
         cacheableOperations = options.cacheable ?? [];
         useNxCloud =
             options.nxCloud ??
-                (options.interactive ? await (0, utils_1.askAboutNxCloud)() : false);
+                (options.interactive
+                    ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
+                    : false);
     }
-    (0, utils_1.createNxJsonFile)(repoRoot, [], cacheableOperations, {});
+    (0, utils_1.createNxJsonFile)(repoRoot, [], cacheableOperations, scriptOutputs);
     const pmc = (0, package_manager_1.getPackageManagerCommand)();
     (0, utils_1.updateGitIgnore)(repoRoot);
     (0, utils_1.addDepsToPackageJson)(repoRoot);
-    (0, utils_1.markRootPackageJsonAsNxProject)(repoRoot, cacheableOperations, scriptOutputs, pmc);
+    if (options.legacy) {
+        (0, utils_1.markRootPackageJsonAsNxProjectLegacy)(repoRoot, cacheableOperations, pmc);
+    }
+    else {
+        (0, utils_1.markPackageJsonAsNxProject)((0, path_1.join)(repoRoot, 'package.json'), cacheableOperations);
+    }
     output_1.output.log({ title: '📦 Installing dependencies' });
     (0, utils_1.runInstall)(repoRoot, pmc);
     if (useNxCloud) {

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

@@ -11,6 +11,7 @@ const utils_1 = require("../utils");
 const integrated_workspace_1 = require("./integrated-workspace");
 const legacy_angular_versions_1 = require("./legacy-angular-versions");
 const standalone_workspace_1 = require("./standalone-workspace");
+const connect_to_nx_cloud_1 = require("../../../connect/connect-to-nx-cloud");
 const defaultCacheableOperations = [
     'build',
     'server',
@@ -35,7 +36,8 @@ async function addNxToAngularCliRepo(options) {
     const cacheableOperations = !options.integrated
         ? await collectCacheableOperations(options)
         : [];
-    const useNxCloud = options.nxCloud ?? (options.interactive ? await (0, utils_1.askAboutNxCloud)() : false);
+    const useNxCloud = options.nxCloud ??
+        (options.interactive ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)() : false);
     output_1.output.log({ title: '📦 Installing dependencies' });
     installDependencies();
     output_1.output.log({ title: '📝 Setting up workspace' });
@@ -106,6 +108,7 @@ function addPluginDependencies() {
     (0, fileutils_1.writeJsonFile)(packageJsonPath, packageJson);
 }
 async function setupWorkspace(cacheableOperations, isIntegratedMigration) {
+    (0, utils_1.updateGitIgnore)(repoRoot);
     if (isIntegratedMigration) {
         (0, integrated_workspace_1.setupIntegratedWorkspace)();
     }