Merge remote-tracking branch 'origin/master' into pr/clemyan/5355

yarnpkg · Apr 24, 2023 · 2153bb3 · 2153bb3
2 parents 20f1da8 + c70ff90
commit 2153bb3
Show file tree

Hide file tree

Showing 29 changed files with 2,610 additions and 114 deletions.
diff --git a/.github/workflows/e2e-typescript-workflow.yml b/.github/workflows/e2e-typescript-workflow.yml
@@ -48,7 +48,7 @@ jobs:
 
         yarn add ts-pnp left-pad @types/left-pad
 
-        echo '{"compilerOptions": {"baseUrl": ".", "strict": true, "esModuleInterop": true}}' > tsconfig.json
+        echo '{"compilerOptions": {"baseUrl": ".", "strict": true, "esModuleInterop": true, "lib": ["es2015"]}}' > tsconfig.json
 
         echo "const foo: number = 42;" | tee file.ts
         yarn tsc --noEmit

diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/...ypescript-patch-d8b3555c5b-1568732705.zip → ...-npm-5.1.0-beta-cd60421662-b48af60cec.zip b/...ypescript-patch-d8b3555c5b-1568732705.zip → ...-npm-5.1.0-beta-cd60421662-b48af60cec.zip
diff --git a/...pt-npm-5.0.1-rc-c8e0816ce2-282f8b515b.zip → ...ypescript-patch-5d9a25bdc8-cf8fb58b23.zip b/...pt-npm-5.0.1-rc-c8e0816ce2-282f8b515b.zip → ...ypescript-patch-5d9a25bdc8-cf8fb58b23.zip
diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "5.0.0-beta-sdk",
+  "version": "5.1.0-beta-sdk",
   "main": "./lib/typescript.js",
   "type": "commonjs"
 }
diff --git a/.yarn/versions/5fe011d9.yml b/.yarn/versions/5fe011d9.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"
diff --git a/.yarn/versions/75340348.yml b/.yarn/versions/75340348.yml
@@ -0,0 +1,27 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/plugin-pnp": patch
+  "@yarnpkg/pnp": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@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-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"
+  - "@yarnpkg/nm"
+  - "@yarnpkg/pnpify"
+  - "@yarnpkg/sdks"
diff --git a/.yarn/versions/87cc1e30.yml b/.yarn/versions/87cc1e30.yml
@@ -0,0 +1,5 @@
+releases:
+  "@yarnpkg/types": patch
+
+declined:
+  - "@yarnpkg/plugin-constraints"
diff --git a/.yarn/versions/fefcfcf9.yml b/.yarn/versions/fefcfcf9.yml
@@ -0,0 +1,36 @@
+releases:
+  "@yarnpkg/fslib": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-exec"
+  - "@yarnpkg/plugin-file"
+  - "@yarnpkg/plugin-git"
+  - "@yarnpkg/plugin-github"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-link"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm"
+  - "@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"
+  - vscode-zipfs
+  - "@yarnpkg/builder"
+  - "@yarnpkg/cli"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"
+  - "@yarnpkg/libzip"
+  - "@yarnpkg/nm"
+  - "@yarnpkg/pnp"
+  - "@yarnpkg/pnpify"
+  - "@yarnpkg/sdks"
+  - "@yarnpkg/shell"
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "jest": "^29.2.1",
     "pirates": "^4.0.5",
     "tslib": "^2.4.0",
-    "typescript": "5.0.1-rc"
+    "typescript": "5.1.0-beta"
   },
   "resolutions": {
     "ink": "patch:ink@npm%3A3.0.8#~/.yarn/patches/ink-npm-3.0.8-3a8005f59f.patch",

diff --git a/packages/gatsby/content/getting-started/editor-sdks.md b/packages/gatsby/content/getting-started/editor-sdks.md
@@ -70,6 +70,8 @@ Run the following command, which will generate a new directory called `.yarn/sdk
 yarn dlx @yarnpkg/sdks vim
 ```
 
+Note that if you're using `coc-tsserver` then you might want to check what version it uses by running `:CocCommand tsserver.chooseVersion` — make sure that "Local version" is selected, not "Bundled with coc-tsserver".
+
 #### Neovim Native LSP
 
 > **Note:** Requires Neovim version >=0.6

diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
@@ -89,7 +89,7 @@
     "typedoc": "patch:typedoc@npm%3A0.17.0-3#~/.yarn/patches/typedoc-npm-0.17.0-3-0ce05847cf.patch",
     "typedoc-neo-theme": "^1.0.7",
     "typedoc-plugin-yarn": "portal:./typedoc-plugin-yarn",
-    "typescript": "5.0.1-rc",
+    "typescript": "5.1.0-beta",
     "unescape-html": "^1.1.0",
     "unfetch": "^4.1.0",
     "unified": "^7.1.0",

diff --git a/packages/gatsby/static/configuration/yarnrc.json b/packages/gatsby/static/configuration/yarnrc.json
@@ -105,7 +105,7 @@
     },
     "enableColors": {
       "_package": "@yarnpkg/core",
-      "description": "If true (by default detects terminal capabilities), Yarn will format its pretty-print its output by using colors to differentiate important parts of its messages.",
+      "description": "If true (by default detects terminal capabilities), Yarn will format its pretty-print output by using colors to differentiate important parts of its messages.",
       "type": "boolean",
       "examples": [true]
     },
@@ -123,7 +123,7 @@
     },
     "enableImmutableCache": {
       "_package": "@yarnpkg/core",
-      "description": "If true, Yarn will refuse the change the cache in any way (whether it would add files or remove them) when running `yarn install`.",
+      "description": "If true, Yarn will refuse to change the cache in any way (whether it would add files or remove them) when running `yarn install`.",
       "type": "boolean",
       "default": false
     },
