Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .changeset/polite-carpets-relax.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@
"@pnpm/cafs-types": major
"@pnpm/store-path": major
"@pnpm/catalogs.config": major
"@pnpm/crypto.polyfill": major
"@pnpm/lockfile.merger": major
"@pnpm/lockfile.pruner": major
"@pnpm/lockfile.walker": major
Expand Down
6 changes: 4 additions & 2 deletions .meta-updater/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@
"is-subdir": "catalog:",
"load-json-file": "catalog:",
"normalize-path": "catalog:",
"semver": "catalog:",
"write-json-file": "catalog:"
},
"devDependencies": {
"@pnpm-private/updater": "workspace:*"
"@pnpm-private/updater": "workspace:*",
"@types/semver": "catalog:"
},
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"repository": "https://github.com/pnpm/pnpm/tree/main/.meta-updater"
}
3 changes: 2 additions & 1 deletion .meta-updater/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { parsePkgAndParentSelector } from '@pnpm/parse-overrides'
import { readWorkspaceManifest } from '@pnpm/workspace.read-manifest'
import isSubdir from 'is-subdir'
import { loadJsonFileSync } from 'load-json-file'
import semver from 'semver'
import normalizePath from 'normalize-path'
import { writeJsonFile } from 'write-json-file'

Expand Down Expand Up @@ -50,7 +51,7 @@ export default async (workspaceDir: string) => { // eslint-disable-line
const smallestAllowedLibVersion = Number(pnpmMajorNumber) * 100
const libMajorVersion = Number(manifest.version!.split('.')[0])
if (manifest.name !== CLI_PKG_NAME) {
if (libMajorVersion < smallestAllowedLibVersion || libMajorVersion >= smallestAllowedLibVersion + 100) {
if (!semver.prerelease(pnpmVersion) && (libMajorVersion < smallestAllowedLibVersion || libMajorVersion >= smallestAllowedLibVersion + 100)) {
manifest.version = `${smallestAllowedLibVersion}.0.0`
}
for (const depType of ['dependencies', 'devDependencies', 'optionalDependencies'] as const) {
Expand Down
2 changes: 1 addition & 1 deletion __typecheck__/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"repository": "https://github.com/pnpm/pnpm/tree/main/__typecheck__"
}
2 changes: 1 addition & 1 deletion __typings__/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"repository": "https://github.com/pnpm/pnpm/tree/main/__typings__"
}
2 changes: 1 addition & 1 deletion __utils__/assert-project/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"homepage": "https://github.com/pnpm/pnpm/blob/master/privatePackages/assert-project#readme",
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"license": "MIT",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion __utils__/assert-store/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"homepage": "https://github.com/pnpm/pnpm/blob/master/privatePackages/assert-store#readme",
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"license": "MIT",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion __utils__/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"homepage": "https://pnpm.io",
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"license": "MIT",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion __utils__/get-release-text/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"repository": "https://github.com/pnpm/pnpm/tree/main/__utils__/get-release-text"
}
2 changes: 1 addition & 1 deletion __utils__/jest-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"repository": "https://github.com/pnpm/pnpm/tree/main/__utils__/jest-config"
}
2 changes: 1 addition & 1 deletion __utils__/prepare-temp-dir/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"repository": "https://github.com/pnpm/pnpm/tree/main/__utils__/prepare-temp-dir"
}
2 changes: 1 addition & 1 deletion __utils__/prepare/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"repository": "https://github.com/pnpm/pnpm/tree/main/__utils__/prepare"
}
2 changes: 1 addition & 1 deletion __utils__/scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"repository": "https://github.com/pnpm/pnpm/tree/main/__utils__/scripts"
}
2 changes: 1 addition & 1 deletion __utils__/test-fixtures/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"homepage": "https://github.com/pnpm/pnpm/blob/master/privatePackages/test-fixtures#readme",
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"license": "MIT",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion __utils__/test-ipc-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"jest": {
"preset": "@pnpm/jest-config"
Expand Down
2 changes: 1 addition & 1 deletion __utils__/tsconfig/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"engines": {
"node": ">=14.6"
Expand Down
2 changes: 1 addition & 1 deletion builder/policy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Create a function for filtering out dependencies that are not allowed to be built",
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"license": "MIT",
"funding": "https://opencollective.com/pnpm",
Expand Down
2 changes: 1 addition & 1 deletion cache/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "API for controlling the cache",
"keywords": [
"pnpm",
"pnpm10",
"pnpm11",
"cache"
],
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion cache/commands/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Commands for controlling the cache",
"keywords": [
"pnpm",
"pnpm10",
"pnpm11",
"cache"
],
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion catalogs/config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Create a normalized catalogs config from pnpm-workspace.yaml contents.",
"keywords": [
"pnpm",
"pnpm10",
"pnpm11",
"types"
],
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion catalogs/protocol-parser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Parse catalog protocol specifiers and return the catalog name.",
"keywords": [
"pnpm",
"pnpm10",
"pnpm11",
"types"
],
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion catalogs/resolver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Dereferences catalog protocol specifiers into usable specifiers.",
"keywords": [
"pnpm",
"pnpm10",
"pnpm11",
"types"
],
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion catalogs/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Types related to the pnpm catalogs feature.",
"keywords": [
"pnpm",
"pnpm10",
"pnpm11",
"types"
],
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion cli/cli-meta/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Reads the metainfo of the currently running pnpm instance",
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"license": "MIT",
"funding": "https://opencollective.com/pnpm",
Expand Down
2 changes: 1 addition & 1 deletion cli/cli-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Utils for pnpm commands",
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"license": "MIT",
"funding": "https://opencollective.com/pnpm",
Expand Down
2 changes: 1 addition & 1 deletion cli/command/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Types and utils for pnpm commands",
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"license": "MIT",
"funding": "https://opencollective.com/pnpm",
Expand Down
2 changes: 1 addition & 1 deletion cli/common-cli-options-help/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Help for some common CLI options",
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"license": "MIT",
"funding": "https://opencollective.com/pnpm",
Expand Down
2 changes: 1 addition & 1 deletion cli/default-reporter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "The default reporter of pnpm",
"keywords": [
"pnpm",
"pnpm10",
"pnpm11",
"pnpm-reporter"
],
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion cli/parse-cli-args/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Parses the CLI args passed to pnpm",
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"license": "MIT",
"funding": "https://opencollective.com/pnpm",
Expand Down
2 changes: 1 addition & 1 deletion completion/plugin-commands-completion/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Commands for shell completions",
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"license": "MIT",
"funding": "https://opencollective.com/pnpm",
Expand Down
2 changes: 1 addition & 1 deletion config/config-writer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Functions for updating the configuration settings",
"keywords": [
"pnpm",
"pnpm10",
"pnpm11",
"config"
],
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion config/config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Gets configuration options for pnpm",
"keywords": [
"pnpm",
"pnpm10",
"pnpm11",
"config"
],
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion config/deps-installer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Installer for configurational dependencies",
"keywords": [
"pnpm",
"pnpm10",
"pnpm11",
"config"
],
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion config/matcher/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "A simple pattern matcher for pnpm",
"keywords": [
"pnpm",
"pnpm10",
"pnpm11",
"match",
"pattern",
"wildcard"
Expand Down
2 changes: 1 addition & 1 deletion config/normalize-registries/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Accepts a mapping of registry URLs and returns a mapping with the same URLs but normalized",
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"license": "MIT",
"funding": "https://opencollective.com/pnpm",
Expand Down
2 changes: 1 addition & 1 deletion config/package-is-installable/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Checks if a package is installable on the current system",
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"license": "MIT",
"funding": "https://opencollective.com/pnpm",
Expand Down
2 changes: 1 addition & 1 deletion config/parse-overrides/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Parse overrides",
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"license": "MIT",
"funding": "https://opencollective.com/pnpm",
Expand Down
2 changes: 1 addition & 1 deletion config/pick-registry-for-package/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Picks the right registry for the package from a registries config",
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"license": "MIT",
"funding": "https://opencollective.com/pnpm",
Expand Down
2 changes: 1 addition & 1 deletion config/plugin-commands-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Commands for reading and writing settings to/from config files",
"keywords": [
"pnpm",
"pnpm10",
"pnpm11",
"config"
],
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion config/version-policy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Parses and evaluates package version policy specs and produces package-version matchers",
"keywords": [
"pnpm",
"pnpm10"
"pnpm11"
],
"license": "MIT",
"funding": "https://opencollective.com/pnpm",
Expand Down
2 changes: 1 addition & 1 deletion crypto/hash/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Generate hashes",
"keywords": [
"pnpm",
"pnpm10",
"pnpm11",
"crypto",
"hash"
],
Expand Down
2 changes: 1 addition & 1 deletion crypto/object-hasher/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Generate hashes from objects",
"keywords": [
"pnpm",
"pnpm10",
"pnpm11",
"crypto",
"hash"
],
Expand Down
Loading
Loading