From 8908f5f98dfaa46ee2ceb25fc79487f6c5c15ff7 Mon Sep 17 00:00:00 2001 From: merceyz Date: Thu, 16 Sep 2021 23:48:47 +0200 Subject: [PATCH 1/5] fix: don't match local files without paths --- .pnp.cjs | 78 +++++++++--------- ...> resolve-patch-00f699a708-21684b4d99.zip} | Bin 53952 -> 53923 bytes ...> resolve-patch-334bc019de-8e86033057.zip} | Bin 50327 -> 50298 bytes ...> resolve-patch-b4a69197d3-a0dd7d16a8.zip} | Bin 53905 -> 53876 bytes .../extra/resolve/normalize-options.js | 14 +--- .../sources/patches/resolve.patch.ts | 2 +- packages/plugin-compat/tests/resolve.test.ts | 28 ++++--- yarn.lock | 12 +-- 8 files changed, 65 insertions(+), 69 deletions(-) rename .yarn/cache/{resolve-patch-ef0f052b02-81e6cfa7c9.zip => resolve-patch-00f699a708-21684b4d99.zip} (79%) rename .yarn/cache/{resolve-patch-7b3788bccb-deb4393d74.zip => resolve-patch-334bc019de-8e86033057.zip} (80%) rename .yarn/cache/{resolve-patch-8f5ee21b5a-d060c878a7.zip => resolve-patch-b4a69197d3-a0dd7d16a8.zip} (81%) diff --git a/.pnp.cjs b/.pnp.cjs index 3375111b6e1e..fc468f4471c0 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -584,7 +584,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["gensync", "npm:1.0.0-beta.2"], ["json5", "npm:2.1.3"], ["lodash", "npm:4.17.21"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:5.7.1"], ["source-map", "npm:0.5.7"] ], @@ -824,7 +824,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/babel__core", null], ["debug", "virtual:5dffae5dceca8d383e37ce1404983ff3eaf566153fb551aede58a16b625356caee63d9240a4386c2b8b44a2ff32b72c5d4444045ea31775b520ccbc9788f7985#npm:4.3.2"], ["lodash.debounce", "npm:4.0.8"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:6.3.0"] ], "packagePeers": [ @@ -845,7 +845,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/babel__core", "npm:7.1.3"], ["debug", "virtual:5dffae5dceca8d383e37ce1404983ff3eaf566153fb551aede58a16b625356caee63d9240a4386c2b8b44a2ff32b72c5d4444045ea31775b520ccbc9788f7985#npm:4.3.2"], ["lodash.debounce", "npm:4.0.8"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:6.3.0"] ], "packagePeers": [ @@ -7367,7 +7367,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["glob", "npm:7.1.6"], ["is-reference", "npm:1.2.1"], ["magic-string", "npm:0.25.7"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["rollup", "npm:2.45.2"] ], "packagePeers": [ @@ -7395,7 +7395,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["builtin-modules", "npm:3.2.0"], ["deepmerge", "npm:4.2.2"], ["is-module", "npm:1.0.0"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["rollup", "npm:2.45.2"] ], "packagePeers": [ @@ -10701,7 +10701,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:f4e4f4a9a0213f122880195b39adaee7de5cb560c1d806ebc8bace6a3124e5b8f820bbb89ebecd4d535caeb6f527d343143210aa405689c118ff2813b78998a0#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:7.3.5"] ], "packagePeers": [ @@ -10726,7 +10726,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:1c3d72c6b31a8950672985f8306a860ecc80c9a006aac95cf4a7ba13a6e7cc4e095e37186a53c9909e9efe97bc0f7f570a74b3879778e2a2356cdcf407120006#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:7.3.5"] ], "packagePeers": [ @@ -10751,7 +10751,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:2351fd5ac4f83ad35b714d8af9fdeea561ada341d529d0dba50742dd5735dc3750df6c56bd680e14833d5b987026a1eab6618211ea0ef1b34b727372b3c77bc9#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:7.3.5"] ], "packagePeers": [ @@ -10776,7 +10776,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:45a6746f11cef24d8db9429cc5650999571e6bb77a8cfb3904a0e832f542be35246ec490516049308ca15b8678eb03bcf394199e514a8145ec32731af7235c91#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:7.3.5"] ], "packagePeers": [ @@ -10801,7 +10801,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:4864d30fc563f2fd1b72a5e3869493c5f50bf38f98ed3886173d80c044d981c3f68220dbf17f2b5fc5b4c5fba7d0af2e003926efe3487086484049f41c449852#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:7.3.5"] ], "packagePeers": [ @@ -10826,7 +10826,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:83b7a14498f70e120fb6f455fa263877f0d2954cbb68f3216e842cf37532afa9fe7895f2327708b45ae12ab75df0f3b07ed6e746fa7001bc6460dba7aaf38d31#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:7.3.5"] ], "packagePeers": [ @@ -10851,7 +10851,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:08fe6ad7a76ed00f8dc32e3b968ce66fd4db8ac47424db78612ce3633e63ecb46d41984611094facf53bbef7eae7fbf98bbfd729fb77f5ccde564684f4e3a829#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:a7c38e9a420fd3b408ea245831c2c9f0e880eac64b268fab3219f5f0b1d6015f44b1f92d23aabfc6e980bbbbda00a23e9faa983fb98544fab94119ccd31f2440#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:7.3.5"] ], "packagePeers": [ @@ -10876,7 +10876,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:adaf1cec8728346f1bf6a263f1954625a52d60518b8d2084da8a926203282105d2b95fb9da84922062af8d4fc84b8a1c39f220238424024e56f55577bdbc7208#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:7.3.5"] ], "packagePeers": [ @@ -10901,7 +10901,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:b4c0e602e8ac4e01a7b08db41bb5808da767dd1f6802758faa5125fb2423614bb0a8806ee1b30c3a0769f86da15ad37377f5118d93cd93fa48df0008a448fb35#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:7.3.5"] ], "packagePeers": [ @@ -10926,7 +10926,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:b63ad861025672af62aed0e7c80dca4cfce3194ca046161e54fc14c498c39e3b82004ea844489c7a58d2f1a31867f388bf25b8128f5ccce46f35305e1f91e9ab#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:7.3.5"] ], "packagePeers": [ @@ -10951,7 +10951,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:c44c4b6360dc34d25da6d32e39622e7e40f36f37b99dc66b6ebbd615fdd49465f496bf10f81b6fa5f71b95443fda61174ad51d2799fc7ca433af9a9666cd0f37#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:7.3.5"] ], "packagePeers": [ @@ -10976,7 +10976,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:cd2af72718007566941ac9f5a6def4d055c38029c95c3ac065493603e6055c1d77b2f2df752588114932973488b5a566f49b00118e7e12f48aa0798ea38cc15b#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:7.3.5"] ], "packagePeers": [ @@ -11001,7 +11001,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:d1d72d9e3903ca8b8d9c23a360395cc764db2689e5992ef9af91c79f03a839db10ec675af9e4c1c8f4842aff1a614eb5b115fcc0afe8256630151ef1252de94b#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:7.3.5"] ], "packagePeers": [ @@ -11026,7 +11026,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:f8376ca2bc11738adced76b97627e7eff07ec08f93f5b76caf8d6bd4f78f5ae9c1911cb9d1a0bd256ef3e0601dedeba933acf0d2381588b6513ee81e25626459#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:7.3.5"] ], "packagePeers": [ @@ -11049,7 +11049,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["@yarnpkg/plugin-npm", "virtual:f9d90af7d716b3ed916c405f2a01eaf983ac84baf75bd67dc1fa320a529fda05c09bbfb4fa47252f3b3e23450138f3130fa2e3d0cec9917c6c8492798c353e12#workspace:packages/plugin-npm"], ["@yarnpkg/plugin-patch", "virtual:f4e4f4a9a0213f122880195b39adaee7de5cb560c1d806ebc8bace6a3124e5b8f820bbb89ebecd4d535caeb6f527d343143210aa405689c118ff2813b78998a0#workspace:packages/plugin-patch"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:7.3.5"] ], "linkType": "SOFT", @@ -16786,7 +16786,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["babel-plugin-macros", "npm:2.8.0"], ["@babel/runtime", "npm:7.14.0"], ["cosmiconfig", "npm:6.0.0"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"] + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"] ], "linkType": "HARD", }] @@ -21452,7 +21452,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageDependencies": [ ["eslint-import-resolver-node", "npm:0.3.4"], ["debug", "virtual:2bcc47d217f870e3d52f0e55493dc34fd3da852877f7db32fa2940cc320151746026495daf6a34a974488cf5a949d93be1e2dc1ffba036faf081a9b15fcd2252#npm:2.6.9"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"] + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"] ], "linkType": "HARD", }] @@ -21554,7 +21554,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["object.values", "npm:1.1.4"], ["pkg-up", "npm:2.0.0"], ["read-pkg-up", "npm:3.0.0"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["tsconfig-paths", "npm:3.9.0"] ], "packagePeers": [ @@ -21622,7 +21622,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["object.fromentries", "npm:2.0.4"], ["object.values", "npm:1.1.4"], ["prop-types", "npm:15.7.2"], - ["resolve", "patch:resolve@npm%3A2.0.0-next.3#~builtin::version=2.0.0-next.3&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A2.0.0-next.3#~builtin::version=2.0.0-next.3&hash=07638b"], ["string.prototype.matchall", "npm:4.0.5"] ], "packagePeers": [ @@ -21648,7 +21648,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["object.fromentries", "npm:2.0.4"], ["object.values", "npm:1.1.4"], ["prop-types", "npm:15.7.2"], - ["resolve", "patch:resolve@npm%3A2.0.0-next.3#~builtin::version=2.0.0-next.3&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A2.0.0-next.3#~builtin::version=2.0.0-next.3&hash=07638b"], ["string.prototype.matchall", "npm:4.0.5"] ], "packagePeers": [ @@ -27678,7 +27678,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest-pnp-resolver", "virtual:631d11a244cf9e8543d845f9233371049f6acc7a371f8cdc0328ac0915c7fea1f5e43b0c6464606ba013212ee8e56784c791cb67764091471a2a31ac041ce93f#npm:1.2.1"], ["jest-util", "npm:26.0.1"], ["read-pkg-up", "npm:7.0.1"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["slash", "npm:3.0.0"] ], "linkType": "HARD", @@ -30771,7 +30771,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageDependencies": [ ["normalize-package-data", "npm:2.5.0"], ["hosted-git-info", "npm:2.7.1"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["semver", "npm:5.7.1"], ["validate-npm-package-license", "npm:3.0.4"] ], @@ -33882,7 +33882,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["js-reporters", "npm:1.2.1"], ["minimatch", "npm:3.0.4"], ["node-watch", "npm:0.6.0"], - ["resolve", "patch:resolve@npm%3A1.9.0#~builtin::version=1.9.0&hash=b382c1"] + ["resolve", "patch:resolve@npm%3A1.9.0#~builtin::version=1.9.0&hash=07638b"] ], "linkType": "HARD", }] @@ -34903,7 +34903,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./.yarn/cache/rechoir-npm-0.6.2-0df5f171ec-fe76bf9c21.zip/node_modules/rechoir/", "packageDependencies": [ ["rechoir", "npm:0.6.2"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"] + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"] ], "linkType": "HARD", }], @@ -34911,7 +34911,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./.yarn/cache/rechoir-npm-0.7.0-9bea79bab8-15f55f55e0.zip/node_modules/rechoir/", "packageDependencies": [ ["rechoir", "npm:0.7.0"], - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"] + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"] ], "linkType": "HARD", }] @@ -35533,27 +35533,27 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["resolve", [ - ["patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1", { - "packageLocation": "./.yarn/cache/resolve-patch-8f5ee21b5a-d060c878a7.zip/node_modules/resolve/", + ["patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b", { + "packageLocation": "./.yarn/cache/resolve-patch-b4a69197d3-a0dd7d16a8.zip/node_modules/resolve/", "packageDependencies": [ - ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b"], ["is-core-module", "npm:2.4.0"], ["path-parse", "npm:1.0.6"] ], "linkType": "HARD", }], - ["patch:resolve@npm%3A1.9.0#~builtin::version=1.9.0&hash=b382c1", { - "packageLocation": "./.yarn/cache/resolve-patch-7b3788bccb-deb4393d74.zip/node_modules/resolve/", + ["patch:resolve@npm%3A1.9.0#~builtin::version=1.9.0&hash=07638b", { + "packageLocation": "./.yarn/cache/resolve-patch-334bc019de-8e86033057.zip/node_modules/resolve/", "packageDependencies": [ - ["resolve", "patch:resolve@npm%3A1.9.0#~builtin::version=1.9.0&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A1.9.0#~builtin::version=1.9.0&hash=07638b"], ["path-parse", "npm:1.0.6"] ], "linkType": "HARD", }], - ["patch:resolve@npm%3A2.0.0-next.3#~builtin::version=2.0.0-next.3&hash=b382c1", { - "packageLocation": "./.yarn/cache/resolve-patch-ef0f052b02-81e6cfa7c9.zip/node_modules/resolve/", + ["patch:resolve@npm%3A2.0.0-next.3#~builtin::version=2.0.0-next.3&hash=07638b", { + "packageLocation": "./.yarn/cache/resolve-patch-00f699a708-21684b4d99.zip/node_modules/resolve/", "packageDependencies": [ - ["resolve", "patch:resolve@npm%3A2.0.0-next.3#~builtin::version=2.0.0-next.3&hash=b382c1"], + ["resolve", "patch:resolve@npm%3A2.0.0-next.3#~builtin::version=2.0.0-next.3&hash=07638b"], ["is-core-module", "npm:2.4.0"], ["path-parse", "npm:1.0.6"] ], diff --git a/.yarn/cache/resolve-patch-ef0f052b02-81e6cfa7c9.zip b/.yarn/cache/resolve-patch-00f699a708-21684b4d99.zip similarity index 79% rename from .yarn/cache/resolve-patch-ef0f052b02-81e6cfa7c9.zip rename to .yarn/cache/resolve-patch-00f699a708-21684b4d99.zip index 9fc47e71452f44447ed7158477f8a6f8076161df..af7a06371f925037ad26b8246f8884acc8c72eb7 100644 GIT binary patch delta 3184 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 Yg9aGh!ck)?;VQw=Tk<5AjOkweKS*SZsQ>@~ diff --git a/.yarn/cache/resolve-patch-7b3788bccb-deb4393d74.zip b/.yarn/cache/resolve-patch-334bc019de-8e86033057.zip similarity index 80% rename from .yarn/cache/resolve-patch-7b3788bccb-deb4393d74.zip rename to .yarn/cache/resolve-patch-334bc019de-8e86033057.zip index 6e99f103e4d697972293970b90a8f1f9046bd647..f6e625ca8b81ee1ba08f587608c0fe25a1236a03 100644 GIT binary patch delta 2860 zcmYk62{={hAIF{7+P!5NOWA4Ab#&c(Z6#zVTS-VYB$0jGLW(KNwN^;fuZT#|Si=oB zW6Ro~5+$Xw*Cb7}C@qSbLyVwANQWx zc=Zfd-7fOEz$df&JK^$vldQ+t5uZ3SR=Hor-WA;f zVe9+N-+Nh(`u?5V;$D_i_e}P?ljgon6KD4uZ98{|ld#2F z>~g1J=4jBynEt6vrQIUW_0?~&1|X|SIHUG~ZB~-Mc3Dk&slJcq^E|20$u5Vhb1~G~ zX&Lc}qMvq1Gs%g?@1@g?y<5o!%rXMP4s*EeEwk1oNc`|o3&E@?zZc44%G># z3k^bcwl)gokIfJKwC#*WL~Gsd%=^khxvQ+N$Lw^`%DKJ2cbpv-CSog7oy1ym%qxLy z@zT0@^`!}ln%YpO{Mb7OKlO(qOAky@Yv{&~R4-2XY+9aoNKI!K^=J#(O+`#^Ww)An z+#!=4+w6~@7!hgHwbJ6dQ$K9p`P6d9&a;m?=H6FNDm>t{$4Rg>((WGKzdAj~!_vHv zK6|sbH|E1jNg0z*?HSDO4afAott?gIUCr4s(P|UmlYBCDY*rwklhgiOjbg$$e{}kl z_1dYys6`@0Mw8nyBoEqwmuu@9wmQbji9B!#9cMa%FN(iqVgS^Pk=A z`f6Uv8FWpul9~-_&7@sT?YB)5MB#Bh5hr#8^0Q1XRV5$xc;QT$Ec>z{>WZ_bOziTT zQ;&O2jlYhlQ|>Uk?J|(+ZY7==JDI_uP;bo(>J;ilC^tX;Sw8JzT2NV^L3|p1N&4h6 z7fSt;5A;anVUs>{$=N}0e1mwu$C=(VQgd{>5NGg)61**Yke776-`h^#`M{w6^8}nR zZ+DDUm%>-^^9pl|nK#d54C^b?$G#MA@UZq#ve#Di5tfBL3wFBvCBJ;KgcUAY zl0@TIYv1?VjW=#%9jV`J{X$#~jf})suT9dgf5Tx-OxoGi!SkY*v?%wBs zQ)^uVPQ3Dr{d8P8Kd<^%(iLMfOZ0|*Gd?)iW=6&HhUh3859{mP^qp$@Zb!=T)}}Ed zDk*!^R@ateuPme+Qo4UyL#~z_Rw(;=uhps?KmMStd?sh=jx~l!-t=ewRa6wJV|`Cs z{*CCvDwfjn!pQrj(I11)SSz~KCpM4IvJy%%EKf&iR>yr2oX(eRI=D4Vf~=^Y$4tq( ze%s=+Rcnyb?ky)xW!8yOv`j}V3`2c$e0pRHx0LT$qA~FDz1l$1@tEoPo4Z9WH;HBM z)NAWoTlG}W_9;EG#HQGzfAX4acfQ`=a^p%0fhX=AWSO3O+v4xTif9|A=ypu&Wqr6) zrQ9thXdzk~KH^GVwq!W%SfJ zKli}YI}Nbv?{>hme-R1@4vAAJQLX&Kyao!bew0PEym#R+j7V;UJ8oYI6AbR ztM1u`$kKv91*jp?C?0;#)s$d;D|%L zjrdZ&AIIgGw8aKtm?9cVFW_iqF%p8=3sl6|3^BQiaBQb~m(aGI}YCt!EcX_B>uo_9Zanq0jI&$SN#e#@L6UGa1teT*m*c>rZ;cSr(wii^2sqmo)$4Us= zgGoSi@iye|NnAn+nmtJ{UyLI)FXAp0q0x&3_9Zy-T~ui(FQK5SMU?~v?5sGePn1VFWn ziazo*w2X#K{JG8DWd^8*hg#(fwBk1+)r4c^I0_Ab7^XTrBCuuwHGx`zqd6YBF_%Dc z1qE3%iHbhFBq~)4s0pTQ1||u?Y&YWN1he&^XP*#|u2L`#*L<&PVG{(5jY0 zoW;ljX#{htkE-b?hKDqcA?oE}D#r{(gI?N6H>kNp$?qc0Oj75wa;L8yb?5d|=<6LtOU)U=|AhJ#h*xLmlsDy<0 zB7hM|2U-J;Y2RfaHL{K- zmih(cS|})Q0oOxp3mu^t0vW)Jk${gx#cff=z`a!mwGv8vWh${hL02mUNyh$AalqRc zs52I@xK&V)D-NYe|J~uDlZZYw7)}y_p*9?upCUe61yF0(Lz_->G50iC#(uM)(88XW OK%BlbKEC-g3-%8cF!s6t delta 2938 zcmY+Edpy+H8^@cYT!#>CE`_Y<%a}1POC$=pY(x=RjB;%zmCLHoAlniOPpvRv-0wun zwQ*Uk5~)Sn%}Tc0x<`pk`}>+<+u!_g=KX%2&vU-#^_|z8#aO=7IKHag6k)lDxGUr9 z)~qQJ2k~GzFi~6!b{SHHA&8{tGOKrrS<*5T=0~3et-m+3sp92sw@5c3J`wvsXDz;< z9uEp6<{UsBs91tLaH7>7^4Gar_A(JuG^+x_6A@*$h$sdS*`jMNgd# ztOaM0Zjf2Z%qR1ouf_gK@%?ll|E6x8mwneWVHKr%1-1a)VNkRsqTOYFWotQ)({!YN{qFDy(joc-hX>}{#|Kh#k1X)H29A;x zd+b%pu)&Rz2VSeUlzcv%>X_c@suVOiAry9uRoHFq`BwdhtFyZ1dfA2Hx;cI#Dt5;JPTHh5$@vcFr5=57fw;fb?%6r`NL3Q>-SgC+c4-zA zwaLtj8Xj5^-oIz5q}qJ9L}C@5q^7knjOgzI7`F0FPX!ohKEHRCi#$5r>7ruEJlv*Z zqwG8+Ij1yM&0wunD)w$YMJ9{M{NdpHVz}DJ(!EQ_t-oyEOexVxv_!0B{JeeOo0k#n z{@?a#b|_yAcOH3=I=GjuDo|zQrb08CMD7u@AZN4 zx-&4;cs%d5S@UHqgg zL(^xk8AnxpZL`>0RuuhCNpOsE-_LR#&E&}W-zJV+w)!}5%)Vpa7_~56qkckXcK6k5 z=L+{Qhs+|MND$du7efQ%S#B;}flRf~#XD>hHM>WPW?_R@PG7PJ7~AtUn%-Ehk6pG~ zSm^u4)aDnL$T{j?QEGGcjg_sRxAthPRS>QpV~m?u7fMcXwia>jsh7_r#E0}}?G$kA z0D|NTz1kO{ZmWo2{)0@A-PW`<5Dy^q~BkypcAY~*ytzadelo^T`W?Z&>*Bq}iaun>XHho`NZsayTet+DIMPjG zu=MVQt6cLdu`Bb#j!52}R}EF_eLLN9#+=L~HZaQd-9lzcm?dxJqg?Dne1csI!s_fN z_2=%Y?VD${k5-*Yqw&?n56F`rKC=1K=iF&_0$%zfxJZ~5L^!`pasTm|M_nAt) zuB_Z9eTEY0{Kr39^W>tt75Toy3%|PROtvydKbZ{lxXS+cnZL$X@4lDNzn3#8WiSw3 z50Z_);$G1u8CvL=5mzIPh$$=#r5NM34IFShY7Qfg@{o>W1`l7bw9y(1ZdLob7OJ=8 zA~RC};;v)p;};#gu89n-{_VP15h1Qt9QJ0)qVm8cYzj=U_0Ug_c!mOJaxuaSh|KXIP~mxwFKTw;j-JfbMnZ>HPzd^SHId5~ z)y>mIqhFMjw*wt?#>3m-a~=u3aDfpQEpX4rP^lY^im>0EAF6PjSXDt-TYw=gcV4$Z z51m;-cOppVehrERVrZCGq7@QBst`k}9^5dk&=@81u%(cS9`SJ6LkzYSsUaB}H#F@* zgwsV-#9UQD=qu7hzkJb28WHr1F{J6aa=>*ES4=_|j^ern28wl%sTbVv+YH%W!k}G( zp_o;bhTtYyC@m2~y{n}S@Q;@eY-|?;DQ|J&nw3vpl(P5A7D8ZFNWDTdOP z5rgScb@ZHvd&{(ur60FiP)0@7%SZx&atv+o=Z;1CuLXBp53i~SG~wFE)Abb;f-aa; z97I5eN5@s5u>$Wc<2DejBq13F7mXQ22&hy;-aNfiX@Gips8FSYD97=THpEt8h{?m( zRhsDWG8(}C8)`@;fEy^kp@*uLQ3Zsnb9DXXs=|DG^a0L5EwgyZ0p=%Rt53fR7B$;{kA45 zTt+h7zm1`H%V+@PIt-l-0YaD_6y}L?H`n{W&5NM5?kM3Cz8XMwqagUyYoNoS_<#xY z)$1VTGhDQ8&?gwfOv4_y+kg>RIE5e-hPP~2&kS}YVuZ~w(&$R?$5$-~XwoFqbE&6k z2a=B9z7cY>5%S|~=m&~e4zycdX?&p?gQaB<|c?Ux!D`tQexdb$h zDe__RB4RMWA)#)rK~|J7=(J#HQzZA9Sy4ogY?6oa7BS@gr8E^O3V-7%&VNhNaJ*Fw zDMYOd%E6OX427+#3hZlBL&H2>Y7>XDHVjdsx#6WYQ}l8fzXq>%61skoi!B!gfzys5 kk7WEJk%zO%!XVWy4$dk6{YUwxaGNea%kj%zUH)!Ll*i9U>^D`q!F4N?EYtS%Shj(r?d#E56|a%*rr#!c zCiuSY1r1ib`~CH#(&CB(-Wr9%k;=)<^xomZ*C)C>I^rv4vI3!@?LdHvA9u?4=ZD2( z4#mUr+xK)dlsdUTxTv3tPrC|i%fY-d^~YV`Y>@XnJ>na;mVMFx($1edgu>VKGv9by zjru)3+Tg)Ss(vW{)k$l&w317oUL|wA&7}2{hI0$U1Vh;OFMgc)Bp()0E2$!v+P(Rz z!>aLM`tYb$`JjBg*YYz5I*+v~G1j{2yJ(aw)J2DO1}2{lGTCybi<_{?MkcSt`0QxN zx|sgw8%jFF9vf=hVh_T(a?$jv+qUPD0%)Adv=T#Kt;abF!zS7sFMo=mR!zx~#|wXQ zUc{12EPAuZ;}LtBw=5ZZ?dY#@M@(w(b801h^=7I!_u_}t9G`uaEp6084U*ecWDHb0)R}Rirp{X& zjwFwW-O#tz7U-(E$833E<-GOu-R4hkDkhfR<~GI2vNcn?e-F}0%k;Ej7SKPm@^~?C zpDmCxeczPM>aaL$=wofA67R+=i-}er2j8P9$HzVh1-5XT9;;JK8Gjs_dO;5I3&cb8 zqO#P}7n_Y0a%Jq#PRTha&-3TP7NAF%aOH@)0(x>9P}b zb}%A+hAwHOZ(RMEno$sYomd++OPLy zrhLCsPpMatxa1{U2Oa^k*UB@a8isO5Y2tq-S&}L!X0u; zvR?Qhr17lo<>URfNx~>1&i7!lbFd)WG`sxh@19RwC=;B2ETT$XwB%wJw>}@}Jn?Aq zV6}4d+IH8$;~v)J#Mp^+E`@sQv#?%)!9nHv0ktKmf2M|TdX3^!@$5w@(yo-6`)}!y z$a8(#bheA5@FNRyzvn4lsziNslL&X{rV_m3+|Eh*qu?1YH)9hMvd+pR!M^w#)2S?i}&yl#?4%kc2tmJMI2X0M%(9cio^GoeakjN0nk zavhXK^!JqnO=&7rNro55Pwuo{p6M?bVlQBNs`~J?@CB^_tiKBj!}M%=XiHv_?v%5Y z78gYJl|;YWbIL|>dre~fqYvza;&iK%QCbyo{|Haz%Gdp7A1*7YXqdw~cJ6w+<&1S> zh?D!K6f?P1B#O4#h^29uU#4%Te8HxRJH#~ypS@8ZOga)X^|{quEU!)`W2?c9-j(GK z3~V3JBa7D;dG=3SmG8(kc&hM7X=!kB&u?tAGp`x~eAx$Y+@t6>PZ^wh+f}aIIV_~8 zo5^Myy-Jnb_d;o?u;!lE(3gkCdm2O7!Ak2wdyjE=#kmXEpC+Cq?&VQNPn_}h2=3EW zTJ1U(F`4z`$|5I)n;}if(ro#&DPlFMG9qNjCuWbo2+Q8(PCqyKdP(|j&N}O_mNudi z;lfcj9`uZspV#~)@;__$Q!Wd|Xaa+_7^0PgAR&)|W~hX!!B8HKYU%unQob=tSOpBv zr4X8rW7pu%doJfI^x4Xj`E^@>s{m(!!PKsTCjBSc`&q5snUR>GkF4IFh zw|&22c9{;k@I&90(b41&-E?^+a&r6L%(+ZQ89(%+8wmmmi0|r(0uprp)+G+!SEy*) z4!)M{kb;^kIFj=qR1>7jwUNsldXyWW{CSiBlBYOyl~d5nY@`K!#Y-Xj0tsn*!7`ua z5L$s_LGWjVGsY!O9Z=)yAw_S3$z%!5r>uYdC z2_(=6N(fAuMH&d#8ljm$V6cop=oSUpupoxDnrI-y(^>^o!6GUKV0_I8(}0j`&M0~} z|4t*jW#P*;3hJIyTF_$t2selKW6BMMBo+^C0yL-`mTDh0oHE(QA=B%~5XMCOonLkC68p>&f0dN_yf;UuCFM_( z0*`hIx*G$su}o+u&>)sTbKt~EfO!W6orwirtTE&gI5CSWK&X?B+~WASyVD5u#_=Cs zn^=&8#Al@*|4rATfmu|ClU-Cy4C=eKVy3|B)&`4ioLIoT?v=zth(Kw#I@V8^AEKS+ r|34?YRUnL~hf?NM8sc*oz+;{QrU_V&Bch$*_l5K<5fMK>`-}P)!OJ!i delta 3090 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 { const pathsToTest = [basedir].concat(originalPaths); const resolution = runPnpResolutionOnArray(request, pathsToTest); - if (typeof resolution === `undefined`) + if (resolution == null) return getCandidates(); - if (resolution === null) - return pathsToTest.map(file => path.join(file, request)); - return [resolution.unqualifiedPath]; }; const paths = (request, basedir, getNodeModulePaths, opts) => { const pathsToTest = [basedir].concat(originalPaths); const resolution = runPnpResolutionOnArray(request, pathsToTest); - if (typeof resolution === `undefined`) - return getNodeModulePaths(); - - if (resolution === null) - return pathsToTest; + if (resolution == null) + return getNodeModulePaths().concat(originalPaths); // Stip the local named folder let nodeModules = path.dirname(resolution.packagePath); @@ -116,7 +110,7 @@ module.exports = function (_, opts) { opts.paths = function (request, basedir, getNodeModulePaths, opts) { if (isInsideIterator) - return getNodeModulePaths(); + return getNodeModulePaths().concat(originalPaths); return paths(request, basedir, getNodeModulePaths, opts); }; diff --git a/packages/plugin-compat/sources/patches/resolve.patch.ts b/packages/plugin-compat/sources/patches/resolve.patch.ts index 78493ab307ff..3df8c3118a8a 100644 --- a/packages/plugin-compat/sources/patches/resolve.patch.ts +++ b/packages/plugin-compat/sources/patches/resolve.patch.ts @@ -2,7 +2,7 @@ let patch: string; export function getPatch() { if (typeof patch === `undefined`) - patch = require(`zlib`).brotliDecompressSync(Buffer.from(`G1ETIIzURnVBnGa0VPvr81orV8AFIqdU0sqrdcVgCdukgAZwi8a50gLk1+99ZzEOlGB8s4acvWeXuS+tdEXZvf/9FpWJoilc6Q6J6jJSoh3LcLpdtPu9FIgS8MvfSzMYoNMZmgjFv02fu1wzv7rjy/uxz4D+3ipRSL9d7a+tby2vMqZ1NtjYWGeIH62vriZB/0y0R4+Ef9fEOfZExraSTqcT5mDirXa43/kAnaydLcMnp7tr+CAJ0D7GarF32/VAZm24KgaKOgkAeLP5OIMmuAqLtyepZZpJ0I8kOM9wGf8HzBcrFKs69DQvA+vDlgPikZ4AzdsRfmwR7y3H88Z+6iJCvkUW7YI0r0/qjTkJMknPjKnGEtM3/GVPblOGKzvGVEG/3ry219D+GFBi/0V5y/Y+5J+ne0oNjKAkqNsJziEsC9uIaCu3BAhKSXzNKKb2ShbfglceIpXKp7QPDEfjYfOEXhVZaj9YuqbW5CqJUFQbEv61vK5cMNH5OUskCmdDBLpP/M8uZ/mtaUl33NTlnzt6OwBXbRE12AV9hIeKySVaULr2d3Db1xA/XQjF17HKVjSBbnrYs/kyPyQJCKSajrMGvhyY9lPrV46lMsFLN32MA1/pnNPPjoMmjNgMYcaCM+fj74qymaJ4WTHxf1gdaYWmRcIe0tH90alG6ez/yA7jwYYtxuHWZdR+2HlMcddaHAV6QC/gXYHV0wnNv47I+5FGevzJFMqWSO/6U4mw3Jh2u4MkhB9O6113OiIlXLWd7bxkBpnsNDHsrPP4nXc3JK/9AofIZqMAJ+ZaM3/p2laHlVlwZHqJ7kVh9GyeneYEyMyukj7fZjyF2EM9xvkSAUqJJ5Em+VH+ebjmSCb2Sof38a6wa4FSMqqKkYiI+kAb54/8g5D97YO3D5633jnd/3yQkvtB1rzPHKhRQEyqhh/0tRF5dw5D0B7W9DcC0hE6cqQ8l0/Yh6X9oGZMOUBXzxTgQ9OXx8jQRaR/akDmFinFPLGIwnXMEE5UZyy86XMK4VuFEWh0dZ4VI+UP43fUdprpIOvgeSAguQRfPa4EorHKDz20artlpBT7n1GVgQD/qPuAYXE2LQTMOIZlKsYsGw+smX1uQLjUWwLjjnVGuctsONqUCJhFJPkeOkpBvP5bR7RKRPtlxlVsw3TVjbthCDj7GJnX7t2DnejrpNElkX9q7nnjLcsXPCoLsg3E9dcmrTSWvmFoOvYt0MT6qzWivVfqfsO1uhU0EbExmorhlrExlJbLj4mFSdXbmYKWU2JkNfxObx+IAmvmu/rtcAUKMT9g/F4NjNXAQdwpYJDrpkvj5SKCGIM8dxijKkar3I08QWINlCGbKR8eO8aUZARY/pBgH+3m0mEs2i+R27kvHB6CgfaxRoaubQgJhFG2qz68GCGk4a8OLPTuyJWtFQzqV7SN3yTPlgnTu8xGcmdZPuQm9QALLSj3YtClAOfeTM7KZM1ub2WI8FuopnrsyXDiX83HzgXnl4WijCPNNOFpJUBgm2EmfNpJ0vFnsI9vvIltvOVela4apm+5zd3uh8iGlwH1zrybDveunndO4O34b+escLZQkcQZeGwFEUj8+KBBBdVLng7eFS5FfRzh6iNyV6ZsPXVuMZFUeKQi2viy2BMZjEfDqF9JqVh0vIVzEdvul0uQ9SgEnZXGmYUX/wdkKgPXRloVdDlvJK8udQZBbR986wgb/oVh8wT0+q1GciF1GSEYAJCM2QBPwahTg+7BrYJVO05+bwN285fIX4hp39NCDVFsIrUmrIlZmer/Prd8kdQWj0k4D+viGB3JQyxr+iqYqgEUkvhczkrGtlr5hvDdkWwtaqLJe8Mgzhqots10eb6qcfs1vV74MtV1FE3zNszshCxmS3SeKfJy1FiSjodoYEVWLEWiFQG7FIItT5zv9ZBUTlcS2eUmpAgBES1TLR013xZj0TIpjlLasjhELo75d+wA`, `base64`)).toString(); + patch = require(`zlib`).brotliDecompressSync(Buffer.from(`G8MSIIzURnVBnObTcvb3XE6v2S9Qgc2K801Oa5otNKEtK8BINZNcaQHy+9/vf/WXBimwutXC33P2DPc64pps5rz7NGGWaOKNSPL4Y2KRE8twut2lFOIN+OXPtRmPMRhMTILib2bEQx43az2I5d3YS8Roa5UZpF/ujHb3Djd3GDvYUfvFYSUQ39vb2cmifp/rgB4J/65JK3wRBTvMBoNBmn3mbXC63/gbBkW/2IRPri0O8bcsRBsmarF328pAln04nyJFkwUAvNu934supAqLtyerZZpJ8I8suJHhf/ocMV+scKwa8NOiDKIPXw6Ex/EEZD6TEGaW8N5zvNHYF10l6Lfooj7D5W2k3dgvQSbp2Wv8TGOayS978gxlOLVjTGXs66ozewbrjwElLtyrYNnWTfzzdEutgROUFPVMhnMoy8EjJLLlWwIEoySxliim9kYW30JUHiPVyjt0iAw/ZpPmCbUCltYPnq6ZNblIKhTNhqS/oqC9iya5sGKZTOVsTEg34n92uZTf2iPpcZih8rPW8CzA+adIGmyCPcKdLMsBLShd+zuEbTrqpwuh+DLmracZcjPC5Sdf5odDAhKpFuOsQS67RT+1VgWWygSv3YwxDnylc04/PYuaMeIzhBkLrvs7e/OUzRTF56MmfY6rI63QtEjEQzq637zQqJ39nNhu3NmoRRhW/086bHGBUtx0PE0j3aEGvkdh9WJC8y8j8mqqke9/dQ5la+Q3ba4RlhvTbnfQhPDDab3tUifkjKuOsp13mXEmO00Mu88F/M67R7LXfoFDFLNtgCSWjWX+3Jn1371pJTK9xPBiMJafvDjtFyAzu8rxeQ0TKMQXNPs5xxiBOd+BRJP8KP88XPtJIbZKh/cdW8KvBUkpqKpGoiIaA32c3/JnQr4efXt85mXvidOvn/eU3Pase1typLYBalJ14mCso9h79nuMOuCa/kZAOkJHmTjP5RM2WNoPasZUAnT1TAE/NH25hUxcQv6hQWR/m1PKk4ooXMcM4SR1iYU3fUohvqk4RY2hbmTVVIXv6TvqO+0doOjgeVFAcom+RlwJQmOVH7pr1Q9LoJT6n1DeQEB+NHygsATbIwTcOKZlJsY8G4+suX1uQLjUWwLjjs0mvSvZcLTpIGAekeR7GCgl8eo3ndAqEe2XCav4huliHjdbIPBsGJuPX7lrO9HX1UbXRH5opOe1x6JsOSgHZR+EaxuXVhpLLxm6jk1LJtZfHSc6BKPun3CpYYVMJGwEUyk8MTGG0XL5MfEwaXpnc9TKnBmlGn6nHiGREc3ysn47XIBDzA+YvFdjZzVIEDcKGpS6PbUJehFRjEne8D0lVU1XuRtlgszq6pTNlQ/3MzNOEgCWPyTct22V2mEi2krizn5VDo9B19/X2DB3hCGRMM7ONbtnAcIx/OWB1u5uPbW1gsH8irXxT/IzG0PoXWYjhbMsH3KTuoOl5o17PulcgvsfTSnKFM354GWI8luqZnrswWjiXy3G+Vbyo1KMopFmmvBwNELgaS8z8dNZchx/Cl/xjddxhMcyqtzFyONb2Zdu90NkI8pAeufe7YlXrp53v8Dj/l8vWeVspRKBGXScBBPI/HinSTGmLDOGGOCIyH0JFdOZx0gWsacNlQLJMIrBhqRxXxHF/5pseWwejlAAvZ3klZSDSYY8mkToaWejXhgNomeGtx1DTLEUFMRkgF5yFB22WYdJnaWN14r1YJj81hGi45+jrADS5nYRhCiSlCJJ1nL8pYX+HDSMhdTEWyRcgHVp/IsUIZYMfT+YYncUQPgcxNGCHfZ88vDdrcUuaGIl6zhAsiaq7R5dfqrqXH/JcBhfjT8D0azayIyEz75Nxp6YkcyDxlJq3EXnJUpqDohJJOysL1t1uNiHESlvsxPb5cpbW0+ICZqJmUZus1BMW0F5IVBODLIo2zHHjA0=`, `base64`)).toString(); return patch; } diff --git a/packages/plugin-compat/tests/resolve.test.ts b/packages/plugin-compat/tests/resolve.test.ts index e0bdbb3ed8b1..b77dbd519992 100644 --- a/packages/plugin-compat/tests/resolve.test.ts +++ b/packages/plugin-compat/tests/resolve.test.ts @@ -1,35 +1,37 @@ import path from 'path'; import resolve from 'resolve'; +const FILENAME = path.basename(__filename); + describe(`ResolvePatch`, () => { - it(`works on local file`, () => { - expect( - resolve.sync(path.basename(__filename), {extensions: [`.ts`]}), - ).toEqual(__filename); + it(`should not match a local file that matches the specifier`, () => { + expect(() => + resolve.sync(FILENAME, {extensions: [`.ts`]}), + ).toThrow(`Cannot find module '${FILENAME}'`); expect( - resolve.sync(path.basename(__filename), { + () => resolve.sync(FILENAME, { extensions: [`.ts`], __skipPackageIterator: true, } as any), - ).toEqual(__filename); + ).toThrow(`Cannot find module '${FILENAME}'`); }); - it(`works on local file with paths option`, () => { + it(`should match a local file when using the paths option`, () => { expect( - resolve.sync(`extensions.ts`, { - paths: [path.join(__dirname, `../sources`)], + resolve.sync(FILENAME, { + paths: [__dirname], extensions: [`.ts`], }), - ).toEqual(path.join(__dirname, `../sources/extensions.ts`)); + ).toEqual(__filename); expect( - resolve.sync(`extensions.ts`, { - paths: [path.join(__dirname, `../sources`)], + resolve.sync(FILENAME, { + paths: [__dirname], extensions: [`.ts`], __skipPackageIterator: true, } as any), - ).toEqual(path.join(__dirname, `../sources/extensions.ts`)); + ).toEqual(__filename); }); it(`can require dependency in paths`, () => { diff --git a/yarn.lock b/yarn.lock index fdc3af6dfab9..1cd58a9feb84 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22737,30 +22737,30 @@ resolve@^2.0.0-next.3: "resolve@patch:resolve@1.9.0#~builtin": version: 1.9.0 - resolution: "resolve@patch:resolve@npm%3A1.9.0#~builtin::version=1.9.0&hash=b382c1" + resolution: "resolve@patch:resolve@npm%3A1.9.0#~builtin::version=1.9.0&hash=07638b" dependencies: path-parse: ^1.0.6 - checksum: deb4393d74bc8fe1f4d0025195dabcc29d2ca825689fc3e1726ca8ad44ef32ad13a9d1b5e87b09bd727201c8318518ae303eb5a0a4d336bacbc61deb7f8332ff + checksum: 8e86033057ad5b02195f40cc0edcf8ea4eb326e95ad977c6ec01344c9129d77e4f13f8d4512b39390dd8dff3c7aac2112de3912c38e3f884f0d51bf92865bf3f languageName: node linkType: hard "resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.12.0#~builtin, resolve@patch:resolve@^1.13.1#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.17.0#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.3.2#~builtin, resolve@patch:resolve@^1.9.0#~builtin": version: 1.20.0 - resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=b382c1" + resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b" dependencies: is-core-module: ^2.2.0 path-parse: ^1.0.6 - checksum: d060c878a7286fcfca5277b90fb12d01e7e075831e0710eef93a8ab7e25311303ab3783cd86d636127d2c7d61daee04aa8a1bc51afd8028110e082a6a2d49ee3 + checksum: a0dd7d16a8e47af23afa9386df2dff10e3e0debb2c7299a42e581d9d9b04d7ad5d2c53f24f1e043f7b3c250cbdc71150063e53d0b6559683d37f790b7c8c3cd5 languageName: node linkType: hard "resolve@patch:resolve@^2.0.0-next.3#~builtin": version: 2.0.0-next.3 - resolution: "resolve@patch:resolve@npm%3A2.0.0-next.3#~builtin::version=2.0.0-next.3&hash=b382c1" + resolution: "resolve@patch:resolve@npm%3A2.0.0-next.3#~builtin::version=2.0.0-next.3&hash=07638b" dependencies: is-core-module: ^2.2.0 path-parse: ^1.0.6 - checksum: 81e6cfa7c9fa5230edcb30de6917f263e71e7e11a06571aafc5aca76481b935f0ff6578e28204048ae5cab1f47eb00f3675c71d57d1cf379f0caf913bcf56019 + checksum: 21684b4d99a4877337cdbd5484311c811b3e8910edb5d868eec85c6e6550b0f570d911f9a384f9e176172d6713f2715bd0b0887fa512cb8c6aeece018de6a9f8 languageName: node linkType: hard From cf30c73742153a4769a1b1c2574b53a244113143 Mon Sep 17 00:00:00 2001 From: merceyz Date: Thu, 16 Sep 2021 23:49:17 +0200 Subject: [PATCH 2/5] test: check dependency can be resolved from `basedir` --- packages/plugin-compat/tests/resolve.test.ts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/packages/plugin-compat/tests/resolve.test.ts b/packages/plugin-compat/tests/resolve.test.ts index b77dbd519992..f20c59def6b7 100644 --- a/packages/plugin-compat/tests/resolve.test.ts +++ b/packages/plugin-compat/tests/resolve.test.ts @@ -34,7 +34,7 @@ describe(`ResolvePatch`, () => { ).toEqual(__filename); }); - it(`can require dependency in paths`, () => { + it(`can require a dependency from paths`, () => { expect( resolve.sync(`got`, { paths: [require.resolve(`@yarnpkg/core`)], @@ -48,4 +48,19 @@ describe(`ResolvePatch`, () => { } as any), ).toEqual(require.resolve(`got`, {paths: [require.resolve(`@yarnpkg/core`)]})); }); + + it(`can require a dependency from basedir`, () => { + expect( + resolve.sync(`got`, { + basedir: require.resolve(`@yarnpkg/core`), + }), + ).toEqual(require.resolve(`got`, {paths: [require.resolve(`@yarnpkg/core`)]})); + + expect( + resolve.sync(`got`, { + basedir: require.resolve(`@yarnpkg/core`), + __skipPackageIterator: true, + } as any), + ).toEqual(require.resolve(`got`, {paths: [require.resolve(`@yarnpkg/core`)]})); + }); }); From d1b465bdbac7c80fd9f771ce1a0687ebba4ba2bb Mon Sep 17 00:00:00 2001 From: merceyz Date: Fri, 17 Sep 2021 00:50:20 +0200 Subject: [PATCH 3/5] test: add test for relative resolve from cwd --- packages/plugin-compat/tests/resolve.test.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/packages/plugin-compat/tests/resolve.test.ts b/packages/plugin-compat/tests/resolve.test.ts index f20c59def6b7..1ff43cef88bd 100644 --- a/packages/plugin-compat/tests/resolve.test.ts +++ b/packages/plugin-compat/tests/resolve.test.ts @@ -63,4 +63,22 @@ describe(`ResolvePatch`, () => { } as any), ).toEqual(require.resolve(`got`, {paths: [require.resolve(`@yarnpkg/core`)]})); }); + + it(`non-absolute paths should return non-absolute result if it can be found from the cwd`, () => { + // This test covers https://github.com/yarnpkg/berry/issues/897 + // The behaviour is odd but the patch shouldn't change it + // The cwd when this test runs is the repo root + expect( + resolve.sync(`run-yarn.js`, { + paths: [`scripts`], + }), + ).toEqual(`scripts${path.sep}run-yarn.js`); + + expect( + resolve.sync(`run-yarn.js`, { + paths: [`scripts`], + __skipPackageIterator: true, + } as any), + ).toEqual(`scripts${path.sep}run-yarn.js`); + }); }); From 5149995fc646b9e91aebac9304808c9b4b235556 Mon Sep 17 00:00:00 2001 From: merceyz Date: Fri, 17 Sep 2021 00:59:24 +0200 Subject: [PATCH 4/5] chore: versions --- .yarn/versions/878d6065.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .yarn/versions/878d6065.yml diff --git a/.yarn/versions/878d6065.yml b/.yarn/versions/878d6065.yml new file mode 100644 index 000000000000..1494bd471424 --- /dev/null +++ b/.yarn/versions/878d6065.yml @@ -0,0 +1,23 @@ +releases: + "@yarnpkg/cli": patch + "@yarnpkg/plugin-compat": patch + +declined: + - "@yarnpkg/plugin-constraints" + - "@yarnpkg/plugin-dlx" + - "@yarnpkg/plugin-essentials" + - "@yarnpkg/plugin-init" + - "@yarnpkg/plugin-interactive-tools" + - "@yarnpkg/plugin-nm" + - "@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/core" + - "@yarnpkg/doctor" From f3800fb9617362207db323eb84309f533d383dde Mon Sep 17 00:00:00 2001 From: merceyz Date: Fri, 17 Sep 2021 01:15:04 +0200 Subject: [PATCH 5/5] chore: changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b614c170e49a..08b741d8a122 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ Yarn now accepts sponsorships! Please give a look at our [OpenCollective](https: - Hoisting algorithm speedup, impacts recurrent `node_modules` installs time. - CLI bundles built from sources output `commit` hash instead of `tree` hash as part of their version - `workspaces foreach run` now handles the fact that a script containing `:` only becomes global if it exists in one workspace. +- The PnP compatibility patch for `resolve` will no longer resolve missing modules to a file with the same name located next to the issuer ### Installs