Skip to content

Commit

Permalink
Merge branch 'main' into v10
Browse files Browse the repository at this point in the history
  • Loading branch information
zkochan committed Oct 12, 2024
2 parents 592e2ef + 884fdd7 commit b33f153
Show file tree
Hide file tree
Showing 48 changed files with 174 additions and 85 deletions.
6 changes: 0 additions & 6 deletions .changeset/afraid-wolves-obey.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/bright-pots-carry.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/forty-goats-exist.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/green-bikes-sparkle.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/hot-lies-rescue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@pnpm/core": patch
---

When the lockfile is not up to date make it clear what `package.json` is out of sync.
6 changes: 0 additions & 6 deletions .changeset/many-cycles-search.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/nervous-baboons-grow.md

This file was deleted.

6 changes: 6 additions & 0 deletions .changeset/olive-pants-know.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@pnpm/store.cafs": patch
"pnpm": patch
---

When checking whether a file in the store has executable permissions, the new approach checks if at least one of the executable bits (owner, group, and others) is set to 1. Previously, a file was incorrectly considered executable only when all the executable bits were set to 1. This fix ensures that files with any executable permission, regardless of the user class, are now correctly identified as executable [#8546](https://github.com/pnpm/pnpm/issues/8546).
7 changes: 7 additions & 0 deletions exec/plugin-commands-script-runners/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @pnpm/plugin-commands-script-runners

## 12.0.8

### Patch Changes

- fb77d4e: Prevent `EBUSY` errors caused by calling `symlinkDir` in parallel `dlx` processes.
- @pnpm/plugin-commands-installation@17.2.5

## 12.0.7

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion exec/plugin-commands-script-runners/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pnpm/plugin-commands-script-runners",
"version": "12.0.7",
"version": "12.0.8",
"description": "Commands for running scripts",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
6 changes: 6 additions & 0 deletions lockfile/filtering/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @pnpm/filter-lockfile

## 1.0.6

### Patch Changes

- 17b5088: Fix maximum call stack size exceeded error related to circular workspace dependencies [#8599](https://github.com/pnpm/pnpm/pull/8599).

## 1.0.5

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion lockfile/filtering/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pnpm/lockfile.filtering",
"version": "1.0.5",
"version": "1.0.6",
"description": "Filters a lockfile",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
7 changes: 7 additions & 0 deletions lockfile/settings-checker/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# @pnpm/lockfile.settings-checker

## 1.0.0

### Major Changes

- 51f3ba1: Initial Release
2 changes: 1 addition & 1 deletion lockfile/settings-checker/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pnpm/lockfile.settings-checker",
"version": "0.0.0",
"version": "1.0.0",
"description": "Utilities to check if lockfile settings are out-of-date",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
6 changes: 6 additions & 0 deletions packages/plugin-commands-setup/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @pnpm/plugin-commands-setup

## 5.1.12

### Patch Changes

- c9ea43c: The pnpx command should work correctly on Windows, when pnpm is installed via the standalone installation script [#8608](https://github.com/pnpm/pnpm/pull/8608).

## 5.1.11

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-commands-setup/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pnpm/plugin-commands-setup",
"version": "5.1.11",
"version": "5.1.12",
"description": "pnpm commands for setting up pnpm",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
6 changes: 6 additions & 0 deletions patching/plugin-commands-patching/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @pnpm/plugin-commands-patching

## 6.4.12

### Patch Changes

- @pnpm/plugin-commands-installation@17.2.5

## 6.4.11

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion patching/plugin-commands-patching/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pnpm/plugin-commands-patching",
"version": "6.4.11",
"version": "6.4.12",
"description": "Commands for creating patches",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
13 changes: 13 additions & 0 deletions pkg-manager/core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# @pnpm/core

## 15.3.6

### Patch Changes

- Updated dependencies [4f4e073]
- Updated dependencies [17b5088]
- Updated dependencies [51f3ba1]
- @pnpm/resolve-dependencies@36.0.5
- @pnpm/lockfile.filtering@1.0.6
- @pnpm/lockfile.settings-checker@1.0.0
- @pnpm/headless@23.2.6
- @pnpm/modules-cleaner@15.1.15

## 15.3.5

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion pkg-manager/core/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@pnpm/core",
"description": "Fast, disk space efficient installation engine",
"version": "15.3.5",
"version": "15.3.6",
"bugs": {
"url": "https://github.com/pnpm/pnpm/issues"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg-manager/core/src/install/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ Note that in CI environments, this setting is enabled by default.`,

throw new PnpmError('OUTDATED_LOCKFILE',
`Cannot install with "frozen-lockfile" because ${WANTED_LOCKFILE} is not up to date with ` +
path.relative(opts.lockfileDir, path.join(rootDir, 'package.json')), {
path.join('<ROOT>', path.relative(opts.lockfileDir, path.join(rootDir, 'package.json'))), {
hint: `Note that in CI environments this setting is true by default. If you still need to run install in such cases, use "pnpm install --no-frozen-lockfile"
Failure reason:
Expand Down
6 changes: 3 additions & 3 deletions pkg-manager/core/test/install/frozenLockfile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ test(`frozen-lockfile: installation fails if specs in package.json don't match t
'is-positive': '^3.1.0',
},
}, testDefaults({ frozenLockfile: true }))
).rejects.toThrow(`Cannot install with "frozen-lockfile" because ${WANTED_LOCKFILE} is not up to date with package.json`)
).rejects.toThrow(`Cannot install with "frozen-lockfile" because ${WANTED_LOCKFILE} is not up to date with ${path.join('<ROOT>', 'package.json')}`)
})

test(`frozen-lockfile+hoistPattern: installation fails if specs in package.json don't match the ones in ${WANTED_LOCKFILE}`, async () => {
Expand All @@ -46,7 +46,7 @@ test(`frozen-lockfile+hoistPattern: installation fails if specs in package.json
'is-positive': '^3.1.0',
},
}, testDefaults({ frozenLockfile: true, hoistPattern: '*' }))
).rejects.toThrow(`Cannot install with "frozen-lockfile" because ${WANTED_LOCKFILE} is not up to date with package.json`)
).rejects.toThrow(`Cannot install with "frozen-lockfile" because ${WANTED_LOCKFILE} is not up to date with ${path.join('<ROOT>', 'package.json')}`)
})

test(`frozen-lockfile: fail on a shared ${WANTED_LOCKFILE} that does not satisfy one of the package.json files`, async () => {
Expand Down Expand Up @@ -97,7 +97,7 @@ test(`frozen-lockfile: fail on a shared ${WANTED_LOCKFILE} that does not satisfy

await expect(
mutateModules(projects, testDefaults({ frozenLockfile: true, allProjects: [project1, project2] }))
).rejects.toThrow(`Cannot install with "frozen-lockfile" because ${WANTED_LOCKFILE} is not up to date with p1${path.sep}package.json`)
).rejects.toThrow(`Cannot install with "frozen-lockfile" because ${WANTED_LOCKFILE} is not up to date with ${path.join('<ROOT>', 'p1/package.json')}`)
})

test(`frozen-lockfile: should successfully install when ${WANTED_LOCKFILE} is available`, async () => {
Expand Down
8 changes: 8 additions & 0 deletions pkg-manager/headless/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @pnpm/headless

## 23.2.6

### Patch Changes

- Updated dependencies [17b5088]
- @pnpm/lockfile.filtering@1.0.6
- @pnpm/modules-cleaner@15.1.15

## 23.2.5

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion pkg-manager/headless/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@pnpm/headless",
"description": "Fast installation using only pnpm-lock.yaml",
"version": "23.2.5",
"version": "23.2.6",
"bugs": {
"url": "https://github.com/pnpm/pnpm/issues"
},
Expand Down
7 changes: 7 additions & 0 deletions pkg-manager/modules-cleaner/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @pnpm/modules-cleaner

## 15.1.15

### Patch Changes

- Updated dependencies [17b5088]
- @pnpm/lockfile.filtering@1.0.6

## 15.1.14

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion pkg-manager/modules-cleaner/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pnpm/modules-cleaner",
"version": "15.1.14",
"version": "15.1.15",
"description": "Exports util functions to clean up node_modules",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
6 changes: 6 additions & 0 deletions pkg-manager/plugin-commands-installation/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @pnpm/plugin-commands-installation

## 17.2.5

### Patch Changes

- @pnpm/core@15.3.6

## 17.2.4

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion pkg-manager/plugin-commands-installation/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pnpm/plugin-commands-installation",
"version": "17.2.4",
"version": "17.2.5",
"description": "Commands for installation",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
6 changes: 6 additions & 0 deletions pkg-manager/resolve-dependencies/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @pnpm/resolve-dependencies

## 36.0.5

### Patch Changes

- 4f4e073: `pnpm update --latest` should not update the automatically installed peer dependencies [#6657](https://github.com/pnpm/pnpm/issues/6657).

## 36.0.4

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion pkg-manager/resolve-dependencies/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pnpm/resolve-dependencies",
"version": "36.0.4",
"version": "36.0.5",
"description": "Resolves dependency graph of a package",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
Loading

0 comments on commit b33f153

Please sign in to comment.