Skip to content

Commit 4229941

Browse files
authored
fix(compat): update patch for [email protected] (#5210)
* fix(compat): update patch for `[email protected]` * deps: update typescript
1 parent 562776b commit 4229941

20 files changed

+2969
-746
lines changed

.pnp.cjs

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

.yarn/sdks/typescript/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "typescript",
3-
"version": "4.9.4-sdk",
3+
"version": "5.0.0-beta-sdk",
44
"main": "./lib/typescript.js",
55
"type": "commonjs"
66
}

.yarn/versions/53aa46d4.yml

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

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"eslint": "^8.2.0",
2626
"jest": "^29.2.1",
2727
"tslib": "^2.4.0",
28-
"typescript": "4.9.4"
28+
"typescript": "5.0.0-beta"
2929
},
3030
"resolutions": {
3131
"ink": "patch:ink@npm%3A3.0.8#~/.yarn/patches/ink-npm-3.0.8-3a8005f59f.patch",

packages/gatsby/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"typedoc": "patch:typedoc@npm%3A0.17.0-3#~/.yarn/patches/typedoc-npm-0.17.0-3-0ce05847cf.patch",
9090
"typedoc-neo-theme": "^1.0.7",
9191
"typedoc-plugin-yarn": "portal:./typedoc-plugin-yarn",
92-
"typescript": "4.9.4",
92+
"typescript": "5.0.0-beta",
9393
"unescape-html": "^1.1.0",
9494
"unfetch": "^4.1.0",
9595
"unified": "^7.1.0",

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

+21-8
Original file line numberDiff line numberDiff line change
@@ -116,37 +116,44 @@ const SLICES = [
116116
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.8-stable
117117
{
118118
from: `623a7ac5aa49250155d39e604b09b4d015468a9c`,
119-
to: `623a7ac5aa49250155d39e604b09b4d015468a9c`,
119+
to: `30840e0c2ad8e115c518f87379b7cb55fdf77f03`,
120120
onto: `60b5167a2a7015759d048cdd4655d1f66a8416a2`,
121121
range: `>=4.8.1-rc <4.8.4`,
122122
},
123123
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.8
124124
{
125125
from: `d3747e92c3cd2d1f98739382c14226a725df38fd`,
126-
to: `d3747e92c3cd2d1f98739382c14226a725df38fd`,
126+
to: `5b9a74243e47db6113e857eabe5d26589fa0b64f`,
127127
onto: `a614119c1921ca61d549a7eee65c0b8c69c28752`,
128128
range: `>=4.8.4 <4.9.1-beta`,
129129
},
130130
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.9-beta
131131
{
132132
from: `69c84aacfcea603c4d74721366cdcbbebd1c1681`,
133-
to: `69c84aacfcea603c4d74721366cdcbbebd1c1681`,
133+
to: `18b67922d3dcc5215541a38bf6417972270bf60f`,
134134
onto: `549b5429d4837344e8c99657109bb6538fd2dbb5`,
135135
range: `>=4.9.1-beta <4.9.2-rc`,
136136
},
137137
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.9-rc
138138
{
139139
from: `5613f8d8e30dfa9fb3da15e2b8432ed7e2347a12`,
140-
to: `5613f8d8e30dfa9fb3da15e2b8432ed7e2347a12`,
140+
to: `d3a8a86ce4774d607c5a4a225cc5b59b1f96f42f`,
141141
onto: `107f832b80df2dc97748021cb00af2b6813db75b`,
142142
range: `>=4.9.2-rc <4.9.4`,
143143
},
144144
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.9
145145
{
146146
from: `a0859a75a408ec95222a3f0175ba0644d60396f1`,
147-
to: `a0859a75a408ec95222a3f0175ba0644d60396f1`,
147+
to: `2b8a9b1c21a6d2c0aa26437c2636414be950aa79`,
148148
onto: `e2868216f637e875a74c675845625eb15dcfe9a2`,
149-
range: `>=4.9.4`,
149+
range: `>=4.9.4 <5.0.0-beta`,
150+
},
151+
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-5.0
152+
{
153+
from: `65bff6fadce4736bb9a77213ba8016f1ac7d25e5`,
154+
to: `65bff6fadce4736bb9a77213ba8016f1ac7d25e5`,
155+
onto: `dcad07ffd29854e2b93a86da0ba197f6eec21698`,
156+
range: `>=5.0.0-beta`,
150157
},
151158
];
152159

@@ -181,7 +188,13 @@ async function execFile(binary, args, {checkExitCode = true, ...opts} = {}) {
181188
console.log(`${binary} ${args.join(` `)}`);
182189

183190
return new Promise((resolve, reject) => {
184-
const child = cp.spawn(binary, args, opts);
191+
const child = cp.spawn(binary, args, {
192+
...opts,
193+
env: {
194+
...process.env,
195+
NODE_OPTIONS: undefined,
196+
},
197+
});
185198

186199
const outChunks = [];
187200
const allChunks = [];
@@ -299,7 +312,7 @@ async function buildRepository({from, to, onto}) {
299312
}
300313
}
301314

302-
await execFile(`./node_modules/.bin/gulp`, [`local`, `LKG`], TS_REPO_SPAWN);
315+
await execFile(fs.existsSync(`${TS_REPO}/node_modules/.bin/hereby`) ? `./node_modules/.bin/hereby` : `./node_modules/.bin/gulp`, [`local`, `LKG`], TS_REPO_SPAWN);
303316

304317
// It seems that in some circumstances the build can produce incorrect artifacts. When
305318
// that happens, the final binary is very small. We try to detect that.

0 commit comments

Comments
 (0)