nx 18.2.0-canary.20240316-b69047e → 18.2.0-canary.20240320-64b2396

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.2.0-canary.20240316-b69047e",
+  "version": "18.2.0-canary.20240320-64b2396",
   "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.2.0-canary.20240316-b69047e"
+    "@nrwl/tao": "18.2.0-canary.20240320-64b2396"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.2.0-canary.20240316-b69047e",
-    "@nx/nx-darwin-arm64": "18.2.0-canary.20240316-b69047e",
-    "@nx/nx-linux-x64-gnu": "18.2.0-canary.20240316-b69047e",
-    "@nx/nx-linux-x64-musl": "18.2.0-canary.20240316-b69047e",
-    "@nx/nx-win32-x64-msvc": "18.2.0-canary.20240316-b69047e",
-    "@nx/nx-linux-arm64-gnu": "18.2.0-canary.20240316-b69047e",
-    "@nx/nx-linux-arm64-musl": "18.2.0-canary.20240316-b69047e",
-    "@nx/nx-linux-arm-gnueabihf": "18.2.0-canary.20240316-b69047e",
-    "@nx/nx-win32-arm64-msvc": "18.2.0-canary.20240316-b69047e",
-    "@nx/nx-freebsd-x64": "18.2.0-canary.20240316-b69047e"
+    "@nx/nx-darwin-x64": "18.2.0-canary.20240320-64b2396",
+    "@nx/nx-darwin-arm64": "18.2.0-canary.20240320-64b2396",
+    "@nx/nx-linux-x64-gnu": "18.2.0-canary.20240320-64b2396",
+    "@nx/nx-linux-x64-musl": "18.2.0-canary.20240320-64b2396",
+    "@nx/nx-win32-x64-msvc": "18.2.0-canary.20240320-64b2396",
+    "@nx/nx-linux-arm64-gnu": "18.2.0-canary.20240320-64b2396",
+    "@nx/nx-linux-arm64-musl": "18.2.0-canary.20240320-64b2396",
+    "@nx/nx-linux-arm-gnueabihf": "18.2.0-canary.20240320-64b2396",
+    "@nx/nx-win32-arm64-msvc": "18.2.0-canary.20240320-64b2396",
+    "@nx/nx-freebsd-x64": "18.2.0-canary.20240320-64b2396"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/adapter/compat.d.ts

@@ -1,2 +1,2 @@
-export declare const allowedProjectExtensions: readonly ["tags", "implicitDependencies", "configFilePath", "$schema", "generators", "namedInputs", "name", "files", "root", "sourceRoot", "projectType", "release", "includedScripts"];
+export declare const allowedProjectExtensions: readonly ["tags", "implicitDependencies", "configFilePath", "$schema", "generators", "namedInputs", "name", "files", "root", "sourceRoot", "projectType", "release", "includedScripts", "metadata"];
 export declare const allowedWorkspaceExtensions: readonly ["implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess", "useInferencePlugins"];

package/src/adapter/compat.js

@@ -28,6 +28,7 @@ exports.allowedProjectExtensions = [
     'projectType',
     'release',
     'includedScripts',
+    'metadata',
 ];
 // If we pass props on the workspace that angular doesn't know about,
 // it throws a warning that users see. We want to pass them still,

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

@@ -55,7 +55,7 @@ async function installPackage(pkgName, version) {
         nxJson.installation.plugins[pkgName] = version;
         (0, fileutils_1.writeJsonFile)('nx.json', nxJson);
         try {
-            await (0, child_process_2.runNxAsync)('');
+            await (0, child_process_2.runNxAsync)('--help');
         }
         catch (e) {
             // revert adding the plugin to nx.json

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

@@ -32,6 +32,12 @@ async function initHandler(options) {
             console.log('Setting Nx up installation in `.nx`. You can run Nx commands like: `./nx.bat --help`');
         }
         (0, add_nx_scripts_1.generateDotNxSetup)(version);
+        const { plugins } = await detectPlugins();
+        plugins.forEach((plugin) => {
+            (0, child_process_2.execSync)(`./nx add ${plugin}`, {
+                stdio: 'inherit',
+            });
+        });
         // invokes the wrapper, thus invoking the initial installation process
         (0, child_process_1.runNxSync)('--version', { stdio: 'ignore' });
         return;
@@ -146,6 +152,9 @@ async function detectPlugins() {
             }
         }
     }
