diff --git a/.yarn/versions/7f906e6f.yml b/.yarn/versions/7f906e6f.yml new file mode 100644 index 00000000000..a84d0d30a4e --- /dev/null +++ b/.yarn/versions/7f906e6f.yml @@ -0,0 +1,35 @@ +releases: + "@yarnpkg/core": patch + +declined: + - "@yarnpkg/plugin-compat" + - "@yarnpkg/plugin-constraints" + - "@yarnpkg/plugin-dlx" + - "@yarnpkg/plugin-essentials" + - "@yarnpkg/plugin-exec" + - "@yarnpkg/plugin-file" + - "@yarnpkg/plugin-git" + - "@yarnpkg/plugin-github" + - "@yarnpkg/plugin-http" + - "@yarnpkg/plugin-init" + - "@yarnpkg/plugin-interactive-tools" + - "@yarnpkg/plugin-jsr" + - "@yarnpkg/plugin-link" + - "@yarnpkg/plugin-nm" + - "@yarnpkg/plugin-npm" + - "@yarnpkg/plugin-npm-cli" + - "@yarnpkg/plugin-pack" + - "@yarnpkg/plugin-patch" + - "@yarnpkg/plugin-pnp" + - "@yarnpkg/plugin-pnpm" + - "@yarnpkg/plugin-stage" + - "@yarnpkg/plugin-typescript" + - "@yarnpkg/plugin-version" + - "@yarnpkg/plugin-workspace-tools" + - "@yarnpkg/builder" + - "@yarnpkg/cli" + - "@yarnpkg/doctor" + - "@yarnpkg/extensions" + - "@yarnpkg/nm" + - "@yarnpkg/pnpify" + - "@yarnpkg/sdks" diff --git a/packages/acceptance-tests/pkg-tests-specs/sources/features/peerDependenciesMeta.test.ts b/packages/acceptance-tests/pkg-tests-specs/sources/features/peerDependenciesMeta.test.ts index d5cadc4e8f7..7a2f7001763 100644 --- a/packages/acceptance-tests/pkg-tests-specs/sources/features/peerDependenciesMeta.test.ts +++ b/packages/acceptance-tests/pkg-tests-specs/sources/features/peerDependenciesMeta.test.ts @@ -40,7 +40,7 @@ describe(`Features`, () => { async ({path, run, source}) => { const {stdout} = await run(`install`); - expect(stdout).toMatch(/no-deps is listed by your project with version 1\.1\.0 \(p[a-f0-9]{5}\), which doesn't satisfy what mismatched-peer-deps-lvl1 and other dependencies request \(1\.0\.0\)/); + expect(stdout).toMatch(/no-deps is listed by your project with version 1\.1\.0 \(p[a-f0-9]{6}\), which doesn't satisfy what mismatched-peer-deps-lvl1 and other dependencies request \(1\.0\.0\)/); }, ), ); @@ -57,7 +57,7 @@ describe(`Features`, () => { async ({path, run, source}) => { const {stdout} = await run(`install`); - expect(stdout).toMatch(/no-deps is listed by your project with version 1\.1\.0 \(p[a-f0-9]{5}\), which doesn't satisfy what mismatched-peer-deps-lvl[12] \(via mismatched-peer-deps-lvl0\) and other dependencies request \(1\.0\.0\)/); + expect(stdout).toMatch(/no-deps is listed by your project with version 1\.1\.0 \(p[a-f0-9]{6}\), which doesn't satisfy what mismatched-peer-deps-lvl[12] \(via mismatched-peer-deps-lvl0\) and other dependencies request \(1\.0\.0\)/); }, ), ); diff --git a/packages/yarnpkg-core/sources/Project.ts b/packages/yarnpkg-core/sources/Project.ts index 0be67cd805e..a8e8869232a 100644 --- a/packages/yarnpkg-core/sources/Project.ts +++ b/packages/yarnpkg-core/sources/Project.ts @@ -2375,7 +2375,7 @@ function applyVirtualResolutionMutations({ requests: new Map(), - hash: `p${hashUtils.makeHash(parentLocator.locatorHash, peerDescriptor.identHash).slice(0, 5)}`, + hash: `p${hashUtils.makeHash(parentLocator.locatorHash, peerDescriptor.identHash).slice(0, 6)}`, }; }); @@ -2565,7 +2565,7 @@ function applyVirtualResolutionMutations({ // For backwards-compatibility // TODO: Remove for next major for (const peerRequest of requirement.requests.values()) { - const hash = `p${hashUtils.makeHash(requirement.subject.locatorHash, structUtils.stringifyIdent(requirement.ident), peerRequest.requester.locatorHash).slice(0, 5)}`; + const hash = `p${hashUtils.makeHash(requirement.subject.locatorHash, structUtils.stringifyIdent(requirement.ident), peerRequest.requester.locatorHash).slice(0, 6)}`; peerRequirements.set(hash, { subject: requirement.subject.locatorHash, @@ -2608,7 +2608,7 @@ function applyVirtualResolutionMutations({ // For backwards-compatibility // TODO: Remove for next major - const hash = `p${hashUtils.makeHash(requirement.subject.locatorHash, structUtils.stringifyIdent(requirement.ident), peerRequest.requester.locatorHash).slice(0, 5)}`; + const hash = `p${hashUtils.makeHash(requirement.subject.locatorHash, structUtils.stringifyIdent(requirement.ident), peerRequest.requester.locatorHash).slice(0, 6)}`; peerWarnings.push({ type: PeerWarningType.NotCompatible, @@ -2642,7 +2642,7 @@ function applyVirtualResolutionMutations({ // For backwards-compatibility // TODO: Remove for next major - const hash = `p${hashUtils.makeHash(requirement.subject.locatorHash, structUtils.stringifyIdent(requirement.ident), peerRequest.requester.locatorHash).slice(0, 5)}`; + const hash = `p${hashUtils.makeHash(requirement.subject.locatorHash, structUtils.stringifyIdent(requirement.ident), peerRequest.requester.locatorHash).slice(0, 6)}`; peerWarnings.push({ type: PeerWarningType.NotProvided,