nx 17.0.3 → 17.0.5

package/src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options.js

@@ -2,15 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const json_1 = require("../../generators/utils/json");
 const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
+const nx_json_1 = require("../../generators/utils/nx-json");
+const update_manager_1 = require("../../nx-cloud/update-manager");
+const run_command_1 = require("../../tasks-runner/run-command");
+const output_1 = require("../../utils/output");
 async function migrate(tree) {
     if (!tree.exists('nx.json')) {
         return;
     }
+    const nxJson = (0, nx_json_1.readNxJson)(tree);
+    // Already migrated
+    if (!nxJson.tasksRunnerOptions?.default) {
+        return;
+    }
+    const nxCloudClientSupported = await isNxCloudClientSupported(nxJson);
     (0, json_1.updateJson)(tree, 'nx.json', (nxJson) => {
-        // Already migrated
-        if (!nxJson.tasksRunnerOptions?.default) {
-            return nxJson;
-        }
         const { runner, options } = nxJson.tasksRunnerOptions.default;
         // This property shouldn't ever be part of tasks runner options.
         if (options.useDaemonProcess !== undefined) {
@@ -28,18 +34,13 @@ async function migrate(tree) {
             if (options.url) {
                 nxJson.nxCloudUrl = options.url;
                 delete options.url;
-                if ([
-                    'https://nx.app',
-                    'https://cloud.nx.app',
-                    'https://staging.nx.app',
-                    'https://snapshot.nx.app',
-                ].includes(nxJson.nxCloudUrl)) {
-                    removeNxCloudDependency(tree);
-                }
             }
-            else {
+            if (nxCloudClientSupported) {
                 removeNxCloudDependency(tree);
             }
+            else {
+                options.useLightClient = false;
+            }
             if (options.encryptionKey) {
                 nxJson.nxCloudEncryptionKey = options.encryptionKey;
                 delete options.encryptionKey;
@@ -73,6 +74,41 @@ async function migrate(tree) {
     await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
 }
 exports.default = migrate;
+async function isNxCloudClientSupported(nxJson) {
+    const nxCloudOptions = (0, run_command_1.getRunnerOptions)('default', nxJson, {}, true);
+    // Non enterprise workspaces support the Nx Cloud Client
+    if (!isNxCloudEnterpriseWorkspace(nxJson)) {
+        return true;
+    }
+    // If we can get the nx cloud client, it's supported
+    try {
+        await (0, update_manager_1.verifyOrUpdateNxCloudClient)(nxCloudOptions);
+        return true;
+    }
+    catch (e) {
+        if (e instanceof update_manager_1.NxCloudEnterpriseOutdatedError) {
+            output_1.output.warn({
+                title: 'Nx Cloud Instance is outdated.',
+                bodyLines: [
+                    'If you are an Nx Enterprise customer, please reach out to your assigned Developer Productivity Engineer.',
+                    'If you are NOT an Nx Enterprise customer but are seeing this message, please reach out to cloud-support@nrwl.io.',
+                ],
+            });
+        }
+        return false;
+    }
+}
+function isNxCloudEnterpriseWorkspace(nxJson) {
+    const { runner, options } = nxJson.tasksRunnerOptions.default;
+    return ((runner === 'nx-cloud' || runner === '@nrwl/nx-cloud') &&
+        options.url &&
+        ![
+            'https://nx.app',
+            'https://cloud.nx.app',
+            'https://staging.nx.app',
+            'https://snapshot.nx.app',
+        ].includes(options.url));
+}
 function removeNxCloudDependency(tree) {
     if (tree.exists('package.json')) {
         (0, json_1.updateJson)(tree, 'package.json', (packageJson) => {

package/src/migrations/update-17-2-0/move-default-base.d.ts

@@ -0,0 +1,5 @@
+import { Tree } from '../../generators/tree';
+/**
+ * Updates existing workspaces to move nx.json's affected.defaultBase to nx.json's base.
+ */
+export default function update(host: Tree): Promise<void>;

package/src/migrations/update-17-2-0/move-default-base.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable @typescript-eslint/no-unused-vars */
+const nx_json_1 = require("../../generators/utils/nx-json");
+const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
+/**
+ * Updates existing workspaces to move nx.json's affected.defaultBase to nx.json's base.
+ */
+async function update(host) {
+    const nxJson = (0, nx_json_1.readNxJson)(host);
+    if (nxJson?.affected?.defaultBase) {
+        nxJson.defaultBase = nxJson.affected.defaultBase;
+        delete nxJson.affected.defaultBase;
+        if (Object.keys(nxJson.affected).length === 0) {
+            delete nxJson.affected;
+        }
+        (0, nx_json_1.updateNxJson)(host, nxJson);
+    }
+    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(host);
+}
+exports.default = update;

package/src/migrations/update-17-3-0/nx-release-path.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '../../generators/tree';
+export default function nxReleasePath(tree: Tree): void;
+export declare function visitNotIgnoredFiles(tree: Tree, dirPath: string, visitor: (path: string) => void): void;

package/src/migrations/update-17-3-0/nx-release-path.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.visitNotIgnoredFiles = void 0;
+const node_path_1 = require("node:path");
+const ignore_1 = require("../../utils/ignore");
+function nxReleasePath(tree) {
+    visitNotIgnoredFiles(tree, '', (file) => {
+        const contents = tree.read(file).toString('utf-8');
+        if (
+        // the deep import usage should be replaced by the new location
+        contents.includes('nx/src/command-line/release') ||
+            // changelog-renderer has moved into nx/release
+            contents.includes('nx/changelog-renderer')) {
+            const finalContents = contents
+                // replace instances of old changelog renderer location
+                .replace(/nx\/changelog-renderer/g, 'nx/release/changelog-renderer')
+                // replace instances of deep import for programmatic API (only perform the replacement if an actual import by checking for trailing ' or ")
+                .replace(/nx\/src\/command-line\/release(['"])/g, 'nx/release$1');
+            tree.write(file, finalContents);
+        }
+    });
+}
+exports.default = nxReleasePath;
+// Adapted from devkit
+function visitNotIgnoredFiles(tree, dirPath = tree.root, visitor) {
+    const ig = (0, ignore_1.getIgnoreObject)();
+    dirPath = normalizePathRelativeToRoot(dirPath, tree.root);
+    if (dirPath !== '' && ig?.ignores(dirPath)) {
+        return;
+    }
+    for (const child of tree.children(dirPath)) {
+        const fullPath = (0, node_path_1.join)(dirPath, child);
+        if (ig?.ignores(fullPath)) {
+            continue;
+        }
+        if (tree.isFile(fullPath)) {
+            visitor(fullPath);
+        }
+        else {
+            visitNotIgnoredFiles(tree, fullPath, visitor);
+        }
+    }
+}
+exports.visitNotIgnoredFiles = visitNotIgnoredFiles;
+// Copied from devkit
+function normalizePathRelativeToRoot(path, root) {
+    return (0, node_path_1.relative)(root, (0, node_path_1.join)(root, path)).split(node_path_1.sep).join('/');
+}

package/src/migrations/update-17-3-0/update-nxw.d.ts

@@ -0,0 +1,2 @@
+import type { Tree } from '../../generators/tree';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-17-3-0/update-nxw.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const update_nxw_1 = require("../../utils/update-nxw");
+async function default_1(tree) {
+    (0, update_nxw_1.updateNxw)(tree);
+}
+exports.default = default_1;

package/src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '../../generators/tree';
+export default function migrate(tree: Tree): void;

package/src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const nx_json_1 = require("../../generators/utils/nx-json");
+function migrate(tree) {
+    const nxJson = (0, nx_json_1.readNxJson)(tree);
+    nxJson.useInferencePlugins = false;
+    (0, nx_json_1.updateNxJson)(tree, nxJson);
+}
+exports.default = migrate;

package/src/native/index.d.ts

@@ -3,6 +3,12 @@
 
 /* auto-generated by NAPI-RS */
 
+export class ExternalObject<T> {
+  readonly '': {
+    readonly '': unique symbol
+    [K: symbol]: T
+  }
+}
 /**
  * Expands the given entries into a list of existing directories and files.
  * This is used for copying outputs to and from the cache
@@ -17,8 +23,12 @@ export function remove(src: string): void
 export function copy(src: string, dest: string): void
 export function hashArray(input: Array<string>): string
 export function hashFile(file: string): string | null
-export function hashFiles(workspaceRoot: string): Record<string, string>
 export function findImports(projectFileMap: Record<string, Array<string>>): Array<ImportResult>
+/**
+ * Transfer the project graph from the JS world to the Rust world, so that we can pass the project graph via memory quicker
+ * This wont be needed once the project graph is created in Rust
+ */
+export function transferProjectGraph(projectGraph: ProjectGraph): ExternalObject<ProjectGraph>
 export interface ExternalNodeData {
   version: string
   hash?: string
@@ -31,6 +41,8 @@ export interface Target {
   executor?: string
   inputs?: Array<JsInputs>
   outputs?: Array<string>
+  options?: string
+  configurations?: string
 }
 export interface Project {
   root: string
@@ -43,6 +55,13 @@ export interface ProjectGraph {
   dependencies: Record<string, Array<string>>
   externalNodes: Record<string, ExternalNode>
 }
+export interface HashDetails {
+  value: string
+  details: Record<string, string>
+}
+export interface HasherOptions {
+  selectivelyHashTsConfig: boolean
+}
 export interface Task {
   id: string
   target: TaskTarget
@@ -87,7 +106,6 @@ export interface DepsOutputsInput {
 /** Stripped version of the NxJson interface for use in rust */
 export interface NxJson {
   namedInputs?: Record<string, Array<JsInputs>>
-  targetDefaults?: Record<string, Target>
 }
 export const enum EventType {
   delete = 'delete',
@@ -103,32 +121,62 @@ export const enum WorkspaceErrors {
   ParseError = 'ParseError',
   Generic = 'Generic'
 }
-export interface ConfigurationParserResult {
-  projectNodes: Record<string, object>
-  externalNodes: Record<string, object>
-}
 export interface NxWorkspaceFiles {
-  projectFileMap: Record<string, Array<FileData>>
+  projectFileMap: ProjectFiles
   globalFiles: Array<FileData>
-  projectConfigurations: Record<string, object>
-  externalNodes: Record<string, object>
+  externalReferences?: NxWorkspaceFilesExternals
+}
+export interface NxWorkspaceFilesExternals {
+  projectFiles: ExternalObject<ProjectFiles>
+  globalFiles: ExternalObject<Array<FileData>>
+  allWorkspaceFiles: ExternalObject<Array<FileData>>
 }
+export interface UpdatedWorkspaceFiles {
+  fileMap: FileMap
+  externalReferences: NxWorkspaceFilesExternals
+}
+export interface FileMap {
+  projectFileMap: ProjectFiles
+  nonProjectFiles: Array<FileData>
+}
+export function testOnlyTransferFileMap(projectFiles: Record<string, Array<FileData>>, nonProjectFiles: Array<FileData>): NxWorkspaceFilesExternals
 export class ImportResult {
   file: string
   sourceProject: string
   dynamicImportExpressions: Array<string>
   staticImportExpressions: Array<string>
 }
+export class ChildProcess {
+  kill(): void
+  onExit(callback: (message: string) => void): void
+  onOutput(callback: (message: string) => void): void
+}
+export class RustPseudoTerminal {
+  constructor()
+  runCommand(command: string, commandDir?: string | undefined | null, jsEnv?: Record<string, string> | undefined | null, quiet?: boolean | undefined | null): ChildProcess
+  /**
+   * This allows us to run a pseudoterminal with a fake node ipc channel
+   * this makes it possible to be backwards compatible with the old implementation
+   */
+  fork(id: string, forkScript: string, pseudoIpcPath: string, commandDir: string | undefined | null, jsEnv: Record<string, string> | undefined | null, quiet: boolean): ChildProcess
+}
 export class HashPlanner {
-  constructor(workspaceRoot: string, nxJson: NxJson, projectGraph: ProjectGraph)
+  constructor(nxJson: NxJson, projectGraph: ExternalObject<ProjectGraph>)
   getPlans(taskIds: Array<string>, taskGraph: TaskGraph): Record<string, string[]>
   getPlansReference(taskIds: Array<string>, taskGraph: TaskGraph): JsExternal
 }
+export class TaskHasher {
+  constructor(workspaceRoot: string, projectGraph: ExternalObject<ProjectGraph>, projectFileMap: ExternalObject<ProjectFiles>, allWorkspaceFiles: ExternalObject<Array<FileData>>, tsConfig: Buffer, tsConfigPaths: Record<string, Array<string>>, options?: HasherOptions | undefined | null)
+  hashPlans(hashPlans: ExternalObject<Record<string, Array<HashInstruction>>>, jsEnv: Record<string, string>): NapiDashMap
+}
 export class Watcher {
   origin: string
   /**
    * Creates a new Watcher instance.
-   * If `useIgnore` is set to false, no ignores will be used, even when `additionalGlobs` is set
+   * Will always ignore the following directories:
+   * * .git/
+   * * node_modules/
+   * * .nx/
    */
   constructor(origin: string, additionalGlobs?: Array<string> | undefined | null, useIgnore?: boolean | undefined | null)
   watch(callback: (err: string | null, events: WatchEvent[]) => void): void
@@ -136,10 +184,12 @@ export class Watcher {
 }
 export class WorkspaceContext {
   workspaceRoot: string
-  constructor(workspaceRoot: string)
-  getWorkspaceFiles(globs: Array<string>, parseConfigurations: (arg0: Array<string>) => ConfigurationParserResult): NxWorkspaceFiles
-  glob(globs: Array<string>): Array<string>
-  getProjectConfigurations(globs: Array<string>, parseConfigurations: (arg0: Array<string>) => ConfigurationParserResult): ConfigurationParserResult
+  constructor(workspaceRoot: string, cacheDir: string)
+  getWorkspaceFiles(projectRootMap: Record<string, string>): NxWorkspaceFiles
+  glob(globs: Array<string>, exclude?: Array<string> | undefined | null): Array<string>
+  hashFilesMatchingGlob(globs: Array<string>, exclude?: Array<string> | undefined | null): string
   incrementalUpdate(updatedFiles: Array<string>, deletedFiles: Array<string>): Record<string, string>
+  updateProjectFiles(projectRootMappings: ProjectRootMappings, projectFiles: ExternalObject<ProjectFiles>, globalFiles: ExternalObject<Array<FileData>>, updatedFiles: Record<string, string>, deletedFiles: Array<string>): UpdatedWorkspaceFiles
   allFileData(): Array<FileData>
+  getFilesInDirectory(directory: string): Array<string>
 }

package/src/native/index.js

@@ -246,7 +246,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { expandOutputs, getFilesForOutputs, remove, copy, hashArray, hashFile, hashFiles, ImportResult, findImports, HashPlanner, EventType, Watcher, WorkspaceContext, WorkspaceErrors } = nativeBinding
+const { expandOutputs, getFilesForOutputs, remove, copy, hashArray, hashFile, ImportResult, findImports, transferProjectGraph, ChildProcess, RustPseudoTerminal, HashPlanner, TaskHasher, EventType, Watcher, WorkspaceContext, WorkspaceErrors, testOnlyTransferFileMap } = nativeBinding
 
 module.exports.expandOutputs = expandOutputs
 module.exports.getFilesForOutputs = getFilesForOutputs
@@ -254,11 +254,15 @@ module.exports.remove = remove
 module.exports.copy = copy
 module.exports.hashArray = hashArray
 module.exports.hashFile = hashFile
-module.exports.hashFiles = hashFiles
 module.exports.ImportResult = ImportResult
 module.exports.findImports = findImports
+module.exports.transferProjectGraph = transferProjectGraph
+module.exports.ChildProcess = ChildProcess
+module.exports.RustPseudoTerminal = RustPseudoTerminal
 module.exports.HashPlanner = HashPlanner
+module.exports.TaskHasher = TaskHasher
 module.exports.EventType = EventType
 module.exports.Watcher = Watcher
 module.exports.WorkspaceContext = WorkspaceContext
 module.exports.WorkspaceErrors = WorkspaceErrors
+module.exports.testOnlyTransferFileMap = testOnlyTransferFileMap

package/src/native/transform-objects.js

@@ -12,6 +12,8 @@ function transformProjectGraphForRust(graph) {
                 executor: targetConfig.executor,
                 inputs: targetConfig.inputs,
                 outputs: targetConfig.outputs,
+                options: JSON.stringify(targetConfig.options),
+                configurations: JSON.stringify(targetConfig.configurations),
             };
         }
         nodes[projectName] = {

package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.d.ts

@@ -2,6 +2,7 @@ import { Tree } from '../../../generators/tree';
 interface ConnectToNxCloudOptions {
     analytics: boolean;
     installationSource: string;
+    hideFormatLogs?: boolean;
 }
 export declare function connectToNxCloud(tree: Tree, schema: ConnectToNxCloudOptions): Promise<() => void>;
 export default connectToNxCloud;

package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.js

@@ -57,25 +57,24 @@ async function createNxCloudWorkspace(workspaceName, installationSource, nxInitD
     return response.data;
 }
 function printSuccessMessage(url) {
-    let host = 'nx.app';
+    let origin = 'https://nx.app';
     try {
-        host = new node_url_1.URL(url).host;
+        origin = new node_url_1.URL(url).origin;
     }
     catch (e) { }
     output_1.output.note({
-        title: `Distributed caching via Nx Cloud has been enabled`,
+        title: `Your Nx Cloud workspace is public`,
         bodyLines: [
-            `In addition to the caching, Nx Cloud provides config-free distributed execution,`,
-            `UI for viewing complex runs and GitHub integration. Learn more at https://nx.app`,
-            ``,
-            `Your workspace is currently unclaimed. Run details from unclaimed workspaces can be viewed on ${host} by anyone`,
-            `with the link. Claim your workspace at the following link to restrict access.`,
-            ``,
-            `${url}`,
+            `To restrict access, connect it to your Nx Cloud account:`,
+            `- Push your changes`,
+            `- Login at ${origin} to connect your repository`,
         ],
     });
 }
 function addNxCloudOptionsToNxJson(tree, nxJson, token) {
+    nxJson ??= {
+        extends: 'nx/presets/npm.json',
+    };
     nxJson.nxCloudAccessToken = token;
     const overrideUrl = process.env.NX_CLOUD_API || process.env.NRWL_API;
     if (overrideUrl) {
@@ -85,7 +84,7 @@ function addNxCloudOptionsToNxJson(tree, nxJson, token) {
 }
 async function connectToNxCloud(tree, schema) {
     const nxJson = (0, nx_json_1.readNxJson)(tree);
-    if (nxJson.neverConnectToCloud) {
+    if (nxJson?.neverConnectToCloud) {
         return () => {
             printCloudConnectionDisabledMessage();
         };
@@ -94,7 +93,9 @@ async function connectToNxCloud(tree, schema) {
         // TODO: Change to using loading light client when that is enabled by default
         const r = await createNxCloudWorkspace(getRootPackageName(tree), schema.installationSource, getNxInitDate());
         addNxCloudOptionsToNxJson(tree, nxJson, r.token);
-        await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
+        await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
+            silent: schema.hideFormatLogs,
+        });
         return () => printSuccessMessage(r.url);
     }
 }

package/src/nx-cloud/generators/connect-to-nx-cloud/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "id": "NxCloudInit",
   "title": "Add Nx Cloud Configuration to the workspace",
   "description": "Connect a workspace to Nx Cloud.",
@@ -15,6 +15,11 @@
       "type": "string",
       "description": "Name of Nx Cloud installation invoker (ex. user, add-nx-to-monorepo, create-nx-workspace, nx-upgrade",
       "default": "user"
+    },
+    "hideFormatLogs": {
+      "type": "boolean",
+      "description": "Hide formatting logs",
+      "x-priority": "internal"
     }
   },
   "additionalProperties": false,

package/src/nx-cloud/update-manager.js

@@ -211,7 +211,8 @@ async function downloadAndExtractClientBundle(axios, runnerBundleInstallDirector
                 const outputFilePath = (0, path_1.join)(bundleExtractLocation, headers.name);
                 const writeStream = (0, fs_1.createWriteStream)(outputFilePath);
                 stream.pipe(writeStream);
-                stream.on('end', function () {
+                // Continue the tar stream after the write stream closes
+                writeStream.on('close', () => {
                     next();
                 });
                 stream.resume();

package/src/plugins/js/index.d.ts

@@ -1,4 +1,4 @@
 import { CreateDependencies, CreateNodes } from '../../utils/nx-plugin';
-export declare const name = "nx-js-graph-plugin";
+export declare const name = "nx/js/dependencies-and-lockfile";
 export declare const createNodes: CreateNodes;
 export declare const createDependencies: CreateDependencies;

package/src/plugins/js/index.js

@@ -14,7 +14,7 @@ const file_hasher_1 = require("../../hasher/file-hasher");
 const package_manager_1 = require("../../utils/package-manager");
 const workspace_root_1 = require("../../utils/workspace-root");
 const versions_1 = require("../../utils/versions");
-exports.name = 'nx-js-graph-plugin';
+exports.name = 'nx/js/dependencies-and-lockfile';
 let parsedLockFile = {};
 exports.createNodes = [
     // Look for all lockfiles
@@ -39,7 +39,7 @@ exports.createNodes = [
                 externalNodes: nodes,
             };
         }
-        const externalNodes = (0, lock_file_1.getLockFileNodes)(packageManager, lockFileContents, lockFileHash);
+        const externalNodes = (0, lock_file_1.getLockFileNodes)(packageManager, lockFileContents, lockFileHash, context);
         parsedLockFile.externalNodes = externalNodes;
         return {
             externalNodes,
@@ -53,7 +53,7 @@ const createDependencies = (_, ctx) => {
     // lockfile may not exist yet
     if (pluginConfig.analyzeLockfile &&
         (0, lock_file_1.lockFileExists)(packageManager) &&
-        parsedLockFile) {
+        parsedLockFile.externalNodes) {
         const lockFilePath = (0, path_1.join)(workspace_root_1.workspaceRoot, (0, lock_file_1.getLockFileName)(packageManager));
         const lockFileContents = (0, fs_1.readFileSync)(lockFilePath).toString();
         const lockFileHash = getLockFileHash(lockFileContents);

package/src/plugins/js/lock-file/lock-file.d.ts

@@ -6,12 +6,12 @@ import { PackageManager } from '../../../utils/package-manager';
 import { ProjectGraph, ProjectGraphExternalNode } from '../../../config/project-graph';
 import { RawProjectGraphDependency } from '../../../project-graph/project-graph-builder';
 import { PackageJson } from '../../../utils/package-json';
-import { CreateDependenciesContext } from '../../../utils/nx-plugin';
+import { CreateDependenciesContext, CreateNodesContext } from '../../../utils/nx-plugin';
 export declare const LOCKFILES: string[];
 /**
  * Parses lock file and maps dependencies and metadata to {@link LockFileGraph}
  */
-export declare function getLockFileNodes(packageManager: PackageManager, contents: string, lockFileHash: string): Record<string, ProjectGraphExternalNode>;
+export declare function getLockFileNodes(packageManager: PackageManager, contents: string, lockFileHash: string, context: CreateNodesContext): Record<string, ProjectGraphExternalNode>;
 /**
  * Parses lock file and maps dependencies and metadata to {@link LockFileGraph}
  */

package/src/plugins/js/lock-file/lock-file.js

@@ -26,10 +26,10 @@ const PNPM_LOCK_PATH = (0, path_1.join)(workspace_root_1.workspaceRoot, PNPM_LOC
 /**
  * Parses lock file and maps dependencies and metadata to {@link LockFileGraph}
  */
-function getLockFileNodes(packageManager, contents, lockFileHash) {
+function getLockFileNodes(packageManager, contents, lockFileHash, context) {
     try {
         if (packageManager === 'yarn') {
-            const packageJson = (0, fileutils_1.readJsonFile)('package.json');
+            const packageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(context.workspaceRoot, 'package.json'));
             return (0, yarn_parser_1.getYarnLockfileNodes)(contents, lockFileHash, packageJson);
         }
         if (packageManager === 'pnpm') {
@@ -109,6 +109,18 @@ function getLockFileName(packageManager) {
     throw new Error(`Unknown package manager: ${packageManager}`);
 }
 exports.getLockFileName = getLockFileName;
+function getLockFilePath(packageManager) {
+    if (packageManager === 'yarn') {
+        return YARN_LOCK_PATH;
+    }
+    if (packageManager === 'pnpm') {
+        return PNPM_LOCK_PATH;
+    }
+    if (packageManager === 'npm') {
+        return NPM_LOCK_PATH;
+    }
+    throw new Error(`Unknown package manager: ${packageManager}`);
+}
 /**
  * Create lock file based on the root level lock file and (pruned) package.json
  *
@@ -119,7 +131,7 @@ exports.getLockFileName = getLockFileName;
  */
 function createLockFile(packageJson, graph, packageManager = (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot)) {
     const normalizedPackageJson = (0, package_json_1.normalizePackageJson)(packageJson);
-    const content = (0, fs_1.readFileSync)(getLockFileName(packageManager), 'utf8');
+    const content = (0, fs_1.readFileSync)(getLockFilePath(packageManager), 'utf8');
     try {
         if (packageManager === 'yarn') {
             const prunedGraph = (0, project_graph_pruning_1.pruneProjectGraph)(graph, packageJson);

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

@@ -6,10 +6,10 @@ const object_sort_1 = require("../../../utils/object-sort");
 const project_graph_1 = require("../../../config/project-graph");
 const fs_1 = require("fs");
 const workspace_root_1 = require("../../../utils/workspace-root");
-const task_hasher_1 = require("../../../hasher/task-hasher");
 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");
 /**
  * Creates a package.json in the output directory for support to install dependencies within containers.
  *

package/src/plugins/js/project-graph/build-dependencies/strip-source-code.d.ts

@@ -1,6 +1,6 @@
 import type { Scanner } from 'typescript';
 /**
- * @deprecated This is deprecated and will be removed in Nx 18.
+ * @deprecated This is deprecated and will be removed in Nx 19.
  * This was not intended to be exposed.
  * Please talk to us if you need this.
  */

package/src/plugins/js/project-graph/build-dependencies/strip-source-code.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.stripSourceCode = void 0;
 let SyntaxKind;
 /**
- * @deprecated This is deprecated and will be removed in Nx 18.
+ * @deprecated This is deprecated and will be removed in Nx 19.
  * This was not intended to be exposed.
  * Please talk to us if you need this.
  */

package/src/plugins/js/project-graph/build-dependencies/typescript-import-locator.d.ts

@@ -1,6 +1,6 @@
 import { DependencyType } from '../../../../config/project-graph';
 /**
- * @deprecated This is deprecated and will be removed in Nx 18.
+ * @deprecated This is deprecated and will be removed in Nx 19.
  * This was not intended to be exposed.
  * Please talk to us if you need this.
  */

package/src/plugins/js/project-graph/build-dependencies/typescript-import-locator.js

@@ -7,7 +7,7 @@ const file_utils_1 = require("../../../../project-graph/file-utils");
 const strip_source_code_1 = require("./strip-source-code");
 let tsModule;
 /**
- * @deprecated This is deprecated and will be removed in Nx 18.
+ * @deprecated This is deprecated and will be removed in Nx 19.
  * This was not intended to be exposed.
  * Please talk to us if you need this.
  */

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

@@ -19,7 +19,7 @@ export declare function registerTsProject(tsConfigPath: string): () => void;
  * workspace path mapping will not, for example).
  *
  * @returns cleanup function
- * @deprecated This signature will be removed in Nx v18. You should pass the full path to the tsconfig in the first argument.
+ * @deprecated This signature will be removed in Nx v19. You should pass the full path to the tsconfig in the first argument.
  */
 export declare function registerTsProject(path: string, configFilename: string): any;
 export declare function getSwcTranspiler(compilerOptions: CompilerOptions): (...args: unknown[]) => unknown;