+    if ((0, fs_1.existsSync)('gradlew') || (0, fs_1.existsSync)('gradlew.bat')) {
+        detectedPlugins.add('@nx/gradle');
+    }
     const plugins = Array.from(detectedPlugins);
     if (plugins.length === 0)
         return undefined;
@@ -166,24 +175,22 @@ async function detectPlugins() {
     ]).then((r) => r.plugins);
     if (pluginsToInstall?.length === 0)
         return undefined;
-    const updatePackageScripts = await (0, enquirer_1.prompt)([
-        {
-            name: 'updatePackageScripts',
-            type: 'autocomplete',
-            message: `Do you want to start using Nx in your package.json scripts?`,
-            choices: [
-                {
-                    name: 'Yes',
-                },
-                {
-                    name: 'No',
-                },
-            ],
-            initial: 0,
-        },
-    ]).then((r) => r.updatePackageScripts === 'Yes');
-    return {
-        plugins: pluginsToInstall,
-        updatePackageScripts,
-    };
+    const updatePackageScripts = (0, fs_1.existsSync)('package.json') &&
+        (await (0, enquirer_1.prompt)([
+            {
+                name: 'updatePackageScripts',
+                type: 'autocomplete',
+                message: `Do you want to start using Nx in your package.json scripts?`,
+                choices: [
+                    {
+                        name: 'Yes',
+                    },
+                    {
+                        name: 'No',
+                    },
+                ],
+                initial: 0,
+            },
+        ]).then((r) => r.updatePackageScripts === 'Yes'));
+    return { plugins: pluginsToInstall, updatePackageScripts };
 }

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

@@ -10,6 +10,7 @@ const configuration_1 = require("../../config/configuration");
 const async_iterator_1 = require("../../utils/async-iterator");
 const executor_utils_1 = require("./executor-utils");
 const pseudo_terminal_1 = require("../../tasks-runner/pseudo-terminal");
+const child_process_1 = require("child_process");
 function printRunHelp(opts, schema, plugin) {
     (0, print_help_1.printHelp)(`run ${opts.project}:${opts.target}`, schema, {
         mode: 'run',
@@ -66,13 +67,22 @@ async function printTargetRunHelpInternal({ project, target }, root, projectsCon
         executor === 'run-commands' &&
         targetConfig.options.command) {
         const command = targetConfig.options.command.split(' ')[0];
-        const terminal = (0, pseudo_terminal_1.getPseudoTerminal)();
-        await new Promise(() => {
-            const cp = terminal.runCommand(`${command} --help`);
-            cp.onExit((code) => {
+        const helpCommand = `${command} --help`;
+        if (pseudo_terminal_1.PseudoTerminal.isSupported()) {
+            const terminal = (0, pseudo_terminal_1.getPseudoTerminal)();
+            await new Promise(() => {
+                const cp = terminal.runCommand(helpCommand);
+                cp.onExit((code) => {
+                    process.exit(code);
+                });
+            });
+        }
+        else {
+            const cp = (0, child_process_1.exec)(helpCommand);
+            cp.on('exit', (code) => {
                 process.exit(code);
             });
-        });
+        }
     }
     else {
         process.exit(0);

package/src/config/workspace-json-project-json.d.ts

@@ -99,6 +99,10 @@ export interface ProjectConfiguration {
     release?: {
         version?: Pick<NxReleaseVersionConfiguration, 'generator' | 'generatorOptions'>;
     };
+    metadata?: {
+        technologies?: string[];
+        targetGroups?: Record<string, string[]>;
+    };
 }
 export interface TargetDependencyConfig {
     /**