Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pnpm/pnpm
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v7.30.0
Choose a base ref
...
head repository: pnpm/pnpm
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v7.30.1
Choose a head ref
  • 8 commits
  • 477 files changed
  • 4 contributors

Commits on Mar 18, 2023

  1. style: update eslint (#6236)

    zkochan committed Mar 18, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    zkochan Zoltan Kochan
    Copy the full SHA
    a90c670 View commit details

Commits on Mar 20, 2023

  1. Verified

    This commit was signed with the committer’s verified signature.
    zkochan Zoltan Kochan
    Copy the full SHA
    6dab633 View commit details
  2. fix: when publish some package throws an error, exit code should be n…

    …on-zero (#6248)
    
    close #5528
    close #5775
    await-ovo authored and zkochan committed Mar 20, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    zkochan Zoltan Kochan
    Copy the full SHA
    cfc8f52 View commit details
  3. ci: change main branch to v7

    zkochan committed Mar 20, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    zkochan Zoltan Kochan
    Copy the full SHA
    14fb01c View commit details
  4. Verified

    This commit was signed with the committer’s verified signature.
    zkochan Zoltan Kochan
    Copy the full SHA
    b05d9df View commit details

Commits on Mar 22, 2023

  1. feat: support resolving peers with npm aliases (#6220)

    close #4301
    Co-authored-by: Zoltan Kochan <z@kochan.io>
    RexSkz authored and zkochan committed Mar 22, 2023

    Partially verified

    This commit is signed with the committer’s verified signature.
    zkochan’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    b8bafe8 View commit details

Commits on Mar 23, 2023

  1. Verified

    This commit was signed with the committer’s verified signature.
    zkochan Zoltan Kochan
    Copy the full SHA
    e6fb46e View commit details
  2. chore(release): 7.30.1

    zkochan committed Mar 23, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    zkochan Zoltan Kochan
    Copy the full SHA
    d1dd46c View commit details
Showing 477 changed files with 2,566 additions and 3,494 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -58,8 +58,8 @@ jobs:
# key: ts-jest-${{ matrix.platform }}-${{ matrix.node }}-${{ github.run_id }}
# restore-keys: ts-jest-${{ matrix.platform }}-${{ matrix.node }}-
- name: run tests (main)
if: github.ref == 'refs/heads/main'
if: github.ref == 'refs/heads/v7'
run: pnpm run test-main
- name: run tests (branch)
if: github.ref != 'refs/heads/main'
if: github.ref != 'refs/heads/v7'
run: pnpm run test-branch
2 changes: 1 addition & 1 deletion __utils__/assert-project/package.json
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@
"@pnpm/constants": "workspace:*",
"@pnpm/lockfile-types": "workspace:*",
"@pnpm/modules-yaml": "workspace:*",
"@pnpm/registry-mock": "3.5.0",
"@pnpm/registry-mock": "3.7.0",
"@pnpm/types": "workspace:*",
"is-windows": "^1.0.2",
"isexe": "2.0.0",
6 changes: 3 additions & 3 deletions __utils__/assert-project/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import path from 'path'
import { assertStore } from '@pnpm/assert-store'
import { WANTED_LOCKFILE } from '@pnpm/constants'
import { Lockfile, ProjectSnapshot } from '@pnpm/lockfile-types'
import { Modules, readModulesManifest } from '@pnpm/modules-yaml'
import { type Lockfile, type ProjectSnapshot } from '@pnpm/lockfile-types'
import { type Modules, readModulesManifest } from '@pnpm/modules-yaml'
import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'
import readYamlFile from 'read-yaml-file'
import exists from 'path-exists'
import writePkg from 'write-pkg'
import isExecutable from './isExecutable'

export { isExecutable, Modules }
export { isExecutable, type Modules }

export type RawLockfile = Lockfile & Partial<ProjectSnapshot>

2 changes: 1 addition & 1 deletion __utils__/assert-store/package.json
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@
},
"dependencies": {
"@pnpm/cafs": "workspace:*",
"@pnpm/registry-mock": "3.5.0",
"@pnpm/registry-mock": "3.7.0",
"path-exists": "^4.0.0"
},
"devDependencies": {
1 change: 1 addition & 0 deletions __utils__/eslint-config/eslint.json
Original file line number Diff line number Diff line change
@@ -60,6 +60,7 @@
"@typescript-eslint/dot-notation": "off",
"@typescript-eslint/no-unnecessary-type-assertion": "off",
"@typescript-eslint/type-annotation-spacing": "error",
"@typescript-eslint/ban-ts-comment": "off",
"brace-style": [
"error",
"1tbs"
4 changes: 2 additions & 2 deletions __utils__/eslint-config/package.json
Original file line number Diff line number Diff line change
@@ -25,8 +25,8 @@
"dependencies": {
"@typescript-eslint/eslint-plugin": "^5.54.0",
"@typescript-eslint/parser": "^5.54.0",
"eslint": "^8.35.0",
"eslint-config-standard-with-typescript": "^26.0.0",
"eslint": "^8.36.0",
"eslint-config-standard-with-typescript": "^34.0.1",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-n": "^15.6.1",
"eslint-plugin-node": "^11.1.0",
6 changes: 3 additions & 3 deletions __utils__/prepare/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import fs from 'fs'
import path from 'path'
import { assertProject, Modules, Project } from '@pnpm/assert-project'
import { ProjectManifest } from '@pnpm/types'
import { assertProject, type Modules, type Project } from '@pnpm/assert-project'
import { type ProjectManifest } from '@pnpm/types'
import uniqueString from 'unique-string'
import { sync as writeJson5File } from 'write-json5-file'
import { sync as writeYamlFile } from 'write-yaml-file'
import writePkg from 'write-pkg'

export { Modules, Project }
export type { Modules, Project }
export type ManifestFormat = 'JSON' | 'JSON5' | 'YAML'

// The testing folder should be outside of the project to avoid lookup in the project's node_modules
2 changes: 1 addition & 1 deletion cli/cli-meta/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path from 'path'
import { DependencyManifest } from '@pnpm/types'
import { type DependencyManifest } from '@pnpm/types'
import loadJsonFile from 'load-json-file'

const defaultManifest = {
7 changes: 7 additions & 0 deletions cli/cli-utils/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @pnpm/cli-utils

## 1.1.8

### Patch Changes

- @pnpm/config@17.0.3
- @pnpm/default-reporter@11.0.43

## 1.1.7

### Patch Changes
2 changes: 1 addition & 1 deletion cli/cli-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pnpm/cli-utils",
"version": "1.1.7",
"version": "1.1.8",
"description": "Utils for pnpm commands",
"main": "lib/index.js",
"types": "lib/index.d.ts",
2 changes: 1 addition & 1 deletion cli/cli-utils/src/getConfig.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { packageManager } from '@pnpm/cli-meta'
import { getConfig as _getConfig, CliOptions } from '@pnpm/config'
import { getConfig as _getConfig, type CliOptions } from '@pnpm/config'
import { formatWarn } from '@pnpm/default-reporter'

export async function getConfig (
2 changes: 1 addition & 1 deletion cli/cli-utils/src/packageIsInstallable.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { packageManager } from '@pnpm/cli-meta'
import { logger } from '@pnpm/logger'
import { checkPackage, UnsupportedEngineError, WantedEngine } from '@pnpm/package-is-installable'
import { checkPackage, UnsupportedEngineError, type WantedEngine } from '@pnpm/package-is-installable'

export function packageIsInstallable (
pkgPath: string,
2 changes: 1 addition & 1 deletion cli/cli-utils/src/readProjectManifest.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as utils from '@pnpm/read-project-manifest'
import { ProjectManifest } from '@pnpm/types'
import { type ProjectManifest } from '@pnpm/types'
import { packageIsInstallable } from './packageIsInstallable'

export async function readProjectManifest (
6 changes: 6 additions & 0 deletions cli/default-reporter/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @pnpm/default-reporter

## 11.0.43

### Patch Changes

- @pnpm/config@17.0.3

## 11.0.42

### Patch Changes
2 changes: 1 addition & 1 deletion cli/default-reporter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pnpm/default-reporter",
"version": "11.0.42",
"version": "11.0.43",
"description": "The default reporter of pnpm",
"main": "lib/index.js",
"types": "lib/index.d.ts",
6 changes: 3 additions & 3 deletions cli/default-reporter/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Config } from '@pnpm/config'
import * as logs from '@pnpm/core-loggers'
import { LogLevel } from '@pnpm/logger'
import { type Config } from '@pnpm/config'
import type * as logs from '@pnpm/core-loggers'
import { type LogLevel } from '@pnpm/logger'
import * as Rx from 'rxjs'
import { filter, map, mergeAll } from 'rxjs/operators'
import createDiffer from 'ansi-diff'
8 changes: 4 additions & 4 deletions cli/default-reporter/src/reportError.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Config } from '@pnpm/config'
import { Log } from '@pnpm/core-loggers'
import { PnpmError } from '@pnpm/error'
import { type Config } from '@pnpm/config'
import { type Log } from '@pnpm/core-loggers'
import { type PnpmError } from '@pnpm/error'
import { renderPeerIssues } from '@pnpm/render-peer-issues'
import { PeerDependencyIssuesByProjects } from '@pnpm/types'
import { type PeerDependencyIssuesByProjects } from '@pnpm/types'
import chalk from 'chalk'
import equals from 'ramda/src/equals'
import StackTracey from 'stacktracey'
8 changes: 4 additions & 4 deletions cli/default-reporter/src/reporterForClient/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Config } from '@pnpm/config'
import * as logs from '@pnpm/core-loggers'
import { LogLevel } from '@pnpm/logger'
import * as Rx from 'rxjs'
import { type Config } from '@pnpm/config'
import type * as logs from '@pnpm/core-loggers'
import { type LogLevel } from '@pnpm/logger'
import type * as Rx from 'rxjs'
import { throttleTime } from 'rxjs/operators'
import { reportBigTarballProgress } from './reportBigTarballsProgress'
import { reportContext } from './reportContext'
4 changes: 2 additions & 2 deletions cli/default-reporter/src/reporterForClient/pkgsDiff.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as logs from '@pnpm/core-loggers'
import { PackageManifest } from '@pnpm/types'
import type * as logs from '@pnpm/core-loggers'
import { type PackageManifest } from '@pnpm/types'
import * as Rx from 'rxjs'
import { filter, map, mapTo, reduce, scan, startWith, take } from 'rxjs/operators'
import mergeRight from 'ramda/src/mergeRight'
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FetchingProgressLog } from '@pnpm/core-loggers'
import * as Rx from 'rxjs'
import { type FetchingProgressLog } from '@pnpm/core-loggers'
import type * as Rx from 'rxjs'
import { filter, map, startWith } from 'rxjs/operators'
import prettyBytes from 'pretty-bytes'
import {
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path from 'path'
import { ContextLog, PackageImportMethodLog } from '@pnpm/core-loggers'
import { type ContextLog, type PackageImportMethodLog } from '@pnpm/core-loggers'
import * as Rx from 'rxjs'
import { map, take } from 'rxjs/operators'
import normalize from 'normalize-path'
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DeprecationLog } from '@pnpm/core-loggers'
import { type DeprecationLog } from '@pnpm/core-loggers'
import * as Rx from 'rxjs'
import { map } from 'rxjs/operators'
import chalk from 'chalk'
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import prettyMs from 'pretty-ms'
import { ExecutionTimeLog } from '@pnpm/core-loggers'
import { type ExecutionTimeLog } from '@pnpm/core-loggers'
import * as Rx from 'rxjs'
import { map, take } from 'rxjs/operators'

2 changes: 1 addition & 1 deletion cli/default-reporter/src/reporterForClient/reportHooks.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { HookLog } from '@pnpm/core-loggers'
import { type HookLog } from '@pnpm/core-loggers'
import * as Rx from 'rxjs'
import { map } from 'rxjs/operators'
import chalk from 'chalk'
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { InstallCheckLog } from '@pnpm/core-loggers'
import { type InstallCheckLog } from '@pnpm/core-loggers'
import * as Rx from 'rxjs'
import { filter, map } from 'rxjs/operators'
import { formatWarn } from './utils/formatWarn'
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path from 'path'
import { LifecycleLog } from '@pnpm/core-loggers'
import { type LifecycleLog } from '@pnpm/core-loggers'
import * as Rx from 'rxjs'
import { buffer, filter, groupBy, map, mergeAll, mergeMap } from 'rxjs/operators'
import chalk from 'chalk'
6 changes: 3 additions & 3 deletions cli/default-reporter/src/reporterForClient/reportMisc.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os from 'os'
import { Config } from '@pnpm/config'
import { Log, RegistryLog } from '@pnpm/core-loggers'
import { LogLevel } from '@pnpm/logger'
import { type Config } from '@pnpm/config'
import { type Log, type RegistryLog } from '@pnpm/core-loggers'
import { type LogLevel } from '@pnpm/logger'
import * as Rx from 'rxjs'
import { filter, map } from 'rxjs/operators'
import { reportError } from '../reportError'
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PeerDependencyIssuesLog } from '@pnpm/core-loggers'
import { type PeerDependencyIssuesLog } from '@pnpm/core-loggers'
import { renderPeerIssues } from '@pnpm/render-peer-issues'
import * as Rx from 'rxjs'
import { map, take } from 'rxjs/operators'
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ProgressLog, StageLog } from '@pnpm/core-loggers'
import { type ProgressLog, type StageLog } from '@pnpm/core-loggers'
import * as Rx from 'rxjs'
import { filter, map, mapTo, takeWhile, startWith, take } from 'rxjs/operators'
import { hlValue } from './outputConstants'
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RequestRetryLog } from '@pnpm/core-loggers'
import { type RequestRetryLog } from '@pnpm/core-loggers'
import * as Rx from 'rxjs'
import { map } from 'rxjs/operators'
import prettyMilliseconds from 'pretty-ms'
2 changes: 1 addition & 1 deletion cli/default-reporter/src/reporterForClient/reportScope.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ScopeLog } from '@pnpm/core-loggers'
import { type ScopeLog } from '@pnpm/core-loggers'
import * as Rx from 'rxjs'
import { map, take } from 'rxjs/operators'

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SkippedOptionalDependencyLog } from '@pnpm/core-loggers'
import { type SkippedOptionalDependencyLog } from '@pnpm/core-loggers'
import * as Rx from 'rxjs'
import { filter, map } from 'rxjs/operators'

