nx 18.0.1 → 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');
@@ -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.1",
+  "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.1"
+    "@nrwl/tao": "18.0.2"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.6.7",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.0.1",
-    "@nx/nx-darwin-arm64": "18.0.1",
-    "@nx/nx-linux-x64-gnu": "18.0.1",
-    "@nx/nx-linux-x64-musl": "18.0.1",
-    "@nx/nx-win32-x64-msvc": "18.0.1",
-    "@nx/nx-linux-arm64-gnu": "18.0.1",
-    "@nx/nx-linux-arm64-musl": "18.0.1",
-    "@nx/nx-linux-arm-gnueabihf": "18.0.1",
-    "@nx/nx-win32-arm64-msvc": "18.0.1",
-    "@nx/nx-freebsd-x64": "18.0.1"
+    "@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/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/plugins/target-defaults/target-defaults-plugin.d.ts

@@ -1,4 +1,6 @@
+import { ProjectConfiguration } from '../../config/workspace-json-project-json';
 import { NxPluginV2 } from '../../utils/nx-plugin';
+import { PackageJson } from '../../utils/package-json';
 /**
  * This symbol marks that a target provides information which should modify a target already registered
  * on the project via other plugins. If the target has not already been registered, and this symbol is true,
@@ -6,3 +8,49 @@ import { NxPluginV2 } from '../../utils/nx-plugin';
  */
 export declare const ONLY_MODIFIES_EXISTING_TARGET: unique symbol;
 export declare const TargetDefaultsPlugin: NxPluginV2;
+/**
+ * This fn gets target info that would make a target uniquely compatible
+ * with what is described by project.json or package.json. As the merge process
+ * for config happens, without this, the target defaults may be compatible
+ * with a config from a plugin and then that combined target be incompatible
+ * with the project json configuration resulting in the target default values
+ * being scrapped. By adding enough information from the project.json / package.json,
+ * we can make sure that the target after merging is compatible with the defined target.
+ */
+export declare function getTargetInfo(target: string, projectJson: Pick<ProjectConfiguration, 'targets'>, packageJson: Pick<PackageJson, 'scripts' | 'nx'>): {
+    command: string;
+    executor?: undefined;
+    options?: undefined;
+} | {
+    executor: string;
+    options: {
+        command: any;
+        commands?: undefined;
+        script?: undefined;
+    };
+    command?: undefined;
+} | {
+    executor: string;
+    options: {
+        commands: any;
+        command?: undefined;
+        script?: undefined;
+    };
+    command?: undefined;
+} | {
+    executor: string;
+    command?: undefined;
+    options?: undefined;
+} | {
+    executor: string;
+    options: {
+        script: any;
+        command?: undefined;
+        commands?: undefined;
+    };
+    command?: undefined;
+} | {
+    command?: undefined;
+    executor?: undefined;
+    options?: undefined;
+};

package/src/plugins/target-defaults/target-defaults-plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TargetDefaultsPlugin = exports.ONLY_MODIFIES_EXISTING_TARGET = void 0;
+exports.getTargetInfo = exports.TargetDefaultsPlugin = exports.ONLY_MODIFIES_EXISTING_TARGET = void 0;
 const minimatch_1 = require("minimatch");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
@@ -57,7 +57,11 @@ exports.TargetDefaultsPlugin = {
                     // Prevents `build` from overwriting `@nx/js:tsc` if both are present
                     // and build is specified later in the ordering.
                     if (!modifiedTargets[targetName] || targetName !== defaultSpecifier) {
-                        modifiedTargets[targetName] = JSON.parse(JSON.stringify(targetDefaults[defaultSpecifier]));
+                        const defaults = JSON.parse(JSON.stringify(targetDefaults[defaultSpecifier]));
+                        modifiedTargets[targetName] = {
+                            ...getTargetInfo(targetName, projectJson, packageJson),
+                            ...defaults,
+                        };
                     }
                     // TODO: Remove this after we figure out a way to define new targets
                     // in target defaults
@@ -101,3 +105,74 @@ function readJsonOrNull(path) {
         return null;
     }
 }
+/**
+ * This fn gets target info that would make a target uniquely compatible
+ * with what is described by project.json or package.json. As the merge process
+ * for config happens, without this, the target defaults may be compatible
+ * with a config from a plugin and then that combined target be incompatible
+ * with the project json configuration resulting in the target default values
+ * being scrapped. By adding enough information from the project.json / package.json,
+ * we can make sure that the target after merging is compatible with the defined target.
+ */
+function getTargetInfo(target, projectJson, packageJson) {
+    const projectJsonTarget = projectJson?.targets?.[target];
+    const packageJsonTarget = packageJson?.nx?.targets?.[target];
+    const executor = getTargetExecutor(target, projectJson, packageJson);
+    const targetOptions = {
+        ...packageJsonTarget?.options,
+        ...projectJsonTarget?.options,
+    };
+    if (projectJsonTarget?.command) {
+        return {
+            command: projectJsonTarget?.command,
+        };
+    }
+    if (executor === 'nx:run-commands') {
+        if (targetOptions?.command) {
+            return {
+                executor: 'nx:run-commands',
+                options: {
+                    command: projectJsonTarget.options?.command,
+                },
+            };
+        }
+        else if (targetOptions?.commands) {
+            return {
+                executor: 'nx:run-commands',
+                options: {
+                    commands: targetOptions.commands,
+                },
+            };
+        }
+        return {
+            executor: 'nx:run-commands',
+        };
+    }
+    if (executor === 'nx:run-script') {
+        return {
+            executor: 'nx:run-script',
+            options: {
+                script: targetOptions?.script ?? target,
+            },
+        };
+    }
+    if (executor) {
+        return { executor };
+    }
+    return {};
+}
+exports.getTargetInfo = getTargetInfo;
+function getTargetExecutor(target, projectJson, packageJson) {
+    const projectJsonTarget = projectJson?.targets?.[target];
+    const packageJsonTarget = packageJson?.nx?.targets?.[target];
+    const packageJsonScript = packageJson?.scripts?.[target];
+    if (projectJsonTarget?.command) {
+        return 'nx:run-commands';
+    }
+    if (!projectJsonTarget?.executor &&
+        !packageJsonTarget?.executor &&
+        packageJsonScript) {
+        return 'nx:run-script';
+    }
+    return projectJsonTarget?.executor ?? packageJsonTarget?.executor;
+}