diff --git a/.pnp.cjs b/.pnp.cjs index 4dac491c71d1..291e624f290e 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -275,7 +275,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest-junit", "npm:10.0.0"], ["micromatch", "npm:4.0.2"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "linkType": "SOFT", }] @@ -9536,7 +9536,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["regexpp", "npm:3.0.0"], ["semver", "npm:7.3.2"], ["tsutils", "virtual:6bf47b2ad271104a08c6662f1f96de96ef03c78d95922079272ee031fd5d0421b9b0b316dde114b15e69129623793a188cc48c1b4e5db399597b2a456377dcfd#npm:3.17.1"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/eslint", @@ -9586,7 +9586,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["functional-red-black-tree", "npm:1.0.1"], ["regexpp", "npm:3.0.0"], ["tsutils", "virtual:5f54d2b1a1f006985d0fdd9ec5559662aecdedf927326cad5264ae047905157bfa09fd75849ec664b5eb3a2d1ec3e16961d252b89cc360af383c9a7c3760e002#npm:3.17.1"], - ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=d8b4e7"] ], "packagePeers": [ "@types/eslint", @@ -9737,7 +9737,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@typescript-eslint/typescript-estree", "virtual:afe155ec2f209914c9c5f8d2834bb420298a95f14e8b5381b5f4d510e40e286dab5bffe7ae67cdc28514ab80eaded9418e0f1fced15dbd23aa9a67187b4e58b3#npm:4.11.1"], ["debug", "virtual:ebe93d6532e43d78779479b0dabfe2d284fd2cc037fde073604e57fc384c1044e905ed82c7d081310a0af68c672c6a0a67f8fdbca758f0bd26d9fc4456fbf1af#npm:4.3.2"], ["eslint", "npm:6.8.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/eslint", @@ -9776,7 +9776,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@typescript-eslint/typescript-estree", "virtual:ad13b5ab21f801b540b464ce4369c0ca688e0d6353ac7e356522b6c6dfb665757f139d77305652f9641cd74ed7e4db3d56c6d652029b271de6c7ee05c9c4d4f5#npm:2.29.0"], ["eslint", null], ["eslint-visitor-keys", "npm:1.1.0"], - ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=d8b4e7"] ], "packagePeers": [ "@types/eslint", @@ -9874,7 +9874,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["lodash", "npm:4.17.20"], ["semver", "npm:6.3.0"], ["tsutils", "virtual:5f54d2b1a1f006985d0fdd9ec5559662aecdedf927326cad5264ae047905157bfa09fd75849ec664b5eb3a2d1ec3e16961d252b89cc360af383c9a7c3760e002#npm:3.17.1"], - ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=d8b4e7"] ], "packagePeers": [ "@types/typescript", @@ -9894,7 +9894,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["lodash", "npm:4.17.20"], ["semver", "npm:7.3.2"], ["tsutils", "virtual:6bf47b2ad271104a08c6662f1f96de96ef03c78d95922079272ee031fd5d0421b9b0b316dde114b15e69129623793a188cc48c1b4e5db399597b2a456377dcfd#npm:3.17.1"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "typescript" @@ -10293,7 +10293,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["terser-webpack-plugin", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.4"], ["ts-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:7.0.5"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.1.1"], ["webpack-merge", "npm:4.2.2"] @@ -10331,7 +10331,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["terser-webpack-plugin", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.4"], ["ts-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:7.0.5"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.1.1"], ["webpack-merge", "npm:4.2.2"] @@ -10369,7 +10369,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["terser-webpack-plugin", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.4"], ["ts-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:7.0.5"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.1.1"], ["webpack-merge", "npm:4.2.2"] @@ -10406,7 +10406,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["terser-webpack-plugin", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.4"], ["ts-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:7.0.5"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.1.1"], ["webpack-merge", "npm:4.2.2"] @@ -10453,7 +10453,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10500,7 +10500,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10547,7 +10547,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10594,7 +10594,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10641,7 +10641,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10688,7 +10688,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10735,7 +10735,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10782,7 +10782,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10829,7 +10829,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10876,7 +10876,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10923,7 +10923,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10970,7 +10970,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -11016,7 +11016,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["yup", "npm:0.32.9"] ], "linkType": "SOFT", @@ -11098,7 +11098,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["micromatch", "npm:4.0.2"], ["p-limit", "npm:2.2.0"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "linkType": "SOFT", }] @@ -11148,7 +11148,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["eslint", "npm:6.8.0"], ["eslint-plugin-arca", "npm:0.10.0"], ["eslint-plugin-react", "virtual:4b728ee22ccd3ae66b83e3be6d39acfb5b7a775112cc78b6b4322feb849fcfe6e39510452356cb4477dc6089bee57db31d02bbfb03b9fc8e914effa16a4145be#npm:7.20.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/eslint", @@ -11271,7 +11271,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["typedoc", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:0.17.0-3"], ["typedoc-neo-theme", "npm:1.0.7"], ["typedoc-plugin-yarn", "portal:./typedoc-plugin-yarn::locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["unescape-html", "npm:1.1.0"], ["unfetch", "npm:4.1.0"], ["unified", "npm:7.1.0"], @@ -11374,7 +11374,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest-junit", "npm:10.0.0"], ["micromatch", "npm:4.0.2"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "linkType": "SOFT", }] @@ -11737,7 +11737,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["node-emoji", "npm:1.10.0"], ["tau-prolog", "npm:0.2.66"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "linkType": "SOFT", }] @@ -12495,7 +12495,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/core", "workspace:packages/yarnpkg-core"], ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "linkType": "SOFT", }] @@ -12944,7 +12944,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["react", "npm:16.13.1"], ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "linkType": "SOFT", }] @@ -15229,7 +15229,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15251,7 +15251,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15273,7 +15273,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15295,7 +15295,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15317,7 +15317,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15339,7 +15339,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15361,7 +15361,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15383,7 +15383,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15405,7 +15405,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15427,7 +15427,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15449,7 +15449,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15471,7 +15471,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15493,7 +15493,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15513,7 +15513,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:3.0.0-rc.10"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "linkType": "SOFT", }] @@ -15533,7 +15533,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["algoliasearch", "npm:4.2.0"], ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "linkType": "SOFT", }] @@ -15557,7 +15557,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["react", "npm:16.13.1"], ["semver", "npm:7.3.2"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "linkType": "SOFT", }] @@ -15577,7 +15577,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["p-limit", "npm:2.2.0"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "linkType": "SOFT", }] @@ -15594,7 +15594,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/monorepo", "workspace:."], ["resolve.exports", "npm:1.0.2"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["webpack", "virtual:16110bda3ce959c103b1979c5d750ceb8ac9cfbd2049c118b6278e46e65aa65fd17e71e04a0ce5f75b7ca3203efd8e9c9b03c948a76c7f4bca807539915b5cfc#npm:5.1.1"], ["webpack-cli", "virtual:16110bda3ce959c103b1979c5d750ceb8ac9cfbd2049c118b6278e46e65aa65fd17e71e04a0ce5f75b7ca3203efd8e9c9b03c948a76c7f4bca807539915b5cfc#npm:4.0.0-beta.8"] ], @@ -15621,7 +15621,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["eslint", "npm:6.8.0"], ["lodash", "npm:4.17.20"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/eslint", @@ -15649,7 +15649,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["eslint", "npm:6.8.0"], ["lodash", "npm:4.17.20"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/eslint", @@ -15675,7 +15675,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["eslint", "npm:6.8.0"], ["lodash", "npm:4.17.20"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "linkType": "SOFT", }] @@ -23225,7 +23225,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["schema-utils", "npm:1.0.0"], ["semver", "npm:5.7.1"], ["tapable", "npm:1.1.3"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["vue-template-compiler", null], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.1.1"] ], @@ -23884,7 +23884,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["strict-ui", "npm:0.1.3"], ["subscriptions-transport-ws", "virtual:e721af34745e2aded5d4d499d50f62b576dd2080eb1f2bb52977c4bfa58f87cba61c1a822a17998b163819d9d9ffb45f4e1cfaad85154aa3bbe0834010be88eb#npm:0.9.16"], ["theme-ui", "npm:0.4.0-highlight.0"], - ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=d8b4e7"], ["urql", "virtual:e721af34745e2aded5d4d499d50f62b576dd2080eb1f2bb52977c4bfa58f87cba61c1a822a17998b163819d9d9ffb45f4e1cfaad85154aa3bbe0834010be88eb#npm:1.9.8"], ["yup", "npm:0.29.1"] ], @@ -30892,7 +30892,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["react-dom", "virtual:118b26a6cee620b5aa3e7e8d8b8e34cd9e486f75b92701001168da9be550fadd8c9d9b12643c642e2d528c2624fd8fe7e128eec9d715340efac44400432a0e0c#npm:16.13.1"], ["react-lifecycles-compat", "npm:3.0.4"], ["shallowequal", "npm:1.1.0"], - ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=d8b4e7"] ], "packagePeers": [ "@types/react-dom", @@ -39578,7 +39578,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["loader-utils", "npm:1.4.0"], ["micromatch", "npm:4.0.2"], ["semver", "npm:6.3.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/typescript", @@ -39652,7 +39652,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["tsutils", "virtual:5f54d2b1a1f006985d0fdd9ec5559662aecdedf927326cad5264ae047905157bfa09fd75849ec664b5eb3a2d1ec3e16961d252b89cc360af383c9a7c3760e002#npm:3.17.1"], ["@types/typescript", null], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=d8b4e7"] ], "packagePeers": [ "@types/typescript", @@ -39666,7 +39666,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["tsutils", "virtual:6bf47b2ad271104a08c6662f1f96de96ef03c78d95922079272ee031fd5d0421b9b0b316dde114b15e69129623793a188cc48c1b4e5db399597b2a456377dcfd#npm:3.17.1"], ["@types/typescript", null], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@types/typescript", @@ -39904,7 +39904,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["typedoc-default-themes", "npm:0.8.0-0"], ["typedoc-neo-theme", "npm:1.0.7"], ["typedoc-plugin-yarn", "portal:./typedoc-plugin-yarn::locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "packagePeers": [ "@strictsoftware/typedoc-plugin-monorepo", @@ -39933,7 +39933,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["typedoc-default-themes", "npm:0.8.0-0"], ["typedoc-neo-theme", null], ["typedoc-plugin-yarn", "portal:./typedoc-plugin-yarn::locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"], - ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=d8b4e7"] ], "packagePeers": [ "@strictsoftware/typedoc-plugin-monorepo", @@ -39961,7 +39961,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["typedoc-default-themes", "npm:0.7.2"], ["typedoc-neo-theme", "npm:1.0.7"], ["typedoc-plugin-yarn", null], - ["typescript", "patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=d8b4e7"] ], "packagePeers": [ "@strictsoftware/typedoc-plugin-monorepo", @@ -40011,30 +40011,30 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageDependencies": [ ["typedoc-plugin-yarn", "portal:./typedoc-plugin-yarn::locator=%40yarnpkg%2Fgatsby%40workspace%3Apackages%2Fgatsby"], ["typedoc", "virtual:258c95d7dd1da51c9c624f238593e0bc1c34b7bd8de0b85fefd9552f2220a4555cad458eb72d96f0c7b341784726b6a8e9c8b4e838a9d27aac3796b29de01981#npm:0.17.0-3"], - ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=d8b4e7"] ], "linkType": "SOFT", }] ]], ["typescript", [ - ["patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=ea7f47", { - "packageLocation": "./.yarn/cache/typescript-patch-1bfd6f21e9-fb62f24bfd.zip/node_modules/typescript/", + ["patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=d8b4e7", { + "packageLocation": "./.yarn/cache/typescript-patch-d2df8dc698-fb62f24bfd.zip/node_modules/typescript/", "packageDependencies": [ - ["typescript", "patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=d8b4e7"] ], "linkType": "HARD", }], - ["patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=ea7f47", { - "packageLocation": "./.yarn/cache/typescript-patch-c1e370d24c-ac6b67d951.zip/node_modules/typescript/", + ["patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=d8b4e7", { + "packageLocation": "./.yarn/cache/typescript-patch-d32c42dc9f-ac6b67d951.zip/node_modules/typescript/", "packageDependencies": [ - ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=d8b4e7"] ], "linkType": "HARD", }], - ["patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47", { - "packageLocation": "./.yarn/cache/typescript-patch-4079614479-ca7a161bc6.zip/node_modules/typescript/", + ["patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7", { + "packageLocation": "./.yarn/cache/typescript-patch-6b7c9f6752-3d3dec06ba.zip/node_modules/typescript/", "packageDependencies": [ - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"] + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"] ], "linkType": "HARD", }] @@ -41162,7 +41162,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/pnpify", "virtual:c44c4b6360dc34d25da6d32e39622e7e40f36f37b99dc66b6ebbd615fdd49465f496bf10f81b6fa5f71b95443fda61174ad51d2799fc7ca433af9a9666cd0f37#workspace:packages/yarnpkg-pnpify"], ["ts-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:7.0.5"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47"], + ["typescript", "patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7"], ["vsce", "npm:1.85.1"], ["webpack", "virtual:4bb0e72ae00ec402a28e80560124ee13357b1a5221665b7175877ddc6b8b2b98eebe4584a111245801ecf7cecb9de577d076505c0dbcf9292aaff35440a2302f#npm:5.1.1"], ["webpack-cli", "virtual:4bb0e72ae00ec402a28e80560124ee13357b1a5221665b7175877ddc6b8b2b98eebe4584a111245801ecf7cecb9de577d076505c0dbcf9292aaff35440a2302f#npm:4.0.0-beta.8"] diff --git a/.yarn/cache/typescript-npm-4.3.0-beta-d5555c96df-c165f915ad.zip b/.yarn/cache/typescript-npm-4.3.0-beta-d5555c96df-c165f915ad.zip deleted file mode 100644 index 02efa592a7fa..000000000000 Binary files a/.yarn/cache/typescript-npm-4.3.0-beta-d5555c96df-c165f915ad.zip and /dev/null differ diff --git a/.yarn/cache/typescript-npm-4.3.2-d108b26f78-c2a86fa03c.zip b/.yarn/cache/typescript-npm-4.3.2-d108b26f78-c2a86fa03c.zip new file mode 100644 index 000000000000..aa820d056421 Binary files /dev/null and b/.yarn/cache/typescript-npm-4.3.2-d108b26f78-c2a86fa03c.zip differ diff --git a/.yarn/cache/typescript-patch-4079614479-ca7a161bc6.zip b/.yarn/cache/typescript-patch-4079614479-ca7a161bc6.zip deleted file mode 100644 index 174f714ac9ba..000000000000 Binary files a/.yarn/cache/typescript-patch-4079614479-ca7a161bc6.zip and /dev/null differ diff --git a/.yarn/cache/typescript-patch-6b7c9f6752-3d3dec06ba.zip b/.yarn/cache/typescript-patch-6b7c9f6752-3d3dec06ba.zip new file mode 100644 index 000000000000..29061995f0a0 Binary files /dev/null and b/.yarn/cache/typescript-patch-6b7c9f6752-3d3dec06ba.zip differ diff --git a/.yarn/cache/typescript-patch-1bfd6f21e9-fb62f24bfd.zip b/.yarn/cache/typescript-patch-d2df8dc698-fb62f24bfd.zip similarity index 100% rename from .yarn/cache/typescript-patch-1bfd6f21e9-fb62f24bfd.zip rename to .yarn/cache/typescript-patch-d2df8dc698-fb62f24bfd.zip diff --git a/.yarn/cache/typescript-patch-c1e370d24c-ac6b67d951.zip b/.yarn/cache/typescript-patch-d32c42dc9f-ac6b67d951.zip similarity index 100% rename from .yarn/cache/typescript-patch-c1e370d24c-ac6b67d951.zip rename to .yarn/cache/typescript-patch-d32c42dc9f-ac6b67d951.zip diff --git a/.yarn/versions/e3086e76.yml b/.yarn/versions/e3086e76.yml new file mode 100644 index 000000000000..554296cf4517 --- /dev/null +++ b/.yarn/versions/e3086e76.yml @@ -0,0 +1,26 @@ +releases: + "@yarnpkg/cli": patch + "@yarnpkg/plugin-compat": minor + +declined: + - "@yarnpkg/plugin-constraints" + - "@yarnpkg/plugin-dlx" + - "@yarnpkg/plugin-essentials" + - "@yarnpkg/plugin-exec" + - "@yarnpkg/plugin-init" + - "@yarnpkg/plugin-interactive-tools" + - "@yarnpkg/plugin-node-modules" + - "@yarnpkg/plugin-npm-cli" + - "@yarnpkg/plugin-pack" + - "@yarnpkg/plugin-patch" + - "@yarnpkg/plugin-pnp" + - "@yarnpkg/plugin-stage" + - "@yarnpkg/plugin-typescript" + - "@yarnpkg/plugin-version" + - "@yarnpkg/plugin-workspace-tools" + - vscode-zipfs + - "@yarnpkg/builder" + - "@yarnpkg/core" + - "@yarnpkg/doctor" + - "@yarnpkg/pnp" + - "@yarnpkg/pnpify" diff --git a/package.json b/package.json index b3af60f4b699..d790f120dc09 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "jest-junit": "^10.0.0", "micromatch": "^4.0.2", "tslib": "^1.13.0", - "typescript": "beta" + "typescript": "^4.3.2" }, "resolutions": { "yoga-layout-prebuilt": "patch:yoga-layout-prebuilt@1.10.0#./.yarn/patches/yoga-layout-prebuilt.patch" diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index 661b14dde1a0..7faff958997d 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -78,7 +78,7 @@ "typedoc": "next", "typedoc-neo-theme": "^1.0.7", "typedoc-plugin-yarn": "portal:./typedoc-plugin-yarn", - "typescript": "beta", + "typescript": "^4.3.2", "unescape-html": "^1.1.0", "unfetch": "^4.1.0", "unified": "^7.1.0", diff --git a/packages/plugin-compat/extra/typescript/gen-typescript-patch.js b/packages/plugin-compat/extra/typescript/gen-typescript-patch.js index fc8d71afe9be..cd4cc1dc9e73 100644 --- a/packages/plugin-compat/extra/typescript/gen-typescript-patch.js +++ b/packages/plugin-compat/extra/typescript/gen-typescript-patch.js @@ -55,9 +55,9 @@ const SLICES = [{ onto: `bfc55b5`, range: `>=4.2 <4.3`, }, { - from: `320a959`, - to: `508e98b`, - onto: `f9b35cd`, + from: `ef7f019`, + to: `ef7f019`, + onto: `28e3e6f`, range: `>=4.3`, }]; diff --git a/packages/plugin-compat/extra/typescript/patch-98f5e425be004a406efe4231fdfb46c7.diff b/packages/plugin-compat/extra/typescript/patch-230c01745969194f9decadfd780d08d0.diff similarity index 96% rename from packages/plugin-compat/extra/typescript/patch-98f5e425be004a406efe4231fdfb46c7.diff rename to packages/plugin-compat/extra/typescript/patch-230c01745969194f9decadfd780d08d0.diff index d1b1652c85fb..84907c9de280 100644 --- a/packages/plugin-compat/extra/typescript/patch-98f5e425be004a406efe4231fdfb46c7.diff +++ b/packages/plugin-compat/extra/typescript/patch-230c01745969194f9decadfd780d08d0.diff @@ -1,5 +1,5 @@ diff --git a/lib/tsc.js b/lib/tsc.js -index 8e68a1124..4fd64540e 100644 +index 83f54758a..75f5bd1f3 100644 semver exclusivity >=4.3 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -13,7 +13,7 @@ semver exclusivity >=4.3 if (platform === "win32" || platform === "win64") { return false; } -@@ -32483,21 +32486,52 @@ var ts; +@@ -32586,21 +32589,52 @@ var ts; } } ts.getEffectiveTypeRoots = getEffectiveTypeRoots; @@ -66,21 +66,21 @@ semver exclusivity >=4.3 + return __spreadArray(__spreadArray([], nmTypes), pnpTypes); + } + } - function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference) { + function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference, cache) { var traceEnabled = isTraceEnabled(options, host); if (redirectedReference) { -@@ -32577,7 +32611,9 @@ var ts; +@@ -32707,7 +32741,9 @@ var ts; } - var result = void 0; + var result_4; if (!ts.isExternalModuleNameRelative(typeReferenceDirectiveName)) { - var searchResult = loadModuleFromNearestNodeModulesDirectory(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState, undefined, undefined); + var searchResult = getPnpApi(initialLocationForSecondaryLookup) + ? tryLoadModuleUsingPnpResolution(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState) + : loadModuleFromNearestNodeModulesDirectory(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState, undefined, undefined); - result = searchResult && searchResult.value; + result_4 = searchResult && searchResult.value; } else { -@@ -32950,9 +32986,12 @@ var ts; +@@ -33146,9 +33182,12 @@ var ts; if (traceEnabled) { trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder_target_file_type_1, moduleName, Extensions[extensions]); } @@ -95,7 +95,7 @@ semver exclusivity >=4.3 var resolvedValue = resolved_1.value; if (!compilerOptions.preserveSymlinks && resolvedValue && !resolvedValue.originalPath) { var path = realPath(resolvedValue.path, host, traceEnabled); -@@ -33240,6 +33279,14 @@ var ts; +@@ -33459,6 +33498,14 @@ var ts; } function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state) { var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName)); @@ -110,7 +110,7 @@ semver exclusivity >=4.3 var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state); if (packageInfo) { var fromFile = loadModuleFromFile(extensions, candidate, !nodeModulesDirectoryExists, state); -@@ -33254,9 +33301,12 @@ var ts; +@@ -33473,9 +33520,12 @@ var ts; loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.packageJsonContent, packageInfo && packageInfo.versionPaths); return withPackageId(packageInfo, pathAndExtension); }; @@ -125,7 +125,7 @@ semver exclusivity >=4.3 packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state); if (packageInfo && packageInfo.versionPaths) { if (state.traceEnabled) { -@@ -33393,6 +33443,47 @@ var ts; +@@ -33612,6 +33662,47 @@ var ts; function toSearchResult(value) { return value !== undefined ? { value: value } : undefined; } @@ -173,7 +173,7 @@ semver exclusivity >=4.3 })(ts || (ts = {})); var ts; (function (ts) { -@@ -89054,6 +89145,7 @@ var ts; +@@ -89033,6 +89124,7 @@ var ts; ConfigFileProgramReloadLevel[ConfigFileProgramReloadLevel["None"] = 0] = "None"; ConfigFileProgramReloadLevel[ConfigFileProgramReloadLevel["Partial"] = 1] = "Partial"; ConfigFileProgramReloadLevel[ConfigFileProgramReloadLevel["Full"] = 2] = "Full"; @@ -181,7 +181,7 @@ semver exclusivity >=4.3 })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {})); function updateSharedExtendedConfigFileWatcher(projectPath, options, extendedConfigFilesMap, createExtendedConfigFileWatch, toPath) { var _a; -@@ -94516,6 +94608,25 @@ var ts; +@@ -94524,6 +94616,25 @@ var ts; return undefined; } var parts = getNodeModulePathParts(path); @@ -207,7 +207,7 @@ semver exclusivity >=4.3 if (!parts) { return undefined; } -@@ -94543,14 +94654,18 @@ var ts; +@@ -94551,14 +94662,18 @@ var ts; if (isRedirect && !isPackageRootPath) { return undefined; } @@ -233,7 +233,7 @@ semver exclusivity >=4.3 function tryDirectoryWithPackageJson(packageRootIndex) { var packageRootPath = path.substring(0, packageRootIndex); var packageJsonPath = ts.combinePaths(packageRootPath, "package.json"); -@@ -95272,6 +95387,10 @@ var ts; +@@ -95280,6 +95395,10 @@ var ts; if (configFileName) { configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile); } @@ -244,7 +244,7 @@ semver exclusivity >=4.3 var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost); ts.setGetSourceFileAsHashVersioned(compilerHost, host); var getNewSourceFile = compilerHost.getSourceFile; -@@ -95343,6 +95462,10 @@ var ts; +@@ -95351,6 +95470,10 @@ var ts; configFileWatcher.close(); configFileWatcher = undefined; } @@ -255,7 +255,7 @@ semver exclusivity >=4.3 extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear(); extendedConfigCache = undefined; if (sharedExtendedConfigFileWatchers) { -@@ -95375,7 +95498,8 @@ var ts; +@@ -95383,7 +95506,8 @@ var ts; function getCurrentProgram() { return builderProgram && builderProgram.getProgramOrUndefined(); } @@ -265,7 +265,7 @@ semver exclusivity >=4.3 writeLog("Synchronizing program"); clearInvalidateResolutionsOfFailedLookupLocations(); var program = getCurrentBuilderProgram(); -@@ -95385,7 +95509,7 @@ var ts; +@@ -95393,7 +95517,7 @@ var ts; resolutionCache.clear(); } } @@ -274,7 +274,7 @@ semver exclusivity >=4.3 if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) { if (hasChangedConfigFileParsingErrors) { builderProgram = createProgram(undefined, undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences); -@@ -95563,6 +95687,12 @@ var ts; +@@ -95571,6 +95695,12 @@ var ts; reloadLevel = ts.ConfigFileProgramReloadLevel.Full; scheduleProgramUpdate(); } @@ -287,7 +287,7 @@ semver exclusivity >=4.3 function updateProgramWithWatchStatus() { timerToUpdateProgram = undefined; reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation); -@@ -95578,6 +95708,10 @@ var ts; +@@ -95586,6 +95716,10 @@ var ts; ts.perfLogger.logStartUpdateProgram("FullConfigReload"); reloadConfigFile(); break; @@ -299,11 +299,11 @@ semver exclusivity >=4.3 ts.perfLogger.logStartUpdateProgram("SynchronizeProgram"); synchronizeProgram(); diff --git a/lib/tsserver.js b/lib/tsserver.js -index 0d581ad61..c1dbea5bc 100644 +index 58028943d..ad0cf1001 100644 semver exclusivity >=4.3 --- a/lib/tsserver.js +++ b/lib/tsserver.js -@@ -7326,6 +7326,11 @@ var ts; +@@ -7338,6 +7338,11 @@ var ts; : new Buffer(input, encoding); } function isFileSystemCaseSensitive() { @@ -315,7 +315,7 @@ semver exclusivity >=4.3 // win32\win64 are case insensitive platforms if (platform === "win32" || platform === "win64") { return false; -@@ -39887,24 +39892,56 @@ var ts; +@@ -40003,24 +40008,56 @@ var ts; ts.getEffectiveTypeRoots = getEffectiveTypeRoots; /** * Returns the path to every node_modules/@types directory from some ancestor directory. @@ -376,18 +376,18 @@ semver exclusivity >=4.3 /** * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown. * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups -@@ -39991,7 +40028,9 @@ var ts; +@@ -40134,7 +40171,9 @@ var ts; } - var result = void 0; + var result_4; if (!ts.isExternalModuleNameRelative(typeReferenceDirectiveName)) { - var searchResult = loadModuleFromNearestNodeModulesDirectory(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState, /*cache*/ undefined, /*redirectedReference*/ undefined); + var searchResult = getPnpApi(initialLocationForSecondaryLookup) + ? tryLoadModuleUsingPnpResolution(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState) + : loadModuleFromNearestNodeModulesDirectory(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState, /*cache*/ undefined, /*redirectedReference*/ undefined); - result = searchResult && searchResult.value; + result_4 = searchResult && searchResult.value; } else { -@@ -40475,9 +40514,12 @@ var ts; +@@ -40685,9 +40724,12 @@ var ts; if (traceEnabled) { trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder_target_file_type_1, moduleName, Extensions[extensions]); } @@ -402,7 +402,7 @@ semver exclusivity >=4.3 var resolvedValue = resolved_1.value; if (!compilerOptions.preserveSymlinks && resolvedValue && !resolvedValue.originalPath) { var path = realPath(resolvedValue.path, host, traceEnabled); -@@ -40798,6 +40840,14 @@ var ts; +@@ -41032,6 +41074,14 @@ var ts; } function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state) { var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName)); @@ -417,7 +417,7 @@ semver exclusivity >=4.3 // First look for a nested package.json, as in `node_modules/foo/bar/package.json`. var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state); if (packageInfo) { -@@ -40813,9 +40863,12 @@ var ts; +@@ -41047,9 +41097,12 @@ var ts; loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.packageJsonContent, packageInfo && packageInfo.versionPaths); return withPackageId(packageInfo, pathAndExtension); }; @@ -432,7 +432,7 @@ semver exclusivity >=4.3 // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings. packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state); if (packageInfo && packageInfo.versionPaths) { -@@ -40973,6 +41026,58 @@ var ts; +@@ -41207,6 +41260,58 @@ var ts; function toSearchResult(value) { return value !== undefined ? { value: value } : undefined; } @@ -491,7 +491,7 @@ semver exclusivity >=4.3 })(ts || (ts = {})); /* @internal */ var ts; -@@ -108352,6 +108457,8 @@ var ts; +@@ -108308,6 +108413,8 @@ var ts; ConfigFileProgramReloadLevel[ConfigFileProgramReloadLevel["Partial"] = 1] = "Partial"; /** Reload completely by re-reading contents of config file from disk and updating program */ ConfigFileProgramReloadLevel[ConfigFileProgramReloadLevel["Full"] = 2] = "Full"; @@ -500,7 +500,7 @@ semver exclusivity >=4.3 })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {})); /** * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project -@@ -114705,6 +114812,29 @@ var ts; +@@ -114695,6 +114802,29 @@ var ts; return undefined; } var parts = getNodeModulePathParts(path); @@ -530,7 +530,7 @@ semver exclusivity >=4.3 if (!parts) { return undefined; } -@@ -114735,18 +114865,24 @@ var ts; +@@ -114725,18 +114855,24 @@ var ts; if (isRedirect && !isPackageRootPath) { return undefined; } @@ -564,7 +564,7 @@ semver exclusivity >=4.3 function tryDirectoryWithPackageJson(packageRootIndex) { var packageRootPath = path.substring(0, packageRootIndex); var packageJsonPath = ts.combinePaths(packageRootPath, "package.json"); -@@ -115534,6 +115670,10 @@ var ts; +@@ -115524,6 +115660,10 @@ var ts; if (configFileName) { configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile); } @@ -575,7 +575,7 @@ semver exclusivity >=4.3 var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost); ts.setGetSourceFileAsHashVersioned(compilerHost, host); // Members for CompilerHost -@@ -115612,6 +115752,10 @@ var ts; +@@ -115602,6 +115742,10 @@ var ts; configFileWatcher.close(); configFileWatcher = undefined; } @@ -586,7 +586,7 @@ semver exclusivity >=4.3 extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear(); extendedConfigCache = undefined; if (sharedExtendedConfigFileWatchers) { -@@ -115644,7 +115788,8 @@ var ts; +@@ -115634,7 +115778,8 @@ var ts; function getCurrentProgram() { return builderProgram && builderProgram.getProgramOrUndefined(); } @@ -596,7 +596,7 @@ semver exclusivity >=4.3 writeLog("Synchronizing program"); clearInvalidateResolutionsOfFailedLookupLocations(); var program = getCurrentBuilderProgram(); -@@ -115655,7 +115800,7 @@ var ts; +@@ -115645,7 +115790,7 @@ var ts; } } // All resolutions are invalid if user provided resolutions @@ -605,7 +605,7 @@ semver exclusivity >=4.3 if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) { if (hasChangedConfigFileParsingErrors) { builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences); -@@ -115855,6 +116000,12 @@ var ts; +@@ -115845,6 +115990,12 @@ var ts; reloadLevel = ts.ConfigFileProgramReloadLevel.Full; scheduleProgramUpdate(); } @@ -618,7 +618,7 @@ semver exclusivity >=4.3 function updateProgramWithWatchStatus() { timerToUpdateProgram = undefined; reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation); -@@ -115870,6 +116021,10 @@ var ts; +@@ -115860,6 +116011,10 @@ var ts; ts.perfLogger.logStartUpdateProgram("FullConfigReload"); reloadConfigFile(); break; @@ -629,7 +629,7 @@ semver exclusivity >=4.3 default: ts.perfLogger.logStartUpdateProgram("SynchronizeProgram"); synchronizeProgram(); -@@ -121117,11 +121272,27 @@ var ts; +@@ -121132,11 +121287,27 @@ var ts; return hasImportablePath; } ts.isImportableFile = isImportableFile; @@ -658,7 +658,7 @@ semver exclusivity >=4.3 // If it's in a `node_modules` but is not reachable from here via a global import, don't bother. var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; }); var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules)); -@@ -121129,6 +121300,26 @@ var ts; +@@ -121144,6 +121315,26 @@ var ts; || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent) || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent)); } @@ -685,7 +685,7 @@ semver exclusivity >=4.3 // #endregion })(ts || (ts = {})); var ts; -@@ -122800,6 +122991,7 @@ var ts; +@@ -122815,6 +123006,7 @@ var ts; * This includes all files that are found in node_modules/moduleName/ with acceptable file extensions */ function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) { @@ -693,7 +693,7 @@ semver exclusivity >=4.3 var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths; var result = []; var extensionOptions = getExtensionOptions(compilerOptions); -@@ -122812,8 +123004,8 @@ var ts; +@@ -122827,8 +123019,8 @@ var ts; } } var fragmentDirectory = getFragmentDirectory(fragment); @@ -704,7 +704,7 @@ semver exclusivity >=4.3 result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined)); } getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result); -@@ -122828,18 +123020,36 @@ var ts; +@@ -122843,18 +123035,36 @@ var ts; result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined)); } }; @@ -748,7 +748,7 @@ semver exclusivity >=4.3 } } return result; -@@ -122940,6 +123150,7 @@ var ts; +@@ -122955,6 +123165,7 @@ var ts; return addReplacementSpans(toComplete, range.pos + prefix.length, names); } function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) { @@ -756,7 +756,7 @@ semver exclusivity >=4.3 if (result === void 0) { result = []; } // Check for typings specified in compiler options var seen = new ts.Map(); -@@ -122948,11 +123159,19 @@ var ts; +@@ -122963,11 +123174,19 @@ var ts; var root = typeRoots_1[_i]; getCompletionEntriesFromDirectories(root); } @@ -781,7 +781,7 @@ semver exclusivity >=4.3 } return result; function getCompletionEntriesFromDirectories(directory) { -@@ -150119,9 +150338,9 @@ var ts; +@@ -150455,9 +150674,9 @@ var ts; if (isTopLevelDeclarationStatement(statement) && !isExported(sourceFile, statement, useEs6Exports) && forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.checkDefined(d.symbol)); })) { @@ -794,7 +794,7 @@ semver exclusivity >=4.3 } return statement; }); -@@ -158822,6 +159041,37 @@ var ts; +@@ -159155,6 +159374,37 @@ var ts; return this.projectReferences; }; ConfiguredProject.prototype.updateReferences = function (refs) { @@ -832,7 +832,7 @@ semver exclusivity >=4.3 this.projectReferences = refs; this.potentialProjectReferences = undefined; }; -@@ -159429,6 +159679,7 @@ var ts; +@@ -159762,6 +160012,7 @@ var ts; watchDirectory: ts.returnNoopFileWatcher, } : ts.getWatchFactory(this.host, watchLogLevel, log, getDetailWatchInfo); @@ -840,7 +840,7 @@ semver exclusivity >=4.3 } ProjectService.prototype.toPath = function (fileName) { return ts.toPath(fileName, this.currentDirectory, this.toCanonicalFileName); -@@ -161253,7 +161504,7 @@ var ts; +@@ -161586,7 +161837,7 @@ var ts; }; ProjectService.prototype.setHostConfiguration = function (args) { var _this = this; @@ -849,7 +849,7 @@ semver exclusivity >=4.3 if (args.file) { var info = this.getScriptInfoForNormalizedPath(server.toNormalizedPath(args.file)); if (info) { -@@ -161271,7 +161522,7 @@ var ts; +@@ -161604,7 +161855,7 @@ var ts; this.logger.info("Format host information updated"); } if (args.preferences) { @@ -858,7 +858,7 @@ semver exclusivity >=4.3 this.hostConfiguration.preferences = __assign(__assign({}, this.hostConfiguration.preferences), args.preferences); if (lazyConfiguredProjectsFromExternalProject && !this.hostConfiguration.preferences.lazyConfiguredProjectsFromExternalProject) { // Load configured projects for external projects that are pending reload -@@ -161297,6 +161548,8 @@ var ts; +@@ -161630,6 +161881,8 @@ var ts; if (args.watchOptions) { this.hostConfiguration.watchOptions = (_a = convertWatchOptions(args.watchOptions)) === null || _a === void 0 ? void 0 : _a.watchOptions; this.logger.info("Host watch options changed to " + JSON.stringify(this.hostConfiguration.watchOptions) + ", it will be take effect for next watches."); @@ -867,7 +867,7 @@ semver exclusivity >=4.3 } } }; -@@ -162274,6 +162527,25 @@ var ts; +@@ -162607,6 +162860,25 @@ var ts; }); }; /*@internal*/ @@ -893,7 +893,7 @@ semver exclusivity >=4.3 ProjectService.prototype.watchPackageJsonFile = function (path) { var _this = this; var watchers = this.packageJsonFilesMap || (this.packageJsonFilesMap = new ts.Map()); -@@ -167021,6 +167293,9 @@ var ts; +@@ -167357,6 +167629,9 @@ var ts; } try { var args = [ts.combinePaths(__dirname, "watchGuard.js"), path]; @@ -903,7 +903,7 @@ semver exclusivity >=4.3 if (logger.hasLevel(server.LogLevel.verbose)) { logger.info("Starting " + process.execPath + " with args:" + server.stringifyIndented(args)); } -@@ -167281,6 +167556,9 @@ var ts; +@@ -167617,6 +167892,9 @@ var ts; break; } } @@ -914,24 +914,24 @@ semver exclusivity >=4.3 this.installer.on("message", function (m) { return _this.handleMessage(m); }); // We have to schedule this event to the next tick diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts -index a2ff8fc1e..e32bcee85 100644 +index 6195d669a..0cabf3bdf 100644 semver exclusivity >=4.3 --- a/lib/tsserverlibrary.d.ts +++ b/lib/tsserverlibrary.d.ts -@@ -4709,6 +4709,7 @@ declare namespace ts { +@@ -4710,6 +4710,7 @@ declare namespace ts { } declare namespace ts { - function getEffectiveTypeRoots(options: CompilerOptions, host: GetEffectiveTypeRootsHost): string[] | undefined; -+ function getPnpTypeRoots(currentDirectory: string): string[]; + export function getEffectiveTypeRoots(options: CompilerOptions, host: GetEffectiveTypeRootsHost): string[] | undefined; ++ export function getPnpTypeRoots(currentDirectory: string): string[]; /** * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown. * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js -index e33bc9110..3d92b0d0c 100644 +index ee78ce982..d798ba17f 100644 semver exclusivity >=4.3 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js -@@ -7520,6 +7520,11 @@ var ts; +@@ -7532,6 +7532,11 @@ var ts; : new Buffer(input, encoding); } function isFileSystemCaseSensitive() { @@ -943,7 +943,7 @@ semver exclusivity >=4.3 // win32\win64 are case insensitive platforms if (platform === "win32" || platform === "win64") { return false; -@@ -40081,24 +40086,56 @@ var ts; +@@ -40197,24 +40202,56 @@ var ts; ts.getEffectiveTypeRoots = getEffectiveTypeRoots; /** * Returns the path to every node_modules/@types directory from some ancestor directory. @@ -1004,18 +1004,18 @@ semver exclusivity >=4.3 /** * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown. * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups -@@ -40185,7 +40222,9 @@ var ts; +@@ -40328,7 +40365,9 @@ var ts; } - var result = void 0; + var result_4; if (!ts.isExternalModuleNameRelative(typeReferenceDirectiveName)) { - var searchResult = loadModuleFromNearestNodeModulesDirectory(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState, /*cache*/ undefined, /*redirectedReference*/ undefined); + var searchResult = getPnpApi(initialLocationForSecondaryLookup) + ? tryLoadModuleUsingPnpResolution(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState) + : loadModuleFromNearestNodeModulesDirectory(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState, /*cache*/ undefined, /*redirectedReference*/ undefined); - result = searchResult && searchResult.value; + result_4 = searchResult && searchResult.value; } else { -@@ -40669,9 +40708,12 @@ var ts; +@@ -40879,9 +40918,12 @@ var ts; if (traceEnabled) { trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder_target_file_type_1, moduleName, Extensions[extensions]); } @@ -1030,7 +1030,7 @@ semver exclusivity >=4.3 var resolvedValue = resolved_1.value; if (!compilerOptions.preserveSymlinks && resolvedValue && !resolvedValue.originalPath) { var path = realPath(resolvedValue.path, host, traceEnabled); -@@ -40992,6 +41034,14 @@ var ts; +@@ -41226,6 +41268,14 @@ var ts; } function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state) { var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName)); @@ -1045,7 +1045,7 @@ semver exclusivity >=4.3 // First look for a nested package.json, as in `node_modules/foo/bar/package.json`. var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state); if (packageInfo) { -@@ -41007,9 +41057,12 @@ var ts; +@@ -41241,9 +41291,12 @@ var ts; loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.packageJsonContent, packageInfo && packageInfo.versionPaths); return withPackageId(packageInfo, pathAndExtension); }; @@ -1060,7 +1060,7 @@ semver exclusivity >=4.3 // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings. packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state); if (packageInfo && packageInfo.versionPaths) { -@@ -41167,6 +41220,58 @@ var ts; +@@ -41401,6 +41454,58 @@ var ts; function toSearchResult(value) { return value !== undefined ? { value: value } : undefined; } @@ -1119,7 +1119,7 @@ semver exclusivity >=4.3 })(ts || (ts = {})); /* @internal */ var ts; -@@ -108546,6 +108651,8 @@ var ts; +@@ -108502,6 +108607,8 @@ var ts; ConfigFileProgramReloadLevel[ConfigFileProgramReloadLevel["Partial"] = 1] = "Partial"; /** Reload completely by re-reading contents of config file from disk and updating program */ ConfigFileProgramReloadLevel[ConfigFileProgramReloadLevel["Full"] = 2] = "Full"; @@ -1128,7 +1128,7 @@ semver exclusivity >=4.3 })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {})); /** * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project -@@ -114899,6 +115006,29 @@ var ts; +@@ -114889,6 +114996,29 @@ var ts; return undefined; } var parts = getNodeModulePathParts(path); @@ -1158,7 +1158,7 @@ semver exclusivity >=4.3 if (!parts) { return undefined; } -@@ -114929,18 +115059,24 @@ var ts; +@@ -114919,18 +115049,24 @@ var ts; if (isRedirect && !isPackageRootPath) { return undefined; } @@ -1192,7 +1192,7 @@ semver exclusivity >=4.3 function tryDirectoryWithPackageJson(packageRootIndex) { var packageRootPath = path.substring(0, packageRootIndex); var packageJsonPath = ts.combinePaths(packageRootPath, "package.json"); -@@ -115728,6 +115864,10 @@ var ts; +@@ -115718,6 +115854,10 @@ var ts; if (configFileName) { configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile); } @@ -1203,7 +1203,7 @@ semver exclusivity >=4.3 var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost); ts.setGetSourceFileAsHashVersioned(compilerHost, host); // Members for CompilerHost -@@ -115806,6 +115946,10 @@ var ts; +@@ -115796,6 +115936,10 @@ var ts; configFileWatcher.close(); configFileWatcher = undefined; } @@ -1214,7 +1214,7 @@ semver exclusivity >=4.3 extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear(); extendedConfigCache = undefined; if (sharedExtendedConfigFileWatchers) { -@@ -115838,7 +115982,8 @@ var ts; +@@ -115828,7 +115972,8 @@ var ts; function getCurrentProgram() { return builderProgram && builderProgram.getProgramOrUndefined(); } @@ -1224,7 +1224,7 @@ semver exclusivity >=4.3 writeLog("Synchronizing program"); clearInvalidateResolutionsOfFailedLookupLocations(); var program = getCurrentBuilderProgram(); -@@ -115849,7 +115994,7 @@ var ts; +@@ -115839,7 +115984,7 @@ var ts; } } // All resolutions are invalid if user provided resolutions @@ -1233,7 +1233,7 @@ semver exclusivity >=4.3 if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) { if (hasChangedConfigFileParsingErrors) { builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences); -@@ -116049,6 +116194,12 @@ var ts; +@@ -116039,6 +116184,12 @@ var ts; reloadLevel = ts.ConfigFileProgramReloadLevel.Full; scheduleProgramUpdate(); } @@ -1246,7 +1246,7 @@ semver exclusivity >=4.3 function updateProgramWithWatchStatus() { timerToUpdateProgram = undefined; reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation); -@@ -116064,6 +116215,10 @@ var ts; +@@ -116054,6 +116205,10 @@ var ts; ts.perfLogger.logStartUpdateProgram("FullConfigReload"); reloadConfigFile(); break; @@ -1257,7 +1257,7 @@ semver exclusivity >=4.3 default: ts.perfLogger.logStartUpdateProgram("SynchronizeProgram"); synchronizeProgram(); -@@ -121686,11 +121841,27 @@ var ts; +@@ -121701,11 +121856,27 @@ var ts; return hasImportablePath; } ts.isImportableFile = isImportableFile; @@ -1286,7 +1286,7 @@ semver exclusivity >=4.3 // If it's in a `node_modules` but is not reachable from here via a global import, don't bother. var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; }); var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules)); -@@ -121698,6 +121869,26 @@ var ts; +@@ -121713,6 +121884,26 @@ var ts; || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent) || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent)); } @@ -1313,7 +1313,7 @@ semver exclusivity >=4.3 // #endregion })(ts || (ts = {})); var ts; -@@ -123369,6 +123560,7 @@ var ts; +@@ -123384,6 +123575,7 @@ var ts; * This includes all files that are found in node_modules/moduleName/ with acceptable file extensions */ function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) { @@ -1321,7 +1321,7 @@ semver exclusivity >=4.3 var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths; var result = []; var extensionOptions = getExtensionOptions(compilerOptions); -@@ -123381,8 +123573,8 @@ var ts; +@@ -123396,8 +123588,8 @@ var ts; } } var fragmentDirectory = getFragmentDirectory(fragment); @@ -1332,7 +1332,7 @@ semver exclusivity >=4.3 result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined)); } getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result); -@@ -123397,18 +123589,36 @@ var ts; +@@ -123412,18 +123604,36 @@ var ts; result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined)); } }; @@ -1376,7 +1376,7 @@ semver exclusivity >=4.3 } } return result; -@@ -123509,6 +123719,7 @@ var ts; +@@ -123524,6 +123734,7 @@ var ts; return addReplacementSpans(toComplete, range.pos + prefix.length, names); } function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) { @@ -1384,7 +1384,7 @@ semver exclusivity >=4.3 if (result === void 0) { result = []; } // Check for typings specified in compiler options var seen = new ts.Map(); -@@ -123517,11 +123728,19 @@ var ts; +@@ -123532,11 +123743,19 @@ var ts; var root = typeRoots_1[_i]; getCompletionEntriesFromDirectories(root); } @@ -1409,7 +1409,7 @@ semver exclusivity >=4.3 } return result; function getCompletionEntriesFromDirectories(directory) { -@@ -150688,9 +150907,9 @@ var ts; +@@ -151024,9 +151243,9 @@ var ts; if (isTopLevelDeclarationStatement(statement) && !isExported(sourceFile, statement, useEs6Exports) && forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.checkDefined(d.symbol)); })) { @@ -1422,7 +1422,7 @@ semver exclusivity >=4.3 } return statement; }); -@@ -159016,6 +159235,37 @@ var ts; +@@ -159349,6 +159568,37 @@ var ts; return this.projectReferences; }; ConfiguredProject.prototype.updateReferences = function (refs) { @@ -1460,7 +1460,7 @@ semver exclusivity >=4.3 this.projectReferences = refs; this.potentialProjectReferences = undefined; }; -@@ -159623,6 +159873,7 @@ var ts; +@@ -159956,6 +160206,7 @@ var ts; watchDirectory: ts.returnNoopFileWatcher, } : ts.getWatchFactory(this.host, watchLogLevel, log, getDetailWatchInfo); @@ -1468,7 +1468,7 @@ semver exclusivity >=4.3 } ProjectService.prototype.toPath = function (fileName) { return ts.toPath(fileName, this.currentDirectory, this.toCanonicalFileName); -@@ -161447,7 +161698,7 @@ var ts; +@@ -161780,7 +162031,7 @@ var ts; }; ProjectService.prototype.setHostConfiguration = function (args) { var _this = this; @@ -1477,7 +1477,7 @@ semver exclusivity >=4.3 if (args.file) { var info = this.getScriptInfoForNormalizedPath(server.toNormalizedPath(args.file)); if (info) { -@@ -161465,7 +161716,7 @@ var ts; +@@ -161798,7 +162049,7 @@ var ts; this.logger.info("Format host information updated"); } if (args.preferences) { @@ -1486,7 +1486,7 @@ semver exclusivity >=4.3 this.hostConfiguration.preferences = __assign(__assign({}, this.hostConfiguration.preferences), args.preferences); if (lazyConfiguredProjectsFromExternalProject && !this.hostConfiguration.preferences.lazyConfiguredProjectsFromExternalProject) { // Load configured projects for external projects that are pending reload -@@ -161491,6 +161742,8 @@ var ts; +@@ -161824,6 +162075,8 @@ var ts; if (args.watchOptions) { this.hostConfiguration.watchOptions = (_a = convertWatchOptions(args.watchOptions)) === null || _a === void 0 ? void 0 : _a.watchOptions; this.logger.info("Host watch options changed to " + JSON.stringify(this.hostConfiguration.watchOptions) + ", it will be take effect for next watches."); @@ -1495,7 +1495,7 @@ semver exclusivity >=4.3 } } }; -@@ -162468,6 +162721,25 @@ var ts; +@@ -162801,6 +163054,25 @@ var ts; }); }; /*@internal*/ @@ -1522,24 +1522,24 @@ semver exclusivity >=4.3 var _this = this; var watchers = this.packageJsonFilesMap || (this.packageJsonFilesMap = new ts.Map()); diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts -index 0b2d291ee..050fb9cf1 100644 +index b86a3a299..a7937dd2e 100644 semver exclusivity >=4.3 --- a/lib/typescript.d.ts +++ b/lib/typescript.d.ts -@@ -4709,6 +4709,7 @@ declare namespace ts { +@@ -4710,6 +4710,7 @@ declare namespace ts { } declare namespace ts { - function getEffectiveTypeRoots(options: CompilerOptions, host: GetEffectiveTypeRootsHost): string[] | undefined; -+ function getPnpTypeRoots(currentDirectory: string): string[]; + export function getEffectiveTypeRoots(options: CompilerOptions, host: GetEffectiveTypeRootsHost): string[] | undefined; ++ export function getPnpTypeRoots(currentDirectory: string): string[]; /** * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown. * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups diff --git a/lib/typescript.js b/lib/typescript.js -index 07337021a..d65d71c25 100644 +index 615ad27f3..891eff5c5 100644 semver exclusivity >=4.3 --- a/lib/typescript.js +++ b/lib/typescript.js -@@ -7520,6 +7520,11 @@ var ts; +@@ -7532,6 +7532,11 @@ var ts; : new Buffer(input, encoding); } function isFileSystemCaseSensitive() { @@ -1551,7 +1551,7 @@ semver exclusivity >=4.3 // win32\win64 are case insensitive platforms if (platform === "win32" || platform === "win64") { return false; -@@ -40081,24 +40086,56 @@ var ts; +@@ -40197,24 +40202,56 @@ var ts; ts.getEffectiveTypeRoots = getEffectiveTypeRoots; /** * Returns the path to every node_modules/@types directory from some ancestor directory. @@ -1612,18 +1612,18 @@ semver exclusivity >=4.3 /** * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown. * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups -@@ -40185,7 +40222,9 @@ var ts; +@@ -40328,7 +40365,9 @@ var ts; } - var result = void 0; + var result_4; if (!ts.isExternalModuleNameRelative(typeReferenceDirectiveName)) { - var searchResult = loadModuleFromNearestNodeModulesDirectory(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState, /*cache*/ undefined, /*redirectedReference*/ undefined); + var searchResult = getPnpApi(initialLocationForSecondaryLookup) + ? tryLoadModuleUsingPnpResolution(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState) + : loadModuleFromNearestNodeModulesDirectory(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState, /*cache*/ undefined, /*redirectedReference*/ undefined); - result = searchResult && searchResult.value; + result_4 = searchResult && searchResult.value; } else { -@@ -40669,9 +40708,12 @@ var ts; +@@ -40879,9 +40918,12 @@ var ts; if (traceEnabled) { trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder_target_file_type_1, moduleName, Extensions[extensions]); } @@ -1638,7 +1638,7 @@ semver exclusivity >=4.3 var resolvedValue = resolved_1.value; if (!compilerOptions.preserveSymlinks && resolvedValue && !resolvedValue.originalPath) { var path = realPath(resolvedValue.path, host, traceEnabled); -@@ -40992,6 +41034,14 @@ var ts; +@@ -41226,6 +41268,14 @@ var ts; } function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state) { var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName)); @@ -1653,7 +1653,7 @@ semver exclusivity >=4.3 // First look for a nested package.json, as in `node_modules/foo/bar/package.json`. var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state); if (packageInfo) { -@@ -41007,9 +41057,12 @@ var ts; +@@ -41241,9 +41291,12 @@ var ts; loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.packageJsonContent, packageInfo && packageInfo.versionPaths); return withPackageId(packageInfo, pathAndExtension); }; @@ -1668,7 +1668,7 @@ semver exclusivity >=4.3 // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings. packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state); if (packageInfo && packageInfo.versionPaths) { -@@ -41167,6 +41220,58 @@ var ts; +@@ -41401,6 +41454,58 @@ var ts; function toSearchResult(value) { return value !== undefined ? { value: value } : undefined; } @@ -1727,7 +1727,7 @@ semver exclusivity >=4.3 })(ts || (ts = {})); /* @internal */ var ts; -@@ -108546,6 +108651,8 @@ var ts; +@@ -108502,6 +108607,8 @@ var ts; ConfigFileProgramReloadLevel[ConfigFileProgramReloadLevel["Partial"] = 1] = "Partial"; /** Reload completely by re-reading contents of config file from disk and updating program */ ConfigFileProgramReloadLevel[ConfigFileProgramReloadLevel["Full"] = 2] = "Full"; @@ -1736,7 +1736,7 @@ semver exclusivity >=4.3 })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {})); /** * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project -@@ -114899,6 +115006,29 @@ var ts; +@@ -114889,6 +114996,29 @@ var ts; return undefined; } var parts = getNodeModulePathParts(path); @@ -1766,7 +1766,7 @@ semver exclusivity >=4.3 if (!parts) { return undefined; } -@@ -114929,18 +115059,24 @@ var ts; +@@ -114919,18 +115049,24 @@ var ts; if (isRedirect && !isPackageRootPath) { return undefined; } @@ -1800,7 +1800,7 @@ semver exclusivity >=4.3 function tryDirectoryWithPackageJson(packageRootIndex) { var packageRootPath = path.substring(0, packageRootIndex); var packageJsonPath = ts.combinePaths(packageRootPath, "package.json"); -@@ -115728,6 +115864,10 @@ var ts; +@@ -115718,6 +115854,10 @@ var ts; if (configFileName) { configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile); } @@ -1811,7 +1811,7 @@ semver exclusivity >=4.3 var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost); ts.setGetSourceFileAsHashVersioned(compilerHost, host); // Members for CompilerHost -@@ -115806,6 +115946,10 @@ var ts; +@@ -115796,6 +115936,10 @@ var ts; configFileWatcher.close(); configFileWatcher = undefined; } @@ -1822,7 +1822,7 @@ semver exclusivity >=4.3 extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear(); extendedConfigCache = undefined; if (sharedExtendedConfigFileWatchers) { -@@ -115838,7 +115982,8 @@ var ts; +@@ -115828,7 +115972,8 @@ var ts; function getCurrentProgram() { return builderProgram && builderProgram.getProgramOrUndefined(); } @@ -1832,7 +1832,7 @@ semver exclusivity >=4.3 writeLog("Synchronizing program"); clearInvalidateResolutionsOfFailedLookupLocations(); var program = getCurrentBuilderProgram(); -@@ -115849,7 +115994,7 @@ var ts; +@@ -115839,7 +115984,7 @@ var ts; } } // All resolutions are invalid if user provided resolutions @@ -1841,7 +1841,7 @@ semver exclusivity >=4.3 if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) { if (hasChangedConfigFileParsingErrors) { builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences); -@@ -116049,6 +116194,12 @@ var ts; +@@ -116039,6 +116184,12 @@ var ts; reloadLevel = ts.ConfigFileProgramReloadLevel.Full; scheduleProgramUpdate(); } @@ -1854,7 +1854,7 @@ semver exclusivity >=4.3 function updateProgramWithWatchStatus() { timerToUpdateProgram = undefined; reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation); -@@ -116064,6 +116215,10 @@ var ts; +@@ -116054,6 +116205,10 @@ var ts; ts.perfLogger.logStartUpdateProgram("FullConfigReload"); reloadConfigFile(); break; @@ -1865,7 +1865,7 @@ semver exclusivity >=4.3 default: ts.perfLogger.logStartUpdateProgram("SynchronizeProgram"); synchronizeProgram(); -@@ -121686,11 +121841,27 @@ var ts; +@@ -121701,11 +121856,27 @@ var ts; return hasImportablePath; } ts.isImportableFile = isImportableFile; @@ -1894,7 +1894,7 @@ semver exclusivity >=4.3 // If it's in a `node_modules` but is not reachable from here via a global import, don't bother. var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; }); var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules)); -@@ -121698,6 +121869,26 @@ var ts; +@@ -121713,6 +121884,26 @@ var ts; || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent) || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent)); } @@ -1921,7 +1921,7 @@ semver exclusivity >=4.3 // #endregion })(ts || (ts = {})); var ts; -@@ -123369,6 +123560,7 @@ var ts; +@@ -123384,6 +123575,7 @@ var ts; * This includes all files that are found in node_modules/moduleName/ with acceptable file extensions */ function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) { @@ -1929,7 +1929,7 @@ semver exclusivity >=4.3 var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths; var result = []; var extensionOptions = getExtensionOptions(compilerOptions); -@@ -123381,8 +123573,8 @@ var ts; +@@ -123396,8 +123588,8 @@ var ts; } } var fragmentDirectory = getFragmentDirectory(fragment); @@ -1940,7 +1940,7 @@ semver exclusivity >=4.3 result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined)); } getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result); -@@ -123397,18 +123589,36 @@ var ts; +@@ -123412,18 +123604,36 @@ var ts; result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined)); } }; @@ -1984,7 +1984,7 @@ semver exclusivity >=4.3 } } return result; -@@ -123509,6 +123719,7 @@ var ts; +@@ -123524,6 +123734,7 @@ var ts; return addReplacementSpans(toComplete, range.pos + prefix.length, names); } function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) { @@ -1992,7 +1992,7 @@ semver exclusivity >=4.3 if (result === void 0) { result = []; } // Check for typings specified in compiler options var seen = new ts.Map(); -@@ -123517,11 +123728,19 @@ var ts; +@@ -123532,11 +123743,19 @@ var ts; var root = typeRoots_1[_i]; getCompletionEntriesFromDirectories(root); } @@ -2017,7 +2017,7 @@ semver exclusivity >=4.3 } return result; function getCompletionEntriesFromDirectories(directory) { -@@ -150688,9 +150907,9 @@ var ts; +@@ -151024,9 +151243,9 @@ var ts; if (isTopLevelDeclarationStatement(statement) && !isExported(sourceFile, statement, useEs6Exports) && forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.checkDefined(d.symbol)); })) { @@ -2031,24 +2031,24 @@ semver exclusivity >=4.3 return statement; }); diff --git a/lib/typescriptServices.d.ts b/lib/typescriptServices.d.ts -index 56e1d342d..09de6de0e 100644 +index 2d44d601a..6fe4cf63a 100644 semver exclusivity >=4.3 --- a/lib/typescriptServices.d.ts +++ b/lib/typescriptServices.d.ts -@@ -4709,6 +4709,7 @@ declare namespace ts { +@@ -4710,6 +4710,7 @@ declare namespace ts { } declare namespace ts { - function getEffectiveTypeRoots(options: CompilerOptions, host: GetEffectiveTypeRootsHost): string[] | undefined; -+ function getPnpTypeRoots(currentDirectory: string): string[]; + export function getEffectiveTypeRoots(options: CompilerOptions, host: GetEffectiveTypeRootsHost): string[] | undefined; ++ export function getPnpTypeRoots(currentDirectory: string): string[]; /** * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown. * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js -index f81ca89a1..1a0d25685 100644 +index 59f7d01b5..2d49e271b 100644 semver exclusivity >=4.3 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js -@@ -7520,6 +7520,11 @@ var ts; +@@ -7532,6 +7532,11 @@ var ts; : new Buffer(input, encoding); } function isFileSystemCaseSensitive() { @@ -2060,7 +2060,7 @@ semver exclusivity >=4.3 // win32\win64 are case insensitive platforms if (platform === "win32" || platform === "win64") { return false; -@@ -40081,24 +40086,56 @@ var ts; +@@ -40197,24 +40202,56 @@ var ts; ts.getEffectiveTypeRoots = getEffectiveTypeRoots; /** * Returns the path to every node_modules/@types directory from some ancestor directory. @@ -2121,18 +2121,18 @@ semver exclusivity >=4.3 /** * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown. * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups -@@ -40185,7 +40222,9 @@ var ts; +@@ -40328,7 +40365,9 @@ var ts; } - var result = void 0; + var result_4; if (!ts.isExternalModuleNameRelative(typeReferenceDirectiveName)) { - var searchResult = loadModuleFromNearestNodeModulesDirectory(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState, /*cache*/ undefined, /*redirectedReference*/ undefined); + var searchResult = getPnpApi(initialLocationForSecondaryLookup) + ? tryLoadModuleUsingPnpResolution(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState) + : loadModuleFromNearestNodeModulesDirectory(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState, /*cache*/ undefined, /*redirectedReference*/ undefined); - result = searchResult && searchResult.value; + result_4 = searchResult && searchResult.value; } else { -@@ -40669,9 +40708,12 @@ var ts; +@@ -40879,9 +40918,12 @@ var ts; if (traceEnabled) { trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder_target_file_type_1, moduleName, Extensions[extensions]); } @@ -2147,7 +2147,7 @@ semver exclusivity >=4.3 var resolvedValue = resolved_1.value; if (!compilerOptions.preserveSymlinks && resolvedValue && !resolvedValue.originalPath) { var path = realPath(resolvedValue.path, host, traceEnabled); -@@ -40992,6 +41034,14 @@ var ts; +@@ -41226,6 +41268,14 @@ var ts; } function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state) { var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName)); @@ -2162,7 +2162,7 @@ semver exclusivity >=4.3 // First look for a nested package.json, as in `node_modules/foo/bar/package.json`. var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state); if (packageInfo) { -@@ -41007,9 +41057,12 @@ var ts; +@@ -41241,9 +41291,12 @@ var ts; loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.packageJsonContent, packageInfo && packageInfo.versionPaths); return withPackageId(packageInfo, pathAndExtension); }; @@ -2177,7 +2177,7 @@ semver exclusivity >=4.3 // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings. packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state); if (packageInfo && packageInfo.versionPaths) { -@@ -41167,6 +41220,58 @@ var ts; +@@ -41401,6 +41454,58 @@ var ts; function toSearchResult(value) { return value !== undefined ? { value: value } : undefined; } @@ -2236,7 +2236,7 @@ semver exclusivity >=4.3 })(ts || (ts = {})); /* @internal */ var ts; -@@ -108546,6 +108651,8 @@ var ts; +@@ -108502,6 +108607,8 @@ var ts; ConfigFileProgramReloadLevel[ConfigFileProgramReloadLevel["Partial"] = 1] = "Partial"; /** Reload completely by re-reading contents of config file from disk and updating program */ ConfigFileProgramReloadLevel[ConfigFileProgramReloadLevel["Full"] = 2] = "Full"; @@ -2245,7 +2245,7 @@ semver exclusivity >=4.3 })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {})); /** * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project -@@ -114899,6 +115006,29 @@ var ts; +@@ -114889,6 +114996,29 @@ var ts; return undefined; } var parts = getNodeModulePathParts(path); @@ -2275,7 +2275,7 @@ semver exclusivity >=4.3 if (!parts) { return undefined; } -@@ -114929,18 +115059,24 @@ var ts; +@@ -114919,18 +115049,24 @@ var ts; if (isRedirect && !isPackageRootPath) { return undefined; } @@ -2309,7 +2309,7 @@ semver exclusivity >=4.3 function tryDirectoryWithPackageJson(packageRootIndex) { var packageRootPath = path.substring(0, packageRootIndex); var packageJsonPath = ts.combinePaths(packageRootPath, "package.json"); -@@ -115728,6 +115864,10 @@ var ts; +@@ -115718,6 +115854,10 @@ var ts; if (configFileName) { configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile); } @@ -2320,7 +2320,7 @@ semver exclusivity >=4.3 var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost); ts.setGetSourceFileAsHashVersioned(compilerHost, host); // Members for CompilerHost -@@ -115806,6 +115946,10 @@ var ts; +@@ -115796,6 +115936,10 @@ var ts; configFileWatcher.close(); configFileWatcher = undefined; } @@ -2331,7 +2331,7 @@ semver exclusivity >=4.3 extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear(); extendedConfigCache = undefined; if (sharedExtendedConfigFileWatchers) { -@@ -115838,7 +115982,8 @@ var ts; +@@ -115828,7 +115972,8 @@ var ts; function getCurrentProgram() { return builderProgram && builderProgram.getProgramOrUndefined(); } @@ -2341,7 +2341,7 @@ semver exclusivity >=4.3 writeLog("Synchronizing program"); clearInvalidateResolutionsOfFailedLookupLocations(); var program = getCurrentBuilderProgram(); -@@ -115849,7 +115994,7 @@ var ts; +@@ -115839,7 +115984,7 @@ var ts; } } // All resolutions are invalid if user provided resolutions @@ -2350,7 +2350,7 @@ semver exclusivity >=4.3 if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) { if (hasChangedConfigFileParsingErrors) { builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences); -@@ -116049,6 +116194,12 @@ var ts; +@@ -116039,6 +116184,12 @@ var ts; reloadLevel = ts.ConfigFileProgramReloadLevel.Full; scheduleProgramUpdate(); } @@ -2363,7 +2363,7 @@ semver exclusivity >=4.3 function updateProgramWithWatchStatus() { timerToUpdateProgram = undefined; reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation); -@@ -116064,6 +116215,10 @@ var ts; +@@ -116054,6 +116205,10 @@ var ts; ts.perfLogger.logStartUpdateProgram("FullConfigReload"); reloadConfigFile(); break; @@ -2374,7 +2374,7 @@ semver exclusivity >=4.3 default: ts.perfLogger.logStartUpdateProgram("SynchronizeProgram"); synchronizeProgram(); -@@ -121686,11 +121841,27 @@ var ts; +@@ -121701,11 +121856,27 @@ var ts; return hasImportablePath; } ts.isImportableFile = isImportableFile; @@ -2403,7 +2403,7 @@ semver exclusivity >=4.3 // If it's in a `node_modules` but is not reachable from here via a global import, don't bother. var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; }); var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules)); -@@ -121698,6 +121869,26 @@ var ts; +@@ -121713,6 +121884,26 @@ var ts; || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent) || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent)); } @@ -2430,7 +2430,7 @@ semver exclusivity >=4.3 // #endregion })(ts || (ts = {})); var ts; -@@ -123369,6 +123560,7 @@ var ts; +@@ -123384,6 +123575,7 @@ var ts; * This includes all files that are found in node_modules/moduleName/ with acceptable file extensions */ function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) { @@ -2438,7 +2438,7 @@ semver exclusivity >=4.3 var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths; var result = []; var extensionOptions = getExtensionOptions(compilerOptions); -@@ -123381,8 +123573,8 @@ var ts; +@@ -123396,8 +123588,8 @@ var ts; } } var fragmentDirectory = getFragmentDirectory(fragment); @@ -2449,7 +2449,7 @@ semver exclusivity >=4.3 result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined)); } getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result); -@@ -123397,18 +123589,36 @@ var ts; +@@ -123412,18 +123604,36 @@ var ts; result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined)); } }; @@ -2493,7 +2493,7 @@ semver exclusivity >=4.3 } } return result; -@@ -123509,6 +123719,7 @@ var ts; +@@ -123524,6 +123734,7 @@ var ts; return addReplacementSpans(toComplete, range.pos + prefix.length, names); } function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) { @@ -2501,7 +2501,7 @@ semver exclusivity >=4.3 if (result === void 0) { result = []; } // Check for typings specified in compiler options var seen = new ts.Map(); -@@ -123517,11 +123728,19 @@ var ts; +@@ -123532,11 +123743,19 @@ var ts; var root = typeRoots_1[_i]; getCompletionEntriesFromDirectories(root); } @@ -2526,7 +2526,7 @@ semver exclusivity >=4.3 } return result; function getCompletionEntriesFromDirectories(directory) { -@@ -150688,9 +150907,9 @@ var ts; +@@ -151024,9 +151243,9 @@ var ts; if (isTopLevelDeclarationStatement(statement) && !isExported(sourceFile, statement, useEs6Exports) && forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.checkDefined(d.symbol)); })) { @@ -2540,11 +2540,11 @@ semver exclusivity >=4.3 return statement; }); diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js -index ef8ee6dd2..ee3d9b719 100644 +index 6810860b9..3b1d2e432 100644 semver exclusivity >=4.3 --- a/lib/typingsInstaller.js +++ b/lib/typingsInstaller.js -@@ -7315,6 +7315,11 @@ var ts; +@@ -7327,6 +7327,11 @@ var ts; : new Buffer(input, encoding); } function isFileSystemCaseSensitive() { @@ -2556,7 +2556,7 @@ semver exclusivity >=4.3 // win32\win64 are case insensitive platforms if (platform === "win32" || platform === "win64") { return false; -@@ -39876,24 +39881,56 @@ var ts; +@@ -39992,24 +39997,56 @@ var ts; ts.getEffectiveTypeRoots = getEffectiveTypeRoots; /** * Returns the path to every node_modules/@types directory from some ancestor directory. @@ -2617,18 +2617,18 @@ semver exclusivity >=4.3 /** * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown. * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups -@@ -39980,7 +40017,9 @@ var ts; +@@ -40123,7 +40160,9 @@ var ts; } - var result = void 0; + var result_4; if (!ts.isExternalModuleNameRelative(typeReferenceDirectiveName)) { - var searchResult = loadModuleFromNearestNodeModulesDirectory(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState, /*cache*/ undefined, /*redirectedReference*/ undefined); + var searchResult = getPnpApi(initialLocationForSecondaryLookup) + ? tryLoadModuleUsingPnpResolution(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState) + : loadModuleFromNearestNodeModulesDirectory(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState, /*cache*/ undefined, /*redirectedReference*/ undefined); - result = searchResult && searchResult.value; + result_4 = searchResult && searchResult.value; } else { -@@ -40464,9 +40503,12 @@ var ts; +@@ -40674,9 +40713,12 @@ var ts; if (traceEnabled) { trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder_target_file_type_1, moduleName, Extensions[extensions]); } @@ -2643,7 +2643,7 @@ semver exclusivity >=4.3 var resolvedValue = resolved_1.value; if (!compilerOptions.preserveSymlinks && resolvedValue && !resolvedValue.originalPath) { var path = realPath(resolvedValue.path, host, traceEnabled); -@@ -40787,6 +40829,14 @@ var ts; +@@ -41021,6 +41063,14 @@ var ts; } function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state) { var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName)); @@ -2658,7 +2658,7 @@ semver exclusivity >=4.3 // First look for a nested package.json, as in `node_modules/foo/bar/package.json`. var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state); if (packageInfo) { -@@ -40802,9 +40852,12 @@ var ts; +@@ -41036,9 +41086,12 @@ var ts; loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.packageJsonContent, packageInfo && packageInfo.versionPaths); return withPackageId(packageInfo, pathAndExtension); }; @@ -2673,7 +2673,7 @@ semver exclusivity >=4.3 // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings. packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state); if (packageInfo && packageInfo.versionPaths) { -@@ -40962,6 +41015,58 @@ var ts; +@@ -41196,6 +41249,58 @@ var ts; function toSearchResult(value) { return value !== undefined ? { value: value } : undefined; } @@ -2732,7 +2732,7 @@ semver exclusivity >=4.3 })(ts || (ts = {})); /* @internal */ var ts; -@@ -108341,6 +108446,8 @@ var ts; +@@ -108297,6 +108402,8 @@ var ts; ConfigFileProgramReloadLevel[ConfigFileProgramReloadLevel["Partial"] = 1] = "Partial"; /** Reload completely by re-reading contents of config file from disk and updating program */ ConfigFileProgramReloadLevel[ConfigFileProgramReloadLevel["Full"] = 2] = "Full"; @@ -2741,7 +2741,7 @@ semver exclusivity >=4.3 })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {})); /** * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project -@@ -114694,6 +114801,29 @@ var ts; +@@ -114684,6 +114791,29 @@ var ts; return undefined; } var parts = getNodeModulePathParts(path); @@ -2771,7 +2771,7 @@ semver exclusivity >=4.3 if (!parts) { return undefined; } -@@ -114724,18 +114854,24 @@ var ts; +@@ -114714,18 +114844,24 @@ var ts; if (isRedirect && !isPackageRootPath) { return undefined; } @@ -2805,7 +2805,7 @@ semver exclusivity >=4.3 function tryDirectoryWithPackageJson(packageRootIndex) { var packageRootPath = path.substring(0, packageRootIndex); var packageJsonPath = ts.combinePaths(packageRootPath, "package.json"); -@@ -115523,6 +115659,10 @@ var ts; +@@ -115513,6 +115649,10 @@ var ts; if (configFileName) { configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile); } @@ -2816,7 +2816,7 @@ semver exclusivity >=4.3 var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost); ts.setGetSourceFileAsHashVersioned(compilerHost, host); // Members for CompilerHost -@@ -115601,6 +115741,10 @@ var ts; +@@ -115591,6 +115731,10 @@ var ts; configFileWatcher.close(); configFileWatcher = undefined; } @@ -2827,7 +2827,7 @@ semver exclusivity >=4.3 extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear(); extendedConfigCache = undefined; if (sharedExtendedConfigFileWatchers) { -@@ -115633,7 +115777,8 @@ var ts; +@@ -115623,7 +115767,8 @@ var ts; function getCurrentProgram() { return builderProgram && builderProgram.getProgramOrUndefined(); } @@ -2837,7 +2837,7 @@ semver exclusivity >=4.3 writeLog("Synchronizing program"); clearInvalidateResolutionsOfFailedLookupLocations(); var program = getCurrentBuilderProgram(); -@@ -115644,7 +115789,7 @@ var ts; +@@ -115634,7 +115779,7 @@ var ts; } } // All resolutions are invalid if user provided resolutions @@ -2846,7 +2846,7 @@ semver exclusivity >=4.3 if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) { if (hasChangedConfigFileParsingErrors) { builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences); -@@ -115844,6 +115989,12 @@ var ts; +@@ -115834,6 +115979,12 @@ var ts; reloadLevel = ts.ConfigFileProgramReloadLevel.Full; scheduleProgramUpdate(); } @@ -2859,7 +2859,7 @@ semver exclusivity >=4.3 function updateProgramWithWatchStatus() { timerToUpdateProgram = undefined; reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation); -@@ -115859,6 +116010,10 @@ var ts; +@@ -115849,6 +116000,10 @@ var ts; ts.perfLogger.logStartUpdateProgram("FullConfigReload"); reloadConfigFile(); break; diff --git a/packages/plugin-compat/sources/patches/typescript.patch.ts b/packages/plugin-compat/sources/patches/typescript.patch.ts index 15dc7874c8da..b347917c297e 100644 --- a/packages/plugin-compat/sources/patches/typescript.patch.ts +++ b/packages/plugin-compat/sources/patches/typescript.patch.ts @@ -2,7 +2,7 @@ let patch: string; export function getPatch() { if (typeof patch === `undefined`) - patch = require(`zlib`).brotliDecompressSync(Buffer.from(`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`, `base64`)).toString(); + patch = require(`zlib`).brotliDecompressSync(Buffer.from(`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`, `base64`)).toString(); return patch; } diff --git a/packages/plugin-constraints/package.json b/packages/plugin-constraints/package.json index 30b485aa08bd..1375e2062319 100644 --- a/packages/plugin-constraints/package.json +++ b/packages/plugin-constraints/package.json @@ -25,7 +25,7 @@ "@yarnpkg/builder": "workspace:*", "@yarnpkg/cli": "workspace:*", "@yarnpkg/core": "workspace:*", - "typescript": "beta" + "typescript": "^4.3.2" }, "scripts": { "build:plugin-constraints": "builder build plugin", diff --git a/packages/plugin-exec/package.json b/packages/plugin-exec/package.json index e18a806abee7..52d8212a0aa8 100644 --- a/packages/plugin-exec/package.json +++ b/packages/plugin-exec/package.json @@ -13,7 +13,7 @@ }, "devDependencies": { "@yarnpkg/core": "workspace:*", - "typescript": "beta" + "typescript": "^4.3.2" }, "scripts": { "build:plugin-exec": "builder build plugin", diff --git a/packages/plugin-interactive-tools/package.json b/packages/plugin-interactive-tools/package.json index 6617fda4d7bb..d7096d00103d 100644 --- a/packages/plugin-interactive-tools/package.json +++ b/packages/plugin-interactive-tools/package.json @@ -27,7 +27,7 @@ "@yarnpkg/cli": "workspace:*", "@yarnpkg/core": "workspace:*", "@yarnpkg/plugin-essentials": "workspace:*", - "typescript": "beta" + "typescript": "^4.3.2" }, "repository": { "type": "git", diff --git a/packages/plugin-stage/package.json b/packages/plugin-stage/package.json index a875a48c74ae..55e510a0e016 100644 --- a/packages/plugin-stage/package.json +++ b/packages/plugin-stage/package.json @@ -16,7 +16,7 @@ "@yarnpkg/builder": "workspace:*", "@yarnpkg/cli": "workspace:*", "@yarnpkg/core": "workspace:*", - "typescript": "beta" + "typescript": "^4.3.2" }, "scripts": { "build:plugin-stage": "builder build plugin", diff --git a/packages/plugin-typescript/package.json b/packages/plugin-typescript/package.json index b27094ddbdea..16d84ec6d295 100644 --- a/packages/plugin-typescript/package.json +++ b/packages/plugin-typescript/package.json @@ -21,7 +21,7 @@ "@yarnpkg/cli": "workspace:*", "@yarnpkg/core": "workspace:*", "@yarnpkg/plugin-essentials": "workspace:*", - "typescript": "beta" + "typescript": "^4.3.2" }, "scripts": { "build:plugin-typescript": "builder build plugin", diff --git a/packages/plugin-version/package.json b/packages/plugin-version/package.json index 62cbf79ae7a8..6c53385fbdbf 100644 --- a/packages/plugin-version/package.json +++ b/packages/plugin-version/package.json @@ -25,7 +25,7 @@ "@yarnpkg/cli": "workspace:*", "@yarnpkg/core": "workspace:*", "@yarnpkg/plugin-pack": "workspace:*", - "typescript": "beta" + "typescript": "^4.3.2" }, "scripts": { "build:plugin-version": "builder build plugin", diff --git a/packages/plugin-workspace-tools/package.json b/packages/plugin-workspace-tools/package.json index 841ba954725c..4872b9d79f40 100644 --- a/packages/plugin-workspace-tools/package.json +++ b/packages/plugin-workspace-tools/package.json @@ -20,7 +20,7 @@ "@yarnpkg/builder": "workspace:*", "@yarnpkg/cli": "workspace:*", "@yarnpkg/core": "workspace:*", - "typescript": "beta" + "typescript": "^4.3.2" }, "scripts": { "build:plugin-workspace-tools": "builder build plugin", diff --git a/packages/vscode-zipfs/package.json b/packages/vscode-zipfs/package.json index c9acdc0fb692..529ff5f7d211 100644 --- a/packages/vscode-zipfs/package.json +++ b/packages/vscode-zipfs/package.json @@ -75,7 +75,7 @@ "@yarnpkg/libzip": "workspace:*", "@yarnpkg/pnpify": "workspace:*", "ts-loader": "^7.0.5", - "typescript": "beta", + "typescript": "^4.3.2", "vsce": "^1.85.1", "webpack": "^5.1.1", "webpack-cli": "^4.0.0-beta.8" diff --git a/packages/yarnpkg-builder/package.json b/packages/yarnpkg-builder/package.json index e4f5aa928889..bdff0ba7c0de 100644 --- a/packages/yarnpkg-builder/package.json +++ b/packages/yarnpkg-builder/package.json @@ -31,7 +31,7 @@ "@types/terser-webpack-plugin": "^3.0.0", "@types/webpack-merge": "^4.1.5", "@yarnpkg/monorepo": "workspace:*", - "typescript": "beta" + "typescript": "^4.3.2" }, "peerDependencies": { "typescript": "*" diff --git a/packages/yarnpkg-cli/package.json b/packages/yarnpkg-cli/package.json index fb011ecba8ca..4dac86ae6ace 100644 --- a/packages/yarnpkg-cli/package.json +++ b/packages/yarnpkg-cli/package.json @@ -40,7 +40,7 @@ "@yarnpkg/monorepo": "workspace:*", "@yarnpkg/pnpify": "workspace:*", "micromatch": "^4.0.2", - "typescript": "beta" + "typescript": "^4.3.2" }, "peerDependencies": { "@yarnpkg/core": "^3.0.0-rc.2" diff --git a/packages/yarnpkg-doctor/package.json b/packages/yarnpkg-doctor/package.json index 7ac5a06b6ee3..2dcf39c20d3f 100644 --- a/packages/yarnpkg-doctor/package.json +++ b/packages/yarnpkg-doctor/package.json @@ -12,7 +12,7 @@ "micromatch": "^4.0.2", "p-limit": "^2.2.0", "tslib": "^1.13.0", - "typescript": "beta" + "typescript": "^4.3.2" }, "devDependencies": { "@types/micromatch": "^4.0.1", diff --git a/packages/yarnpkg-pnp/package.json b/packages/yarnpkg-pnp/package.json index ffb4f2c66be4..7ec6e7197341 100644 --- a/packages/yarnpkg-pnp/package.json +++ b/packages/yarnpkg-pnp/package.json @@ -13,7 +13,7 @@ "@yarnpkg/builder": "workspace:*", "@yarnpkg/libzip": "workspace:*", "@yarnpkg/monorepo": "workspace:*", - "typescript": "beta", + "typescript": "^4.3.2", "webpack": "^5.1.1", "webpack-cli": "^4.0.0-beta.8" }, diff --git a/packages/yarnpkg-pnpify/package.json b/packages/yarnpkg-pnpify/package.json index e69359925ea4..a3f94427ed52 100644 --- a/packages/yarnpkg-pnpify/package.json +++ b/packages/yarnpkg-pnpify/package.json @@ -22,7 +22,7 @@ "@yarnpkg/monorepo": "workspace:*", "@yarnpkg/pnp": "workspace:*", "eslint": "^6.8.0", - "typescript": "beta" + "typescript": "^4.3.2" }, "peerDependencies": { "eslint": "*", diff --git a/yarn.lock b/yarn.lock index ce332ded6d19..0a79fdd7372e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5489,7 +5489,7 @@ __metadata: terser-webpack-plugin: ^3.0.4 ts-loader: ^7.0.5 tslib: ^1.13.0 - typescript: beta + typescript: ^4.3.2 val-loader: ^2.1.1 webpack: ^5.1.1 webpack-merge: ^4.2.2 @@ -5537,7 +5537,7 @@ __metadata: semver: ^7.1.2 tslib: ^1.13.0 typanion: ^3.3.0 - typescript: beta + typescript: ^4.3.2 yup: ^0.32.9 peerDependencies: "@yarnpkg/core": ^3.0.0-rc.2 @@ -5614,7 +5614,7 @@ __metadata: micromatch: ^4.0.2 p-limit: ^2.2.0 tslib: ^1.13.0 - typescript: beta + typescript: ^4.3.2 bin: doctor: ./sources/boot-cli-dev.js languageName: unknown @@ -5747,7 +5747,7 @@ __metadata: typedoc: next typedoc-neo-theme: ^1.0.7 typedoc-plugin-yarn: "portal:./typedoc-plugin-yarn" - typescript: beta + typescript: ^4.3.2 unescape-html: ^1.1.0 unfetch: ^4.1.0 unified: ^7.1.0 @@ -5825,7 +5825,7 @@ __metadata: jest-junit: ^10.0.0 micromatch: ^4.0.2 tslib: ^1.13.0 - typescript: beta + typescript: ^4.3.2 dependenciesMeta: core-js: built: false @@ -5892,7 +5892,7 @@ __metadata: node-emoji: ^1.8.1 tau-prolog: ^0.2.66 tslib: ^1.13.0 - typescript: beta + typescript: ^4.3.2 peerDependencies: "@yarnpkg/cli": ^3.0.0-rc.2 "@yarnpkg/core": ^3.0.0-rc.2 @@ -5951,7 +5951,7 @@ __metadata: "@yarnpkg/core": "workspace:*" "@yarnpkg/fslib": "workspace:^2.5.0-rc.2" tslib: ^1.13.0 - typescript: beta + typescript: ^4.3.2 peerDependencies: "@yarnpkg/core": ^3.0.0-rc.2 languageName: unknown @@ -6048,7 +6048,7 @@ __metadata: react: ^16.13.1 semver: ^7.1.2 tslib: ^1.13.0 - typescript: beta + typescript: ^4.3.2 peerDependencies: "@yarnpkg/cli": ^3.0.0-rc.2 "@yarnpkg/core": ^3.0.0-rc.2 @@ -6202,7 +6202,7 @@ __metadata: "@yarnpkg/fslib": "workspace:^2.5.0-rc.2" clipanion: ^3.0.0-rc.10 tslib: ^1.13.0 - typescript: beta + typescript: ^4.3.2 peerDependencies: "@yarnpkg/cli": ^3.0.0-rc.2 "@yarnpkg/core": ^3.0.0-rc.2 @@ -6223,7 +6223,7 @@ __metadata: algoliasearch: ^4.2.0 semver: ^7.1.2 tslib: ^1.13.0 - typescript: beta + typescript: ^4.3.2 peerDependencies: "@yarnpkg/cli": ^3.0.0-rc.2 "@yarnpkg/core": ^3.0.0-rc.2 @@ -6249,7 +6249,7 @@ __metadata: react: ^16.13.1 semver: ^7.1.2 tslib: ^1.13.0 - typescript: beta + typescript: ^4.3.2 peerDependencies: "@yarnpkg/cli": ^3.0.0-rc.2 "@yarnpkg/core": ^3.0.0-rc.2 @@ -6271,7 +6271,7 @@ __metadata: p-limit: ^2.2.0 tslib: ^1.13.0 typanion: ^3.3.0 - typescript: beta + typescript: ^4.3.2 peerDependencies: "@yarnpkg/cli": ^3.0.0-rc.2 "@yarnpkg/core": ^3.0.0-rc.2 @@ -6289,7 +6289,7 @@ __metadata: "@yarnpkg/monorepo": "workspace:*" resolve.exports: ^1.0.2 tslib: ^1.13.0 - typescript: beta + typescript: ^4.3.2 webpack: ^5.1.1 webpack-cli: ^4.0.0-beta.8 languageName: unknown @@ -6312,7 +6312,7 @@ __metadata: eslint: ^6.8.0 lodash: ^4.17.15 tslib: ^1.13.0 - typescript: beta + typescript: ^4.3.2 peerDependencies: eslint: "*" typescript: "*" @@ -26350,19 +26350,19 @@ typescript@3.7.x: languageName: node linkType: hard -typescript@beta: - version: 4.3.0-beta - resolution: "typescript@npm:4.3.0-beta" +typescript@^4.3.2: + version: 4.3.2 + resolution: "typescript@npm:4.3.2" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: c165f915ad33919643fceeb71a70f5483fba468509bf4a04a7465f61dc14886dfc5f9bdf5ef3dd4dbf4d7204854abe1935e215d2c15080dd0bf6cba39e009908 + checksum: c2a86fa03ce03b255adc13ccd70a55173ca6539ae12114feca59f34a4e9bb69f14fb7cd5adc6c2416e568cff05c870b89d1366768ec55fce04fbdffb429a1cee languageName: node linkType: hard "typescript@patch:typescript@3.7.x#~builtin": version: 3.7.5 - resolution: "typescript@patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=ea7f47" + resolution: "typescript@patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=d8b4e7" bin: tsc: bin/tsc tsserver: bin/tsserver @@ -26372,7 +26372,7 @@ typescript@beta: "typescript@patch:typescript@^3.8.3#~builtin, typescript@patch:typescript@^3.9.3#~builtin": version: 3.9.5 - resolution: "typescript@patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=ea7f47" + resolution: "typescript@patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=d8b4e7" bin: tsc: bin/tsc tsserver: bin/tsserver @@ -26380,13 +26380,13 @@ typescript@beta: languageName: node linkType: hard -"typescript@patch:typescript@beta#~builtin": - version: 4.3.0-beta - resolution: "typescript@patch:typescript@npm%3A4.3.0-beta#~builtin::version=4.3.0-beta&hash=ea7f47" +"typescript@patch:typescript@^4.3.2#~builtin": + version: 4.3.2 + resolution: "typescript@patch:typescript@npm%3A4.3.2#~builtin::version=4.3.2&hash=d8b4e7" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: ca7a161bc6a4ca9dac511265923c90e1071d85871fa95f6d31738eb959e51cda1fdc55ed70c9b941e015f03b95b55d8ce4402acb5bb51006bd63a10c2ea975f2 + checksum: 3d3dec06ba6e5b05caa292355712ed9db813fa1c2377630b1f24b42e5ee8957f0bcdd5efd1500c970a11a6f684897f5728f5542ac822932227159a0611499a5e languageName: node linkType: hard @@ -27327,7 +27327,7 @@ typescript@beta: "@yarnpkg/pnpify": "workspace:*" ts-loader: ^7.0.5 tslib: ^1.13.0 - typescript: beta + typescript: ^4.3.2 vsce: ^1.85.1 webpack: ^5.1.1 webpack-cli: ^4.0.0-beta.8