nx 21.0.0-beta.1 → 21.0.0-beta.10

package/src/native/index.d.ts

@@ -7,7 +7,25 @@ export declare class ExternalObject<T> {
     [K: symbol]: T
   }
 }
+export declare class AppLifeCycle {
+  constructor(tasks: Array<Task>, pinnedTasks: Array<string>, tuiCliArgs: TuiCliArgs, tuiConfig: TuiConfig, titleText: string)
+  startCommand(threadCount?: number | undefined | null): void
+  scheduleTask(task: Task): void
+  startTasks(tasks: Array<Task>, metadata: object): void
+  printTaskTerminalOutput(task: Task, status: string, output: string): void
+  endTasks(taskResults: Array<TaskResult>, metadata: object): void
+  endCommand(): void
+  __init(doneCallback: () => any): void
+  registerRunningTask(taskId: string, parserAndWriter: ExternalObject<[ParserArc, WriterArc]>): void
+  registerRunningTaskWithEmptyParser(taskId: string): void
+  appendTaskOutput(taskId: string, output: string): void
+  setTaskStatus(taskId: string, status: TaskStatus): void
+  registerForcedShutdownCallback(forcedShutdownCallback: () => any): void
+  __setCloudMessage(message: string): Promise<void>
+}
+
 export declare class ChildProcess {
+  getParserAndWriter(): ExternalObject<[ParserArc, WriterArc]>
   kill(): void
   onExit(callback: (message: string) => void): void
   onOutput(callback: (message: string) => void): void
@@ -26,7 +44,13 @@ export declare class FileLock {
 export declare class HashPlanner {
   constructor(nxJson: NxJson, projectGraph: ExternalObject<ProjectGraph>)
   getPlans(taskIds: Array<string>, taskGraph: TaskGraph): Record<string, string[]>
-  getPlansReference(taskIds: Array<string>, taskGraph: TaskGraph): JsExternal
+  getPlansReference(taskIds: Array<string>, taskGraph: TaskGraph): ExternalObject<Record<string, Array<HashInstruction>>>
+}
+
+export declare class HttpRemoteCache {
+  constructor()
+  retrieve(hash: string, cacheDirectory: string): Promise<CachedResult | null>
+  store(hash: string, cacheDirectory: string, terminalOutput: string, code: number): Promise<boolean>
 }
 
 export declare class ImportResult {
@@ -38,12 +62,13 @@ export declare class ImportResult {
 
 export declare class NxCache {
   cacheDirectory: string
-  constructor(workspaceRoot: string, cachePath: string, dbConnection: ExternalObject<NxDbConnection>, linkTaskDetails?: boolean | undefined | null)
+  constructor(workspaceRoot: string, cachePath: string, dbConnection: ExternalObject<NxDbConnection>, linkTaskDetails?: boolean | undefined | null, maxCacheSize?: number | undefined | null)
   get(hash: string): CachedResult | null
   put(hash: string, terminalOutput: string, outputs: Array<string>, code: number): void
-  applyRemoteCacheResults(hash: string, result: CachedResult): void
+  applyRemoteCacheResults(hash: string, result: CachedResult, outputs?: Array<string> | undefined | null): void
   getTaskOutputsPath(hash: string): string
-  copyFilesFromCache(cachedResult: CachedResult, outputs: Array<string>): void
+  getCacheSize(): number
+  copyFilesFromCache(cachedResult: CachedResult, outputs: Array<string>): number
   removeOldCacheRecords(): void
   checkCacheFsInSync(): boolean
 }
@@ -55,6 +80,13 @@ export declare class NxTaskHistory {
   getEstimatedTaskTimings(targets: Array<TaskTarget>): Record<string, number>
 }
 
+export declare class RunningTasksService {
+  constructor(db: ExternalObject<NxDbConnection>)
+  getRunningTasks(ids: Array<string>): Array<string>
+  addRunningTask(taskId: string): void
+  removeRunningTask(taskId: string): void
+}
+
 export declare class RustPseudoTerminal {
   constructor()
   runCommand(command: string, commandDir?: string | undefined | null, jsEnv?: Record<string, string> | undefined | null, execArgv?: Array<string> | undefined | null, quiet?: boolean | undefined | null, tty?: boolean | undefined | null): ChildProcess
@@ -94,6 +126,14 @@ export declare class WorkspaceContext {
   constructor(workspaceRoot: string, cacheDir: string)
   getWorkspaceFiles(projectRootMap: Record<string, string>): NxWorkspaceFiles
   glob(globs: Array<string>, exclude?: Array<string> | undefined | null): Array<string>
+  /**
+   * Performs multiple glob pattern matches against workspace files in parallel
+   * @returns An array of arrays, where each inner array contains the file paths
+   * that matched the corresponding glob pattern in the input. The outer array maintains the same order
+   * as the input globs.
+   */
+  multiGlob(globs: Array<string>, exclude?: Array<string> | undefined | null): Array<Array<string>>
+  hashFilesMatchingGlobs(globGroups: Array<Array<string>>): 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
@@ -103,15 +143,16 @@ export declare class WorkspaceContext {
 
 export interface CachedResult {
   code: number
-  terminalOutput: string
+  terminalOutput?: string
   outputsPath: string
+  size?: number
 }
 
-export declare export function closeDbConnection(connection: ExternalObject<NxDbConnection>): void
+export declare export declare function closeDbConnection(connection: ExternalObject<NxDbConnection>): void
 
-export declare export function connectToNxDb(cacheDir: string, nxVersion: string, dbName?: string | undefined | null): ExternalObject<NxDbConnection>
+export declare export declare function connectToNxDb(cacheDir: string, nxVersion: string, dbName?: string | undefined | null): ExternalObject<NxDbConnection>
 
-export declare export function copy(src: string, dest: string): void
+export declare export declare function copy(src: string, dest: string): number
 
 export interface DepsOutputsInput {
   dependentTasksOutputFiles: string
@@ -128,7 +169,7 @@ export declare const enum EventType {
   create = 'create'
 }
 
-export declare export function expandOutputs(directory: string, entries: Array<string>): Array<string>
+export declare export declare function expandOutputs(directory: string, entries: Array<string>): Array<string>
 
 export interface ExternalDependenciesInput {
   externalDependencies: Array<string>
@@ -154,19 +195,21 @@ export interface FileSetInput {
   fileset: string
 }
 
-export declare export function findImports(projectFileMap: Record<string, Array<string>>): Array<ImportResult>
+export declare export declare function findImports(projectFileMap: Record<string, Array<string>>): Array<ImportResult>
+
+export declare export declare function getBinaryTarget(): string
 
-export declare export function getBinaryTarget(): string
+export declare export declare function getDefaultMaxCacheSize(cachePath: string): number
 
 /**
  * Expands the given outputs into a list of existing files.
  * This is used when hashing outputs
  */
-export declare export function getFilesForOutputs(directory: string, entries: Array<string>): Array<string>
+export declare export declare function getFilesForOutputs(directory: string, entries: Array<string>): Array<string>
 
-export declare export function getTransformableOutputs(outputs: Array<string>): Array<string>
+export declare export declare function getTransformableOutputs(outputs: Array<string>): Array<string>
 
-export declare export function hashArray(input: Array<string>): string
+export declare export declare function hashArray(input: Array<string | undefined | null>): string
 
 export interface HashDetails {
   value: string
@@ -184,7 +227,7 @@ export interface HasherOptions {
   selectivelyHashTsConfig: boolean
 }
 
-export declare export function hashFile(file: string): string | null
+export declare export declare function hashFile(file: string): string | null
 
 export interface InputsInput {
   input: string
@@ -211,6 +254,8 @@ export interface NxWorkspaceFilesExternals {
   allWorkspaceFiles: ExternalObject<Array<FileData>>
 }
 
+export declare export declare function parseTaskStatus(stringStatus: string): TaskStatus
+
 export interface Project {
   root: string
   namedInputs?: Record<string, Array<JsInputs>>
@@ -224,7 +269,9 @@ export interface ProjectGraph {
   externalNodes: Record<string, ExternalNode>
 }
 
-export declare export function remove(src: string): void
+export declare export declare function remove(src: string): void
+
+export declare export declare function restoreTerminal(): void
 
 export interface RuntimeInput {
   runtime: string
@@ -244,6 +291,9 @@ export interface Task {
   target: TaskTarget
   outputs: Array<string>
   projectRoot?: string
+  startTime?: number
+  endTime?: number
+  continuous?: boolean
 }
 
 export interface TaskGraph {
@@ -252,6 +302,13 @@ export interface TaskGraph {
   dependencies: Record<string, Array<string>>
 }
 
+export interface TaskResult {
+  task: Task
+  status: string
+  code: number
+  terminalOutput?: string
+}
+
 export interface TaskRun {
   hash: string
   status: string
@@ -260,26 +317,48 @@ export interface TaskRun {
   end: number
 }
 
+export declare const enum TaskStatus {
+  Success = 0,
+  Failure = 1,
+  Skipped = 2,
+  LocalCacheKeptExisting = 3,
+  LocalCache = 4,
+  RemoteCache = 5,
+  NotStarted = 6,
+  InProgress = 7,
+  Shared = 8,
+  Stopped = 9
+}
+
 export interface TaskTarget {
   project: string
   target: string
   configuration?: string
 }
 
-export declare export function testOnlyTransferFileMap(projectFiles: Record<string, Array<FileData>>, nonProjectFiles: Array<FileData>): NxWorkspaceFilesExternals
+export declare export declare function testOnlyTransferFileMap(projectFiles: Record<string, Array<FileData>>, nonProjectFiles: Array<FileData>): NxWorkspaceFilesExternals
 
 /**
  * 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 declare export function transferProjectGraph(projectGraph: ProjectGraph): ExternalObject<ProjectGraph>
+export declare export declare function transferProjectGraph(projectGraph: ProjectGraph): ExternalObject<ProjectGraph>
+
+export interface TuiCliArgs {
+  targets?: string[] | undefined
+  tuiAutoExit?: boolean | number | undefined
+}
+
+export interface TuiConfig {
+  autoExit?: boolean | number | undefined
+}
 
 export interface UpdatedWorkspaceFiles {
   fileMap: FileMap
   externalReferences: NxWorkspaceFilesExternals
 }
 
-export declare export function validateOutputs(outputs: Array<string>): void
+export declare export declare function validateOutputs(outputs: Array<string>): void
 
 export interface WatchEvent {
   path: string

package/src/native/index.js

@@ -1,5 +1,5 @@
 const { join, basename } = require('path');
-const { copyFileSync, existsSync, mkdirSync } = require('fs');
+const { copyFileSync, existsSync, mkdirSync, renameSync } = require('fs');
 const Module = require('module');
 const { nxVersion } = require('../utils/versions');
 const { getNativeFileCacheLocation } = require('./native-file-cache-location');
@@ -71,14 +71,28 @@ Module._load = function (request, parent, isMain) {
 
     // we copy the file to a workspace-scoped tmp directory and prefix with nxVersion to avoid stale files being loaded
     const nativeFileCacheLocation = getNativeFileCacheLocation();
+    // This is a path to copy to, not the one that gets loaded
+    const tmpTmpFile = join(
+      nativeFileCacheLocation,
+      nxVersion + '-' + Math.random() + fileName
+    );
+    // This is the path that will get loaded
     const tmpFile = join(nativeFileCacheLocation, nxVersion + '-' + fileName);
+
+    // If the file to be loaded already exists, just load it
     if (existsSync(tmpFile)) {
       return originalLoad.apply(this, [tmpFile, parent, isMain]);
     }
     if (!existsSync(nativeFileCacheLocation)) {
       mkdirSync(nativeFileCacheLocation, { recursive: true });
     }
-    copyFileSync(nativeLocation, tmpFile);
+    // First copy to a unique location for each process
+    copyFileSync(nativeLocation, tmpTmpFile);
+
+    // Then rename to the final location
+    renameSync(tmpTmpFile, tmpFile);
+
+    // Load from the final location
     return originalLoad.apply(this, [tmpFile, parent, isMain]);
   } else {
     // call the original _load function for everything else

package/src/native/native-bindings.js

@@ -361,12 +361,15 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
+module.exports.AppLifeCycle = nativeBinding.AppLifeCycle
 module.exports.ChildProcess = nativeBinding.ChildProcess
 module.exports.FileLock = nativeBinding.FileLock
 module.exports.HashPlanner = nativeBinding.HashPlanner
+module.exports.HttpRemoteCache = nativeBinding.HttpRemoteCache
 module.exports.ImportResult = nativeBinding.ImportResult
 module.exports.NxCache = nativeBinding.NxCache
 module.exports.NxTaskHistory = nativeBinding.NxTaskHistory
+module.exports.RunningTasksService = nativeBinding.RunningTasksService
 module.exports.RustPseudoTerminal = nativeBinding.RustPseudoTerminal
 module.exports.TaskDetails = nativeBinding.TaskDetails
 module.exports.TaskHasher = nativeBinding.TaskHasher
@@ -379,12 +382,16 @@ module.exports.EventType = nativeBinding.EventType
 module.exports.expandOutputs = nativeBinding.expandOutputs
 module.exports.findImports = nativeBinding.findImports
 module.exports.getBinaryTarget = nativeBinding.getBinaryTarget
+module.exports.getDefaultMaxCacheSize = nativeBinding.getDefaultMaxCacheSize
 module.exports.getFilesForOutputs = nativeBinding.getFilesForOutputs
 module.exports.getTransformableOutputs = nativeBinding.getTransformableOutputs
 module.exports.hashArray = nativeBinding.hashArray
 module.exports.hashFile = nativeBinding.hashFile
 module.exports.IS_WASM = nativeBinding.IS_WASM
+module.exports.parseTaskStatus = nativeBinding.parseTaskStatus
 module.exports.remove = nativeBinding.remove
+module.exports.restoreTerminal = nativeBinding.restoreTerminal
+module.exports.TaskStatus = nativeBinding.TaskStatus
 module.exports.testOnlyTransferFileMap = nativeBinding.testOnlyTransferFileMap
 module.exports.transferProjectGraph = nativeBinding.transferProjectGraph
 module.exports.validateOutputs = nativeBinding.validateOutputs

package/src/native/nx.wasi-browser.js

@@ -76,25 +76,26 @@ function __napi_rs_initialize_modules(__napiInstance) {
   __napiInstance.exports['__napi_register__TaskHasher_impl_27']?.()
   __napiInstance.exports['__napi_register__Task_struct_28']?.()
   __napiInstance.exports['__napi_register__TaskTarget_struct_29']?.()
-  __napiInstance.exports['__napi_register__TaskGraph_struct_30']?.()
-  __napiInstance.exports['__napi_register__FileData_struct_31']?.()
-  __napiInstance.exports['__napi_register__InputsInput_struct_32']?.()
-  __napiInstance.exports['__napi_register__FileSetInput_struct_33']?.()
-  __napiInstance.exports['__napi_register__RuntimeInput_struct_34']?.()
-  __napiInstance.exports['__napi_register__EnvironmentInput_struct_35']?.()
-  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_36']?.()
-  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_37']?.()
-  __napiInstance.exports['__napi_register__NxJson_struct_38']?.()
-  __napiInstance.exports['__napi_register__FileLock_struct_39']?.()
-  __napiInstance.exports['__napi_register__FileLock_impl_41']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_struct_42']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_impl_51']?.()
-  __napiInstance.exports['__napi_register__WorkspaceErrors_52']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_53']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_54']?.()
-  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_55']?.()
-  __napiInstance.exports['__napi_register__FileMap_struct_56']?.()
-  __napiInstance.exports['__napi_register____test_only_transfer_file_map_57']?.()
+  __napiInstance.exports['__napi_register__TaskResult_struct_30']?.()
+  __napiInstance.exports['__napi_register__TaskGraph_struct_31']?.()
+  __napiInstance.exports['__napi_register__FileData_struct_32']?.()
+  __napiInstance.exports['__napi_register__InputsInput_struct_33']?.()
+  __napiInstance.exports['__napi_register__FileSetInput_struct_34']?.()
+  __napiInstance.exports['__napi_register__RuntimeInput_struct_35']?.()
+  __napiInstance.exports['__napi_register__EnvironmentInput_struct_36']?.()
+  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_37']?.()
+  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_38']?.()
+  __napiInstance.exports['__napi_register__NxJson_struct_39']?.()
+  __napiInstance.exports['__napi_register__FileLock_struct_40']?.()
+  __napiInstance.exports['__napi_register__FileLock_impl_42']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_struct_43']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_impl_54']?.()
+  __napiInstance.exports['__napi_register__WorkspaceErrors_55']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_56']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_57']?.()
+  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_58']?.()
+  __napiInstance.exports['__napi_register__FileMap_struct_59']?.()
+  __napiInstance.exports['__napi_register____test_only_transfer_file_map_60']?.()
 }
 export const FileLock = __napiModule.exports.FileLock
 export const HashPlanner = __napiModule.exports.HashPlanner

package/src/native/nx.wasi.cjs

@@ -107,25 +107,26 @@ function __napi_rs_initialize_modules(__napiInstance) {
   __napiInstance.exports['__napi_register__TaskHasher_impl_27']?.()
   __napiInstance.exports['__napi_register__Task_struct_28']?.()
   __napiInstance.exports['__napi_register__TaskTarget_struct_29']?.()
-  __napiInstance.exports['__napi_register__TaskGraph_struct_30']?.()
-  __napiInstance.exports['__napi_register__FileData_struct_31']?.()
-  __napiInstance.exports['__napi_register__InputsInput_struct_32']?.()
-  __napiInstance.exports['__napi_register__FileSetInput_struct_33']?.()
-  __napiInstance.exports['__napi_register__RuntimeInput_struct_34']?.()
-  __napiInstance.exports['__napi_register__EnvironmentInput_struct_35']?.()
-  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_36']?.()
-  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_37']?.()
-  __napiInstance.exports['__napi_register__NxJson_struct_38']?.()
-  __napiInstance.exports['__napi_register__FileLock_struct_39']?.()
-  __napiInstance.exports['__napi_register__FileLock_impl_41']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_struct_42']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_impl_51']?.()
-  __napiInstance.exports['__napi_register__WorkspaceErrors_52']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_53']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_54']?.()
-  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_55']?.()
-  __napiInstance.exports['__napi_register__FileMap_struct_56']?.()
-  __napiInstance.exports['__napi_register____test_only_transfer_file_map_57']?.()
+  __napiInstance.exports['__napi_register__TaskResult_struct_30']?.()
+  __napiInstance.exports['__napi_register__TaskGraph_struct_31']?.()
+  __napiInstance.exports['__napi_register__FileData_struct_32']?.()
+  __napiInstance.exports['__napi_register__InputsInput_struct_33']?.()
+  __napiInstance.exports['__napi_register__FileSetInput_struct_34']?.()
+  __napiInstance.exports['__napi_register__RuntimeInput_struct_35']?.()
+  __napiInstance.exports['__napi_register__EnvironmentInput_struct_36']?.()
+  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_37']?.()
+  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_38']?.()
+  __napiInstance.exports['__napi_register__NxJson_struct_39']?.()
+  __napiInstance.exports['__napi_register__FileLock_struct_40']?.()
+  __napiInstance.exports['__napi_register__FileLock_impl_42']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_struct_43']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_impl_54']?.()
+  __napiInstance.exports['__napi_register__WorkspaceErrors_55']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_56']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_57']?.()
+  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_58']?.()
+  __napiInstance.exports['__napi_register__FileMap_struct_59']?.()
+  __napiInstance.exports['__napi_register____test_only_transfer_file_map_60']?.()
 }
 module.exports.FileLock = __napiModule.exports.FileLock
 module.exports.HashPlanner = __napiModule.exports.HashPlanner

package/src/nx-cloud/nx-cloud-tasks-runner-shell.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxCloudTasksRunnerShell = void 0;
-const resolution_helpers_1 = require("./resolution-helpers");
-const update_manager_1 = require("./update-manager");
 const default_tasks_runner_1 = require("../tasks-runner/default-tasks-runner");
 const output_1 = require("../utils/output");
+const resolution_helpers_1 = require("./resolution-helpers");
+const update_manager_1 = require("./update-manager");
 const nxCloudTasksRunnerShell = async (tasks, options, context) => {
     try {
         const { nxCloudClient, version } = await (0, update_manager_1.verifyOrUpdateNxCloudClient)(options);
@@ -27,7 +27,7 @@ const nxCloudTasksRunnerShell = async (tasks, options, context) => {
         if (e instanceof update_manager_1.NxCloudEnterpriseOutdatedError) {
             output_1.output.warn({
                 title: e.message,
-                bodyLines: ['Nx Cloud will not used for this command.', ...body],
+                bodyLines: ['Nx Cloud will not be used for this command.', ...body],
             });
         }
         const results = await (0, default_tasks_runner_1.defaultTasksRunner)(tasks, options, context);

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

@@ -10,8 +10,10 @@ exports.getLockFileDependencies = getLockFileDependencies;
 exports.lockFileExists = lockFileExists;
 exports.getLockFileName = getLockFileName;
 exports.createLockFile = createLockFile;
-const fs_1 = require("fs");
-const path_1 = require("path");
+const node_child_process_1 = require("node:child_process");
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+const semver_1 = require("semver");
 const package_manager_1 = require("../../../utils/package-manager");
 const workspace_root_1 = require("../../../utils/workspace-root");
 const output_1 = require("../../../utils/output");
@@ -25,23 +27,26 @@ const YARN_LOCK_FILE = 'yarn.lock';
 const NPM_LOCK_FILE = 'package-lock.json';
 const PNPM_LOCK_FILE = 'pnpm-lock.yaml';
 const BUN_LOCK_FILE = 'bun.lockb';
+const BUN_TEXT_LOCK_FILE = 'bun.lock';
 exports.LOCKFILES = [
     YARN_LOCK_FILE,
     NPM_LOCK_FILE,
     PNPM_LOCK_FILE,
     BUN_LOCK_FILE,
+    BUN_TEXT_LOCK_FILE,
 ];
-const YARN_LOCK_PATH = (0, path_1.join)(workspace_root_1.workspaceRoot, YARN_LOCK_FILE);
-const NPM_LOCK_PATH = (0, path_1.join)(workspace_root_1.workspaceRoot, NPM_LOCK_FILE);
-const PNPM_LOCK_PATH = (0, path_1.join)(workspace_root_1.workspaceRoot, PNPM_LOCK_FILE);
-const BUN_LOCK_PATH = (0, path_1.join)(workspace_root_1.workspaceRoot, BUN_LOCK_FILE);
+const YARN_LOCK_PATH = (0, node_path_1.join)(workspace_root_1.workspaceRoot, YARN_LOCK_FILE);
+const NPM_LOCK_PATH = (0, node_path_1.join)(workspace_root_1.workspaceRoot, NPM_LOCK_FILE);
+const PNPM_LOCK_PATH = (0, node_path_1.join)(workspace_root_1.workspaceRoot, PNPM_LOCK_FILE);
+const BUN_LOCK_PATH = (0, node_path_1.join)(workspace_root_1.workspaceRoot, BUN_LOCK_FILE);
+const BUN_TEXT_LOCK_PATH = (0, node_path_1.join)(workspace_root_1.workspaceRoot, BUN_TEXT_LOCK_FILE);
 /**
  * Parses lock file and maps dependencies and metadata to {@link LockFileGraph}
  */
 function getLockFileNodes(packageManager, contents, lockFileHash, context) {
     try {
         if (packageManager === 'yarn') {
-            const packageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(context.workspaceRoot, 'package.json'));
+            const packageJson = (0, fileutils_1.readJsonFile)((0, node_path_1.join)(context.workspaceRoot, 'package.json'));
             return (0, yarn_parser_1.getYarnLockfileNodes)(contents, lockFileHash, packageJson);
         }
         if (packageManager === 'pnpm') {
@@ -99,16 +104,16 @@ function getLockFileDependencies(packageManager, contents, lockFileHash, context
 }
 function lockFileExists(packageManager) {
     if (packageManager === 'yarn') {
-        return (0, fs_1.existsSync)(YARN_LOCK_PATH);
+        return (0, node_fs_1.existsSync)(YARN_LOCK_PATH);
     }
     if (packageManager === 'pnpm') {
-        return (0, fs_1.existsSync)(PNPM_LOCK_PATH);
+        return (0, node_fs_1.existsSync)(PNPM_LOCK_PATH);
     }
     if (packageManager === 'npm') {
-        return (0, fs_1.existsSync)(NPM_LOCK_PATH);
+        return (0, node_fs_1.existsSync)(NPM_LOCK_PATH);
     }
     if (packageManager === 'bun') {
-        return (0, fs_1.existsSync)(BUN_LOCK_PATH);
+        return (0, node_fs_1.existsSync)(BUN_LOCK_PATH) || (0, node_fs_1.existsSync)(BUN_TEXT_LOCK_PATH);
     }
     throw new Error(`Unknown package manager ${packageManager} or lock file missing`);
 }
@@ -143,7 +148,17 @@ function getLockFilePath(packageManager) {
         return NPM_LOCK_PATH;
     }
     if (packageManager === 'bun') {
-        return BUN_LOCK_PATH;
+        try {
+            const bunVersion = (0, node_child_process_1.execSync)('bun --version').toString().trim();
+            // In version 1.2.0, bun switched to a text based lockfile format by default
+            if ((0, semver_1.gte)(bunVersion, '1.2.0')) {
+                return BUN_TEXT_LOCK_FILE;
+            }
+            return BUN_LOCK_PATH;
+        }
+        catch {
+            return BUN_LOCK_PATH;
+        }
     }
     throw new Error(`Unknown package manager: ${packageManager}`);
 }
@@ -157,7 +172,7 @@ function getLockFilePath(packageManager) {
  */
 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)(getLockFilePath(packageManager), 'utf8');
+    const content = (0, node_fs_1.readFileSync)(getLockFilePath(packageManager), 'utf8');
     try {
         if (packageManager === 'yarn') {
             const prunedGraph = (0, project_graph_pruning_1.pruneProjectGraph)(graph, packageJson);

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

@@ -3,7 +3,7 @@ import { PackageJson } from '../../../../utils/package-json';
  * Get version of hoisted package if available
  */
 export declare function getHoistedPackageVersion(packageName: string): string;
-export type NormalizedPackageJson = Pick<PackageJson, 'name' | 'version' | 'license' | 'dependencies' | 'devDependencies' | 'peerDependencies' | 'peerDependenciesMeta' | 'optionalDependencies' | 'packageManager'>;
+export type NormalizedPackageJson = Pick<PackageJson, 'name' | 'version' | 'license' | 'dependencies' | 'devDependencies' | 'peerDependencies' | 'peerDependenciesMeta' | 'optionalDependencies' | 'packageManager' | 'resolutions'>;
 /**
  * Strip off non-pruning related fields from package.json
  */

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

@@ -2,24 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHoistedPackageVersion = getHoistedPackageVersion;
 exports.normalizePackageJson = normalizePackageJson;
-const fs_1 = require("fs");
 const workspace_root_1 = require("../../../../utils/workspace-root");
+const fileutils_1 = require("../../../../utils/fileutils");
 /**
  * Get version of hoisted package if available
  */
 function getHoistedPackageVersion(packageName) {
     const fullPath = `${workspace_root_1.workspaceRoot}/node_modules/${packageName}/package.json`;
-    if ((0, fs_1.existsSync)(fullPath)) {
-        const content = (0, fs_1.readFileSync)(fullPath, 'utf-8');
-        return JSON.parse(content)?.version;
+    try {
+        return (0, fileutils_1.readJsonFile)(fullPath)?.version;
+    }
+    catch (e) {
+        return;
     }
-    return;
 }
 /**
  * Strip off non-pruning related fields from package.json
  */
 function normalizePackageJson(packageJson) {
-    const { name, version, license, dependencies, devDependencies, peerDependencies, peerDependenciesMeta, optionalDependencies, packageManager, } = packageJson;
+    const { name, version, license, dependencies, devDependencies, peerDependencies, peerDependenciesMeta, optionalDependencies, packageManager, resolutions, } = packageJson;
     return {
         name,
         version,
@@ -30,5 +31,6 @@ function normalizePackageJson(packageJson) {
         peerDependenciesMeta,
         optionalDependencies,
         packageManager,
+        resolutions,
     };
 }

package/src/plugins/js/lock-file/utils/pnpm-normalizer.js

@@ -9,7 +9,7 @@ exports.usesLeadingDash = usesLeadingDash;
 exports.loadPnpmHoistedDepsDefinition = loadPnpmHoistedDepsDefinition;
 exports.parseAndNormalizePnpmLockfile = parseAndNormalizePnpmLockfile;
 exports.stringifyToPnpmYaml = stringifyToPnpmYaml;
-const fs_1 = require("fs");
+const node_fs_1 = require("node:fs");
 const semver_1 = require("semver");
 const workspace_root_1 = require("../../../../utils/workspace-root");
 const file_hasher_1 = require("../../../../hasher/file-hasher");
@@ -31,8 +31,8 @@ function usesLeadingDash(data) {
 }
 function loadPnpmHoistedDepsDefinition() {
     const fullPath = `${workspace_root_1.workspaceRoot}/node_modules/.modules.yaml`;
-    if ((0, fs_1.existsSync)(fullPath)) {
-        const content = (0, fs_1.readFileSync)(fullPath, 'utf-8');
+    if ((0, node_fs_1.existsSync)(fullPath)) {
+        const content = (0, node_fs_1.readFileSync)(fullPath, 'utf-8');
         const { load } = require('@zkochan/js-yaml');
         return load(content)?.hoistedDependencies ?? {};
     }