Skip to content

Commit ab8738f

Browse files
authored
fix(compat): typescript - improve PnP support (#5351)
1 parent 026d36e commit ab8738f

12 files changed

+933
-397
lines changed

.pnp.cjs

+14-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.yarn/sdks/typescript/lib/tsserver.js

+2
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ const moduleWrapper = tsserver => {
109109
str = `zip:${str}`;
110110
} break;
111111
}
112+
} else {
113+
str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
112114
}
113115
}
114116

.yarn/sdks/typescript/lib/tsserverlibrary.js

+2
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ const moduleWrapper = tsserver => {
109109
str = `zip:${str}`;
110110
} break;
111111
}
112+
} else {
113+
str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
112114
}
113115
}
114116

.yarn/versions/5f4aab94.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
releases:
2+
"@yarnpkg/cli": patch
3+
"@yarnpkg/plugin-compat": patch
4+
"@yarnpkg/sdks": patch
5+
6+
declined:
7+
- "@yarnpkg/plugin-constraints"
8+
- "@yarnpkg/plugin-dlx"
9+
- "@yarnpkg/plugin-essentials"
10+
- "@yarnpkg/plugin-init"
11+
- "@yarnpkg/plugin-interactive-tools"
12+
- "@yarnpkg/plugin-nm"
13+
- "@yarnpkg/plugin-npm-cli"
14+
- "@yarnpkg/plugin-pack"
15+
- "@yarnpkg/plugin-patch"
16+
- "@yarnpkg/plugin-pnp"
17+
- "@yarnpkg/plugin-pnpm"
18+
- "@yarnpkg/plugin-stage"
19+
- "@yarnpkg/plugin-typescript"
20+
- "@yarnpkg/plugin-version"
21+
- "@yarnpkg/plugin-workspace-tools"
22+
- "@yarnpkg/builder"
23+
- "@yarnpkg/core"
24+
- "@yarnpkg/doctor"

packages/plugin-compat/extra/typescript/gen-typescript-patch.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -144,21 +144,21 @@ const SLICES = [
144144
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.9
145145
{
146146
from: `a0859a75a408ec95222a3f0175ba0644d60396f1`,
147-
to: `2b8a9b1c21a6d2c0aa26437c2636414be950aa79`,
147+
to: `936e68ba96e004bd32e438d64ac720c3bfe5576b`,
148148
onto: `e2868216f637e875a74c675845625eb15dcfe9a2`,
149149
range: `>=4.9.4 <5.0.0-beta`,
150150
},
151151
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-5.0-beta
152152
{
153153
from: `65bff6fadce4736bb9a77213ba8016f1ac7d25e5`,
154-
to: `65bff6fadce4736bb9a77213ba8016f1ac7d25e5`,
154+
to: `6225be2771938c6a1fce825eabe66292e4ace489`,
155155
onto: `dcad07ffd29854e2b93a86da0ba197f6eec21698`,
156156
range: `>=5.0.0-beta <5.0.1-rc`,
157157
},
158158
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-5.0
159159
{
160160
from: `2c85874875fdf1f1182733b99afe47604915bfec`,
161-
to: `2c85874875fdf1f1182733b99afe47604915bfec`,
161+
to: `9a2c1c80b05a5fbd5bc6d2bfcbaa617793a236ab`,
162162
onto: `89515ce7e31d0bfaef776ac25929a78015cceb82`,
163163
range: `>=5.0.1-rc`,
164164
},

0 commit comments

Comments
 (0)