nx 19.0.0-rc.0 → 19.0.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.0.0-rc.0",
+  "version": "19.0.0-rc.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": "19.0.0-rc.0"
+    "@nrwl/tao": "19.0.0-rc.2"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.0.0-rc.0",
-    "@nx/nx-darwin-arm64": "19.0.0-rc.0",
-    "@nx/nx-linux-x64-gnu": "19.0.0-rc.0",
-    "@nx/nx-linux-x64-musl": "19.0.0-rc.0",
-    "@nx/nx-win32-x64-msvc": "19.0.0-rc.0",
-    "@nx/nx-linux-arm64-gnu": "19.0.0-rc.0",
-    "@nx/nx-linux-arm64-musl": "19.0.0-rc.0",
-    "@nx/nx-linux-arm-gnueabihf": "19.0.0-rc.0",
-    "@nx/nx-win32-arm64-msvc": "19.0.0-rc.0",
-    "@nx/nx-freebsd-x64": "19.0.0-rc.0"
+    "@nx/nx-darwin-x64": "19.0.0-rc.2",
+    "@nx/nx-darwin-arm64": "19.0.0-rc.2",
+    "@nx/nx-linux-x64-gnu": "19.0.0-rc.2",
+    "@nx/nx-linux-x64-musl": "19.0.0-rc.2",
+    "@nx/nx-win32-x64-msvc": "19.0.0-rc.2",
+    "@nx/nx-linux-arm64-gnu": "19.0.0-rc.2",
+    "@nx/nx-linux-arm64-musl": "19.0.0-rc.2",
+    "@nx/nx-linux-arm-gnueabihf": "19.0.0-rc.2",
+    "@nx/nx-win32-arm64-msvc": "19.0.0-rc.2",
+    "@nx/nx-freebsd-x64": "19.0.0-rc.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -1,2 +1,3 @@
 import type { AddOptions } from './command-object';
 export declare function addHandler(options: AddOptions): Promise<void>;
+export declare const coreNxPluginVersions: Map<string, string>;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addHandler = void 0;
+exports.coreNxPluginVersions = exports.addHandler = void 0;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const ora = require("ora");
@@ -15,6 +15,7 @@ const params_1 = require("../../utils/params");
 const plugins_1 = require("../../utils/plugins");
 const versions_1 = require("../../utils/versions");
 const workspace_root_1 = require("../../utils/workspace-root");
