nx 20.5.0-beta.3 → 20.5.0-beta.5

package/src/core/graph/styles.js

@@ -1 +1 @@
-"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[532],{2784:()=>{}},s=>{var e;e=2784,s(s.s=e)}]);
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[532],{2558:()=>{}},s=>{var e;e=2558,s(s.s=e)}]);

package/src/daemon/server/server.js

@@ -255,6 +255,7 @@ function lockFileHashChanged() {
         (0, path_1.join)(workspace_root_1.workspaceRoot, 'yarn.lock'),
         (0, path_1.join)(workspace_root_1.workspaceRoot, 'pnpm-lock.yaml'),
         (0, path_1.join)(workspace_root_1.workspaceRoot, 'bun.lockb'),
+        (0, path_1.join)(workspace_root_1.workspaceRoot, 'bun.lock'),
     ]
         .filter((file) => (0, fs_1.existsSync)(file))
         .map((file) => (0, native_1.hashFile)(file));

package/src/native/index.d.ts

@@ -173,7 +173,7 @@ export declare export function getFilesForOutputs(directory: string, entries: Ar
 
 export declare export function getTransformableOutputs(outputs: Array<string>): Array<string>
 
-export declare export function hashArray(input: Array<string>): string
+export declare export function hashArray(input: Array<string | undefined | null>): string
 
 export interface HashDetails {
   value: string

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/yarn-parser.js

@@ -29,14 +29,14 @@ function getYarnLockfileNodes(lockFileContent, lockFileHash, packageJson) {
     const isBerry = !!__metadata;
     // yarn classic splits keys when parsing so we need to stich them back together
     const groupedDependencies = groupDependencies(dependencies, isBerry);
-    return getNodes(groupedDependencies, packageJson, keyMap, isBerry);
+    return getNodes(groupedDependencies, packageJson, isBerry);
 }
 function getYarnLockfileDependencies(lockFileContent, lockFileHash, ctx) {
     const { __metadata, ...dependencies } = parseLockFile(lockFileContent, lockFileHash);
     const isBerry = !!__metadata;
     // yarn classic splits keys when parsing so we need to stich them back together
     const groupedDependencies = groupDependencies(dependencies, isBerry);
-    return getDependencies(groupedDependencies, keyMap, ctx);
+    return getDependencies(groupedDependencies, ctx);
 }
 function getPackageNameKeyPairs(keys) {
     const result = new Map();
@@ -51,7 +51,7 @@ function getPackageNameKeyPairs(keys) {
     });
     return result;
 }
-function getNodes(dependencies, packageJson, keyMap, isBerry) {
+function getNodes(dependencies, packageJson, isBerry) {
     const nodes = new Map();
     const combinedDeps = {
         ...packageJson.dependencies,
@@ -68,7 +68,7 @@ function getNodes(dependencies, packageJson, keyMap, isBerry) {
         nameKeyPairs.forEach((keySet, packageName) => {
             const keysArray = Array.from(keySet);
             // use key relevant to the package name
-            const version = findVersion(packageName, keysArray[0], snapshot, isBerry);
+            const [version, isAlias] = findVersion(packageName, keysArray[0], snapshot, isBerry);
             // use keys linked to the extracted package name
             keysArray.forEach((key) => {
                 // we don't need to keep duplicates, we can just track the keys
@@ -79,7 +79,7 @@ function getNodes(dependencies, packageJson, keyMap, isBerry) {
                 }
                 const node = {
                     type: 'npm',
-                    name: version
+                    name: version && !isAlias
                         ? `npm:${packageName}@${version}`
                         : `npm:${packageName}`,
                     data: {
@@ -151,7 +151,7 @@ function findVersion(packageName, key, snapshot, isBerry) {
         ? snapshot.resolution && !snapshot.resolution.startsWith(`${packageName}@`)
         : versionRange.startsWith('npm:');
     if (isAlias) {
-        return versionRange;
+        return [versionRange, true];
     }
     // check for berry tarball packages
     if (isBerry &&
@@ -159,13 +159,13 @@ function findVersion(packageName, key, snapshot, isBerry) {
         // different registry would yield suffix following '::' which we don't need
         snapshot.resolution.split('::')[0] !==
             `${packageName}@npm:${snapshot.version}`) {
-        return snapshot.resolution.slice(packageName.length + 1);
+        return [snapshot.resolution.slice(packageName.length + 1)];
     }
     if (!isBerry && isTarballPackage(versionRange, snapshot)) {
-        return snapshot.resolved;
+        return [snapshot.resolved];
     }
     // otherwise it's a standard version
-    return snapshot.version;
+    return [snapshot.version];
 }
 // check if snapshot represents tarball package
 function isTarballPackage(versionRange, snapshot) {
@@ -193,7 +193,7 @@ function getHoistedVersion(packageName) {
         return version;
     }
 }
-function getDependencies(dependencies, keyMap, ctx) {
+function getDependencies(dependencies, ctx) {
     const projectGraphDependencies = [];
     Object.keys(dependencies).forEach((keys) => {
         const snapshot = dependencies[keys];

package/src/plugins/js/project-graph/affected/lock-file-changes.js

@@ -19,6 +19,7 @@ const getTouchedProjectsFromLockFile = (fileChanges, projectGraphNodes) => {
         'pnpm-lock.yaml',
         'pnpm-lock.yml',
         'bun.lockb',
+        'bun.lock',
     ];
     if (fileChanges.some((f) => lockFiles.includes(f.file))) {
         return Object.values(projectGraphNodes).map((p) => p.name);

package/src/plugins/js/project-graph/build-dependencies/explicit-project-dependencies.js

@@ -38,7 +38,7 @@ function buildExplicitTypeScriptDependencies(ctx, targetProjectLocator) {
     if (isVuePluginInstalled()) {
         moduleExtensions.push('.vue');
     }
-    for (const [project, fileData] of Object.entries(ctx.fileMap.projectFileMap)) {
+    for (const [project, fileData] of Object.entries(ctx.filesToProcess.projectFileMap)) {
         filesToProcess[project] ??= [];
         for (const { file } of fileData) {
             if (moduleExtensions.some((ext) => file.endsWith(ext))) {

package/src/plugins/js/utils/typescript.js

@@ -23,11 +23,11 @@ function readTsConfigOptions(tsConfigPath) {
         tsModule = require('typescript');
     }
     const readResult = tsModule.readConfigFile(tsConfigPath, tsModule.sys.readFile);
-    // we don't need to scan the files, we only care about options
+    // We only care about options, so we don't need to scan source files, and thus
+    // `readDirectory` is stubbed for performance.
     const host = {
+        ...tsModule.sys,
         readDirectory: () => [],
-        readFile: () => '',
-        fileExists: tsModule.sys.fileExists,
     };
     return tsModule.parseJsonConfigFileContent(readResult.config, host, (0, path_1.dirname)(tsConfigPath)).options;
 }

package/src/project-graph/plugins/isolation/plugin-worker.js

@@ -186,12 +186,14 @@ const server = (0, net_1.createServer)((socket) => {
     });
 });
 server.listen(socketPath);
-setTimeout(() => {
-    if (!connected) {
-        console.error('The plugin worker is exiting as it was not connected to within 5 seconds.');
-        process.exit(1);
-    }
-}, 5000).unref();
+if (process.env.NX_PLUGIN_NO_TIMEOUTS !== 'true') {
+    setTimeout(() => {
+        if (!connected) {
+            console.error('The plugin worker is exiting as it was not connected to within 5 seconds.');
+            process.exit(1);
+        }
+    }, 5000).unref();
+}
 const exitHandler = (exitCode) => () => {
     server.close();
     try {

package/src/tasks-runner/run-command.js

@@ -535,10 +535,9 @@ function getRunner(nxArgs, nxJson) {
     try {
         if (isCustomRunnerPath(modulePath)) {
             output_1.output.warn({
-                title: `Custom task runners will no longer be supported in Nx 21.`,
+                title: `Custom task runners will be replaced by a new API starting with Nx 21.`,
                 bodyLines: [
-                    `Use Nx Cloud or the Nx Powerpack caches instead.`,
-                    `For more information, see https://nx.dev/nx-enterprise/powerpack/custom-caching`,
+                    `For more information, see https://nx.dev/deprecated/custom-tasks-runner`,
                 ],
             });
         }

package/src/utils/command-line-utils.d.ts

@@ -8,7 +8,7 @@ export interface NxArgs {
     targets?: string[];
     configuration?: string;
     /**
-     * @deprecated Custom task runners will no longer be supported in Nx 21. Use Nx Cloud or Nx Powerpack instead.
+     * @deprecated Custom task runners will be replaced by a new API starting with Nx 21. More info: https://nx.dev/deprecated/custom-tasks-runner
      */
     runner?: string;
     parallel?: number;

package/src/utils/find-matching-projects.js

@@ -112,8 +112,8 @@ function addMatchingProjectsByName(projectNames, projects, pattern, matchedProje
         return;
     }
     if (!(0, globs_1.isGlobPattern)(pattern.value)) {
-        // Custom regex that is basically \b without underscores, so "foo" pattern matches "foo_bar".
-        const regex = new RegExp(`(?<![a-zA-Z0-9])${pattern.value}(?![a-zA-Z0-9])`, 'i');
+        // Custom regex that is basically \b but includes hyphens (-) and excludes underscores (_), so "foo" pattern matches "foo_bar" but not "foo-e2e".
+        const regex = new RegExp(`(?<![a-zA-Z0-9-])${pattern.value}(?![a-zA-Z0-9-])`, 'i');
         const matchingProjects = Object.keys(projects).filter((name) => regex.test(name));
         for (const projectName of matchingProjects) {
             if (pattern.exclude) {

package/src/utils/package-manager.js

@@ -35,7 +35,7 @@ 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, 'bun.lockb'))
+        ((0, fs_1.existsSync)((0, path_1.join)(dir, 'bun.lockb')) || (0, fs_1.existsSync)((0, path_1.join)(dir, 'bun.lock'))
             ? 'bun'
             : (0, fs_1.existsSync)((0, path_1.join)(dir, 'yarn.lock'))
                 ? 'yarn'
@@ -151,7 +151,7 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
             };
         },
         bun: () => {
-            // bun doesn't current support programatically reading config https://github.com/oven-sh/bun/issues/7140
+            // bun doesn't current support programmatically reading config https://github.com/oven-sh/bun/issues/7140
             return {
                 install: 'bun install',
                 ciInstall: 'bun install --no-cache',

package/src/command-line/init/implementation/react/write-craco-config.d.ts

@@ -1 +0,0 @@
-export declare function writeCracoConfig(appName: string, isCRA5: boolean, isStandalone: boolean): void;

package/src/command-line/init/implementation/react/write-craco-config.js

@@ -1,61 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeCracoConfig = writeCracoConfig;
-const fs_1 = require("fs");
-function writeCracoConfig(appName, isCRA5, isStandalone) {
-    const configOverride = `
-  const path = require('path');
-  const TsConfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
-  const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
-  module.exports = {
-    webpack: {
-      configure: (config) => {
-        // Remove guard against importing modules outside of \`src\`.
-        // Needed for workspace projects.
-        config.resolve.plugins = config.resolve.plugins.filter(
-          (plugin) => !(plugin instanceof ModuleScopePlugin)
-        );
-        // Add support for importing workspace projects.
-        config.resolve.plugins.push(
-          new TsConfigPathsPlugin({
-            configFile: path.resolve(__dirname, 'tsconfig.json'),
-            extensions: ['.ts', '.tsx', '.js', '.jsx'],
-            mainFields: ['browser', 'module', 'main'],
-          })
-        );
-        ${isCRA5
-        ? `
-        // Replace include option for babel loader with exclude
-        // so babel will handle workspace projects as well.
-        config.module.rules[1].oneOf.forEach((r) => {
-          if (r.loader && r.loader.indexOf('babel') !== -1) {
-            r.exclude = /node_modules/;
-            delete r.include;
-          }
-        });`
-        : `
-        // Replace include option for babel loader with exclude
-        // so babel will handle workspace projects as well.
-        config.module.rules.forEach((r) => {
-          if (r.oneOf) {
-            const babelLoader = r.oneOf.find(
-              (rr) => rr.loader.indexOf('babel-loader') !== -1
-            );
-            babelLoader.exclude = /node_modules/;
-            delete babelLoader.include;
-          }
-        });
-        `}
-        return config;
-      },
-    },
-    jest: {
-      configure: (config) => {
-        config.resolver = '@nx/jest/plugins/resolver';
-        return config;
-      },
-    },
-  };
-  `;
-    (0, fs_1.writeFileSync)(isStandalone ? 'craco.config.js' : `apps/${appName}/craco.config.js`, configOverride);
-}