nx 23.0.1 → 23.0.2

package/dist/src/utils/catalog/pnpm-manager.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PnpmCatalogManager = void 0;
-const js_yaml_1 = require("@zkochan/js-yaml");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-const fileutils_1 = require("../fileutils");
-const output_1 = require("../output");
 const manager_1 = require("./manager");
+const manager_utils_1 = require("./manager-utils");
 const PNPM_WORKSPACE_FILENAME = 'pnpm-workspace.yaml';
 /**
  * PNPM-specific catalog manager implementation
@@ -40,13 +38,13 @@ class PnpmCatalogManager {
             if (!(0, node_fs_1.existsSync)(configPath)) {
                 return null;
             }
-            return readConfigFromFs(configPath);
+            return (0, manager_utils_1.readCatalogConfigFromFs)(PNPM_WORKSPACE_FILENAME, configPath);
         }
         else {
             if (!treeOrRoot.exists(PNPM_WORKSPACE_FILENAME)) {
                 return null;
             }
-            return readConfigFromTree(treeOrRoot, PNPM_WORKSPACE_FILENAME);
+            return (0, manager_utils_1.readCatalogConfigFromTree)(PNPM_WORKSPACE_FILENAME, treeOrRoot);
         }
     }
     resolveCatalogReference(treeOrRoot, packageName, version) {
@@ -147,103 +145,7 @@ class PnpmCatalogManager {
         }
     }
     updateCatalogVersions(treeOrRoot, updates) {
-        let checkExists;
-        let readYaml;
-        let writeYaml;
-        if (typeof treeOrRoot === 'string') {
-            const configPath = (0, node_path_1.join)(treeOrRoot, PNPM_WORKSPACE_FILENAME);
-            checkExists = () => (0, node_fs_1.existsSync)(configPath);
-            readYaml = () => (0, node_fs_1.readFileSync)(configPath, 'utf-8');
-            writeYaml = (content) => (0, node_fs_1.writeFileSync)(configPath, content, 'utf-8');
-        }
-        else {
-            checkExists = () => treeOrRoot.exists(PNPM_WORKSPACE_FILENAME);
-            readYaml = () => treeOrRoot.read(PNPM_WORKSPACE_FILENAME, 'utf-8');
-            writeYaml = (content) => treeOrRoot.write(PNPM_WORKSPACE_FILENAME, content);
-        }
-        if (!checkExists()) {
-            output_1.output.warn({
-                title: `No ${PNPM_WORKSPACE_FILENAME} found`,
-                bodyLines: [
-                    `Cannot update catalog versions without a ${PNPM_WORKSPACE_FILENAME} file.`,
-                    `Create a ${PNPM_WORKSPACE_FILENAME} file to use catalogs.`,
-                ],
-            });
-            return;
-        }
-        try {
-            const configContent = readYaml();
-            const configData = (0, js_yaml_1.load)(configContent) || {};
-            let hasChanges = false;
-            for (const update of updates) {
-                const { packageName, version, catalogName } = update;
-                const normalizedCatalogName = catalogName === 'default' ? undefined : catalogName;
-                let targetCatalog;
-                if (!normalizedCatalogName) {
-                    // Default catalog - update whichever exists, prefer catalog over catalogs.default
-                    if (configData.catalog) {
-                        targetCatalog = configData.catalog;
-                    }
-                    else if (configData.catalogs?.default) {
-                        targetCatalog = configData.catalogs.default;
-                    }
-                    else {
-                        // Neither exists, create catalog (shorthand syntax)
-                        configData.catalog ??= {};
-                        targetCatalog = configData.catalog;
-                    }
-                }
-                else {
-                    // Named catalog
-                    configData.catalogs ??= {};
-                    configData.catalogs[normalizedCatalogName] ??= {};
-                    targetCatalog = configData.catalogs[normalizedCatalogName];
-                }
-                if (targetCatalog[packageName] !== version) {
-                    targetCatalog[packageName] = version;
-                    hasChanges = true;
-                }
-            }
-            if (hasChanges) {
-                writeYaml((0, js_yaml_1.dump)(configData, {
-                    indent: 2,
-                    quotingType: '"',
-                    forceQuotes: true,
-                }));
-            }
-        }
-        catch (error) {
-            output_1.output.error({
-                title: 'Failed to update catalog versions',
-                bodyLines: [error instanceof Error ? error.message : String(error)],
-            });
-            throw error;
-        }
+        (0, manager_utils_1.updateCatalogVersionsInFile)(PNPM_WORKSPACE_FILENAME, treeOrRoot, updates);
     }
 }
 exports.PnpmCatalogManager = PnpmCatalogManager;
-function readConfigFromFs(path) {
-    try {
-        return (0, fileutils_1.readYamlFile)(path);
-    }
-    catch (error) {
-        output_1.output.warn({
-            title: `Unable to parse ${PNPM_WORKSPACE_FILENAME}`,
-            bodyLines: [error.toString()],
-        });
-        return null;
-    }
-}
-function readConfigFromTree(tree, path) {
-    const content = tree.read(path, 'utf-8');
-    try {
-        return (0, js_yaml_1.load)(content, { filename: path });
-    }
-    catch (error) {
-        output_1.output.warn({
-            title: `Unable to parse ${PNPM_WORKSPACE_FILENAME}`,
-            bodyLines: [error.toString()],
-        });
-        return null;
-    }
-}

package/dist/src/utils/catalog/yarn-manager.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.YarnCatalogManager = void 0;
-const js_yaml_1 = require("@zkochan/js-yaml");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-const fileutils_1 = require("../fileutils");
-const output_1 = require("../output");
 const manager_1 = require("./manager");
+const manager_utils_1 = require("./manager-utils");
 const YARNRC_FILENAME = '.yarnrc.yml';
 /**
  * Yarn Berry (v4+) catalog manager implementation
@@ -40,13 +38,13 @@ class YarnCatalogManager {
             if (!(0, node_fs_1.existsSync)(configPath)) {
                 return null;
             }
-            return readConfigFromFs(configPath);
+            return (0, manager_utils_1.readCatalogConfigFromFs)(YARNRC_FILENAME, configPath);
         }
         else {
             if (!treeOrRoot.exists(YARNRC_FILENAME)) {
                 return null;
             }
-            return readConfigFromTree(treeOrRoot, YARNRC_FILENAME);
+            return (0, manager_utils_1.readCatalogConfigFromTree)(YARNRC_FILENAME, treeOrRoot);
         }
     }
     resolveCatalogReference(treeOrRoot, packageName, version) {
@@ -147,103 +145,7 @@ class YarnCatalogManager {
         }
     }
     updateCatalogVersions(treeOrRoot, updates) {
-        let checkExists;
-        let readYaml;
-        let writeYaml;
-        if (typeof treeOrRoot === 'string') {
-            const configPath = (0, node_path_1.join)(treeOrRoot, YARNRC_FILENAME);
-            checkExists = () => (0, node_fs_1.existsSync)(configPath);
-            readYaml = () => (0, node_fs_1.readFileSync)(configPath, 'utf-8');
-            writeYaml = (content) => (0, node_fs_1.writeFileSync)(configPath, content, 'utf-8');
-        }
-        else {
-            checkExists = () => treeOrRoot.exists(YARNRC_FILENAME);
-            readYaml = () => treeOrRoot.read(YARNRC_FILENAME, 'utf-8');
-            writeYaml = (content) => treeOrRoot.write(YARNRC_FILENAME, content);
-        }
-        if (!checkExists()) {
-            output_1.output.warn({
-                title: `No ${YARNRC_FILENAME} found`,
-                bodyLines: [
-                    `Cannot update catalog versions without a ${YARNRC_FILENAME} file.`,
-                    `Create a ${YARNRC_FILENAME} file to use catalogs.`,
-                ],
-            });
-            return;
-        }
-        try {
-            const configContent = readYaml();
-            const configData = (0, js_yaml_1.load)(configContent) || {};
-            let hasChanges = false;
-            for (const update of updates) {
-                const { packageName, version, catalogName } = update;
-                const normalizedCatalogName = catalogName === 'default' ? undefined : catalogName;
-                let targetCatalog;
-                if (!normalizedCatalogName) {
-                    // Default catalog - update whichever exists, prefer catalog over catalogs.default
-                    if (configData.catalog) {
-                        targetCatalog = configData.catalog;
-                    }
-                    else if (configData.catalogs?.default) {
-                        targetCatalog = configData.catalogs.default;
-                    }
-                    else {
-                        // Neither exists, create catalog (shorthand syntax)
-                        configData.catalog ??= {};
-                        targetCatalog = configData.catalog;
-                    }
-                }
-                else {
-                    // Named catalog
-                    configData.catalogs ??= {};
-                    configData.catalogs[normalizedCatalogName] ??= {};
-                    targetCatalog = configData.catalogs[normalizedCatalogName];
-                }
-                if (targetCatalog[packageName] !== version) {
-                    targetCatalog[packageName] = version;
-                    hasChanges = true;
-                }
-            }
-            if (hasChanges) {
-                writeYaml((0, js_yaml_1.dump)(configData, {
-                    indent: 2,
-                    quotingType: '"',
-                    forceQuotes: true,
-                }));
-            }
-        }
-        catch (error) {
-            output_1.output.error({
-                title: 'Failed to update catalog versions',
-                bodyLines: [error instanceof Error ? error.message : String(error)],
-            });
-            throw error;
-        }
+        (0, manager_utils_1.updateCatalogVersionsInFile)(YARNRC_FILENAME, treeOrRoot, updates);
     }
 }
 exports.YarnCatalogManager = YarnCatalogManager;
-function readConfigFromFs(path) {
-    try {
-        return (0, fileutils_1.readYamlFile)(path);
-    }
-    catch (error) {
-        output_1.output.warn({
-            title: `Unable to parse ${YARNRC_FILENAME}`,
-            bodyLines: [error.toString()],
-        });
-        return null;
-    }
-}
-function readConfigFromTree(tree, path) {
-    const content = tree.read(path, 'utf-8');
-    try {
-        return (0, js_yaml_1.load)(content, { filename: path });
-    }
-    catch (error) {
-        output_1.output.warn({
-            title: `Unable to parse ${YARNRC_FILENAME}`,
-            bodyLines: [error.toString()],
-        });
-        return null;
-    }
-}

package/dist/src/utils/is-sandbox.js

@@ -5,5 +5,7 @@ function isSandbox() {
     return (!!process.env.SANDBOX_RUNTIME ||
         !!process.env.GEMINI_SANDBOX ||
         !!process.env.CODEX_SANDBOX ||
+        // Codex only sets CODEX_SANDBOX on macOS; on Linux it sets this instead.
+        !!process.env.CODEX_SANDBOX_NETWORK_DISABLED ||
         !!process.env.CURSOR_SANDBOX);
 }

package/dist/src/utils/min-release-age/behavior/pnpm.d.ts

@@ -2,11 +2,12 @@ import type { RegistryMetadata } from '../packument';
 import { type PickOutcome } from '../pick';
 import type { MinReleaseAgePolicy, MinReleaseAgePolicyReadResult } from '../policy';
 /**
- * Reads pnpm's effective cooldown configuration once. The surface set and
- * precedence depend on the pnpm major: v10 layers npm-conf surfaces
- * (workspace yaml > npm_config env > project .npmrc > user .npmrc); v11
- * layers pnpm-native surfaces (pnpm_config / PNPM_CONFIG env >
- * pnpm-workspace.yaml > global config.yaml > built-in 1440-minute default).
+ * Reads pnpm's effective cooldown configuration once by asking pnpm itself
+ * (`pnpm config list --json`) instead of re-implementing how it layers config
+ * surfaces (a moving target across pnpm versions). The window and excludes come
+ * straight from pnpm; the strict default, exclude grammar, and loose-fallback
+ * semantics stay version-keyed because pnpm does not report those resolved
+ * values.
  */
 export declare function readPnpmPolicy(root: string, pmVersion: string): Promise<MinReleaseAgePolicyReadResult>;
 /**