@rushstack/rush-sdk 5.143.0-pr5009.1 → 5.143.0-pr5027.0

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

@@ -8,11 +8,6 @@ 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;
 }
@@ -24,10 +19,10 @@ export interface IPnpmV8VersionSpecifier {
     version: string;
     specifier: string;
 }
-export type IPnpmV9VersionSpecifier = string;
-export type IPnpmVersionSpecifier = IPnpmV7VersionSpecifier | IPnpmV8VersionSpecifier | IPnpmV9VersionSpecifier;
-export interface IPnpmShrinkwrapDependencyYaml extends Omit<PackageSnapshot, 'resolution'> {
-    resolution: {
+export type IPnpmVersionSpecifier = IPnpmV7VersionSpecifier | IPnpmV8VersionSpecifier;
+export interface IPnpmShrinkwrapDependencyYaml {
+    /** Information about the resolved package */
+    resolution?: {
         /** The directory this package should clone, for injected dependencies */
         directory?: string;
         /** The hash of the tarball, to ensure archive integrity */
@@ -35,51 +30,101 @@ export interface IPnpmShrinkwrapDependencyYaml extends Omit<PackageSnapshot, 're
         /** 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 type IPnpmShrinkwrapImporterYaml = ProjectSnapshot;
-export interface IPnpmShrinkwrapYaml extends Lockfile {
+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>;
     /**
-     * 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"
-     *    }
-     *  }
+     * The list of specifiers used to resolve dependency versions
+     *
+     * @remarks
+     * This has been removed in PNPM v8
      */
+    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 specifiers used to resolve direct dependency versions */
-    specifiers?: Record<string, string>;
+    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;
+    registry: 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;
 }
 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.
@@ -103,7 +148,6 @@ 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.143.0-pr5009.1",
+  "version": "5.143.0-pr5027.0",
   "description": "An API for interacting with the Rush engine",
   "repository": {
     "type": "git",
@@ -33,7 +33,6 @@
   },
   "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.5",
@@ -45,13 +44,13 @@
     "@types/semver": "7.5.0",
     "@types/webpack-env": "1.18.0",
     "webpack": "~5.95.0",
-    "@microsoft/rush-lib": "5.143.0-pr5009.1",
+    "@rushstack/heft-webpack5-plugin": "0.11.7",
+    "@rushstack/stream-collator": "4.1.77",
     "@rushstack/heft": "0.68.9",
     "local-node-rig": "1.0.0",
-    "@rushstack/stream-collator": "4.1.77",
-    "@rushstack/heft-webpack5-plugin": "0.11.7",
     "@rushstack/ts-command-line": "4.23.1",
-    "@rushstack/webpack-preserve-dynamic-require-plugin": "0.11.76"
+    "@rushstack/webpack-preserve-dynamic-require-plugin": "0.11.76",
+    "@microsoft/rush-lib": "5.143.0-pr5027.0"
   },
   "scripts": {
     "build": "heft build --clean",

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

@@ -1,11 +0,0 @@
-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

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