2 changes: 1 addition & 1 deletion cli/default-reporter/src/reporterForClient/reportStats.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { StatsLog } from '@pnpm/core-loggers'
import { type StatsLog } from '@pnpm/core-loggers'
import * as Rx from 'rxjs'
import { filter, take, reduce, map } from 'rxjs/operators'
import chalk from 'chalk'
12 changes: 6 additions & 6 deletions cli/default-reporter/src/reporterForClient/reportSummary.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import path from 'path'
import {
DeprecationLog,
PackageManifestLog,
RootLog,
SummaryLog,
type DeprecationLog,
type PackageManifestLog,
type RootLog,
type SummaryLog,
} from '@pnpm/core-loggers'
import { Config } from '@pnpm/config'
import { type Config } from '@pnpm/config'
import * as Rx from 'rxjs'
import { map, take } from 'rxjs/operators'
import chalk from 'chalk'
import semver from 'semver'
import { EOL } from '../constants'
import {
getPkgsDiff,
PackageDiff,
type PackageDiff,
propertyByDependencyType,
} from './pkgsDiff'
import {
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UpdateCheckLog } from '@pnpm/core-loggers'
import { type UpdateCheckLog } from '@pnpm/core-loggers'
import boxen from 'boxen'
import chalk from 'chalk'
import * as Rx from 'rxjs'
6 changes: 3 additions & 3 deletions cli/default-reporter/src/reporterForServer.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Config } from '@pnpm/config'
import { Log } from '@pnpm/core-loggers'
import * as Rx from 'rxjs'
import { type Config } from '@pnpm/config'
import { type Log } from '@pnpm/core-loggers'
import type * as Rx from 'rxjs'
import chalk from 'chalk'
import { reportError } from './reportError'

