nx 19.4.0-rc.0 → 19.4.0

package/package.json

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

package/src/nx-cloud/utilities/url-shorten.d.ts

@@ -1,2 +1,8 @@
 export declare function shortenedCloudUrl(installationSource: string, accessToken?: string, usesGithub?: boolean): Promise<string>;
 export declare function repoUsesGithub(github?: boolean): Promise<boolean>;
+export declare function removeTrailingSlash(apiUrl: string): string;
+export declare function getURLifShortenFailed(usesGithub: boolean, githubSlug: string, apiUrl: string, source: string, accessToken?: string): string;
+export declare function getNxCloudVersion(apiUrl: string): Promise<string | null>;
+export declare function removeVersionModifier(versionString: string): string;
+export declare function versionIsValid(version: string): boolean;
+export declare function compareCleanCloudVersions(version1: string, version2: string): number;

package/src/nx-cloud/utilities/url-shorten.js

@@ -1,14 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.repoUsesGithub = exports.shortenedCloudUrl = void 0;
+exports.compareCleanCloudVersions = exports.versionIsValid = exports.removeVersionModifier = exports.getNxCloudVersion = exports.getURLifShortenFailed = exports.removeTrailingSlash = exports.repoUsesGithub = exports.shortenedCloudUrl = void 0;
 const devkit_exports_1 = require("../../devkit-exports");
 const git_utils_1 = require("../../utils/git-utils");