+const add_nx_scripts_1 = require("../init/implementation/dot-nx/add-nx-scripts");
 function addHandler(options) {
     if (options.verbose) {
         process.env.NX_VERBOSE_LOGGING = 'true';
@@ -52,7 +53,7 @@ async function installPackage(pkgName, version, nxJson) {
     }
     else {
         nxJson.installation.plugins ??= {};
-        nxJson.installation.plugins[pkgName] = version;
+        nxJson.installation.plugins[pkgName] = (0, add_nx_scripts_1.normalizeVersionForNxJson)(pkgName, version);
         (0, fileutils_1.writeJsonFile)('nx.json', nxJson);
         try {
             await (0, child_process_2.runNxAsync)('--help', { silent: true });
@@ -92,7 +93,7 @@ async function initializePlugin(pkgName, options, nxJson) {
     spinner.start();
     try {
         const args = [];
-        if (coreNxPlugins.includes(pkgName)) {
+        if (exports.coreNxPluginVersions.has(pkgName)) {
             args.push(`--keepExistingVersions`);
             if (options.updatePackageScripts ||
                 (options.updatePackageScripts === undefined &&
@@ -133,8 +134,8 @@ function findInitGenerator(generators) {
 function parsePackageSpecifier(packageSpecifier) {
     const i = packageSpecifier.lastIndexOf('@');
     if (i <= 0) {
-        if (coreNxPlugins.includes(packageSpecifier)) {
-            return [packageSpecifier, versions_1.nxVersion];
+        if (exports.coreNxPluginVersions.has(packageSpecifier)) {
+            return [packageSpecifier, exports.coreNxPluginVersions.get(packageSpecifier)];
         }
         return [packageSpecifier, 'latest'];
     }
@@ -142,31 +143,10 @@ function parsePackageSpecifier(packageSpecifier) {
     const version = packageSpecifier.substring(i + 1);
     return [pkgName, version];
 }
-const coreNxPlugins = [
-    '@nx/angular',
-    '@nx/cypress',
-    '@nx/detox',
-    '@nx/devkit',
-    '@nx/esbuild',
-    '@nx/eslint',
-    '@nx/eslint-plugin',
-    '@nx/expo',
-    '@nx/express',
-    '@nx/jest',
-    '@nx/nest',
-    '@nx/next',
-    '@nx/node',
-    '@nx/nuxt',
-    '@nx/playwright',
-    '@nx/plugin',
-    '@nx/react',
-    '@nx/react-native',
-    '@nx/remix',
-    '@nx/rollup',
-    '@nx/storybook',
-    '@nx/vite',
-    '@nx/vue',
-    '@nx/web',
-    '@nx/webpack',
-    '@nx/workspace',
-];
+exports.coreNxPluginVersions = require('../../../package.json')['nx-migrations'].packageGroup.reduce((map, entry) => {
+    const packageName = typeof entry === 'string' ? entry : entry.package;
+    const version = typeof entry === 'string' ? versions_1.nxVersion : entry.version;
+    return map.set(packageName, version);
+}, 
+// Package Name -> Desired Version
+new Map());

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

@@ -3,10 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.connectExistingRepoToNxCloudPrompt = exports.connectToNxCloudWithPrompt = exports.connectToNxCloudCommand = exports.connectToNxCloudIfExplicitlyAsked = exports.onlyDefaultRunnerIsUsed = void 0;
 const output_1 = require("../../utils/output");
 const configuration_1 = require("../../config/configuration");
+const tree_1 = require("../../generators/tree");
+const connect_to_nx_cloud_1 = require("../../nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud");
 const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
 const child_process_1 = require("../../utils/child-process");
 const ab_testing_1 = require("../../utils/ab-testing");
 const versions_1 = require("../../utils/versions");
+const workspace_root_1 = require("../../utils/workspace-root");
 const chalk = require("chalk");
 function onlyDefaultRunnerIsUsed(nxJson) {
     const defaultRunner = nxJson.tasksRunnerOptions?.default?.runner;
@@ -49,9 +52,11 @@ async function connectToNxCloudCommand() {
         });
         return false;
     }
-    (0, child_process_1.runNxSync)(`g nx:connect-to-nx-cloud --quiet --no-interactive`, {
-        stdio: [0, 1, 2],
-    });
+    const tree = new tree_1.FsTree(workspace_root_1.workspaceRoot, false, 'connect-to-nx-cloud');
+    const callback = await (0, connect_to_nx_cloud_1.connectToNxCloud)(tree, {});
+    tree.lock();
+    (0, tree_1.flushChanges)(workspace_root_1.workspaceRoot, tree.listChanges());
+    callback();
     return true;
 }
 exports.connectToNxCloudCommand = connectToNxCloudCommand;

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

@@ -1,6 +1,7 @@
 import { Tree } from '../../../../generators/tree';
 export declare const nxWrapperPath: (p?: typeof import('path')) => string;
 export declare function generateDotNxSetup(version?: string): void;
+export declare function normalizeVersionForNxJson(pkg: string, version: string): string;
 export declare function writeMinimalNxJson(host: Tree, version: string): void;
 export declare function updateGitIgnore(host: Tree): void;
 export declare function getNxWrapperContents(): string;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sanitizeWrapperScript = exports.getNxWrapperContents = exports.updateGitIgnore = exports.writeMinimalNxJson = exports.generateDotNxSetup = exports.nxWrapperPath = void 0;
+exports.sanitizeWrapperScript = exports.getNxWrapperContents = exports.updateGitIgnore = exports.writeMinimalNxJson = exports.normalizeVersionForNxJson = exports.generateDotNxSetup = exports.nxWrapperPath = void 0;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path = require("path");
@@ -36,29 +36,18 @@ function generateDotNxSetup(version) {
     (0, tree_1.flushChanges)(host.root, changes);
 }
 exports.generateDotNxSetup = generateDotNxSetup;
+function normalizeVersionForNxJson(pkg, version) {
+    if (!(0, semver_1.valid)(version)) {
+        version = (0, child_process_1.execSync)(`npm view ${pkg}@${version} version`).toString();
+    }
+    return version.trimEnd();
+}
+exports.normalizeVersionForNxJson = normalizeVersionForNxJson;
 function writeMinimalNxJson(host, version) {
     if (!host.exists('nx.json')) {
-        if (!(0, semver_1.valid)(version)) {
-            version = (0, child_process_1.execSync)(`npm view nx@${version} version`).toString();
-        }
         (0, json_1.writeJson)(host, 'nx.json', {
-            targetDefaults: {
-                build: {
-                    cache: true,
-                    dependsOn: ['^build'],
-                },
-                lint: {
-                    cache: true,
-                },
-                test: {
-                    cache: true,
-                },
-                e2e: {
-                    cache: true,
-                },
-            },
             installation: {
-                version: version.trimEnd(),
+                version: normalizeVersionForNxJson('nx', version),
             },
         });
     }