2 changes: 1 addition & 1 deletion cli/default-reporter/test/filterLogHook.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Log } from '@pnpm/core-loggers'
import { type Log } from '@pnpm/core-loggers'
import { toOutput$ } from '@pnpm/default-reporter'
import { logger, createStreamParser } from '@pnpm/logger'

2 changes: 1 addition & 1 deletion cli/default-reporter/test/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// <reference path="../../../__typings__/index.d.ts"/>
import path from 'path'
import { Config } from '@pnpm/config'
import { type Config } from '@pnpm/config'
import {
deprecationLogger,
hookLogger,
2 changes: 1 addition & 1 deletion cli/default-reporter/test/reportingProgress.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Config } from '@pnpm/config'
import { type Config } from '@pnpm/config'
import {
fetchingProgressLogger,
progressLogger,
2 changes: 1 addition & 1 deletion cli/default-reporter/test/reportingScope.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Config } from '@pnpm/config'
import { type Config } from '@pnpm/config'
import { scopeLogger } from '@pnpm/core-loggers'
import { toOutput$ } from '@pnpm/default-reporter'
import { createStreamParser } from '@pnpm/logger'
2 changes: 1 addition & 1 deletion cli/default-reporter/test/reportingUpdateCheck.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Config } from '@pnpm/config'
import { type Config } from '@pnpm/config'
import { updateCheckLogger } from '@pnpm/core-loggers'
import { toOutput$ } from '@pnpm/default-reporter'
import { createStreamParser } from '@pnpm/logger'
2 changes: 1 addition & 1 deletion cli/parse-cli-args/test/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import os from 'os'
import { PnpmError } from '@pnpm/error'
import { type PnpmError } from '@pnpm/error'
import { parseCliArgs } from '@pnpm/parse-cli-args'
import tempy from 'tempy'

6 changes: 6 additions & 0 deletions config/config/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @pnpm/config

## 17.0.3

### Patch Changes

- @pnpm/pnpmfile@4.0.41

## 17.0.2

### Patch Changes
2 changes: 1 addition & 1 deletion config/config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pnpm/config",
"version": "17.0.2",
"version": "17.0.3",
"description": "Gets configuration options for pnpm",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Loading