nx 19.1.0-canary.20240521-1255603 → 19.1.0-canary.20240523-261b0ff

package/src/plugins/js/index.js

@@ -14,6 +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");
+const child_process_1 = require("child_process");
 exports.name = 'nx/js/dependencies-and-lockfile';
 let parsedLockFile = {};
 exports.createNodes = [
@@ -30,7 +31,9 @@ exports.createNodes = [
             return {};
         }
         const lockFilePath = (0, path_1.join)(workspace_root_1.workspaceRoot, lockFile);
-        const lockFileContents = (0, fs_1.readFileSync)(lockFilePath).toString();
+        const lockFileContents = packageManager !== 'bun'
+            ? (0, fs_1.readFileSync)(lockFilePath).toString()
+            : (0, child_process_1.execSync)(`bun ${lockFilePath}`).toString();
         const lockFileHash = getLockFileHash(lockFileContents);
         if (!lockFileNeedsReprocessing(lockFileHash)) {
             const nodes = readCachedParsedLockFile().externalNodes;
@@ -55,7 +58,9 @@ const createDependencies = (_, ctx) => {
         (0, lock_file_1.lockFileExists)(packageManager) &&
         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 lockFileContents = packageManager !== 'bun'
+            ? (0, fs_1.readFileSync)(lockFilePath).toString()
+            : (0, child_process_1.execSync)(`bun ${lockFilePath}`).toString();
         const lockFileHash = getLockFileHash(lockFileContents);
         if (!lockFileNeedsReprocessing(lockFileHash)) {
             lockfileDependencies = readCachedParsedLockFile().dependencies ?? [];

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

@@ -19,10 +19,17 @@ const fileutils_1 = require("../../../utils/fileutils");
 const YARN_LOCK_FILE = 'yarn.lock';
 const NPM_LOCK_FILE = 'package-lock.json';
 const PNPM_LOCK_FILE = 'pnpm-lock.yaml';
-exports.LOCKFILES = [YARN_LOCK_FILE, NPM_LOCK_FILE, PNPM_LOCK_FILE];
+const BUN_LOCK_FILE = 'bun.lockb';
+exports.LOCKFILES = [
+    YARN_LOCK_FILE,
+    NPM_LOCK_FILE,
+    PNPM_LOCK_FILE,
+    BUN_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);
 /**
  * Parses lock file and maps dependencies and metadata to {@link LockFileGraph}
  */
@@ -38,6 +45,11 @@ function getLockFileNodes(packageManager, contents, lockFileHash, context) {
         if (packageManager === 'npm') {
             return (0, npm_parser_1.getNpmLockfileNodes)(contents, lockFileHash);
         }
+        if (packageManager === 'bun') {
+            // bun uses yarn v1 for the file format
+            const packageJson = (0, fileutils_1.readJsonFile)('package.json');
+            return (0, yarn_parser_1.getYarnLockfileNodes)(contents, lockFileHash, packageJson);
+        }
     }
     catch (e) {
         if (!isPostInstallProcess()) {
@@ -65,6 +77,10 @@ function getLockFileDependencies(packageManager, contents, lockFileHash, context
         if (packageManager === 'npm') {
             return (0, npm_parser_1.getNpmLockfileDependencies)(contents, lockFileHash, context);
         }
+        if (packageManager === 'bun') {
+            // bun uses yarn v1 for the file format
+            return (0, yarn_parser_1.getYarnLockfileDependencies)(contents, lockFileHash, context);
+        }
     }
     catch (e) {
         if (!isPostInstallProcess()) {
@@ -88,6 +104,9 @@ function lockFileExists(packageManager) {
     if (packageManager === 'npm') {
         return (0, fs_1.existsSync)(NPM_LOCK_PATH);
     }
+    if (packageManager === 'bun') {
+        return (0, fs_1.existsSync)(BUN_LOCK_PATH);
+    }
     throw new Error(`Unknown package manager ${packageManager} or lock file missing`);
 }
 exports.lockFileExists = lockFileExists;
@@ -106,6 +125,9 @@ function getLockFileName(packageManager) {
     if (packageManager === 'npm') {
         return NPM_LOCK_FILE;
     }
+    if (packageManager === 'bun') {
+        return BUN_LOCK_FILE;
+    }
     throw new Error(`Unknown package manager: ${packageManager}`);
 }
 exports.getLockFileName = getLockFileName;
@@ -119,6 +141,9 @@ function getLockFilePath(packageManager) {
     if (packageManager === 'npm') {
         return NPM_LOCK_PATH;
     }
+    if (packageManager === 'bun') {
+        return BUN_LOCK_PATH;
+    }
     throw new Error(`Unknown package manager: ${packageManager}`);
 }
 /**
@@ -145,6 +170,11 @@ function createLockFile(packageJson, graph, packageManager = (0, package_manager
             const prunedGraph = (0, project_graph_pruning_1.pruneProjectGraph)(graph, packageJson);
             return (0, npm_parser_1.stringifyNpmLockfile)(prunedGraph, content, normalizedPackageJson);
         }
+        if (packageManager === 'bun') {
+            output_1.output.log({
+                title: "Unable to create bun lock files. Run bun install it's just as quick",
+            });
+        }
     }
     catch (e) {
         if (!isPostInstallProcess()) {

package/src/plugins/target-defaults/target-defaults-plugin.d.ts

@@ -13,6 +13,11 @@ export default TargetDefaultsPlugin;
  */
 export declare function getTargetInfo(target: string, projectJsonTargets: Record<string, TargetConfiguration>, packageJsonTargets: Record<string, TargetConfiguration>): {
     command: string;
+    metadata: {
+        [x: string]: any;
+        description?: string;
+        technologies?: string[];
+    };
     executor?: undefined;
     options?: undefined;
 } | {
@@ -22,6 +27,11 @@ export declare function getTargetInfo(target: string, projectJsonTargets: Record
         commands?: undefined;
         script?: undefined;
     };
+    metadata: {
+        [x: string]: any;
+        description?: string;
+        technologies?: string[];
+    };
     command?: undefined;
 } | {
     executor: string;
@@ -30,9 +40,19 @@ export declare function getTargetInfo(target: string, projectJsonTargets: Record
         command?: undefined;
         script?: undefined;
     };
+    metadata: {
+        [x: string]: any;
+        description?: string;
+        technologies?: string[];
+    };
     command?: undefined;
 } | {
     executor: string;
+    metadata: {
+        [x: string]: any;
+        description?: string;
+        technologies?: string[];
+    };
     command?: undefined;
     options?: undefined;
 } | {
@@ -42,9 +62,20 @@ export declare function getTargetInfo(target: string, projectJsonTargets: Record
         command?: undefined;
         commands?: undefined;
     };
+    metadata: {
+        [x: string]: any;
+        description?: string;
+        technologies?: string[];
+    };
     command?: undefined;
+} | {
+    executor: string;
+    command?: undefined;
+    metadata?: undefined;
+    options?: undefined;
 } | {
     command?: undefined;
+    metadata?: undefined;
     executor?: undefined;
     options?: undefined;
 };

package/src/plugins/target-defaults/target-defaults-plugin.js

@@ -111,9 +111,14 @@ function getTargetInfo(target, projectJsonTargets, packageJsonTargets) {
         ...packageJsonTarget?.options,
         ...projectJsonTarget?.options,
     };
+    const metadata = {
+        ...packageJsonTarget?.metadata,
+        ...projectJsonTarget?.metadata,
+    };
     if (projectJsonTarget?.command) {
         return {
             command: projectJsonTarget?.command,
+            metadata,
         };
     }
     if (executor === 'nx:run-commands') {
@@ -123,6 +128,7 @@ function getTargetInfo(target, projectJsonTargets, packageJsonTargets) {
                 options: {
                     command: targetOptions?.command,
                 },
+                metadata,
             };
         }
         else if (targetOptions?.commands) {
@@ -131,10 +137,12 @@ function getTargetInfo(target, projectJsonTargets, packageJsonTargets) {
                 options: {
                     commands: targetOptions.commands,
                 },
+                metadata,
             };
         }
         return {
             executor: 'nx:run-commands',
+            metadata,
         };
     }
     if (executor === 'nx:run-script') {
@@ -143,6 +151,7 @@ function getTargetInfo(target, projectJsonTargets, packageJsonTargets) {
             options: {
                 script: targetOptions?.script ?? target,
             },
+            metadata,
         };
     }
     if (executor) {

package/src/utils/ab-testing.js

@@ -90,6 +90,11 @@ async function recordStat(opts) {
 exports.recordStat = recordStat;
 function shouldRecordStats() {
     const pmc = (0, package_manager_1.getPackageManagerCommand)();
+    if (!pmc.getRegistryUrl) {
+        // Fallback on true as Package management doesn't support reading config for registry.
+        // currently Bun doesn't support fetching config settings https://github.com/oven-sh/bun/issues/7140
+        return true;
+    }
     try {
         const stdout = (0, node_child_process_1.execSync)(pmc.getRegistryUrl, { encoding: 'utf-8' });
         const url = new URL(stdout.trim());

package/src/utils/package-json.d.ts

@@ -65,7 +65,7 @@ export declare function normalizePackageGroup(packageGroup: PackageGroup): Array
 export declare function readNxMigrateConfig(json: Partial<PackageJson>): NxMigrationsConfiguration & {
     packageGroup?: ArrayPackageGroup;
 };
-export declare function buildTargetFromScript(script: string): TargetConfiguration;
+export declare function buildTargetFromScript(script: string, scripts?: Record<string, string>): TargetConfiguration;
 export declare function readTargetsFromPackageJson(packageJson: PackageJson): Record<string, TargetConfiguration<any>>;
 /**
  * Uses `require.resolve` to read the package.json for a module.

package/src/utils/package-json.js

@@ -6,6 +6,7 @@ const path_1 = require("path");
 const project_configuration_utils_1 = require("../project-graph/utils/project-configuration-utils");
 const fileutils_1 = require("./fileutils");
 const installation_directory_1 = require("./installation-directory");
+const package_manager_1 = require("./package-manager");
 function normalizePackageGroup(packageGroup) {
     return Array.isArray(packageGroup)
         ? packageGroup.map((x) => typeof x === 'string' ? { package: x, version: '*' } : x)
@@ -38,12 +39,17 @@ function readNxMigrateConfig(json) {
     };
 }
 exports.readNxMigrateConfig = readNxMigrateConfig;
-function buildTargetFromScript(script) {
+function buildTargetFromScript(script, scripts = {}) {
+    const packageManagerCommand = (0, package_manager_1.getPackageManagerCommand)();
     return {
         executor: 'nx:run-script',
         options: {
             script,
         },
+        metadata: {
+            scriptContent: scripts[script],
+            runCommand: packageManagerCommand.run(script),
+        },
     };
 }
 exports.buildTargetFromScript = buildTargetFromScript;
@@ -53,7 +59,7 @@ function readTargetsFromPackageJson(packageJson) {
     const includedScripts = nx?.includedScripts || Object.keys(scripts ?? {});
     //
     for (const script of includedScripts) {
-        res[script] = buildTargetFromScript(script);
+        res[script] = buildTargetFromScript(script, scripts);
     }
     for (const targetName in nx?.targets) {
         res[targetName] = (0, project_configuration_utils_1.mergeTargetConfigurations)(nx?.targets[targetName], res[targetName]);

package/src/utils/package-manager.d.ts

@@ -1,4 +1,4 @@
-export type PackageManager = 'yarn' | 'pnpm' | 'npm';
+export type PackageManager = 'yarn' | 'pnpm' | 'npm' | 'bun';
 export interface PackageManagerCommands {
     preInstall?: string;
     install: string;
@@ -10,8 +10,8 @@ export interface PackageManagerCommands {
     exec: string;
     dlx: string;
     list: string;
-    run: (script: string, args: string) => string;
-    getRegistryUrl: string;
+    run: (script: string, args?: string) => string;
+    getRegistryUrl?: string;
 }
 /**
  * Detects which package manager is used in the workspace based on the lock file.

package/src/utils/package-manager.js

@@ -20,11 +20,13 @@ const execAsync = (0, util_1.promisify)(child_process_1.exec);
 function detectPackageManager(dir = '') {
     const nxJson = (0, configuration_1.readNxJson)();
     return (nxJson.cli?.packageManager ??
-        ((0, fs_1.existsSync)((0, path_1.join)(dir, 'yarn.lock'))
-            ? 'yarn'
-            : (0, fs_1.existsSync)((0, path_1.join)(dir, 'pnpm-lock.yaml'))
-                ? 'pnpm'
-                : 'npm'));
+        ((0, fs_1.existsSync)((0, path_1.join)(dir, 'bun.lockb'))
+            ? 'bun'
+            : (0, fs_1.existsSync)((0, path_1.join)(dir, 'yarn.lock'))
+                ? 'yarn'
+                : (0, fs_1.existsSync)((0, path_1.join)(dir, 'pnpm-lock.yaml'))
+                    ? 'pnpm'
+                    : 'npm'));
 }
 exports.detectPackageManager = detectPackageManager;
 /**
@@ -74,7 +76,7 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
                 rm: 'yarn remove',
                 exec: 'yarn',
                 dlx: useBerry ? 'yarn dlx' : 'yarn',
-                run: (script, args) => `yarn ${script} ${args}`,
+                run: (script, args) => `yarn ${script}${args ? ` ${args}` : ''}`,
                 list: useBerry ? 'yarn info --name-only' : 'yarn list',
                 getRegistryUrl: useBerry
                     ? 'yarn config get npmRegistryServer'
@@ -95,9 +97,11 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
                 rm: 'pnpm rm',
                 exec: modernPnpm ? 'pnpm exec' : 'pnpx',
                 dlx: modernPnpm ? 'pnpm dlx' : 'pnpx',
-                run: (script, args) => includeDoubleDashBeforeArgs
-                    ? `pnpm run ${script} -- ${args}`
-                    : `pnpm run ${script} ${args}`,
+                run: (script, args) => `pnpm run ${script}${args
+                    ? includeDoubleDashBeforeArgs
+                        ? ' -- ' + args
+                        : ` ${args}`
+                    : ''}`,
                 list: 'pnpm ls --depth 100',
                 getRegistryUrl: 'pnpm config get registry',
             };
@@ -114,11 +118,26 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
                 rm: 'npm rm',
                 exec: 'npx',
                 dlx: 'npx',
-                run: (script, args) => `npm run ${script} -- ${args}`,
+                run: (script, args) => `npm run ${script}${args ? ' -- ' + args : ''}`,
                 list: 'npm ls',
                 getRegistryUrl: 'npm config get registry',
             };
         },
+        bun: () => {
+            // bun doesn't current support programatically reading config https://github.com/oven-sh/bun/issues/7140
+            return {
+                install: 'bun install',
+                ciInstall: 'bun install --no-cache',
+                updateLockFile: 'bun install --frozen-lockfile',
+                add: 'bun install',
+                addDev: 'bun install -D',
+                rm: 'bun rm',
+                exec: 'bun',
+                dlx: 'bunx',
+                run: (script, args) => `bun run ${script} -- ${args}`,
+                list: 'bun pm ls',
+            };
+        },
     };
     return commands[packageManager]();
 }
@@ -193,7 +212,12 @@ function modifyYarnRcToFitNewDirectory(contents) {
 }
 exports.modifyYarnRcToFitNewDirectory = modifyYarnRcToFitNewDirectory;
 function copyPackageManagerConfigurationFiles(root, destination) {
-    for (const packageManagerConfigFile of ['.npmrc', '.yarnrc', '.yarnrc.yml']) {
+    for (const packageManagerConfigFile of [
+        '.npmrc',
+        '.yarnrc',
+        '.yarnrc.yml',
+        'bunfig.toml',
+    ]) {
         // f is an absolute path, including the {workspaceRoot}.
         const f = findFileInPackageJsonDirectory(packageManagerConfigFile, root);
         if (f) {
@@ -216,6 +240,10 @@ function copyPackageManagerConfigurationFiles(root, destination) {
                     (0, fs_1.writeFileSync)(destinationPath, updated);
                     break;
                 }
+                case 'bunfig.toml': {
+                    (0, fs_1.copyFileSync)(f, destinationPath);
+                    break;
+                }
             }
         }
     }
@@ -297,12 +325,16 @@ async function resolvePackageVersionUsingInstallation(packageName, version) {
 exports.resolvePackageVersionUsingInstallation = resolvePackageVersionUsingInstallation;
 async function packageRegistryView(pkg, version, args) {
     let pm = detectPackageManager();
-    if (pm === 'yarn') {
+    if (pm === 'yarn' || pm === 'bun') {
         /**
          * yarn has `yarn info` but it behaves differently than (p)npm,
          * which makes it's usage unreliable
          *
          * @see https://github.com/nrwl/nx/pull/9667#discussion_r842553994
+         *
+         * Bun has a pm ls function but it only relates to its lockfile
+         * and acts differently from all other package managers
+         * from Jarred: "it probably would be bun pm view <package-name>"
          */
         pm = 'npm';
     }
@@ -312,13 +344,15 @@ async function packageRegistryView(pkg, version, args) {
 exports.packageRegistryView = packageRegistryView;
 async function packageRegistryPack(cwd, pkg, version) {
     let pm = detectPackageManager();
-    if (pm === 'yarn') {
+    if (pm === 'yarn' || pm === 'bun') {
         /**
          * `(p)npm pack` will download a tarball of the specified version,
          * whereas `yarn` pack creates a tarball of the active workspace, so it
          * does not work for getting the content of a library.
          *
          * @see https://github.com/nrwl/nx/pull/9667#discussion_r842553994
+         *
+         * bun doesn't currently support pack
          */
         pm = 'npm';
     }