nx 23.0.0-beta.4 → 23.0.0-beta.6

package/dist/plugins/package-json.js

@@ -8,6 +8,7 @@ const cache_directory_1 = require("../src/utils/cache-directory");
 const path_1 = require("path");
 const fileutils_1 = require("../src/utils/fileutils");
 const plugin_cache_utils_1 = require("../src/utils/plugin-cache-utils");
+const package_manager_1 = require("../src/utils/package-manager");
 const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'package-json.hash');
 let packageJsonPluginCache = null;
 function readPackageJsonConfigurationCache() {
@@ -16,7 +17,7 @@ function readPackageJsonConfigurationCache() {
 }
 function writeCache() {
     if (packageJsonPluginCache) {
-        packageJsonPluginCache.writeToDisk(cachePath);
+        packageJsonPluginCache.writeToDisk();
     }
 }
 const plugin = {
@@ -27,7 +28,8 @@ const plugin = {
             const cache = readPackageJsonConfigurationCache();
             const patterns = (0, package_json_1.buildPackageJsonPatterns)(context.workspaceRoot, (f) => (0, fileutils_1.readJsonFile)((0, path_1.join)(context.workspaceRoot, f)));
             const isInPackageJsonWorkspaces = (0, package_json_1.buildPackageJsonWorkspacesMatcher)(patterns);
-            const result = (0, plugins_1.createNodesFromFiles)((packageJsonPath) => (0, package_json_1.createNodeFromPackageJson)(packageJsonPath, workspace_root_1.workspaceRoot, cache, isInPackageJsonWorkspaces(packageJsonPath)), configFiles, options, context);
+            const packageManagerCommand = (0, package_manager_1.getPackageManagerCommand)((0, package_manager_1.detectPackageManager)(context.workspaceRoot), context.workspaceRoot);
+            const result = (0, plugins_1.createNodesFromFiles)((packageJsonPath) => (0, package_json_1.createNodeFromPackageJson)(packageJsonPath, workspace_root_1.workspaceRoot, cache, isInPackageJsonWorkspaces(packageJsonPath), packageManagerCommand), configFiles, options, context);
             writeCache();
             return result;
         },

package/dist/src/analytics/analytics.js

@@ -16,6 +16,7 @@ const native_1 = require("../native");
 const package_manager_1 = require("../utils/package-manager");
 const semver_1 = require("semver");
 const os = tslib_1.__importStar(require("os"));
+const crypto_1 = require("crypto");
 const machine_id_cache_1 = require("../utils/machine-id-cache");
 const is_ci_1 = require("../utils/is-ci");
 const analytics_prompt_1 = require("../utils/analytics-prompt");
@@ -56,7 +57,7 @@ async function startAnalytics() {
         return;
     }
     const isNxCloud = !!(nxJson?.nxCloudId ?? nxJson?.nxCloudAccessToken);
-    const userId = await (0, machine_id_cache_1.getCurrentMachineId)();
+    const userId = await getTelemetryUserId(workspaceId);
     const packageManagerInfo = getPackageManagerInfo();
     const nodeVersion = (0, semver_1.parse)(process.version);
     const nodeVersionString = nodeVersion
@@ -225,3 +226,11 @@ function isAnalyticsEnabled() {
     const nxJson = (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot);
     return nxJson?.analytics === true;
 }
+// Mix workspace id in: shared Docker images (Gitpod, Cypress, etc.) bake
+// in /etc/machine-id, so machine-id alone collapses many users into one.
+async function getTelemetryUserId(workspaceId) {
+    const machineId = await (0, machine_id_cache_1.getCurrentMachineId)();
+    return (0, crypto_1.createHash)('sha256')
+        .update(`${machineId}|${workspaceId}`)
+        .digest('hex');
+}

package/dist/src/config/task-graph.d.ts

@@ -1,109 +1,6 @@
 /**
- * A representation of the invocation of an Executor
+ * `Task` and `TaskGraph` are defined as Rust structs in
+ * `packages/nx/src/native/tasks/types.rs` and exposed to TypeScript via NAPI.
+ * This file re-exports them so existing imports keep working.
  */
-export interface Task {
-    /**
-     * Unique ID
-     */
-    id: string;
-    /**
-     * Details about which project, target, and configuration to run.
-     */
-    target: {
-        /**
-         * The project for which the task belongs to
-         */
-        project: string;
-        /**
-         * The target name which the task should invoke
-         */
-        target: string;
-        /**
-         * The configuration of the target which the task invokes
-         */
-        configuration?: string;
-    };
-    /**
-     * Overrides for the configured options of the target
-     */
-    overrides: any;
-    /**
-     * The outputs the task may produce
-     */
-    outputs: string[];
-    /**
-     * Root of the project the task belongs to
-     */
-    projectRoot?: string;
-    /**
-     * Hash of the task which is used for caching.
-     */
-    hash?: string;
-    /**
-     * Details about the composition of the hash
-     */
-    hashDetails?: {
-        /**
-         * Command of the task
-         */
-        command: string;
-        /**
-         * Hashes of inputs used in the hash
-         */
-        nodes: {
-            [name: string]: string;
-        };
-        /**
-         * Hashes of implicit dependencies which are included in the hash
-         */
-        implicitDeps?: {
-            [fileName: string]: string;
-        };
-        /**
-         * Hash of the runtime environment which the task was executed
-         */
-        runtime?: {
-            [input: string]: string;
-        };
-    };
-    /**
-     *
-     * Unix timestamp of when a Batch Task starts
-     **/
-    startTime?: number;
-    /**
-     *
-     * Unix timestamp of when a Batch Task ends
-     **/
-    endTime?: number;
-    /**
-     * Determines if a given task should be cacheable.
-     */
-    cache?: boolean;
-    /**
-     * Determines if a given task should be parallelizable.
-     */
-    parallelism: boolean;
-    /**
-     * This denotes if the task runs continuously
-     */
-    continuous?: boolean;
-}
-/**
- * Graph of Tasks to be executed
- */
-export interface TaskGraph {
-    /**
-     * IDs of Tasks which do not have any dependencies and are thus ready to execute immediately
-     */
-    roots: string[];
-    /**
-     * Map of Task IDs to Tasks
-     */
-    tasks: Record<string, Task>;
-    /**
-     * Map of Task IDs to IDs of tasks which the task depends on
-     */
-    dependencies: Record<string, string[]>;
-    continuousDependencies: Record<string, string[]>;
-}
+export type { Task, TaskGraph, TaskTarget, TaskHashDetails } from '../native';