@@ -183,7 +183,7 @@
     },
     "enableTelemetry": {
       "_package": "@yarnpkg/core",
-      "description": "If true (the default outside of CI environments), Yarn will periodically send anonymous data to our servers tracking some usage information such as the number of dependency in your project, how many install you ran, etc. Consult the [Telemetry](/advanced/telemetry) page for more details about it.",
+      "description": "If true (the default outside of CI environments), Yarn will periodically send anonymous data to our servers tracking some usage information such as the number of dependencies in your project, how many installs you ran, etc. Consult the [Telemetry](/advanced/telemetry) page for more details about it.",
       "type": "boolean",
       "examples": [true]
     },
@@ -496,7 +496,7 @@
       "type": "object",
       "patternProperties": {
         "^(?:^[a-zA-Z][a-zA-Z0-9+-.]*:)?[^\\s]*$": {
-          "description": "This key represent the registry that's covered by the settings defined in the nested object. The protocol is optional (using `https://npm.pkg.github.com` would work just as well).",
+          "description": "This key represents the registry that's covered by the settings defined in the nested object. The protocol is optional (using `https://npm.pkg.github.com` would work just as well).",
           "type": "object",
           "properties": {
             "npmAlwaysAuth": {
@@ -716,7 +716,7 @@
     },
     "rcFilename": {
       "_package": "@yarnpkg/core",
-      "description": "This setting defines the name of the files that Yarn looks for when resolving the rc files. For obvious reasons this settings cannot be set within rc files, and must be defined in the environment using the `YARN_RC_FILENAME` variable.",
+      "description": "This setting defines the name of the files that Yarn looks for when resolving the rc files. For obvious reasons, this setting cannot be set within rc files, and must be defined in the environment using the `YARN_RC_FILENAME` variable.",
       "type": "string",
       "pattern": "^[^<>:;,?\"*|/]+$",
       "default": ".yarnrc.yml"

diff --git a/packages/plugin-compat/extra/typescript/gen-typescript-patch.js b/packages/plugin-compat/extra/typescript/gen-typescript-patch.js
@@ -160,7 +160,14 @@ const SLICES = [
     from: `2c85874875fdf1f1182733b99afe47604915bfec`,
     to: `9a2c1c80b05a5fbd5bc6d2bfcbaa617793a236ab`,
     onto: `89515ce7e31d0bfaef776ac25929a78015cceb82`,
-    range: `>=5.0.1-rc`,
+    range: `>=5.0.1-rc <5.1.0-beta`,
+  },
+  // https://github.com/merceyz/TypeScript/tree/merceyz/pnp-5.1
+  {
+    from: `a6ef895fb06014c416cce2f80969912ec5ea47d5`,
+    to: `a6ef895fb06014c416cce2f80969912ec5ea47d5`,
+    onto: `1c5cc6152322cd5b131b6e617e0947bcb068fc4a`,
+    range: `>=5.1.0-beta`,
   },
 ];
 

diff --git a/packages/plugin-compat/extra/typescript/patch-02c20e6d5668807b199467622bb0d6a8.diff b/packages/plugin-compat/extra/typescript/patch-02c20e6d5668807b199467622bb0d6a8.diff
@@ -1,6 +1,6 @@
 diff --git a/lib/tsc.js b/lib/tsc.js
 index 92bf3cf99..5df945acb 100644
-semver exclusivity >=5.0.1-rc
+semver exclusivity >=5.0.1-rc <5.1.0-beta
 --- a/lib/tsc.js
 +++ b/lib/tsc.js
 @@ -5153,6 +5153,9 @@ var sys = (() => {
@@ -329,7 +329,7 @@ semver exclusivity >=5.0.1-rc
          synchronizeProgram();
 diff --git a/lib/tsserver.js b/lib/tsserver.js
 index 20cb517f8..eeac46d44 100644
-semver exclusivity >=5.0.1-rc
+semver exclusivity >=5.0.1-rc <5.1.0-beta
 --- a/lib/tsserver.js
 +++ b/lib/tsserver.js
 @@ -8601,6 +8601,9 @@ var sys = (() => {
@@ -966,7 +966,7 @@ semver exclusivity >=5.0.1-rc
        this.installer.on("message", (m) => this.handleMessage(m));
 diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
 index a69e846e7..d1973b29c 100644
-semver exclusivity >=5.0.1-rc
+semver exclusivity >=5.0.1-rc <5.1.0-beta
 --- a/lib/tsserverlibrary.js
 +++ b/lib/tsserverlibrary.js
 @@ -6412,6 +6412,9 @@ ${lanes.join("\n")}
@@ -1649,7 +1649,7 @@ semver exclusivity >=5.0.1-rc
            if (!watchers.has(path)) {
 diff --git a/lib/typescript.js b/lib/typescript.js
 index 4b53c156e..54d44a8d6 100644
-semver exclusivity >=5.0.1-rc
+semver exclusivity >=5.0.1-rc <5.1.0-beta
 --- a/lib/typescript.js
 +++ b/lib/typescript.js
 @@ -6412,6 +6412,9 @@ ${lanes.join("\n")}
@@ -2230,7 +2230,7 @@ semver exclusivity >=5.0.1-rc
        kindPrecedence = {
 diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
 index 00afe537d..97a3bab6b 100644
-semver exclusivity >=5.0.1-rc
+semver exclusivity >=5.0.1-rc <5.1.0-beta
 --- a/lib/typingsInstaller.js
 +++ b/lib/typingsInstaller.js
 @@ -4587,6 +4587,9 @@ var sys = (() => {