-const semver_1 = require("semver");
 async function shortenedCloudUrl(installationSource, accessToken, usesGithub) {
     const githubSlug = (0, git_utils_1.getGithubSlugOrNull)();
     const apiUrl = removeTrailingSlash(process.env.NX_CLOUD_API || process.env.NRWL_API || `https://cloud.nx.app`);
-    const version = await getNxCloudVersion(apiUrl);
-    if (version && (0, semver_1.lt)(removeVersionModifier(version), '2406.11.5')) {
+    try {
+        const version = await getNxCloudVersion(apiUrl);
+        if ((version && compareCleanCloudVersions(version, '2406.11.5') < 0) ||
+            !version) {
+            return apiUrl;
+        }
+    }
+    catch (e) {
+        devkit_exports_1.logger.verbose(`Failed to get Nx Cloud version.
+    ${e}`);
         return apiUrl;
     }
     const source = getSource(installationSource);
@@ -44,6 +51,7 @@ exports.repoUsesGithub = repoUsesGithub;
 function removeTrailingSlash(apiUrl) {
     return apiUrl[apiUrl.length - 1] === '/' ? apiUrl.slice(0, -1) : apiUrl;
 }
+exports.removeTrailingSlash = removeTrailingSlash;
 function getSource(installationSource) {
     if (installationSource.includes('nx-init')) {
         return 'nx-init';
@@ -69,6 +77,7 @@ function getURLifShortenFailed(usesGithub, githubSlug, apiUrl, source, accessTok
     }
     return `${apiUrl}/setup/connect-workspace/manual?accessToken=${accessToken}&source=${source}`;
 }
+exports.getURLifShortenFailed = getURLifShortenFailed;
 async function getInstallationSupportsGitHub(apiUrl) {
     try {
         const response = await require('axios').get(`${apiUrl}/nx-cloud/system/features`);
@@ -89,17 +98,55 @@ async function getNxCloudVersion(apiUrl) {
     try {
         const response = await require('axios').get(`${apiUrl}/nx-cloud/system/version`);
         const version = removeVersionModifier(response.data.version);
+        const isValid = versionIsValid(version);
         if (!version) {
             throw new Error('Failed to extract version from response.');
         }
+        if (!isValid) {
+            throw new Error(`Invalid version format: ${version}`);
+        }
         return version;
     }
     catch (e) {
         devkit_exports_1.logger.verbose(`Failed to get version of Nx Cloud.
       ${e}`);
+        return null;
     }
 }
+exports.getNxCloudVersion = getNxCloudVersion;
 function removeVersionModifier(versionString) {
-    // version may be something like 2406.13.5.hotfix2
+    // Cloud version string is in the format of YYMM.DD.BuildNumber-Modifier
     return versionString.split(/[\.-]/).slice(0, 3).join('.');
 }
+exports.removeVersionModifier = removeVersionModifier;
+function versionIsValid(version) {
+    // Updated Regex pattern to require YYMM.DD.BuildNumber format
+    // All parts are required, including the BuildNumber.
+    const pattern = /^\d{4}\.\d{2}\.\d+$/;
+    return pattern.test(version);
+}
+exports.versionIsValid = versionIsValid;
+function compareCleanCloudVersions(version1, version2) {
+    const parseVersion = (version) => {
+        // The format we're using is YYMM.DD.BuildNumber
+        const parts = version.split('.').map((part) => parseInt(part, 10));
+        return {
+            yearMonth: parts[0],
+            day: parts[1],
+            buildNumber: parts[2],
+        };
+    };
+    const v1 = parseVersion(version1);
+    const v2 = parseVersion(version2);
+    if (v1.yearMonth !== v2.yearMonth) {
+        return v1.yearMonth > v2.yearMonth ? 1 : -1;
+    }
+    if (v1.day !== v2.day) {
+        return v1.day > v2.day ? 1 : -1;
+    }
+    if (v1.buildNumber !== v2.buildNumber) {
+        return v1.buildNumber > v2.buildNumber ? 1 : -1;
+    }
+    return 0;
+}
+exports.compareCleanCloudVersions = compareCleanCloudVersions;

package/src/plugins/js/package-json/create-package-json.js

@@ -10,6 +10,7 @@ const configuration_1 = require("../../../config/configuration");
 const nx_deps_cache_1 = require("../../../project-graph/nx-deps-cache");
 const path_1 = require("path");
 const task_hasher_1 = require("../../../hasher/task-hasher");
+const output_1 = require("../../../utils/output");
 /**
  * Creates a package.json in the output directory for support to install dependencies within containers.
  *
@@ -106,6 +107,19 @@ function createPackageJson(projectName, graph, options = {}, fileMap = null) {
     packageJson.dependencies &&= (0, object_sort_1.sortObjectByKeys)(packageJson.dependencies);
     packageJson.peerDependencies &&= (0, object_sort_1.sortObjectByKeys)(packageJson.peerDependencies);
     packageJson.peerDependenciesMeta &&= (0, object_sort_1.sortObjectByKeys)(packageJson.peerDependenciesMeta);
+    if (rootPackageJson.packageManager) {
+        if (packageJson.packageManager &&
+            packageJson.packageManager !== rootPackageJson.packageManager) {
+            output_1.output.warn({
+                title: 'Package Manager Mismatch',
+                bodyLines: [
+                    `The project ${projectName} has explicitly specified "packageManager" config of "${packageJson.packageManager}" but the workspace is using "${rootPackageJson.packageManager}".`,
+                    `Please remove the project level "packageManager" config or align it with the workspace root package.json.`,
+                ],
+            });
+        }
+        packageJson.packageManager = rootPackageJson.packageManager;
+    }
     return packageJson;
 }
 exports.createPackageJson = createPackageJson;

package/src/plugins/js/utils/register.d.ts

@@ -1,4 +1,3 @@
-import type { TsConfigOptions } from 'ts-node';
 import type { CompilerOptions } from 'typescript';
 /**
  * Optionally, if swc-node and tsconfig-paths are available in the current workspace, apply the require
@@ -24,7 +23,7 @@ export declare function registerTsProject(tsConfigPath: string): () => void;
  */
 export declare function registerTsProject(path: string, configFilename: string): any;
 export declare function getSwcTranspiler(compilerOptions: CompilerOptions): (...args: unknown[]) => unknown;
-export declare function getTsNodeTranspiler(compilerOptions: CompilerOptions, tsNodeOptions?: TsConfigOptions): (...args: unknown[]) => unknown;
+export declare function getTsNodeTranspiler(compilerOptions: CompilerOptions): (...args: unknown[]) => unknown;
 export declare function getTranspiler(compilerOptions: CompilerOptions, tsConfigRaw?: unknown): () => (...args: unknown[]) => unknown;
 /**
  * Register ts-node or swc-node given a set of compiler options.

package/src/plugins/js/utils/register.js

@@ -7,7 +7,45 @@ const swcNodeInstalled = packageIsInstalled('@swc-node/register');
 const tsNodeInstalled = packageIsInstalled('ts-node/register');
 let ts;
 let isTsEsmLoaderRegistered = false;
+/**
+ * tsx is a utility to run TypeScript files in node which is growing in popularity:
+ * https://tsx.is
+ *
+ * Behind the scenes it is invoking node with relevant --require and --import flags.
+ *
+ * If the user is invoking Nx via a script which is being invoked via tsx, then we
+ * do not need to register any transpiler at all as the environment will have already
+ * been configured by tsx. In fact, registering a transpiler such as ts-node or swc
+ * in this case causes issues.
+ *
+ * Because node is being invoked by tsx, the tsx binary does not end up in the final
+ * process.argv and so we need to check a few possible things to account for usage
+ * via different package managers (e.g. pnpm does not set process._ to tsx, but rather
+ * pnpm itself, modern yarn does not set process._ at all etc.).
+ */
+const isInvokedByTsx = (() => {
+    if (process.env._?.endsWith(`${path_1.sep}tsx`)) {
+        return true;
+    }
+    const requireArgs = [];
+    const importArgs = [];
+    (process.execArgv ?? []).forEach((arg, i) => {
+        if (arg === '-r' || arg === '--require') {
+            requireArgs.push(process.execArgv[i + 1]);
+        }
+        if (arg === '--import') {
+            importArgs.push(process.execArgv[i + 1]);
+        }
+    });
+    const isTsxPath = (p) => p.includes(`${path_1.sep}tsx${path_1.sep}`);
+    return (requireArgs.some((a) => isTsxPath(a)) ||
+        importArgs.some((a) => isTsxPath(a)));
+})();
 function registerTsProject(path, configFilename) {
+    // See explanation alongside isInvokedByTsx declaration
+    if (isInvokedByTsx) {
+        return () => { };
+    }
     const tsConfigPath = configFilename ? (0, path_1.join)(path, configFilename) : path;
     const compilerOptions = readCompilerOptions(tsConfigPath);
     const cleanupFunctions = [
@@ -41,7 +79,13 @@ function getSwcTranspiler(compilerOptions) {
     return typeof cleanupFn === 'function' ? cleanupFn : () => { };
 }
 exports.getSwcTranspiler = getSwcTranspiler;
-function getTsNodeTranspiler(compilerOptions, tsNodeOptions) {
+const registered = new Set();
+function getTsNodeTranspiler(compilerOptions) {
+    // Just return if transpiler was already registered before.
+    const registrationKey = JSON.stringify(compilerOptions);
+    if (registered.has(registrationKey)) {
+        return () => { };
+    }
     const { register } = require('ts-node');
     // ts-node doesn't provide a cleanup method
     const service = register({
@@ -50,13 +94,14 @@ function getTsNodeTranspiler(compilerOptions, tsNodeOptions) {
         // we already read and provide the compiler options, so prevent ts-node from reading them again
         skipProject: true,
     });
+    registered.add(registrationKey);
     const { transpiler, swc } = service.options;
     // Don't warn if a faster transpiler is enabled
     if (!transpiler && !swc) {
         warnTsNodeUsage();
     }
     return () => {
-        service.enabled(false);
+        // Do not cleanup ts-node service since other consumers may need it
     };
 }
 exports.getTsNodeTranspiler = getTsNodeTranspiler;
@@ -121,7 +166,7 @@ function getTranspiler(compilerOptions, tsConfigRaw) {
     // We can fall back on ts-node if it's available
     if (tsNodeInstalled) {
         const tsNodeOptions = filterRecognizedTsConfigTsNodeOptions(tsConfigRaw).recognized;
-        return () => getTsNodeTranspiler(compilerOptions, tsNodeOptions);
+        return () => getTsNodeTranspiler(compilerOptions);
     }
 }
 exports.getTranspiler = getTranspiler;