@rushstack/rush-sdk 5.141.4 → 5.143.0-pr5009.0

package/dist/rush-lib.d.ts

@@ -3118,7 +3118,6 @@ export declare class PhasedCommandHooks {
  * @public
  */
 export declare class PnpmOptionsConfiguration extends PackageManagerOptionsConfigurationBase {
-    private static _jsonSchema;
     private readonly _json;
     private _globalPatchedDependencies;
     /**
@@ -3276,6 +3275,8 @@ export declare class PnpmOptionsConfiguration extends PackageManagerOptionsConfi
      * dependencies. The settings are copied into the pnpm.ignoredOptionalDependencies field of the common/temp/package.json
      * file that is generated by Rush during installation.
      *
+     * (SUPPORTED ONLY IN PNPM 9.0.0 AND NEWER)
+     *
      * PNPM documentation: https://pnpm.io/package_json#pnpmignoredoptionaldependencies
      */
     readonly globalIgnoredOptionalDependencies: string[] | undefined;
@@ -4743,7 +4744,6 @@ export declare class Subspace {
      * - Lockfiles: (i.e. - `pnpm-lock.yaml`, `npm-shrinkwrap.json`, `yarn.lock`, etc)
      * - 'common-versions.json'
      * - 'pnpmfile.js'/'.pnpmfile.cjs'
-     * - 'pnpm-config.js'
      */
     getVariantDependentSubspaceConfigFolderPath(variant: string | undefined): string;
     /**
@@ -4808,7 +4808,7 @@ export declare class Subspace {
      * Example: `C:\MyRepo\common\subspaces\my-subspace\pnpm-config.json`
      * @beta
      */
-    getPnpmConfigFilePath(variant?: string): string;
+    getPnpmConfigFilePath(): string;
     /**
      * Gets the settings from the common-versions.json config file.
      * @beta

package/lib/api/Subspace.d.ts

@@ -49,7 +49,6 @@ export declare class Subspace {
      * - Lockfiles: (i.e. - `pnpm-lock.yaml`, `npm-shrinkwrap.json`, `yarn.lock`, etc)
      * - 'common-versions.json'
      * - 'pnpmfile.js'/'.pnpmfile.cjs'
-     * - 'pnpm-config.js'
      */
     getVariantDependentSubspaceConfigFolderPath(variant: string | undefined): string;
     /**
@@ -114,7 +113,7 @@ export declare class Subspace {
      * Example: `C:\MyRepo\common\subspaces\my-subspace\pnpm-config.json`
      * @beta
      */
-    getPnpmConfigFilePath(variant?: string): string;
+    getPnpmConfigFilePath(): string;
     /**
      * Gets the settings from the common-versions.json config file.
      * @beta

package/lib/logic/installManager/InstallHelpers.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="node" />
+import { type ITerminal } from '@rushstack/terminal';
 import type { RushConfiguration } from '../../api/RushConfiguration';
 import type { RushGlobalFolder } from '../../api/RushGlobalFolder';
 import type { Subspace } from '../../api/Subspace';
 export declare class InstallHelpers {
-    static generateCommonPackageJson(rushConfiguration: RushConfiguration, subspace: Subspace, dependencies?: Map<string, string>): void;
+    static generateCommonPackageJson(rushConfiguration: RushConfiguration, subspace: Subspace, dependencies: Map<string, string> | undefined, terminal: ITerminal): void;
     static getPackageManagerEnvironment(rushConfiguration: RushConfiguration, options?: {
         debug?: boolean;
     }): NodeJS.ProcessEnv;

package/lib/logic/pnpm/PnpmOptionsConfiguration.d.ts

@@ -142,7 +142,6 @@ export interface IPnpmOptionsJson extends IPackageManagerOptionsJsonBase {
  * @public
  */
 export declare class PnpmOptionsConfiguration extends PackageManagerOptionsConfigurationBase {
-    private static _jsonSchema;
     private readonly _json;
     private _globalPatchedDependencies;
     /**
@@ -300,6 +299,8 @@ export declare class PnpmOptionsConfiguration extends PackageManagerOptionsConfi
      * dependencies. The settings are copied into the pnpm.ignoredOptionalDependencies field of the common/temp/package.json
      * file that is generated by Rush during installation.
      *
+     * (SUPPORTED ONLY IN PNPM 9.0.0 AND NEWER)
+     *
      * PNPM documentation: https://pnpm.io/package_json#pnpmignoredoptionaldependencies
      */
     readonly globalIgnoredOptionalDependencies: string[] | undefined;

package/lib/logic/pnpm/PnpmShrinkWrapFileConverters.d.ts

@@ -0,0 +1,11 @@
+import type { Lockfile, LockfileFileV9 } from '@pnpm/lockfile.types';
+/**
+ * Convert lockfile v9 object to standard lockfile object.
+ *
+ * This function will mutate the lockfile object. It will:
+ * 1. Ensure importers['.'] exists.
+ * 2. Merge snapshots and packages into packages.
+ * 3. Extract specifier from importers['xxx'] into the specifiers field.
+ */
+export declare function convertLockfileV9ToLockfileObject(lockfile: LockfileFileV9): Lockfile;
+//# sourceMappingURL=PnpmShrinkWrapFileConverters.d.ts.map

package/lib/logic/pnpm/PnpmShrinkWrapFileConverters.js

@@ -0,0 +1 @@
+module.exports = require("../../../lib-shim/index")._rushSdk_loadInternalModule("logic/pnpm/PnpmShrinkWrapFileConverters");

package/lib/logic/pnpm/PnpmShrinkwrapFile.d.ts

@@ -8,6 +8,11 @@ import type { RushConfigurationProject } from '../../api/RushConfigurationProjec
 import { PnpmProjectShrinkwrapFile } from './PnpmProjectShrinkwrapFile';
 import type { PackageManagerOptionsConfigurationBase } from '../base/BasePackageManagerOptionsConfiguration';
 import type { Subspace } from '../../api/Subspace';
+import type { Lockfile, PackageSnapshot, ProjectSnapshot } from '@pnpm/lockfile.types';
+export declare enum ShrinkwrapFileMajorVersion {
+    V6 = 6,
+    V9 = 9
+}
 export interface IPeerDependenciesMetaYaml {
     optional?: boolean;
 }
@@ -19,10 +24,10 @@ export interface IPnpmV8VersionSpecifier {
     version: string;
     specifier: string;
 }
-export type IPnpmVersionSpecifier = IPnpmV7VersionSpecifier | IPnpmV8VersionSpecifier;
-export interface IPnpmShrinkwrapDependencyYaml {
-    /** Information about the resolved package */
-    resolution?: {
+export type IPnpmV9VersionSpecifier = string;
+export type IPnpmVersionSpecifier = IPnpmV7VersionSpecifier | IPnpmV8VersionSpecifier | IPnpmV9VersionSpecifier;
+export interface IPnpmShrinkwrapDependencyYaml extends Omit<PackageSnapshot, 'resolution'> {
+    resolution: {
         /** The directory this package should clone, for injected dependencies */
         directory?: string;
         /** The hash of the tarball, to ensure archive integrity */
@@ -30,101 +35,51 @@ export interface IPnpmShrinkwrapDependencyYaml {
         /** The name of the tarball, if this was from a TGZ file */
         tarball?: string;
     };
-    /** The list of bundled dependencies in this package */
-    bundledDependencies?: ReadonlyArray<string>;
-    /** The list of dependencies and the resolved version */
-    dependencies?: Record<string, IPnpmVersionSpecifier>;
-    /** The list of optional dependencies and the resolved version */
-    optionalDependencies?: Record<string, IPnpmVersionSpecifier>;
-    /** The list of peer dependencies and the resolved version */
-    peerDependencies?: Record<string, IPnpmVersionSpecifier>;
-    /**
-     * Used to indicate optional peer dependencies, as described in this RFC:
-     * https://github.com/yarnpkg/rfcs/blob/master/accepted/0000-optional-peer-dependencies.md
-     */
-    peerDependenciesMeta?: Record<string, IPeerDependenciesMetaYaml>;
-    /** The name of the package, if the package is a local tarball */
-    name?: string;
-    /** If this is an optional dependency */
-    optional?: boolean;
-    /** The values of process.platform supported by this package */
-    os?: readonly string[];
-    /** The values of process.arch supported by this package */
-    cpu?: readonly string[];
-    /** The libc runtimes supported by this package */
-    libc?: readonly string[];
 }
-export interface IPnpmShrinkwrapImporterYaml {
-    /** The list of resolved version numbers for direct dependencies */
-    dependencies?: Record<string, IPnpmVersionSpecifier>;
-    /** The list of resolved version numbers for dev dependencies */
-    devDependencies?: Record<string, IPnpmVersionSpecifier>;
-    /** The list of resolved version numbers for optional dependencies */
-    optionalDependencies?: Record<string, IPnpmVersionSpecifier>;
-    /** The list of metadata for dependencies declared inside dependencies, optionalDependencies, and devDependencies. */
-    dependenciesMeta?: Record<string, IDependenciesMetaYaml>;
+export type IPnpmShrinkwrapImporterYaml = ProjectSnapshot;
+export interface IPnpmShrinkwrapYaml extends Lockfile {
     /**
-     * The list of specifiers used to resolve dependency versions
-     *
-     * @remarks
-     * This has been removed in PNPM v8
+     * This interface represents the raw pnpm-lock.YAML file
+     * Example:
+     *  {
+     *    "dependencies": {
+     *      "@rush-temp/project1": "file:./projects/project1.tgz"
+     *    },
+     *    "packages": {
+     *      "file:projects/library1.tgz": {
+     *        "dependencies: {
+     *          "markdown": "0.5.0"
+     *        },
+     *        "name": "@rush-temp/library1",
+     *        "resolution": {
+     *          "tarball": "file:projects/library1.tgz"
+     *        },
+     *        "version": "0.0.0"
+     *      },
+     *      "markdown/0.5.0": {
+     *        "resolution": {
+     *          "integrity": "sha1-KCBbVlqK51kt4gdGPWY33BgnIrI="
+     *        }
+     *      }
+     *    },
+     *    "registry": "http://localhost:4873/",
+     *    "shrinkwrapVersion": 3,
+     *    "specifiers": {
+     *      "@rush-temp/project1": "file:./projects/project1.tgz"
+     *    }
+     *  }
      */
-    specifiers?: Record<string, IPnpmVersionSpecifier>;
-}
-/**
- * This interface represents the raw pnpm-lock.YAML file
- * Example:
- *  {
- *    "dependencies": {
- *      "@rush-temp/project1": "file:./projects/project1.tgz"
- *    },
- *    "packages": {
- *      "file:projects/library1.tgz": {
- *        "dependencies: {
- *          "markdown": "0.5.0"
- *        },
- *        "name": "@rush-temp/library1",
- *        "resolution": {
- *          "tarball": "file:projects/library1.tgz"
- *        },
- *        "version": "0.0.0"
- *      },
- *      "markdown/0.5.0": {
- *        "resolution": {
- *          "integrity": "sha1-KCBbVlqK51kt4gdGPWY33BgnIrI="
- *        }
- *      }
- *    },
- *    "registry": "http://localhost:4873/",
- *    "shrinkwrapVersion": 3,
- *    "specifiers": {
- *      "@rush-temp/project1": "file:./projects/project1.tgz"
- *    }
- *  }
- */
-export interface IPnpmShrinkwrapYaml {
-    /** The version of the lockfile format */
-    lockfileVersion?: string | number;
     /** The list of resolved version numbers for direct dependencies */
-    dependencies: Record<string, string>;
-    /** The list of importers for local workspace projects */
-    importers: Record<string, IPnpmShrinkwrapImporterYaml>;
-    /** The description of the solved graph */
-    packages: Record<string, IPnpmShrinkwrapDependencyYaml>;
-    /** URL of the registry which was used */
-    registry: string;
+    dependencies?: Record<string, string>;
     /** The list of specifiers used to resolve direct dependency versions */
-    specifiers: Record<string, string>;
-    /** The list of override version number for dependencies */
-    overrides?: {
-        [dependency: string]: string;
-    };
-    /** The checksum of package extensions fields for extending dependencies */
-    packageExtensionsChecksum?: string;
+    specifiers?: Record<string, string>;
+    /** URL of the registry which was used */
+    registry?: string;
 }
 export interface ILoadFromFileOptions {
     withCaching?: boolean;
 }
+export declare function parsePnpm9DependencyKey(dependencyName: string, versionSpecifier: IPnpmVersionSpecifier): DependencySpecifier | undefined;
 /**
  * Given an encoded "dependency key" from the PNPM shrinkwrap file, this parses it into an equivalent
  * DependencySpecifier.
@@ -148,6 +103,7 @@ export declare class PnpmShrinkwrapFile extends BaseShrinkwrapFile {
     private readonly _integrities;
     private _pnpmfileConfiguration;
     private constructor();
+    static getLockfileV9PackageId(name: string, version: string): string;
     static loadFromFile(shrinkwrapYamlFilePath: string, { withCaching }?: ILoadFromFileOptions): PnpmShrinkwrapFile | undefined;
     static loadFromString(shrinkwrapContent: string): PnpmShrinkwrapFile;
     getShrinkwrapHash(experimentsConfig?: IExperimentsJson): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/rush-sdk",
-  "version": "5.141.4",
+  "version": "5.143.0-pr5009.0",
   "description": "An API for interacting with the Rush engine",
   "repository": {
     "type": "git",
@@ -33,24 +33,25 @@
   },
   "license": "MIT",
   "dependencies": {
+    "@pnpm/lockfile.types": "~1.0.3",
     "@types/node-fetch": "2.6.2",
     "tapable": "2.2.1",
-    "@rushstack/lookup-by-path": "0.4.4",
-    "@rushstack/node-core-library": "5.10.0",
+    "@rushstack/lookup-by-path": "0.4.5",
+    "@rushstack/package-deps-hash": "4.2.10",
     "@rushstack/terminal": "0.14.3",
-    "@rushstack/package-deps-hash": "4.2.9"
+    "@rushstack/node-core-library": "5.10.0"
   },
   "devDependencies": {
     "@types/semver": "7.5.0",
     "@types/webpack-env": "1.18.0",
     "webpack": "~5.95.0",
-    "@microsoft/rush-lib": "5.141.4",
-    "@rushstack/heft-webpack5-plugin": "0.11.6",
+    "@rushstack/heft": "0.68.9",
+    "@microsoft/rush-lib": "5.143.0-pr5009.0",
     "local-node-rig": "1.0.0",
+    "@rushstack/heft-webpack5-plugin": "0.11.7",
+    "@rushstack/stream-collator": "4.1.77",
     "@rushstack/ts-command-line": "4.23.1",
-    "@rushstack/heft": "0.68.8",
-    "@rushstack/webpack-preserve-dynamic-require-plugin": "0.11.75",
-    "@rushstack/stream-collator": "4.1.76"
+    "@rushstack/webpack-preserve-dynamic-require-plugin": "0.11.76"
   },
   "scripts": {
     "build": "heft build --clean",