nx 18.0.0 → 18.0.2

package/bin/init-local.js

@@ -11,23 +11,6 @@ const Mod = require("module");
  * @param workspace Relevant local workspace properties
  */
 function initLocal(workspace) {
-    // If module.register is not available, we need to restart the process with the experimental ESM loader.
-    // Otherwise, usage of `registerTsProject` will not work for `.ts` files using ESM.
-    // TODO: Remove this once Node 18 is out of LTS (March 2024).
-    if (shouldRestartWithExperimentalTsEsmLoader()) {
-        const child = require('child_process').fork(require.resolve('./nx'), process.argv.slice(2), {
-            env: {
-                ...process.env,
-                RESTARTED_WITH_EXPERIMENTAL_TS_ESM_LOADER: '1',
-            },
-            execArgv: execArgvWithExperimentalLoaderOptions(),
-        });
-        child.on('close', (code) => {
-            if (code !== 0 && code !== null)
-                process.exit(code);
-        });
-        return;
-    }
     process.env.NX_CLI_SET = 'true';
     try {
         perf_hooks_1.performance.mark('init-local');
@@ -136,7 +119,7 @@ function handleAngularCLIFallbacks(workspace) {
         if (!process.argv[3]) {
             console.log(`"ng completion" is not natively supported by Nx.
   Instead, you could try an Nx Editor Plugin for a visual tool to run Nx commands. If you're using VSCode, you can use the Nx Console plugin, or if you're using WebStorm, you could use one of the available community plugins.
-  For more information, see https://nx.dev/core-features/integrate-with-editors`);
+  For more information, see https://nx.dev/features/integrate-with-editors`);
         }
     }
     else {
@@ -190,33 +173,3 @@ function monkeyPatchRequire() {
         // do some side-effect of your own
     };
 }
-function shouldRestartWithExperimentalTsEsmLoader() {
-    // Already restarted with experimental loader
-    if (process.env.RESTARTED_WITH_EXPERIMENTAL_TS_ESM_LOADER === '1')
-        return false;
-    const nodeVersion = parseInt(process.versions.node.split('.')[0]);
-    // `--experimental-loader` is only supported in Nodejs >= 16 so there is no point restarting for older versions
-    if (nodeVersion < 16)
-        return false;
-    // Node 20.6.0 adds `module.register`, otherwise we need to restart process with "--experimental-loader ts-node/esm".
-    return (!require('node:module').register &&
-        moduleResolves('ts-node/esm') &&
-        moduleResolves('typescript'));
-}
-function execArgvWithExperimentalLoaderOptions() {
-    return [
-        ...process.execArgv,
-        '--no-warnings',
-        '--experimental-loader',
-        'ts-node/esm',
-    ];
-}
-function moduleResolves(packageName) {
-    try {
-        require.resolve(packageName);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -66,7 +66,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "18.0.0"
+    "@nrwl/tao": "18.0.2"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.6.7",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.0.0",
-    "@nx/nx-darwin-arm64": "18.0.0",
-    "@nx/nx-linux-x64-gnu": "18.0.0",
-    "@nx/nx-linux-x64-musl": "18.0.0",
-    "@nx/nx-win32-x64-msvc": "18.0.0",
-    "@nx/nx-linux-arm64-gnu": "18.0.0",
-    "@nx/nx-linux-arm64-musl": "18.0.0",
-    "@nx/nx-linux-arm-gnueabihf": "18.0.0",
-    "@nx/nx-win32-arm64-msvc": "18.0.0",
-    "@nx/nx-freebsd-x64": "18.0.0"
+    "@nx/nx-darwin-x64": "18.0.2",
+    "@nx/nx-darwin-arm64": "18.0.2",
+    "@nx/nx-linux-x64-gnu": "18.0.2",
+    "@nx/nx-linux-x64-musl": "18.0.2",
+    "@nx/nx-win32-x64-msvc": "18.0.2",
+    "@nx/nx-linux-arm64-gnu": "18.0.2",
+    "@nx/nx-linux-arm64-musl": "18.0.2",
+    "@nx/nx-linux-arm-gnueabihf": "18.0.2",
+    "@nx/nx-win32-arm64-msvc": "18.0.2",
+    "@nx/nx-freebsd-x64": "18.0.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/connect/connect-to-nx-cloud.js

@@ -57,7 +57,7 @@ async function connectToNxCloudCommand() {
 exports.connectToNxCloudCommand = connectToNxCloudCommand;
 async function connectToNxCloudWithPrompt(command) {
     const setNxCloud = await nxCloudPrompt('setupNxCloud');
-    const useCloud = setNxCloud ? await connectToNxCloudCommand() : false;
+    const useCloud = setNxCloud === 'yes' ? await connectToNxCloudCommand() : false;
     await (0, ab_testing_1.recordStat)({
         command,
         nxVersion: versions_1.nxVersion,

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

@@ -1,3 +1,4 @@
+import { PackageJson } from '../../../utils/package-json';
 import { PackageManagerCommands } from '../../../utils/package-manager';
 export declare function createNxJsonFile(repoRoot: string, topologicalTargets: string[], cacheableOperations: string[], scriptOutputs: {
     [name: string]: string;
@@ -14,3 +15,4 @@ export declare function printFinalMessage({ learnMoreLink, bodyLines, }: {
     learnMoreLink?: string;
     bodyLines?: string[];
 }): void;
+export declare function isMonorepo(packageJson: PackageJson): boolean;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printFinalMessage = exports.markRootPackageJsonAsNxProject = exports.addVsCodeRecommendedExtensions = exports.initCloud = exports.runInstall = exports.updateGitIgnore = exports.addDepsToPackageJson = exports.createNxJsonFile = void 0;
+exports.isMonorepo = exports.printFinalMessage = exports.markRootPackageJsonAsNxProject = exports.addVsCodeRecommendedExtensions = exports.initCloud = exports.runInstall = exports.updateGitIgnore = exports.addDepsToPackageJson = exports.createNxJsonFile = void 0;
 const child_process_1 = require("child_process");
 const path_1 = require("path");
 const child_process_2 = require("../../../utils/child-process");
@@ -174,3 +174,13 @@ function printFinalMessage({ learnMoreLink, bodyLines, }) {
     });
 }
 exports.printFinalMessage = printFinalMessage;
+function isMonorepo(packageJson) {
+    if (!!packageJson.workspaces)
+        return true;
+    if ((0, fs_1.existsSync)('pnpm-workspace.yaml') || (0, fs_1.existsSync)('pnpm-workspace.yml'))
+        return true;
+    if ((0, fs_1.existsSync)('lerna.json'))
+        return true;
+    return false;
+}
+exports.isMonorepo = isMonorepo;

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

@@ -14,6 +14,7 @@ const react_1 = require("./implementation/react");
 const child_process_2 = require("../../utils/child-process");
 const fileutils_1 = require("../../utils/fileutils");
 const versions_1 = require("../../utils/versions");
+const utils_1 = require("./implementation/utils");
 async function initHandler(options) {
     // strip the 'init' command itself so we don't forward it
     const args = process.argv.slice(3).join(' ');
@@ -35,7 +36,7 @@ async function initHandler(options) {
         else if (isNestCLI(packageJson)) {
             await (0, add_nx_to_nest_1.addNxToNest)(options, packageJson);
         }
-        else if (isMonorepo(packageJson)) {
+        else if ((0, utils_1.isMonorepo)(packageJson)) {
             await (0, add_nx_to_monorepo_1.addNxToMonorepo)(options);
         }
         else {
@@ -96,15 +97,6 @@ function isNestCLI(packageJson) {
         combinedDependencies['@nestjs/core'] &&
         combinedDependencies['@nestjs/cli']);
 }
-function isMonorepo(packageJson) {
-    if (!!packageJson.workspaces)
-        return true;
-    if ((0, fs_1.existsSync)('pnpm-workspace.yaml') || (0, fs_1.existsSync)('pnpm-workspace.yml'))
-        return true;
-    if ((0, fs_1.existsSync)('lerna.json'))
-        return true;
-    return false;
-}
 function setupDotNxInstallation(version) {
     if (process.platform !== 'win32') {
         console.log('Setting Nx up installation in `.nx`. You can run nx commands like: `./nx --help`');

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

@@ -16,6 +16,7 @@ const angular_1 = require("./implementation/angular");
 const workspace_context_1 = require("../../utils/workspace-context");
 const connect_to_nx_cloud_1 = require("../connect/connect-to-nx-cloud");
 const add_nx_to_npm_repo_1 = require("./implementation/add-nx-to-npm-repo");
+const add_nx_to_monorepo_1 = require("./implementation/add-nx-to-monorepo");
 async function initHandler(options) {
     const version = process.env.NX_VERSION ?? ((0, semver_1.prerelease)(versions_1.nxVersion) ? 'next' : 'latest');
     if (process.env.NX_VERSION) {
@@ -41,24 +42,27 @@ async function initHandler(options) {
         });
         return;
     }
-    const repoRoot = process.cwd();
-    const cacheableOperations = [];
-    (0, utils_1.createNxJsonFile)(repoRoot, [], cacheableOperations, {});
-    const pmc = (0, package_manager_1.getPackageManagerCommand)();
-    (0, utils_1.updateGitIgnore)(repoRoot);
     const detectPluginsResponse = await detectPlugins();
     if (!detectPluginsResponse?.plugins.length) {
         // If no plugins are detected/chosen, guide users to setup
         // their targetDefaults correctly so their package scripts will work.
-        await (0, add_nx_to_npm_repo_1.addNxToNpmRepo)({
-            interactive: options.interactive,
-        });
+        const packageJson = (0, fileutils_1.readJsonFile)('package.json');
+        if ((0, utils_1.isMonorepo)(packageJson)) {
+            await (0, add_nx_to_monorepo_1.addNxToMonorepo)({ interactive: options.interactive });
+        }
+        else {
+            await (0, add_nx_to_npm_repo_1.addNxToNpmRepo)({ interactive: options.interactive });
+        }
     }
     else {
         const useNxCloud = options.nxCloud ??
             (options.interactive
                 ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
                 : false);
+        const repoRoot = process.cwd();
+        const pmc = (0, package_manager_1.getPackageManagerCommand)();
+        (0, utils_1.createNxJsonFile)(repoRoot, [], [], {});
+        (0, utils_1.updateGitIgnore)(repoRoot);
         (0, utils_1.addDepsToPackageJson)(repoRoot, detectPluginsResponse?.plugins ?? []);
         output_1.output.log({ title: '📦 Installing Nx' });
         (0, utils_1.runInstall)(repoRoot, pmc);

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

@@ -801,7 +801,7 @@ async function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
                         `- To learn more go to https://nx.dev/recipes/tips-n-tricks/advanced-update`,
                     ]
                     : [
-                        `- To learn more go to https://nx.dev/core-features/automate-updating-dependencies`,
+                        `- To learn more go to https://nx.dev/features/automate-updating-dependencies`,
                     ]),
                 ...(showConnectToCloudMessage()
                     ? [