Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(compat): update patch for typescript@4.8.4 and typescript@4.9.1-beta #4903

Merged
merged 2 commits into from
Sep 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 24 additions & 24 deletions .pnp.cjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"pasteImage.prefix": "/",
"typescript.enablePromptUseWorkspaceTsdk": true,
"search.exclude": {
"**/.pnp.*": true
"**/.pnp.*": true,
"**/.yarn": true
}
}
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion .yarn/sdks/typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "typescript",
"version": "4.8.1-rc-sdk",
"version": "4.9.1-beta-sdk",
"main": "./lib/typescript.js",
"type": "commonjs"
}
23 changes: 23 additions & 0 deletions .yarn/versions/1214c879.yml
Original file line number Diff line number Diff line change
@@ -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"
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ The following changes only affect people writing Yarn plugins:
### Compatibility

- The patched filesystem now supports `fchown`.
- Updates the PnP compatibility layer for TypeScript v4.8.4 and v4.9.1-beta.

### Shell

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"eslint": "^8.2.0",
"jest": "^28.1.3",
"tslib": "^2.4.0",
"typescript": "4.8.1-rc"
"typescript": "4.9.1-beta"
},
"resolutions": {
"ink": "patch:ink@npm%3A3.0.8#~/.yarn/patches/ink-npm-3.0.8-3a8005f59f.patch",
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"typedoc": "0.17.0-3",
"typedoc-neo-theme": "^1.0.7",
"typedoc-plugin-yarn": "portal:./typedoc-plugin-yarn",
"typescript": "4.8.1-rc",
"typescript": "4.9.1-beta",
"unescape-html": "^1.1.0",
"unfetch": "^4.1.0",
"unified": "^7.1.0",
Expand Down
20 changes: 18 additions & 2 deletions packages/plugin-compat/extra/typescript/gen-typescript-patch.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ const IGNORED_VERSIONS = new Set([
`4.0.0-beta`,
`4.3.0-beta`,
`4.4.0-beta`,
// Broken publish - missing files
`4.9.0-beta`,
]);

const SLICES = [
Expand Down Expand Up @@ -111,12 +113,26 @@ const SLICES = [
onto: `9a09c37878a45b06994485fdb510eb4d24587dcb`,
range: `>=4.8.0-beta <4.8.1-rc`,
},
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.8
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.8-stable
{
from: `623a7ac5aa49250155d39e604b09b4d015468a9c`,
to: `623a7ac5aa49250155d39e604b09b4d015468a9c`,
onto: `60b5167a2a7015759d048cdd4655d1f66a8416a2`,
range: `>=4.8.1-rc`,
range: `>=4.8.1-rc <4.8.4`,
},
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.8
{
from: `d3747e92c3cd2d1f98739382c14226a725df38fd`,
to: `d3747e92c3cd2d1f98739382c14226a725df38fd`,
onto: `a614119c1921ca61d549a7eee65c0b8c69c28752`,
range: `>=4.8.4 <4.9.1-beta`,
},
// https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.9
{
from: `69c84aacfcea603c4d74721366cdcbbebd1c1681`,
to: `69c84aacfcea603c4d74721366cdcbbebd1c1681`,
onto: `549b5429d4837344e8c99657109bb6538fd2dbb5`,
range: `>=4.9.1-beta`,
},
];

Expand Down