rebase + changeset

Author: spanishpear

.pnp.cjs

@@ -0,0 +1,33 @@
+releases:
+  "@yarnpkg/builder": patch
+  "@yarnpkg/cli": patch
+  "@yarnpkg/core": patch
+  "@yarnpkg/doctor": patch
+  "@yarnpkg/extensions": patch
+  "@yarnpkg/nm": patch
+  "@yarnpkg/plugin-compat": patch
+  "@yarnpkg/plugin-constraints": patch
+  "@yarnpkg/plugin-dlx": patch
+  "@yarnpkg/plugin-essentials": patch
+  "@yarnpkg/plugin-exec": patch
+  "@yarnpkg/plugin-file": patch
+  "@yarnpkg/plugin-git": patch
+  "@yarnpkg/plugin-github": patch
+  "@yarnpkg/plugin-http": patch
+  "@yarnpkg/plugin-init": patch
+  "@yarnpkg/plugin-interactive-tools": patch
+  "@yarnpkg/plugin-jsr": patch
+  "@yarnpkg/plugin-link": patch
+  "@yarnpkg/plugin-nm": patch
+  "@yarnpkg/plugin-npm": patch
+  "@yarnpkg/plugin-npm-cli": patch
+  "@yarnpkg/plugin-pack": patch
+  "@yarnpkg/plugin-patch": patch
+  "@yarnpkg/plugin-pnp": patch
+  "@yarnpkg/plugin-pnpm": patch
+  "@yarnpkg/plugin-stage": patch
+  "@yarnpkg/plugin-typescript": patch
+  "@yarnpkg/plugin-version": patch
+  "@yarnpkg/plugin-workspace-tools": patch
+  "@yarnpkg/pnpify": patch
+  "@yarnpkg/sdks": patch

.yarn/versions/29002943.yml

@@ -0,0 +1,7 @@
+module.exports = require(`./package.json`);
+
+for (const key of [`dependencies`, `devDependencies`, `peerDependencies`]) {
+  for (const dep of Object.keys(module.exports[key] || {})) {
+    module.exports[key][dep] = require(dep);
+  }
+}

packages/acceptance-tests/pkg-tests-fixtures/packages/peer-deps-implicit-types-conflict-1.0.0/index.js

@@ -0,0 +1,10 @@
+{
+  "name": "peer-deps-implicit-types-conflict",
+  "version": "1.0.0",
+  "dependencies": {
+    "@types/no-deps": "2.0.0"
+  },
+  "peerDependencies": {
+    "no-deps": "1.0.0"
+  }
+}

packages/acceptance-tests/pkg-tests-fixtures/packages/peer-deps-implicit-types-conflict-1.0.0/package.json

@@ -100,6 +100,29 @@ describe(`Features`, () => {
         },
       ),
     );
+
+    test(
+      `it should correctly resolve nested dependencies with different versions of types packages`,
+      makeTemporaryEnv(
+        {
+          dependencies: {
+            'peer-deps-implicit-types-conflict': `1.0.0`,
+            '@types/no-deps': `1.0.0`,
+          },
+        },
+        async ({path, run, source}) => {
+          await run(`install`);
+
+          await expect(
+            source(`require('@types/no-deps').version`),
+          ).resolves.toEqual(`1.0.0`);
+
+          await expect(
+            source(`require(require.resolve('@types/no-deps', { paths: [require.resolve('peer-deps-implicit-types-conflict/package.json')] })).version`),
+          ).resolves.toEqual(`2.0.0`);
+        },
+      ),
+    );
   });
 });
 

packages/acceptance-tests/pkg-tests-specs/sources/features/peerDependenciesMeta.test.ts

@@ -1971,7 +1971,7 @@ export class Configuration {
       const typesIdent = structUtils.makeIdent(`types`, typesName);
       const stringifiedTypesIdent = structUtils.stringifyIdent(typesIdent);
 
-      if (pkg.peerDependencies.has(typesIdent.identHash) || pkg.peerDependenciesMeta.has(stringifiedTypesIdent))
+      if (pkg.peerDependencies.has(typesIdent.identHash) || pkg.peerDependenciesMeta.has(stringifiedTypesIdent) || pkg.dependencies.has(typesIdent.identHash))
         continue;
 
       pkg.peerDependencies.set(typesIdent.identHash, structUtils.makeDescriptor(typesIdent, `*`));