@rushstack/rush-sdk 5.100.0-pr4132.1 → 5.100.1

package/lib/cli/actions/AddAction.d.ts

@@ -8,6 +8,7 @@ export declare class AddAction extends BaseAddAndRemoveAction {
     private readonly _exactFlag;
     private readonly _caretFlag;
     private readonly _devDependencyFlag;
+    private readonly _peerDependencyFlag;
     private readonly _makeConsistentFlag;
     constructor(parser: RushCommandLineParser);
     getUpdateOptions(): IPackageJsonUpdaterRushAddOptions;

package/lib/logic/PackageJsonUpdaterTypes.d.ts

@@ -58,6 +58,10 @@ export interface IPackageJsonUpdaterRushAddOptions extends IPackageJsonUpdaterRu
      * Whether or not this dependency should be added as a devDependency or a regular dependency.
      */
     devDependency: boolean;
+    /**
+     * Whether or not this dependency should be added as a peerDependency or a regular dependency.
+     */
+    peerDependency: boolean;
     /**
      * If specified, other packages that use this dependency will also have their package.json's updated.
      */

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

@@ -9,6 +9,12 @@ import { PackageManagerOptionsConfigurationBase } from '../base/BasePackageManag
 export interface IPeerDependenciesMetaYaml {
     optional?: boolean;
 }
+export type IPnpmV7VersionSpecifier = string;
+export interface IPnpmV8VersionSpecifier {
+    version: string;
+    specifier: string;
+}
+export type IPnpmVersionSpecifier = IPnpmV7VersionSpecifier | IPnpmV8VersionSpecifier;
 export interface IPnpmShrinkwrapDependencyYaml {
     /** Information about the resolved package */
     resolution?: {
@@ -18,42 +24,31 @@ export interface IPnpmShrinkwrapDependencyYaml {
         tarball?: string;
     };
     /** The list of dependencies and the resolved version */
-    dependencies?: {
-        [dependency: string]: string;
-    };
+    dependencies?: Record<string, IPnpmVersionSpecifier>;
     /** The list of optional dependencies and the resolved version */
-    optionalDependencies?: {
-        [dependency: string]: string;
-    };
+    optionalDependencies?: Record<string, IPnpmVersionSpecifier>;
     /** The list of peer dependencies and the resolved version */
-    peerDependencies?: {
-        [dependency: string]: string;
-    };
+    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?: {
-        [dependency: string]: IPeerDependenciesMetaYaml;
-    };
+    peerDependenciesMeta?: Record<string, IPeerDependenciesMetaYaml>;
 }
 export interface IPnpmShrinkwrapImporterYaml {
     /** The list of resolved version numbers for direct dependencies */
-    dependencies?: {
-        [dependency: string]: string;
-    };
+    dependencies?: Record<string, IPnpmVersionSpecifier>;
     /** The list of resolved version numbers for dev dependencies */
-    devDependencies?: {
-        [dependency: string]: string;
-    };
+    devDependencies?: Record<string, IPnpmVersionSpecifier>;
     /** The list of resolved version numbers for optional dependencies */
-    optionalDependencies?: {
-        [dependency: string]: string;
-    };
-    /** The list of specifiers used to resolve dependency versions */
-    specifiers: {
-        [dependency: string]: string;
-    };
+    optionalDependencies?: Record<string, IPnpmVersionSpecifier>;
+    /**
+     * 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
@@ -87,24 +82,18 @@ export interface IPnpmShrinkwrapImporterYaml {
  *  }
  */
 export interface IPnpmShrinkwrapYaml {
+    /** The version of the lockfile format */
+    lockfileVersion?: string | number;
     /** The list of resolved version numbers for direct dependencies */
-    dependencies: {
-        [dependency: string]: string;
-    };
+    dependencies: Record<string, string>;
     /** The list of importers for local workspace projects */
-    importers: {
-        [relativePath: string]: IPnpmShrinkwrapImporterYaml;
-    };
+    importers: Record<string, IPnpmShrinkwrapImporterYaml>;
     /** The description of the solved graph */
-    packages: {
-        [dependencyVersion: string]: IPnpmShrinkwrapDependencyYaml;
-    };
+    packages: Record<string, IPnpmShrinkwrapDependencyYaml>;
     /** URL of the registry which was used */
     registry: string;
     /** The list of specifiers used to resolve direct dependency versions */
-    specifiers: {
-        [dependency: string]: string;
-    };
+    specifiers: Record<string, string>;
 }
 /**
  * Given an encoded "dependency key" from the PNPM shrinkwrap file, this parses it into an equivalent
@@ -112,11 +101,13 @@ export interface IPnpmShrinkwrapYaml {
  *
  * @returns a SemVer string, or undefined if the version specifier cannot be parsed
  */
-export declare function parsePnpmDependencyKey(dependencyName: string, dependencyKey: string): DependencySpecifier | undefined;
+export declare function parsePnpmDependencyKey(dependencyName: string, versionSpecifier: IPnpmVersionSpecifier): DependencySpecifier | undefined;
+export declare function normalizePnpmVersionSpecifier(versionSpecifier: IPnpmVersionSpecifier): string;
 export declare class PnpmShrinkwrapFile extends BaseShrinkwrapFile {
+    readonly shrinkwrapFileMajorVersion: number;
     readonly isWorkspaceCompatible: boolean;
     readonly registry: string;
-    readonly dependencies: ReadonlyMap<string, string>;
+    readonly dependencies: ReadonlyMap<string, IPnpmVersionSpecifier>;
     readonly importers: ReadonlyMap<string, IPnpmShrinkwrapImporterYaml>;
     readonly specifiers: ReadonlyMap<string, string>;
     readonly packages: ReadonlyMap<string, IPnpmShrinkwrapDependencyYaml>;
@@ -137,7 +128,7 @@ export declare class PnpmShrinkwrapFile extends BaseShrinkwrapFile {
      * Example of return value: file:projects/build-tools.tgz
      */
     getTarballPath(packageName: string): string | undefined;
-    getTopLevelDependencyKey(dependencyName: string): string | undefined;
+    getTopLevelDependencyKey(dependencyName: string): IPnpmVersionSpecifier | undefined;
     /**
      * Gets the version number from the list of top-level dependencies in the "dependencies" section
      * of the shrinkwrap file. Sample return values:
@@ -150,7 +141,7 @@ export declare class PnpmShrinkwrapFile extends BaseShrinkwrapFile {
      */
     getTopLevelDependencyVersion(dependencyName: string): DependencySpecifier | undefined;
     /**
-     * The PNPM shrinkwrap file has top-level dependencies on the temp projects like this:
+     * The PNPM shrinkwrap file has top-level dependencies on the temp projects like this (version 5.x):
      *
      * ```
      * dependencies:
@@ -164,12 +155,32 @@ export declare class PnpmShrinkwrapFile extends BaseShrinkwrapFile {
      *     version: 0.0.0
      * ```
      *
-     * We refer to 'file:projects/my-app.tgz_25c559a5921686293a001a397be4dce0' as the temp project dependency key
-     * of the temp project '@rush-temp/my-app'.
+     * or in version 6.1, like this:
+     * ```
+     * dependencies:
+     *  '@rush-temp/my-app':
+     *    specifier: file:./projects/my-app.tgz
+     *    version: file:projects/my-app.tgz
+     *  packages:
+     *    /@types/node@10.14.15:
+     *      resolution: {integrity: sha512-iAB+**==}
+     *      dev: false
+     *    file:projects/my-app.tgz
+     *      resolution: {integrity: sha512-guuoFIc**==, tarball: file:projects/sp-filepicker.tgz}
+     *      name: '@rush-temp/my-app'
+     *      version: 0.0.0
+     *      dependencies:
+     *        '@microsoft/load-themed-styles': 1.10.7
+     *        ...
+     *      dev: false
+     * ```
+     *
+     * We refer to 'file:projects/my-app.tgz_25c559a5921686293a001a397be4dce0' or 'file:projects/my-app.tgz' as
+     * the temp project dependency key of the temp project '@rush-temp/my-app'.
      */
     getTempProjectDependencyKey(tempProjectName: string): string | undefined;
     getShrinkwrapEntryFromTempProjectDependencyKey(tempProjectDependencyKey: string): IPnpmShrinkwrapDependencyYaml | undefined;
-    getShrinkwrapEntry(name: string, version: string): IPnpmShrinkwrapDependencyYaml | undefined;
+    getShrinkwrapEntry(name: string, version: IPnpmVersionSpecifier): IPnpmShrinkwrapDependencyYaml | undefined;
     /**
      * Serializes the PNPM Shrinkwrap file
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/rush-sdk",
-  "version": "5.100.0-pr4132.1",
+  "version": "5.100.1",
   "description": "An API for interacting with the Rush engine",
   "repository": {
     "type": "git",
@@ -19,13 +19,13 @@
   "devDependencies": {
     "@types/semver": "7.3.5",
     "@types/webpack-env": "1.18.0",
-    "@microsoft/rush-lib": "5.100.0-pr4132.1",
+    "@microsoft/rush-lib": "5.100.1",
     "@rushstack/eslint-config": "3.3.1",
-    "@rushstack/heft": "0.52.1",
-    "@rushstack/heft-node-rig": "2.2.1",
-    "@rushstack/stream-collator": "4.0.241",
-    "@rushstack/ts-command-line": "4.14.0",
-    "@rushstack/terminal": "0.5.16"
+    "@rushstack/heft": "0.55.1",
+    "@rushstack/heft-node-rig": "2.2.8",
+    "@rushstack/stream-collator": "4.0.248",
+    "@rushstack/ts-command-line": "4.15.0",
+    "@rushstack/terminal": "0.5.23"
   },
   "scripts": {
     "build": "heft build --clean",