diff --git a/.pnp.cjs b/.pnp.cjs index e9e4b2e4d99a..953cc41cd16d 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -288,7 +288,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.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "linkType": "SOFT", }] @@ -8824,7 +8824,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["regexpp", "npm:3.2.0"], ["semver", "npm:7.3.5"], ["tsutils", "virtual:5e27cd7a319c4b7c3909eb012bf293660fa275bf4eddce08571aa0562ef7b9b8f3c02315f6dad27820a35a49c368107bf917cd6e2a8d99abe84b6a230d415fc4#npm:3.21.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/eslint", @@ -8993,7 +8993,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@typescript-eslint/typescript-estree", "virtual:fe98bd70d13aaca1010fe6d701118ea3af3e45d43c8d6c5a099bc3b50f958b72e1ed6da100c174f4c93673179c6f276656d496d7d151b1435a7d2a99739ef29a#npm:5.3.1"], ["debug", "virtual:5dffae5dceca8d383e37ce1404983ff3eaf566153fb551aede58a16b625356caee63d9240a4386c2b8b44a2ff32b72c5d4444045ea31775b520ccbc9788f7985#npm:4.3.2"], ["eslint", "npm:8.2.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/eslint", @@ -9149,7 +9149,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["is-glob", "npm:4.0.3"], ["semver", "npm:7.3.5"], ["tsutils", "virtual:5e27cd7a319c4b7c3909eb012bf293660fa275bf4eddce08571aa0562ef7b9b8f3c02315f6dad27820a35a49c368107bf917cd6e2a8d99abe84b6a230d415fc4#npm:3.21.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/typescript", @@ -9624,7 +9624,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.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.38.1"], ["webpack-merge", "npm:4.2.2"] @@ -9665,7 +9665,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.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.38.1"], ["webpack-merge", "npm:4.2.2"] @@ -9706,7 +9706,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.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.38.1"], ["webpack-merge", "npm:4.2.2"] @@ -9746,7 +9746,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.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.38.1"], ["webpack-merge", "npm:4.2.2"] @@ -9793,7 +9793,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.5"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.2"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -9840,7 +9840,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.5"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.2"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -9887,7 +9887,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.5"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.2"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -9934,7 +9934,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.5"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.2"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -9981,7 +9981,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.5"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.2"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10028,7 +10028,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.5"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.2"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10075,7 +10075,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.5"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.2"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10122,7 +10122,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.5"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.2"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10169,7 +10169,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.5"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.2"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10216,7 +10216,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.5"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.2"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10263,7 +10263,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.5"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.2"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10310,7 +10310,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.5"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.2"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10357,7 +10357,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.5"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.2"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10403,7 +10403,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.5"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.2"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["yup", "npm:0.32.9"] ], "linkType": "SOFT", @@ -10486,7 +10486,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.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "linkType": "SOFT", }] @@ -10537,7 +10537,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["eslint", "npm:8.2.0"], ["eslint-plugin-arca", "npm:0.12.1"], ["eslint-plugin-react", "virtual:4b728ee22ccd3ae66b83e3be6d39acfb5b7a775112cc78b6b4322feb849fcfe6e39510452356cb4477dc6089bee57db31d02bbfb03b9fc8e914effa16a4145be#npm:7.25.1"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/eslint", @@ -10663,7 +10663,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.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["unescape-html", "npm:1.1.0"], ["unfetch", "npm:4.1.0"], ["unified", "npm:7.1.0"], @@ -10766,7 +10766,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.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "linkType": "SOFT", }] @@ -11180,7 +11180,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.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "linkType": "SOFT", }] @@ -12069,7 +12069,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.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "linkType": "SOFT", }] @@ -12546,7 +12546,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["react", "npm:16.13.1"], ["semver", "npm:7.3.5"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "linkType": "SOFT", }] @@ -15328,7 +15328,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15350,7 +15350,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15372,7 +15372,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15394,7 +15394,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15416,7 +15416,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15438,7 +15438,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15460,7 +15460,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15482,7 +15482,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15504,7 +15504,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15526,7 +15526,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15548,7 +15548,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15570,7 +15570,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15592,7 +15592,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15614,7 +15614,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -15634,7 +15634,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"], ["clipanion", "virtual:02f08ef8b8f3af06d08a146e8941d7fef41abbe0f441d85250a110dd2773e679dff502bd7763f42309743e1ddb33847a4bc3aab82132068c9954ae25f4c4bce5#npm:3.0.1"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "linkType": "SOFT", }] @@ -15654,7 +15654,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["algoliasearch", "npm:4.2.0"], ["semver", "npm:7.3.5"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "linkType": "SOFT", }] @@ -15680,7 +15680,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["react", "npm:16.13.1"], ["semver", "npm:7.3.5"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "linkType": "SOFT", }] @@ -15701,7 +15701,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["p-limit", "npm:2.2.0"], ["tslib", "npm:1.13.0"], ["typanion", "npm:3.3.2"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "linkType": "SOFT", }] @@ -15726,7 +15726,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["rollup", "npm:2.45.2"], ["rollup-plugin-esbuild", "virtual:16110bda3ce959c103b1979c5d750ceb8ac9cfbd2049c118b6278e46e65aa65fd17e71e04a0ce5f75b7ca3203efd8e9c9b03c948a76c7f4bca807539915b5cfc#npm:3.0.4"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["webpack", "virtual:16110bda3ce959c103b1979c5d750ceb8ac9cfbd2049c118b6278e46e65aa65fd17e71e04a0ce5f75b7ca3203efd8e9c9b03c948a76c7f4bca807539915b5cfc#npm:5.38.1"], ["webpack-cli", "virtual:16110bda3ce959c103b1979c5d750ceb8ac9cfbd2049c118b6278e46e65aa65fd17e71e04a0ce5f75b7ca3203efd8e9c9b03c948a76c7f4bca807539915b5cfc#npm:4.0.0-beta.8"] ], @@ -23331,7 +23331,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.5.2#~builtin::version=4.5.2&hash=493e53"], + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"], ["vue-template-compiler", null], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.38.1"] ], @@ -30438,7 +30438,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=493e53"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=de8f8a"] ], "packagePeers": [ "@types/react-dom", @@ -38952,7 +38952,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.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/typescript", @@ -39082,7 +39082,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["tsutils", "virtual:5e27cd7a319c4b7c3909eb012bf293660fa275bf4eddce08571aa0562ef7b9b8f3c02315f6dad27820a35a49c368107bf917cd6e2a8d99abe84b6a230d415fc4#npm:3.21.0"], ["@types/typescript", null], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@types/typescript", @@ -39324,7 +39324,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.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "packagePeers": [ "@strictsoftware/typedoc-plugin-monorepo", @@ -39359,7 +39359,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=493e53"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=de8f8a"] ], "packagePeers": [ "@strictsoftware/typedoc-plugin-monorepo", @@ -39393,7 +39393,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=493e53"] + ["typescript", "patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=de8f8a"] ], "packagePeers": [ "@strictsoftware/typedoc-plugin-monorepo", @@ -39446,30 +39446,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=493e53"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=de8f8a"] ], "linkType": "SOFT", }] ]], ["typescript", [ - ["patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=493e53", { - "packageLocation": "./.yarn/cache/typescript-patch-79d0c62131-6a82cb02b2.zip/node_modules/typescript/", + ["patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=de8f8a", { + "packageLocation": "./.yarn/cache/typescript-patch-b7dd24e578-6a82cb02b2.zip/node_modules/typescript/", "packageDependencies": [ - ["typescript", "patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=493e53"] + ["typescript", "patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=de8f8a"] ], "linkType": "HARD", }], - ["patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=493e53", { - "packageLocation": "./.yarn/cache/typescript-patch-86dfa756b8-bfea14f536.zip/node_modules/typescript/", + ["patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=de8f8a", { + "packageLocation": "./.yarn/cache/typescript-patch-e9dd59f50e-bfea14f536.zip/node_modules/typescript/", "packageDependencies": [ - ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=493e53"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=de8f8a"] ], "linkType": "HARD", }], - ["patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53", { - "packageLocation": "./.yarn/cache/typescript-patch-613ccf361e-53838d56ab.zip/node_modules/typescript/", + ["patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a", { + "packageLocation": "./.yarn/cache/typescript-patch-2d2a037988-e25e689eba.zip/node_modules/typescript/", "packageDependencies": [ - ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53"] + ["typescript", "patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a"] ], "linkType": "HARD", }] diff --git a/.yarn/cache/typescript-patch-613ccf361e-53838d56ab.zip b/.yarn/cache/typescript-patch-2d2a037988-e25e689eba.zip similarity index 86% rename from .yarn/cache/typescript-patch-613ccf361e-53838d56ab.zip rename to .yarn/cache/typescript-patch-2d2a037988-e25e689eba.zip index 8f0c2aae072c..4b64c9d312b2 100644 Binary files a/.yarn/cache/typescript-patch-613ccf361e-53838d56ab.zip and b/.yarn/cache/typescript-patch-2d2a037988-e25e689eba.zip differ diff --git a/.yarn/cache/typescript-patch-79d0c62131-6a82cb02b2.zip b/.yarn/cache/typescript-patch-b7dd24e578-6a82cb02b2.zip similarity index 100% rename from .yarn/cache/typescript-patch-79d0c62131-6a82cb02b2.zip rename to .yarn/cache/typescript-patch-b7dd24e578-6a82cb02b2.zip diff --git a/.yarn/cache/typescript-patch-86dfa756b8-bfea14f536.zip b/.yarn/cache/typescript-patch-e9dd59f50e-bfea14f536.zip similarity index 100% rename from .yarn/cache/typescript-patch-86dfa756b8-bfea14f536.zip rename to .yarn/cache/typescript-patch-e9dd59f50e-bfea14f536.zip diff --git a/.yarn/versions/7639258b.yml b/.yarn/versions/7639258b.yml new file mode 100644 index 000000000000..1494bd471424 --- /dev/null +++ b/.yarn/versions/7639258b.yml @@ -0,0 +1,23 @@ +releases: + "@yarnpkg/cli": patch + "@yarnpkg/plugin-compat": patch + +declined: + - "@yarnpkg/plugin-constraints" + - "@yarnpkg/plugin-dlx" + - "@yarnpkg/plugin-essentials" + - "@yarnpkg/plugin-init" + - "@yarnpkg/plugin-interactive-tools" + - "@yarnpkg/plugin-nm" + - "@yarnpkg/plugin-npm-cli" + - "@yarnpkg/plugin-pack" + - "@yarnpkg/plugin-patch" + - "@yarnpkg/plugin-pnp" + - "@yarnpkg/plugin-pnpm" + - "@yarnpkg/plugin-stage" + - "@yarnpkg/plugin-typescript" + - "@yarnpkg/plugin-version" + - "@yarnpkg/plugin-workspace-tools" + - "@yarnpkg/builder" + - "@yarnpkg/core" + - "@yarnpkg/doctor" diff --git a/packages/plugin-compat/extra/typescript/gen-typescript-patch.js b/packages/plugin-compat/extra/typescript/gen-typescript-patch.js index 5fe6e02bbb75..8a46e8034f28 100644 --- a/packages/plugin-compat/extra/typescript/gen-typescript-patch.js +++ b/packages/plugin-compat/extra/typescript/gen-typescript-patch.js @@ -60,27 +60,28 @@ const SLICES = [ // https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.2 { from: `8e0e8703b9c95013aec7819e4593d099cdf7763a`, - to: `545d5a8c5409dac447a668d4e7d315702fd115d6`, + to: `178a67b4663d80b0fcbea542e7255b4499b51708`, onto: `bfc55b5762443c37ecdef08a3b5a4e057b4d1e85`, range: `>=4.2 <4.3`, }, // https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.3 { from: `530aad19e4ac19d35cb6b200168c91ce86cb0050`, - to: `6d7d4d2ce0df8e65a2c86a20c014c053ef530ea3`, + to: `ffa54c5a104e7940b5c23666ddffbf44878f9d9f`, onto: `28e3e6ff2f49f1dbf06d31809ec73dbe42f1aa63`, range: `>=4.3 <4.4`, }, // https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.4 { from: `793bfe32745bf6797924354b0fd5be62cf01950c`, - to: `88a10595c32309fc26eb4a7f5a858d98e883dae0`, + to: `20ffca2f3c48591c971e6606a55b7b1820d8a64f`, onto: `a10409ccaa3604790dc45f52ef0402eb49015dcf`, range: `>=4.4 <4.5`, }, + // https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.5 { from: `79fe5d206f89e5f1585807bdcd7feeb567a69646`, - to: `79fe5d206f89e5f1585807bdcd7feeb567a69646`, + to: `fff89a12766fa485e35b1c65d8631d109c4e2c0e`, onto: `7893f689fedcfe28a499d119d34844840bce9160`, range: `>=4.5.2`, }, diff --git a/packages/plugin-compat/extra/typescript/patch-237f109a166d02eca3ed935b5b77dc3a.diff b/packages/plugin-compat/extra/typescript/patch-004fedee87dc6ed39b2a2ee44e2a42a9.diff similarity index 99% rename from packages/plugin-compat/extra/typescript/patch-237f109a166d02eca3ed935b5b77dc3a.diff rename to packages/plugin-compat/extra/typescript/patch-004fedee87dc6ed39b2a2ee44e2a42a9.diff index 4f17c5427a6f..fd4528a69009 100644 --- a/packages/plugin-compat/extra/typescript/patch-237f109a166d02eca3ed935b5b77dc3a.diff +++ b/packages/plugin-compat/extra/typescript/patch-004fedee87dc6ed39b2a2ee44e2a42a9.diff @@ -1,5 +1,5 @@ diff --git a/lib/tsc.js b/lib/tsc.js -index 7f46cc9d8..7cbce60e4 100644 +index 7f46cc9d8..fd2e81687 100644 semver exclusivity >=4.2 <4.3 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -189,8 +189,8 @@ semver exclusivity >=4.2 <4.3 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); -+ if (locator !== null) { ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + if (locator === sourceLocator) { + return undefined; @@ -300,7 +300,7 @@ semver exclusivity >=4.2 <4.3 ts.perfLogger.logStartUpdateProgram("SynchronizeProgram"); synchronizeProgram(); diff --git a/lib/tsserver.js b/lib/tsserver.js -index a1d0a7a17..d91fc7268 100644 +index a1d0a7a17..a85af606d 100644 semver exclusivity >=4.2 <4.3 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -509,9 +509,9 @@ semver exclusivity >=4.2 <4.3 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) @@ -935,7 +935,7 @@ semver exclusivity >=4.2 <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 diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js -index e8537e466..a9b26d7bc 100644 +index e8537e466..499df472c 100644 semver exclusivity >=4.2 <4.3 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -1144,9 +1144,9 @@ semver exclusivity >=4.2 <4.3 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) @@ -1548,7 +1548,7 @@ semver exclusivity >=4.2 <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 diff --git a/lib/typescript.js b/lib/typescript.js -index 8539f89fd..1a23b4f8d 100644 +index 8539f89fd..ae4dbaa64 100644 semver exclusivity >=4.2 <4.3 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -1757,9 +1757,9 @@ semver exclusivity >=4.2 <4.3 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) @@ -2058,7 +2058,7 @@ semver exclusivity >=4.2 <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 diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js -index 6b08bfe23..26108a400 100644 +index 6b08bfe23..5019e423b 100644 semver exclusivity >=4.2 <4.3 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -2267,9 +2267,9 @@ semver exclusivity >=4.2 <4.3 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) @@ -2555,7 +2555,7 @@ semver exclusivity >=4.2 <4.3 return statement; }); diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js -index 9fa096358..79265c286 100644 +index 9fa096358..0c97fc3ff 100644 semver exclusivity >=4.2 <4.3 --- a/lib/typingsInstaller.js +++ b/lib/typingsInstaller.js @@ -2764,9 +2764,9 @@ semver exclusivity >=4.2 <4.3 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) diff --git a/packages/plugin-compat/extra/typescript/patch-4dc03175a57925faac72200a27c4bbff.diff b/packages/plugin-compat/extra/typescript/patch-77f15852b4335e1effa11d15ccc193d6.diff similarity index 99% rename from packages/plugin-compat/extra/typescript/patch-4dc03175a57925faac72200a27c4bbff.diff rename to packages/plugin-compat/extra/typescript/patch-77f15852b4335e1effa11d15ccc193d6.diff index f33f77d6d8ce..3ce0dc10b12d 100644 --- a/packages/plugin-compat/extra/typescript/patch-4dc03175a57925faac72200a27c4bbff.diff +++ b/packages/plugin-compat/extra/typescript/patch-77f15852b4335e1effa11d15ccc193d6.diff @@ -1,5 +1,5 @@ diff --git a/lib/tsc.js b/lib/tsc.js -index d425ad1b5..0f7fe5cd1 100644 +index d425ad1b5..4261d27cd 100644 semver exclusivity >=4.4 <4.5 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -189,8 +189,8 @@ semver exclusivity >=4.4 <4.5 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); -+ if (locator !== null) { ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + if (locator === sourceLocator) { + return undefined; @@ -300,7 +300,7 @@ semver exclusivity >=4.4 <4.5 ts.perfLogger.logStartUpdateProgram("SynchronizeProgram"); synchronizeProgram(); diff --git a/lib/tsserver.js b/lib/tsserver.js -index 6e4ee30b7..561057665 100644 +index 6e4ee30b7..779172b83 100644 semver exclusivity >=4.4 <4.5 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -509,9 +509,9 @@ semver exclusivity >=4.4 <4.5 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) @@ -922,7 +922,7 @@ semver exclusivity >=4.4 <4.5 * @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 5fa1cd290..a7852ed52 100644 +index 5fa1cd290..9253c6ff4 100644 semver exclusivity >=4.4 <4.5 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -1131,9 +1131,9 @@ semver exclusivity >=4.4 <4.5 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) @@ -1522,7 +1522,7 @@ semver exclusivity >=4.4 <4.5 * @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 44462973f..3f5a196de 100644 +index 44462973f..dec9f5a1e 100644 semver exclusivity >=4.4 <4.5 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -1731,9 +1731,9 @@ semver exclusivity >=4.4 <4.5 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) @@ -2019,7 +2019,7 @@ semver exclusivity >=4.4 <4.5 * @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 20a6fc52e..c7d12009d 100644 +index 20a6fc52e..662551c39 100644 semver exclusivity >=4.4 <4.5 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -2228,9 +2228,9 @@ semver exclusivity >=4.4 <4.5 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) @@ -2503,7 +2503,7 @@ semver exclusivity >=4.4 <4.5 return statement; }); diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js -index a0e7177a1..1a61d3009 100644 +index a0e7177a1..c3f471586 100644 semver exclusivity >=4.4 <4.5 --- a/lib/typingsInstaller.js +++ b/lib/typingsInstaller.js @@ -2712,9 +2712,9 @@ semver exclusivity >=4.4 <4.5 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) diff --git a/packages/plugin-compat/extra/typescript/patch-44ecdba2b3c1d56d858ed0b65eeb37ae.diff b/packages/plugin-compat/extra/typescript/patch-a008bbf4a5f638549cfb4c967e3fca0d.diff similarity index 99% rename from packages/plugin-compat/extra/typescript/patch-44ecdba2b3c1d56d858ed0b65eeb37ae.diff rename to packages/plugin-compat/extra/typescript/patch-a008bbf4a5f638549cfb4c967e3fca0d.diff index 8557fab5b97c..439232cee191 100644 --- a/packages/plugin-compat/extra/typescript/patch-44ecdba2b3c1d56d858ed0b65eeb37ae.diff +++ b/packages/plugin-compat/extra/typescript/patch-a008bbf4a5f638549cfb4c967e3fca0d.diff @@ -1,5 +1,5 @@ diff --git a/lib/tsc.js b/lib/tsc.js -index 83f54758a..9e8a1c936 100644 +index 83f54758a..b3ab9eb57 100644 semver exclusivity >=4.3 <4.4 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -189,8 +189,8 @@ semver exclusivity >=4.3 <4.4 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); -+ if (locator !== null) { ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + if (locator === sourceLocator) { + return undefined; @@ -300,7 +300,7 @@ semver exclusivity >=4.3 <4.4 ts.perfLogger.logStartUpdateProgram("SynchronizeProgram"); synchronizeProgram(); diff --git a/lib/tsserver.js b/lib/tsserver.js -index 58028943d..54dee3ec2 100644 +index 58028943d..de5bd36e2 100644 semver exclusivity >=4.3 <4.4 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -509,9 +509,9 @@ semver exclusivity >=4.3 <4.4 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) @@ -935,7 +935,7 @@ semver exclusivity >=4.3 <4.4 * @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 ee78ce982..a28cb6882 100644 +index ee78ce982..d8fc9d744 100644 semver exclusivity >=4.3 <4.4 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -1144,9 +1144,9 @@ semver exclusivity >=4.3 <4.4 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) @@ -1548,7 +1548,7 @@ semver exclusivity >=4.3 <4.4 * @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 615ad27f3..2d8faf3fa 100644 +index 615ad27f3..1ccc4561b 100644 semver exclusivity >=4.3 <4.4 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -1757,9 +1757,9 @@ semver exclusivity >=4.3 <4.4 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) @@ -2058,7 +2058,7 @@ semver exclusivity >=4.3 <4.4 * @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 59f7d01b5..2626ac05c 100644 +index 59f7d01b5..7bd6144fa 100644 semver exclusivity >=4.3 <4.4 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -2267,9 +2267,9 @@ semver exclusivity >=4.3 <4.4 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) @@ -2555,7 +2555,7 @@ semver exclusivity >=4.3 <4.4 return statement; }); diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js -index 6810860b9..f2a0436f1 100644 +index 6810860b9..eccc2b444 100644 semver exclusivity >=4.3 <4.4 --- a/lib/typingsInstaller.js +++ b/lib/typingsInstaller.js @@ -2764,9 +2764,9 @@ semver exclusivity >=4.3 <4.4 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator(sourceDirectory + "/"); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) diff --git a/packages/plugin-compat/extra/typescript/patch-2a1b9a360a2526e10b7ddecf40fecc30.diff b/packages/plugin-compat/extra/typescript/patch-a0f4b2d552ff3b4930fdbb2b6ae46be5.diff similarity index 99% rename from packages/plugin-compat/extra/typescript/patch-2a1b9a360a2526e10b7ddecf40fecc30.diff rename to packages/plugin-compat/extra/typescript/patch-a0f4b2d552ff3b4930fdbb2b6ae46be5.diff index 3f33c8061a2c..122f8a44d4f9 100644 --- a/packages/plugin-compat/extra/typescript/patch-2a1b9a360a2526e10b7ddecf40fecc30.diff +++ b/packages/plugin-compat/extra/typescript/patch-a0f4b2d552ff3b4930fdbb2b6ae46be5.diff @@ -1,5 +1,5 @@ diff --git a/lib/tsc.js b/lib/tsc.js -index b7520e834..cc65fa20d 100644 +index b7520e834..a8b13999c 100644 semver exclusivity >=4.5.2 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -192,8 +192,8 @@ semver exclusivity >=4.5.2 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); -+ if (locator !== null) { ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator("".concat(sourceDirectory, "/")); + if (locator === sourceLocator) { + return undefined; @@ -303,7 +303,7 @@ semver exclusivity >=4.5.2 ts.perfLogger.logStartUpdateProgram("SynchronizeProgram"); synchronizeProgram(); diff --git a/lib/tsserver.js b/lib/tsserver.js -index d0063b2e5..dbddbdfaa 100644 +index d0063b2e5..17d21c109 100644 semver exclusivity >=4.5.2 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -518,9 +518,9 @@ semver exclusivity >=4.5.2 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator("".concat(sourceDirectory, "/")); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) @@ -924,7 +924,7 @@ semver exclusivity >=4.5.2 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.js b/lib/tsserverlibrary.js -index 362c8ed2f..bfc2ab594 100644 +index 362c8ed2f..836fb22b4 100644 semver exclusivity >=4.5.2 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -1139,9 +1139,9 @@ semver exclusivity >=4.5.2 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator("".concat(sourceDirectory, "/")); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) @@ -1521,7 +1521,7 @@ semver exclusivity >=4.5.2 var _this = this; var watchers = this.packageJsonFilesMap || (this.packageJsonFilesMap = new ts.Map()); diff --git a/lib/typescript.js b/lib/typescript.js -index b08660b52..c87030840 100644 +index b08660b52..0cefe5195 100644 semver exclusivity >=4.5.2 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -1736,9 +1736,9 @@ semver exclusivity >=4.5.2 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator("".concat(sourceDirectory, "/")); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) @@ -2014,7 +2014,7 @@ semver exclusivity >=4.5.2 return statement; }); diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js -index bbe1b9b37..10cdfa2aa 100644 +index bbe1b9b37..197e2c71c 100644 semver exclusivity >=4.5.2 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -2229,9 +2229,9 @@ semver exclusivity >=4.5.2 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator("".concat(sourceDirectory, "/")); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) @@ -2507,7 +2507,7 @@ semver exclusivity >=4.5.2 return statement; }); diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js -index 514f48a46..0ae6223ab 100644 +index 514f48a46..4d1aa5d8f 100644 semver exclusivity >=4.5.2 --- a/lib/typingsInstaller.js +++ b/lib/typingsInstaller.js @@ -2722,9 +2722,9 @@ semver exclusivity >=4.5.2 + if (!parts && typeof process.versions.pnp !== "undefined") { + var findPnpApi = require("module").findPnpApi; + var pnpApi = findPnpApi(path); -+ var locator = pnpApi.findPackageLocator(path); ++ var locator = pnpApi === null || pnpApi === void 0 ? void 0 : pnpApi.findPackageLocator(path); + // eslint-disable-next-line no-null/no-null -+ if (locator !== null) { ++ if (locator != null) { + var sourceLocator = pnpApi.findPackageLocator("".concat(sourceDirectory, "/")); + // Don't use the package name when the imported file is inside + // the source directory (prefer a relative path instead) diff --git a/packages/plugin-compat/sources/patches/typescript.patch.ts b/packages/plugin-compat/sources/patches/typescript.patch.ts index 9d27111bedf2..3ee6af59d20b 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(`m3wJE1GkN6sQTGg/U6NIb0aTKMP9bivYNuU6vRmRrSm//3UCehrg5OrrHCrSWkCREhF890RJt8fjR4A2EeX46L4IrTIWP/affkbbukX9rgdYBpRx68FI2tVZV558HxxDbdbwcwWkxS9fTf/18/XcF+clrnTSdsJrlW6VKgApOBTI2YUuI09ioW31NNUEPOEYwiH60pTg2ci7Zluqr7fVRbadjqmOuYgcHJcM4LBSeue6QXpmFJpjz6uvUY+qiVCSyyWXY8pujLb8Gjf4fk5Utq7UVA2mJ3RlmbiNgx50eZC/iKz6+5zWK7EBdVOHtfr7yYnjEryCuaayo/JNKQnrzulnbmJV2VwuioDYlbOf/59vWqYk1hgD7K7EWdmIR0GEwwFlnM2UyaNvvVeP0w4roAGcQQMcw+GsoZF19ape/d8OpJcIynmfREpSBaF8FrfDOEt5UsaYTBsEif5XtbLV8UISsUH42gBo3z5ytsc0jVR051TU7o42iUnOubqQZh0rV0okHHIbi9JVSDNXNJ27WhJJ0UFcOQCkA0A5iJRTrGzicT+2A9iMpBpP9K/HMLPdevu+NgYUUYmgecbBv1vifxR6qHpJYLfJLqGa2UoINqVGZPuVV+svIMHCEHvGtE9vL3s1v0alNAHhhbLgmAxd6s/VspNCKKOK/lVFdCXfzx14GtKyVZdT5m/8pmnQKq6SQOv3ma6/18z+LqQ/ayOsvyZQz599+mevPz784zO+/Nr6RpK55Jt68eAFQw9+E0NaYfv1P/Asy495y4oCw5cxMsZg+QUuLtAaYLSBesyzG3nPFvLjJFex/jgrj/75Kd7Ltk5WUKA7zLy+PAVaBmAze3IiIBde+dQgisrwU+TX12lQVqwPWzmaYmnbCkMSAv6tqiVy8As0b5QOuQp0k259vNcVQ4ApWBJRh4lPrUzRTjU/adf4GdE1oEp/y44CfcDw1N5oEOOyjTLOavMlwX8D7ROLrYQ/UYw/mmb82pJItiRYRaJO8b8s0MfBVXrlEVA5+VglWgcRePz+j442Cb6M/38IgrSMqTM8FKFecJcv0dD60T9ns1Q9KuNkdQmrck8g0u84adKkrELIVv3wduwxAy4mKOQ0aR7/AlZt4G0pFcLVH32jD8nFxWvUQsWTC+Z6vI78NIqFUrClUy+bg4HBYmz8WVwbJkMAJuLLLIdAwdwYqcqsvGkFHC0FTxdXv1keR/VtRgPAKkJa8dd1Yuej83EWvEJGJOhbeJqoHIHzGbu+vURKAHeFsBGqKhP7CeN4pAPuvB5XgCQFn10TZKNminVv2DpEIPmy5c1Lk2UOyR6pHLd+lzc/h5tWLt0oZ9yCcZctnS/oTKIpnIH16MI84Nr1OY5j0tAMfE58UgA3olWWCBKpaMSaKmmNVY5puvPrDruOqcrAVEb6Zj4rE6MxkOwUKJnVAzVewmCOuWOAmuauS4s8NVYNj/V4CapXcNF/2nq1tGZR6qDGr+Ipsn1MlWIBllUR9SgeHA0vtm5sI67NCaheZKqfWvIo+7ny1FSYSwymj6m+uBYWKnKFhV+ytUDfv/7w4IkXYdaLQMTFCSWzKEeUAjt7GVuASDsqGQ5Rk21EvybS+uHFBgEV0uvSakDBAtprVhl6fP1rhR/pNk5iRwqoKvbm9YlXpobk5HvZoFbqxEQgkLfYt9Iw3a5LFEhmbr6LCIRuwgCTeYw3OMsr3wYSTnDlITdO/nr6zOaMZFneF+WbzvD2+LD531wOPCo3sNF35+gsYkD4VHguM1nRJli+xP/YOAdHyFPBjV2oPB9EajQSbo3oPeY8n5IP4XqdWWjw1GvuuGzyixJ6o7lUvqFOdrgSvuFCFL6jdKnaAaXlenMB61Tl/GJc9iTUxl5TmKmde5bFx426/0/Y6KolypU6bSTX623OG+uUW5ETq7UlKedAkGMd33fr19/Qoe/Mz7XsF52rbWl+QiZxilW9YePk5s1xW/6G6hcblMlaLIghONyehPySm19qi06gBd3ddk7Vg6KZ174l1QdDLTgeQRMglOKZjlh4jTlWvRxrdGPodGm/n4vuGhR2DR8vdkdv/vCTIANK8tJiauUmFz8K34NAIYQXFHRRbxT1xT6eYj/YUw6OyC+XMu/rp8dQGDmhtVsIYV00Zps7KL818iAvq7BBNlm1yBktAsB3IHzsyn43IltDG7I4ClE2+5LA2F+36/D7Qh6bXygDlTeLzWE5YyndxucKMQptWs7UMW1agXGLp7hf2y9E8A6XbI8eZpRG3G584FaIqi09f2U2s50Od6c4uugOnmkBYbYsekjircRt5e6z6Kg+KCT9zZslC4eutoxt7dAmt+tEV7EWgPgWJsFtRXdboqFWpUV4ZuhYCKJdOUviSwMCjBHVSOKII+xbO+9hCmi7ejSlcodd0TXe6xSHTiRoGeZXaRzQeR1rl3Qd0lfNHdsGTKcwur0nACTpsZUM5aceTSDCBH9NYBFAwcikQcCmpymsCKrpXpe+XOQ+L4ElcvACWZwj0hFRYPI5I5HqBIfIr2K5xM4pwhaCxMwaafawrZzfNwP0HqChwyHe4soq6X6Gw9lQ3/RKYbYvdBIFTXlk7iDSJaT0O6QkCpQ88qpoevZfetGeXn138JG5P3rRhvwpkEXdo5eQYPKZJWeAj3l21uB7GRqemTap9ZNj0Lj3eAlMou/U8mrjpb7eIbaEYxGGur5BKo8gwOXsaAzCgsh5pXI9HL2Nzr0yqp8oX44Qe5FEqzpZ1LsJT/8XGmbZzq26apmcy3vt8Rg2iPG+3rQIVQ7GBh8i4Hnhvvsqnd7rpyCRaRdiyiZirGbWGdXMDmvDkOm2Guv/3q2lMFNyWm3XGLZemml3/ItUvf7Xim2ghSMt44+YvEFML5uqu/9cbFrVUEQLoRK8Va0e0uVjJeZwficqi2gLMDizQjmeE0EvU1sc+80ECweB3YHpY8+2GO7Ow79wnCdiwlkb6yS83Nw+UxX3NxIycFvp6G7qM9b4DQtSndZXqNaorCssJ0dZnTd7rfvb7Me82+yd9pnnfJiPbhDnHqf6sndZN+bmk962ankH/x9FnSRC+aF2l+gGnecCj/4Hm3hwxYrDwfAB+MbriENYusTJCmvcyzo9yPBeQIY2/grGj8kMCRRXsPHcqlrGioE0roE35NeD4Z1UxBcpauFgSWzjf7xZ6JeKg2zcUHGr8DDAyPFiykcaJcC0ktR+FnHTIPiFHLZ/aOLvo49vbpSBAAROFazyaSpyDPH0WNaNXbG5O5DBv3qqqKf9pCR23ys7qqRpi/qW84HnnvznBAOFcreTbFr5g07nNL7LHV1P087Jef/oO3WNaj4E9GYNzDaY/PrK8xoVxKUx1aSpT45XtiJc2tTJPP5QtMrxhaJc3j8zKG4fIuOjwgwfKAeCQHTM6QCiaq6hYxkuAHDUUifFIOSFF1tQ2iV1rhBY1wgACCrIdGk5y0DRMqvXRcG8v0redyrtI2/ijanHUGCLbjm+TNTKZYQrxQUAcDd7RhV23+xetZ17s1tljwAAc4PJEZql1MuyXNTM+yfQb/uEjzrwg+2MdwsOi7pZwtwpWAGgdj769dfn62T0ZB/MyaWict7f3Q8dVH5knSm8EF4cgyiu6U9IXRbtluECALvCm5jCey17rLTPqZM4COsaAYBjuhSO2elFmpjexO/lAr7ZUrD6jLiQlubAy2QAADhOAvnfc7Pfv3b9f5m6MWlz65/tpQiqXWdHUSKgq7kePIiNtO++Wuc7xqN7QUR4whdilQ687C0AgHGBsmQiZWNi1+kJe/45TboCspWrs2/3iayyuzIBgDVKLB/k7MN9HoQzPxv5oLLAwlXMqFhqCwAUdV9yw9Z9SbWnahy41+suAYCGaa2WvOdc0PR++uxxaAUUYt4ceBm2AEA4GXSrCkOyd3PtNYmpz16tawQAChEpGrOAP6DVj86Da+48PeFlcSXLqwAIN0ebmnGLn5nm7r6WXwb6s0lvPUFlOMx8P7NsAYDBsZEuNwzdt+n2pbLy3bfZjQAAU6VkzNLTM3M+j/YUrK5/+a1lv/VlCWruwMtkAACIpQtqjHvG/GyX3gtVZsZqu0b2qcD+IvYgPUz10vO7k0eaDwR6wleytX3gZW8BACQs62mMe2UGo0bvXStBY6XdUSetIKzNBAAO9jDhDHzO2r+6yT0XWxa7nMaotgwXAKgV3l5DeFHqrBXUXHvopBVYcwkAhP3oj7T80Bm/uDF+OPFlERcqleECACV1th3UnPDRWTOQa186aQbWbAIAC+sFV2H4nXlv7S2d6U/FXZlgBUDUOVr2mb4Khv4D6zghzxn6FL2Wxp1y8WfZuADAiNn3Whnu033Mua/u47pGAGAV+lWo8ObR6so+a/tyKFZu85LAv01spxNMZ+lRhxn/C4+mbnshp2/y/nuR4XsSytgOB0lKroEBV9KRd4Qn3bGrMix5sdCSK+hM/ML1pT8VOsHiHVcDR3798eErcRvvmRpf9oXa47tdL+x90l0XKeez+DsKHFM3Rsayb2n6ap/8CNRifpSo8o4gviONA3B+7irvo9Chf03P76E3W+xuVxGH9ydi7pPZG1skSCf9iFxtx0RpUT1B38P7e6JzrxS/O3hzhgsID8+d1n2lpuW9yDn1cycJk/HC7TI616v6rBVFOssf+fzF7zq/n+bEnAKkjwFenbdX9BtqN8GhgSJBie7a/Lkx8ifCiIqRus245NzsdyfrpY7E9MdkjqhT5b0mnawm3TFhLewL9gHbyp3892Zl0gGUpiG5tM7eKyaSAgWPLSCipRRdtYbQraAsQ6/DXgwoAu54ousxeu/5QlhAhGi8P3HFywow3ZfBDoi1Axu6SNfvJeOPdl41ZJTCfQx6ct2x+ocRx84fscJhSkgdfgx4HvBi55tvfQk75PJjH3jE+RBWODj3/MAs7UWUCr2bZiWOd5KoPgmiK2Uozr3P0Mqp5iiNscCAHMuqyfvBc8JEwKfTZAQysMEfcywLk8IKERnbqcybTcuoiUzpECXdXDkY+SnyJbzco+5+MxpIarmO0PFDWD6znZfapp1H/r09Sp1Pgvv3I06Vyce3SuLx8ueTV9dOE4cBXmvZG5AYgKgF7aiZkyASzn6k9sda5PbHiR+UJjEXs5K7hVqjpHzgI9SaOxjNLZkzv1licCDwQ071sZro0/FKbdwV+drbA6Vc5N0WpBXZksnrWcKFV2fm4f1PZOZlRaVZ23i5KLZbvHHOIYeQLl+2HL6HZD9+Ygb1osLH1c+lixsT6n1MbMLKu+Oon3648hAAxGGfQzf32uBd66Khu3H51ZaVyetua6CTF03S8tcoM/jHWOj7uFctdLL2a8dInDUbe1s3CickDPOTvd/yNcEvursIwKPJQk9V9m5Sx97sCDC9V9hCZ/L8hITgIC7OgVvTRZw3jUtQYMkywRrgScbSO4npEnwdlM5smZ0NmV0pDBHxNaDT6Lra5fdkFm0xqh5jwVQHzlWo+udmQnb1OFxOBjNk/SJDtdtHfB2at+Ha/SO+Fv+W6iuRJXc/ygj0NLMPJR+nsYsl5HZh8flVD/Ob/VBOnLV+B6FX3zbGDi2J1byDiTkX14Mj6DeoguLGudviW9pr0jlIvGUPnHd6I5Xz4D0CJBl2fdcuQeKH65NFAki0bDH/TgtAHF9XCSKoUN6OARVSWViSVWJbpxfiSJzmy+l4oCyHpAZ+uOEadNMxqje4BNdSlx5LyShnMzb19iMJ8ekLxrg0XLjDBiXzkd3oTUcqBNgwJDZuI4Zlh7GDIHrvhuguy4kx+TVhD1zC7V58Wph066fXxmaPb0yO3MY+nlmJBS+a4cyGVtjkvIZT0t+AvpxQimsKatVlTSNevWWUy+6Xr9rwkIISs4hbYClBAU/70Ff/cjYqwZuEc9HMJ47v0Bh3hciVzZbd9jpp1BSnCua6Cn4Z7LBC6hkII17itoSAkzNlAUeQHPjzuambOoSLVAcrNmVZpE0b/rpZsiTaSpt/5PO2NcNE4W/HUn5DYY9NumeBKlfy/tiVD3iV47FL52MawdJFIRrsv22WE0aNjn5JALR0vrg6alPC4GqzGi0x2dTXGeyjldAsOXqMN7vDOznP0rV2YMeH0rQByQoEYKTjM5nMAECGS0OTF06Gkmt3hrNGEwBwbJ8s32PvFAkEbpDZij7FeuRdRZNbIi6ykTfUfrvOu6zt9/HbZtp1krUOwpUzAwBDQ6VIyh2fXLsOJt9wSjQBAPlhZ2V5io0uFOi4sC7sW0FJ0VORmKJuebPVzfymt3Zwl4mpAKxWI6yIcN7UGP7O36wdzJ2sTtMuSdYStFvKDABsjJRaLi2ckyjtrAylRBMAuIqtkeUetrYYwBbVsWXZz9Zfkf2FJ+Af/MRp3SMx/K/rsMDtJCRkbi9IpWYAQBDC2tET7Bp35uQ8Nqm2kwgTN+bzQO82y4nVY/l/YK5mujxG82mIshvGBAkr4jk3HZkdbEy0GsuBqPSeskcoF8cHyGZmk/zR5KiSXsX0Qdsd1w/SLhcRMbNmLiajcM11wc2miEV7W9rZyyyWPRjhKhBUwcEvMQg2aYUjdko+M9qj08BRLBVw57j2kYaDxCxa5Whq0Zfw3LFNZiFMuJy/ajkhBp2PDNUr2jwW3AwTViZhuUNRRExoOO+5wLQsgPvnBkrpy9LHbWUJLgifj57YnOETp9/agBaJmZrr3fPWqLnv4OVU7jLBWAYORiw6I+nkyUXZr9V51cqpYWKWwesu6sze2EkioKiY07xsr9FWNFGnIoMuHQTtJtgjHpq1q5c6PYTnJHc89QVToXRia3aChNG0ozNG2p4+wWSQwrSMCNyRbGqdtGtdtBNgEmKUD13b4a/rdBHS7QXDm65jLuZWjduF/ZM7Vq0G1K48wlrQlads6tWxoxFnYePQDF9446wcGKWryN3FIoIvQWWECe0JiWSNE9Zgp8I2OO5N7rZ4j+JqLTuTcKN+N+2uJE4HdpYhHFrjqfhifG8xeLVqh2xpKW0QtH9nantgveeHMvUvqwWRHjh/fY6Fynqqus4eC/jdgzEDALvOnsrXCJ/Y6MUvvsv+bXaqQGtzH8Xw38sEAChBy9EpJvvD/+GeYu7EBb+PsawRq+QYqw/HNF+EMKeMGF5fGM82C4N1+PITrRiupxOCQZNE8Akg1vJxZE5WLh/xauyIxW1wgxsevqwup/qlcZuFo/BraGMq/0eLbJ8bHvevmtajDL1KmpQmeXhhsd6b2E0XdqMN8Tz63vX1bB51r/fDMTlU4FH4f/dW1D3GJj0X8HMIiUPfPYplmpPNhgrC3wgThAJKWxk/xWjdW80Z9rPTqRw747a1pMZklqNhdHZnzGg4vdOz3FNDUFuJCSFH1mjkdYprxdYxfrx1BgNcWLXMldhwV/DtVEYDaosrV4wbvcv4y2c2Pcv/5UI+L+pE7a2PsM6mA5duraWmpU6QX3B+fSKNtw7rHwxnigb32nfAFHA4Rf1BWRvqGccafEO4D549P94zBbClCKHppCBZU9uNQFI5MwAgsa2csAdK6XGqJ2p7L9tTpgkAeKFT1b2K0GUzSgCgLt1lVUxmAVaoaLpqURxdPjYBhTeOnj9Iv7x1ZmsR4ZNZ5QBsIyLCQ6nJtsev87rOHkHefja2GSEu2VMOwDYkoj1uuGzaPtVyc/b5lttFpO1HCM5ls7mdrB7PCJjrjcwAwJwBTznhqYqiz16r7U32TokmANB0ZU9F94kLcLlJAMAV1dGsZk/QvZ7dj762dfjFXva/+tKXzeZ2AhKXksnbOjMAYONQVoKRUJSMOzFfHLqQoCjsnjg0t32V+aqLpduDGvSXSrmATBf+6O+HktGouMEIqUXY2udqsA2OWd8VVAG2u1/zEyj+hSYNgekMCoDu5TEJTx2GL8BpN04zXUzC55u1gJNrasnMoprDvgBRza9UrGtWxQxh/wi4RUluBBlyDMp+TjcWSAdA9gxEkh0TJbwDL9rR714zz43/ox31mJgOpuVPVLiK2t0gWXff9OB84fR633LMWGqeEWn2wGBclxR+XUWHDkDfrXgCtbtocK7/GoIWkmYDx6fXhQG6fsVxXt2PuqM59ThInB6PF/V9OR/sJ17YQzOi0mEyy30a3Rh5p4a2oUTqT5/HyJrEo827ys59gXx9BYgi1SOUDvNCX1wgYyWSD20LECfbMJmBTStiTJOBwU1niV3vLy+sGHfNdjcFAHytdmbyWNw7pc46xFFh/jp+4WF1di10ZKxWS1n5QTbc6nvOH/r+wIPSEQ4IHesNx9c8+tMPaz7jgSUMoVUGncfzEPszbTCJ/aJhW4wj+ego6X+JQsUbWhAkpINJij5ooXnc6dwME2P4XC4V1+oYp8V2eEdujVankY4pLrlzMOVsoAfPsq0VnuufY9576RzaWdsBODo7JmsxsGZO4mJlhJHSkiMrizonS7H+zMtxOQ5brEAIu9tnE3GJ4gUEnwsDB+25v6JyK6cdrEpuDt123vsmKI0GRfzCBJ3dDh1S6H+vqtodowsZc/cgtMEMBxFwq16UQvaITAVz8Z/r97LjAtDxT+pavdwqZkRryrP+eFdsm2IHO2QrZbdRvZNa6mWETbK+brtQVi0QnRgLvrAgmxVz+4QYpzgghvsUN+QE792KrrMZGmGjlHU8Ehgermdt3TeAlEiVtgS87Qw3h0omSCfSsvuIMtDKnPF4vdfHkKa8uMq1zyemxnvRKwLO+lE4qvK7qFUc8w5yoekETdULJCiGs3iRHx17sRbbyoOpYQl1aALGpLn145D6PWRAahmsMjLIebGgt57Fl3UWjTN+dwaDHToY+97NZZxPFPDDQyqpB6poTRnFzQK8MUvdvNvYX4Gp4dr8ZfnV5ATTiqaKM9EopYUo4UMiVieR/9QpYMwYqIg5IxhioLTPeOl4Yy469guMzRptp+y1lKNqy2YihkQFPNr7eeZctGubRMRxZToiqh3jPnLA73yrgc9ezE8Tn4eRGZuVEwBxsSxZ4sP60HLapZWEF4vx5AoYMrcpHzCfX41SB2HanzM1YJdedN7x4NmV2jP6kTo4VVRu1jCa16yxu/JbXviYJl2N8mcBfz1teVFXwhWLD59msDQ35K12R2ub9lSNiv2IEhT8OoVJ0C8g2iCk2CH/XOyIIza6UBjdZ/LifaYST0XzQd8xMX9LigdfIe5Lr4U9fMB4J0Tj55bvDzg81o+EDNI8u7J4rXT3nr18N1LFz9VmrhHjpuNOqeputxktteBeFjMAEFJKCEZCcb7GpSoWpzzkBCXXzpWqySnhK8sEANgPj/XxbJYy2c0D/url2qnD3/ieBVYC4NoAWou3vDP06vO4oUhI3AdEHQbiObrqSWE9T/h6qNv4a08EoLpcVUdMNF0BqFXHVP+mqZjSzE34mWi8805g1AdkuGDVih2GIUKJp+giBihJZuE5jfe/ilpXdDXzj8npQ9oDgN2yXZubS1wn8UFXcNc49tyGVpyBRhTphoSxEZCs2MG2Z0snOyfc/haQaKyiNtH4Qol1P7A5jOuBidfSznB1iLFrbjTj7xUUhylGTxy7fkZw/ngeBuuh/vvrWo6q/km0/DXN67ZkiwT6sKs+VzzfP68xV/M46qEEJJ1jhq4Iaz/AG0+fOvfdR5GZi517XVc8FsAkt+sZA0kk+vVYhXtQiqf/HZh8go5+pU89qkQH7ZkFfZ41rF2b3Gbz5qGSriHY2zdw2NOWV72V+nC8c6Kb6PFk/Lsle5SHuWbP34nUYx9c/HsdTfMrRa9WA+o10BLn85kWBOvuuMOWIQ3Cde0GRJ+P7dbJAN6NKzvr2jfkO6+CQ+PkWJeQstapRj3T9Fn+WLlC/R8pcKOpztB6VdS1HbrRrDPeSTKMhgvO5tLVA3Im8KFvKvqLl/WybtFRZ4dFe7niWYsxnt74hPO6qXJ+/VOtIR7761QUDxvqtEZMI8Om9uZXzEmrV8JmVbqaAzpOEVbW313WaDLcZTCVDen6xvwFVqEcHjjglWf4O2wVdEHMvWieIzEvtIypn3YSTnANB/bLkQq9dd1xBqx3fZfCyBYBRIuiPE7XnGb8+N6+qZgaD7oAKqb7aMXAOBF8GPacE1uZtcYgCt0rWfWOa6pao8BDcyNPpw0WF6NlleV3wuv5E31jMxScOhPNypi9jL68y8nhriOHgxLTfa7nYEfziP/KS/THF7bMrP3yhsFUJvcwExYTMu6yTGc6o6CgtkUWocBZv2x05k1sAlWNG9lTMMf3RNiCu96FeYW1xASz3bEfkOU4+0IaVsvAW6EUVmbgjdHAsvPznJRdxUVPiPkpXV+FvWNsyt4ANHbHI1QR5ysbmhW5tmq22cmgr1xNkSuX8C8f7YF4T09r6Guaj4123KXT9MXCF/zGtWqDKtmmxNpz/scN803rNkr4ZBMOim8m4BPpOdTUFwrdOVuWEvgywOek4uvUa9O4CWJeAq99qBN2XuGVmagXPI4Zp1o95LQYiVdX4rqgts0bma9JXKE8C5w0AQYHXN7Fdm2Lww5HHOUsOTFNOkgvxzk2I4zD0MC6I/LPRStdegi7WOW73txGocc7IVoi3i9sVaXSEJKwwnWwoyhhJ3HaWmDadbWsYXrBabUsszzF4d66bDTxZ1ovl0YYaemAEJvAjZfN3jjDY2gqPNlfXdQ/19H7gt0QUuJit6bFMcMCvSkViiLxGAIELELsv744jl8XjcMj9t2qt3KvAwkFjK2Ye7hy4QtLNYNuI18gt6cnzOaP/ddIfB32a+mHy/jAr9km0Ie/tmKx8ENaiftoz2by3e53vDPOiSLP7gZvDL4mE85GWYTgQLy0h4ouDIyh/orkYvhV9lhw/L0lWWGAWDAGY0cndGz0sXtZ7F7k6l2oDUGj1CFxJmN576G/XgfGqbRT4e8FvEw3eqEdK0CML1OySyy33MrJIIdMwLyUQyGxYbkB79xTPAqSsB8WuGm9lfD8rCR9exnwSfjXd78NHuHw7CT1pSy5bJq8rWEGAC4Oe51grCY0bwqlLPb6gOdOZeecY3s+nHNpJgBw02fkAORo2FwW7FWFXiLdtDb1AwA3AqRNKO0A9Wk+q4GGuthbQJTx5wAsRyVIns5mAFaR31c/HAXuqlmSPYuyCk1KbBs40WZZgAm1hXyA1Wa2soBY/e0eMFRVkWZEMfBt7Do+Wyw/h70G5wn28xA+mQYSwJb7Z+P0mPiocvtOLq7MpufkayJ+Ly6ZCxLAJhKjHbZUFr3fd5rnHIy0q6Qjeiw4neuTqtenOgxlXUFaxwwAdAi7HYx8MOOQPvpUdszlkeOU+PoIH5doAgADXedUmwCKivRSLnSV9gMAUxBbiXKgpuyjIZw0tiCW+rcLTRSDFVujvX0W1agcs9uD6w+iN1/IP7gOq/uB6zII1knI+eVEaTCYa80AAIXQw2DkPzcOve2Awq6OA1oXKMy/zXvoHebgmguXGZVjcmv+dl04uAGfePzoi2MuuRTE0HiKMN84N5sLrC+Invtur/vd+CVecmPeE+q1n+LhuZvAB8HFmKwkAgTz2tel+r10fODFmt+DpA7zTGpcDz8YTzSezbGTIjZoMm8GJ0XCp4Ul8ESK6hnKmAcnZcQPBsHOcZoyp3+pCS5Yf5/ZxXwT/J74DL9vdg3P9S3dinU3KaxL2ODPspgBgBfVkhB1MHLCglxV+fLss20XHY4X3+ZMAEBzx9tmFve3XjNUz95PD7v0ZjFfN/vHxzn7OVnSZduvaxafw3F8HXXh9tRNbdqNq0fsD6taZjEA8KyO53yMksen7uZl9bv5VNYc/m5Xdftd6jXHKeFZSuG/XQ27cd5As4rfcg5/twsjvxsEs4BzGFJJ7xsO+s7pSLDU8RpolpR3UGlSkKSdjpsO4qoj/6VMKBY60m4rZgl0tKxlz7rQcdXWezZGKaCpiNsl+hE6ZjXa++V3b4oPtLc/Vg8cl63ldmIV1lP5KWWfn6xViPY/J+FzfaHhR6IaGpf9WcYMAHSHZLv0RJZPhy9dEXJ9zLnfqzZs3d1oXYYmANDJIjoSajZjat8PwO1KOdm6qt5cEAAY7VZXDxQoqJlFPkBJ7s3EB0BJ4lF8gGnVbxwfEKcUyPEBSVmupOu6ikmDwF0VSoadCqWKNsMQrFpb3BisY2afCPaovy8Ftl1VdEVRjNMx2z8HNfvzSHbwmSmr+4cMBAlg+/2zMVrHrFZGz1fLG/M79MWvVg8OGQ0SwIYSI76sQzD5qD578Tl67SmmPUYI4r57bIs58seSlYGq1zEDAHWa4QbsUj6YOSWXS64d/Sz32dkyTQAAgbiqDQuyC+XcruBcahAAtCGsEiVCVbJvALWksRqC1T8PBCoGbmhOegeiGrlj1l/sPbnhjb97H4OvWOjLtA05YoC9ubjn3CzgslxrJLLGxbeuQGUE/GhuSyTTwXZUnPLcvyQu817WiUi1MeK9/qJgUT3olcMfe5bnozvDnX/83DtdmTBoXpS2au9AnjCmENQuxgIsv9hXApuVcJ+d50z8wFan8vDuOrgrbu4rMZMfYok5RzHl4YkV/Mqj3ZLiHsl0R4ktQeQNmZGE90dgbse5UVRJNJ1PkgslNKJlp4xNYfL9C3W5GDo5N1iSOd4FaNNCGYsAxgmdQnEhp3uo4m82DMwPkTqn1YXuYyNJVYQgEvLOUMdR1P58wZMepYc6lHccJFsWn16CavVjQyfxs71IWNEARMiDtpyqWMbUAZpaPWmDVrNChcJu14uX4Yvb6gptCIK1jz/kO7CpyQV5EVOioQK9JikVhk8ufEk1XwAD6Q77IUymxVkepdKhRekIcxTkWZdO+WlEl99URtcgnLp8wEHx40aEJgY+YkF3OlTP5JORz7tSW3ReIbQg9kbrUKWTmBK+ivfMPodogfGq+U6wnVYI+WEoBDO/TLcgynGBToKWcb45N3VnpWO82/pUJJCzqez//nFrOghAJtIklGAd406zy5Ic734hMt2LOuwuMXujjjXMgZU5Xtx0tCOz7EWsu8p+9Mk6pVgcKzfmigBFfbwWgx3r7GKhdbdHKcwbrxlT/03ZbvueZq1P/wvGs4zBpNz32bPL4d8s73AWgkUzHlup9DyuMBU3MAhlI6MAzZftWHYImrPDj1NoC4NqbhbuUSiOu7Z0BAnQYb78PrYl++Lv9mwBnusQ1JHG+otTmL2m7aaz+vs6AED6sguBzr+g2F5CjhXGmNFf2olDwzMK6SltApu/b2LDZYoIp1CjF3qaQyePXOiJn1MwMalvtAmc2Q4jtcv74DMZ6lhnJYivToA7LgQJ6wlTrYUtXCgvdI828TdOttDnaYNyFVzo1fTVq/GdELyIJM4yR8UpSYapvCR1t7aaRIw8TBwvaAm+Hll3jQA2kh3SND8iOf8QknOfvDujg42UBfEackfUhO/C5c1ySXjgw1EK0rcjGGvyDmkf387gpNFoZd+/3XqiXxfJ+t4/reMeZZwj1+rqKPyX9GFmilwNC/dIYBW2HHkMrfAgqhoAdVBbxYW12UPusLvdJEXkRpfaYJMA0OLlNbACwCtDcrd0YfRERT2deNSQAGx0ANR8GOmdfQyKMXUCbbUKJQfqScIR3r4fd6DofDSMuGEe4dRS4YHz1Hl1mFXWmhClLNdSok4zKZWANUpSiWSWwhRIiQ5zTYKZ6ob2j5hogG3Q681x1rSjHBiTqu74sfQ5+ZDXaiN+cMxbM8LWW+2wAceFR+/MCe39T6ze+G+KMlN6a75HTF6KrLTXvXU3u8PKU3NZHj5qtOe9N9r3Gqqqt8Cz1N9CFjqJQqvtGrZN6I1rIj3+rRSee/Jz1NtKZkP1UxcziSI1JgGOXzs73IShzupkn/6DC2zdxnR/Ir9uTHoPZLTmDuIzj231CSzZRz9BtcCjlaEj1HWAQlkKf/XoPEHBewjX1xN9BMitB4yEoDshyv/TWYm3q1+AW4sYczu5wcDcMLdhNx/XskQQD6nF2jyKQvLxMyYCSfRmfg428lygl3b4/4Y4JiVSAYlUvs6P0gF5aditFJfbT3dy27ZT1FvlQj72e4kyMpNMVS22pRdxHBqJud24L3Z0zE8cXnReEyT2h4TX82yT6JYvD25eC/yDqU9SLqbBxxi7wFiEep8QhNZrS8+Y2uvxUieOYarVGCrOFPhdyi8H9m8aZryd3gAVBwmkjdpldG8qETJzE4MuWyA77vASFNIe9s6alecW1NndFYOqiR7gkWme0tYe6Uf5qhmV7DFhuZXNTyhs3O40WAFC23H0EPX4RrWj95GvnKRuQ/xvrsqm36feaJbnSyNDK1dnJn85ioHmU+sDCZpJX0JtgNk9kAwkFi59+w0LjfBe2SZxPy68WcWZMC8+Nrwp2hP3BvOB3wuO9/RDPUj4b/12avPIka6p0zQlJDEofS7dRVIgW4u6pZk2XgRMxbx75nrxHUspeXpIddPR5VJfZdgjnVU8G9I+5Ds8oXL4M5m43pqfpBNDgoEtdl4p9b+4P1azrekdtsVRftXXvf2mesSGzPOCpCowM/As6SyBWUhQdFoz7ETiTeiNieIcSOc6rCB5MZZVAvwHwuYA9zKtWUluBTnSsOQPDwNb8Gimp/pcY3FOCH8d/WpR59A+V1uX/b6yzTvf7nbc/7f7WVz8rL2/fuA/nc93/K93DKUf52J74P7ljp2/fnOo4/up2z3933lKdbTXVwzW32EIpMr0Bowx5U8gRqU9Zm1KMS16VrDQzgsU663fk7+cZRfGxrLXF1H3b8Fvx7SgAUFF29LFEIhwp4xvftEDshUxFFBC8Up3Q3jtzeU60dwPlaOSSMWbuVvOLgs5U8193sO9iYSTL9KMfokZqpPbjOE8wc1X/kluxjg90eXrtpiqkr1H28tjsppDA2vtaJN3OGsbK5eScwgsCag06XYlBs4zOnx3eHxA0UCjzuTRJJqyp0Lv62RFBJBOpw0YFRwvAjNLx0dmfQ4dq2G5d5M5/J7FVTJdAmCI8qE9L7NBRoQRz+Vjp2WInn4iJqLq8Q3XRfnhWQWFigohD3uBtQ1N2/QmLCJwlRjNxT89ctFtcYBpFwVHRYwTNRJwFMWgX0gXL75D8W2OaHmcq4sTBs9kSC+jW91KGC+Ek2bcPHmsmzkn/Q0CSHtkr7MdAtkiQV7KUbV+RQeChy7j2Pq0YRygKEXfvIhMtOVGwXcultKonY/zjw1R4uqRsO6Mnxfm+Sw7cUKGU3o/XonWIT+LkX85wxcwpDYoS+kfF09VskUzcV7qjjqQb5P2pGbUiNGxTY9Tvo0q/8RNG5InzFxh6TeLoHPGy+smnnutLJNg/rCTeW+KzE+pJbgovnhEGYRUlfnNLSrR7rm7adV1E6v/BmASTdac/thdDTdihISpm7p9d07xEXqW/nAlPUlnX4nqgM/sGcJLJwF3k02gxQf6Q90Q+1RVNdilCYmZs6NT+Wbl8M/EpupPdW/PAZU1jjFPCSoQi+6H+rDBWW4z9o6Tk3YupSlR3EHcMv93XWHlQtRTevBq8rhlJKF0FJFjfDCSFcXxpNW4EXdL/amdOs8pnhnC+lyp7V8Hg97uIf/5RVbb38Fj+YjGLEsvds3R2V/+FHomXLJ03FI0jXTWYKSP91NV+J3S7QbM6YGJ/qJXNzrU9xs4sAmsVQXUELkcVxgFKNcbGyHtIxAa0pd29rLdxuwJEg9AXEd4T8Adj3PA3S5P681Ru2XclM8HDGSYDb4ebQKM/+aufRPYM3LQkwlPKSsxMCCTjd01Bhq/CVhpMh1lVEfw20EzU2MPINctBsdKsgOlEYWKmtjUKg10PJVgaLnr4DhSd6qwNna9gofKWQthSHfRHSibKQS3SWzgD2HPqNmEFs6QamG992qia2MYfoYYktbjIVji8hVje2/JpPWCL+BWQHGZBWvLyiNgKQmydZTMo5jiiahr44/QlHKqVaa5bWMYpS9YzZ4fHUBxVzvsUl5dSyeISQIiPoKBNbGt5i9HjvppB614rGuwkFE7E95jTUmABD8Ysw4q4zJPtimUOlVfUBrHCYqmugcGYkehNEjdbcmA4WM7s7ZDFr/X8fuRdtHDGDEDdnKf6Sf5IUk06ZHdfpqk1tHhIy1mHVmTyQ55m3K/djny2c6pqPvCylAoqUq65/LJSY6S0eqeeQmSNDh2wadWx766QKS9SAyUbpyhd4UU4DXHl8ByTieaYRF3snlNKG/uBZccqtFpmxf0qiCgrJIDcWuRGdaixmaREebfMoC2XtlSh2oVLJFB8mHwb6wAf6mv1dGL6Sc2f0270EC+ltBTPIAYpPnH/MYoJdCdW97NX7Jb2XrlQc6/8dFZPGUsmQGKYwQwovWpDjYSVfOex5c0SoM/WTbutzo1rOsn04kF4JmLndk/WVZYFnJGqpSxOusAQCeentwjEzNjf/Tn8nOXu+46131u19xO84/rymAPn10xcw9AMSPzXx86ScxYAAuQ/IReI7nOBTfvo0j1CAYim2kKoHwyn7n9YDecheL0vrNIyThrElQfuQsOPmjHML23vpBFYuUFG7QyZj6A3aTTHYBzna/bzswvdxuiLZjn/Kcj+A4qnOAXz0SLqhyXxxCJyaqB8/FZzweJs7/r8ZdDVE42rxKJBeofynd606vz3awsI5gw/GZYyF5Xdov5UbhWeeViD1B7Lo2y8KFNH4UB9fuGT3v1xrfnV+2b8lRo4HES7UDixkYV20oRc1CPar4b8y6+KxDXPBKTd37B3OznbKaf1/C7ylYKXZXC80PfJRjFoTaC0IC/sKW0D8aPVSrts2S0JF9DYDvFoHH9G9wg/5BrkGozncbjWeUAcZteckv57+CPzBbNCdtHAsQ6pxIazHsgJ5rQgCPj/t/GJMp0oK5MMtab83RUwb3DzlSLW4DUdsAvVEPx5S2y/2q+FrHfO98fMfbHbX92yz2DN+t+8XC5+LVxhVtyYXm0WScyTjf7tq/wzuebOyC08/nmTo50Y4TDz/QCZ33/KqNJoeUD8iyFTN4bL8qEUvpcOvAms//g0NmvmL+7NtnHe4x9PoK2jjyuNilXSfQA7eoGAA5Tz0YMD07SjQs/kpwHp0faRadvQboijtXjIBRWbLJntVqqo144X6oheLqViPEkHrfUPeAqlWCrGC3zHchO9dylwNXs/AcAUEPgo/GTabA+7XZdYBM5fDNJbvG+ge6UP2rBd1srmOagU42awLQJgtG8twcyMsfuAEf9d9sBAFRVdM7zlz5UT3Rum3+pxXbc9A6V5subA3pANTQdUfDRdZVtW091uzEPAJhesLCOuxSgqWe2DzAws3cWqGI2rAcwWwG1pKkrPvVF3Pv0eeRZL31fq5M/46b//4OZAuyX0d/6FF0WSBU816UoWmzFhs79In/rDT7EL/lYC/2bbK8N4HkthS4I35fo3qfPI7tVZrkUn+qylx9D3WzlO/p7CVETvnTCbpYj7Mgfaw3x+kPsDbkrj0BZGNxkj20Au2GO+Arn8qFfkB69l1+eH6w3hQXXj7SNkasY5ArFvXXdAICGtAA3uKrr+yDN5DzYldWd75E00xVxuJsOQmHFThzu6ECRxDm4y0pEa5pIWOoemJNKoGp663wH7FTP7Qr4svMfAOjgAHPGj2EgU7ttCSijixcBOhp/y4L3UCvATVCkdtuP04mq3q1s8E9llceb/EbhJNua/vDeW4kcAsXcW9cFAFwOu7I+Hy1vxdh6wWGpfj24/CQ++JlM0+b8dEan02GoC0Je+BJvHmS4U3MeoZBxY0cBADA2kKuZLf416GjgG95m8wuhwMYPug1KqXfrAAC0B0RIGS6aoyMRYkSj/j1S3Ma4K5sOLouM+Lg2Ocxkp9cmhZ5GRqsTbcrIO7yhN8QVaa+/Gr4HRJORxZIaXG2N1JZwcG+Xx/9dpxvn07y1uR2r6rSfxyPtiaZK4Mtk9M9FitOX/N7+Gr1GXFmNQo7z8Ub5ucO3yZo+szOT1eq4suRaVcP/tJ4bAIgRqycIK4alrUngnzuJmaS+cSxHWztrUQXgpSvMsWsQhDtXrDxciV0M3EniDDfKtw4RALDRTMUkCLvmIJpro/SpcY4poMeFdv0DAIwMKoHGj2xRVlC5sL3Uclji+BFOh3+7Kl4puYJMTa89hCCRi3l+MFGFMgt0l4eBqOLSJ65GbJF1xePoHnVtXkUjnxTfTlqIXPlCX6pLxz/hfUGJPjbsdETJeuzLuZv7pn07SS41N/X6FVan3xHydjNbV9SZrcfv3NThdwHW33fuYP4T7SZfQk97xroDf+7q7MudBWF19Y2snr7C6ugrpn6+IhLrha6Xb5g6+XLlFd7F97PVvfdR18GXy2d23dTQ9e4VVOfeyVkbQrAs3k2flrjXRzRq/6+GQOqh3qv40FGiSGurO1WbdlUEcYBgeZdQxVC5BYRTg5gaWzcFAGAPOGm7N227BZyn0W565VkVpT5R/LWKyiv0WtqVBwDcrJBbYwvnqm42q+tW/JcYd9huu138O6Fi6+K4PcV/CVSGKK7h2iYoI+4TxWHojrbmsx6i69561eaCNTx9zO7xBt61hnvHmoGzs13cFpWjQx01jwVnPfwDSOh6zrrveLwvA55QvNsisGag7GggVTW3YxOu1bd/rxsAsFB4Rl14ELN5LDh7q7u7v/9NWwQDVoXhF5IXO4LBLpLAVZwVN2sTIgDQFBoVTIK4rspe871AcsVzdydbUZfXG/8BAJVQbaf2o0iBPWvNmwVBVsR3vZANQOYk/aUOrbE21DVnFLgzj3eftkuMPEElxqS71dVz0YLtqXpIpDcT6l2t9WbOxphybgwbm9oBAJf0RqDm25Ebo0G13ZJoF1hbaZBgeBvzAAD5wMkSDt3OVR/elJZBzXlC5MN7MbJRig8HNBpQGx9OdQPUlEJcO1fZFfZwUZ435Tn7WTpr+skUw/M1iqKrq6yhnib/sTf0ia/hL2v6xyyGDeC5Gc1Ow1T304p8DPrx5Hcyb/xYM0imIXYVHGHfVPdr/nwBX+qJ4WeDvq0ZHLMiNoBdCUc8QZvui664XukJFcj4h9YMlmQHq1UHi9wduLeuGwDYA+KPG2M2twv2Utpt34iVpC2CC11cUS5Iqg/XuEiiEtx9mxABgAbR4NYkCOuy1TnfCzisnttrsM2d/wAAQwH1GD9WAV1rzR0AY2TxukypII+m10asDVWGaoHuBubhtBVeViiV+JEI79PPGSE9ja1nBD//09nt0Fn8TCjXXYXbCUhcZq54W28DAEzFUg/n4NKToqUe/8SDP6R4VrdUMurWDCOOtmVqIPhEc/6uEMLblMEpI0S65sxBEBLth3ICAGA7TroKgRXz3dUnLY6F2E71h9eT6SrYt2EHAHAKWU4ZSisGr0pnrgGvRhOvBa+I144J+AC3WBxSCFy7Pv5PqPCd5v0gJTNuo8+LSFPJLtYk2Kj2/3s2u4Tp781+jd7228kdhpd74i6tLYt9VpuSrBTgvGWGAMDt8w4xDUtNsuBVE+m6aIbuIb5Jkxhpa8z59ukU/llRVdZcgSJAUK0GCZQFjN4NiAAAALhd6vO7QWTQ6FaugG5bYhJoe/M/ANAL0D1Q/UkJNhWl5GYaKCWN00Cpn9I00iU0dAvAFycaCGZB5rI6DwTW/mHj6DWc/qyTv317Vz5236atNPhAx+d/X0yEvxnElfVFpzW1esooSxPeyNhI1y+ydWPqcFWstDbO6r5e8nGdoo7S9xidl3034FBkDN/UNH+dL29y3B23ydYVADFMtqqo2uq1ihQ4fwc1+YuKGe7urcIeQpnLN5fcdARvOS/4nV3mUv6/SyKQSu/KmSHJXEid2hi05RakoQmhbdlTAEA1UalMaz6FuQVZrLZT5DlN1KmpsAyuYcFPZXkAQDzhqroeOD4Np54HVaO2MhobVU9q2ZoQVZu1BrELdStNUWaZu104n+KDe9BtxGdWyR1Woz8OL0dvcl4Y+kJYHLgur47XdEY1UffrF85S1kvLQ/i2Whyo2lbCemfh7Nrt5l6WIQAwEdwnI88jC+NgNg8ODledTy5kGj7cR1UY8wLsYkcw6qokoINnS4kgrnDBS90D22MSpQOQKZ6bmy5Juju98R8AWBJNd9SfoKaoKC03M1AgjTNQ8EAmVboAaZVA9zInA0C3PHH/EF9Cia1aFwmjxKYxkByirmS7a2yj7qramBHqudu72gEATxVqIFs+c0rPGDfbmXN65ExuxYU89eHQm/IAgClNlak+oKHjthZMU8/IBWZgZmsDRjEbXAQjFEG5Ju16cQsrWfiIPu3NK+KbF2Oxn0oxPEuhKAp5yorQuJ2fN/zTwvTnLPZP2ckawDMSmp0amrJbTs+Ib2/w94LflrU4SKUhdpAbYViCx36Uvt6ML1LVfSwOTtnOGsAOdKMtXylbcI67D3qDj+GHoc7igNUmpSrJtU4OUhk4AOA+5Pe4smZzg7AJaefczJSlLEL7chUWNQ1XsUqiRLgtJQJ9SfNf6h5QJVfkOb6Lbm2q57YzS512t2vjPwCwGHSvR/1JFbEU7cnNNJSSxmko9UA6VfoAsM2CyQLIup8VUdW3lF2uqG8wvZlt+iuCz1dG//jSXkuRNQ3f0LL/WvD2chdYeEefP464/vz2g/b8zeIvdxJN1XfWE/0VgUvqkAxpbc8aFgyP/kEg0FBFxm6+MlTDRrB49gTh61CfP0yk8q1v3gb9FduKJ9o3ysgAPWKdUUyeYjNdhce9dvEUhSMETTGVeU1O7sJjaJt8ZGf63D1jX2G40rT8RGj2SClJdV8TnhhNV0nVqL4PSG7mjzGmSVPzuuDGwfYUGBJzuUxo+TPyUE0Qvx0jW1RgnEnMBGpFvKe56o2owD//Caay1rzM0TVJbXiAPT5GeaME7MfUuN9gAXvsj2OiMvuEjTvBmDaUvkP9SLrD8vMn9oIk7IfYa3zBuO2XGVl0ZVuo6t/w94Eqncv5hbMOYXKwdn3XJrtNBMDBo7FniPC5hi2W8C16bPs0akkChRDD8Ri6C0IXmQDD9PU0+r11/EupXHJTRcGazqrDqwHCVPz+wZX5mJvoCvxxz2slk5bcE5rSYa8M/q8cVAvW82tTAyora1RPfXNmWV4SmYyFcTqLrftbLNg7zEbbf2MbGwjOXNPuYmesd9uURqhzcfnPAMu2RE4XuOJxMpmp5rvcZDAV+DJ7475G6biYPQ6uZp6E2aNzdfh0rWKIozluyrg20YWX2bNV6bsJajFsdBjwHltXTtJfx6JX6eWL5HT/BvC86PQjZlf36qn6ItY/Pj5bLfx+qmpvuOf6r4Nve3z/3jUuF6Ce1vPPuN4/golnsdTO2AnJ13/j7nXXmyD2FU3nc/eMcY+ups0kQHeEIeWI5wq+xkM2SnCWqhxSo4nXJywv5IbH7a4/2qN9IlIlXGm8sxZ9RzOLRJfxceoahJp8iZHO6OhlejRmk4Q9meH88bt49+TNrzT2HcT6BCT2B5P3YJkeZJtWP5oHQ0Q7GDfGqImAuArwEK/dmDCIj1caL+6gC2LN8Qq3/TL/xXuhq5RG0jhtkXgrNRN1i2QkQ8UPkmBgaB8Dj9FbWw/J1F8yd4Uc0RL30h3WXuie8WDBnxvV16hqmKVFCntaSqXuqkPkdLLUhpRSydSc0TZ1JXVXYsQmljRIY2K5BgFZGP+7KHhrEsEl2VR6U63pjy23iTB8Z+nfNkPJXt/MtbpkDwBYeOI1H4STiRgp4nsH5U73f20Z1BS/hfHFiyfqLjgSMzYXhb0tMYpoE5a18LartKGQTl5clKpqBShTvqkuSq2aAMoGdWFrXe4I1DXabrlvMPExD8sthJxKN6LmTQ3oxjbHUkJvE1xKOe9wyBuJGVfXxAJQZ6pgVU0IU2XqAlBk6hRKmjh6rjiOdy5W9KvcFoBWJ06uIwotMYlIpo5fE8s/8nNKx3PAMGHz13bq64/r4E2tVNVFr1JV4dKhSJnIgYLuHbd8QTV6qUKzXdAFul2qq+ygQXWjxj23GlPcwW5WhEExzf8SxyRC8Rae9moAXynvT9rrruL/h2J8qCDvOoz3ZN72bKm3cE41aFizlYlF0BBdy44XoCH39+P4guMzt1HX+P+fwXgbL8z1kX3T5+MqZhG15wiC1UdxT7Uev5lnLLnEKP73ulsOAO5ymjeXSlYeDQGL9NDKWG1V63HEy/jX4N0r7vriLL1Tj8/fjS3CUz/B27evM2HDtE4Awr/jMw7SQjRx0MSn72NNqs5K2k5iGjwAIeWHyrLhHdf03vRsqqXJr6r+8bGzdavV7dea+t6ryEMvQ1hX0GDXbjABANwNLyr3sae/dBIVPIn5xylkitd0NnWDTBn1gukmMrWsI00jMGaUNuSodS3VDvhaJdorwyo9nprszsV0NVO2BwDY82B94hwYnfHDC+Cs1lQKcEcSG++qCHzA0Cj1APioFITFWPXB1ikCcahdV+/yegPurSDclV44lrxGRVZpyJhj8XgiNLP5IQCwSi9a677N6CqsuNsDcNZUuRo9N654bzgP1affA0vpuDsB3eqZMMAtMzs2MNuAyAF4VCGWhKA3tA0MhF0vJW8mvKbC+srpH18yLDeAJ1I0G5VKZVcf7Gz2rzfWe6dosIDE/ZixuQHsXTfaArKyivxJPGLewHOMMM/6KusfXzoqSlXV+6Ww2/akKnmhCkfsQpkJAFBmt/Iemp2/EqnYGRUQYpPFZwlbqxrUsX1KEoaN5NoyK1Us144d5wr0JplvvgO4qrSbOxeQMoAAwM0WzR/cQAO5uYKcFXG/tR4JoD2lFKvLXK5gqvEaQMWVvwI=`, `base64`)).toString(); + patch = require(`zlib`).brotliDecompressSync(Buffer.from(`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`, `base64`)).toString(); return patch; } diff --git a/yarn.lock b/yarn.lock index aa5878cea65f..4289a92cea70 100644 --- a/yarn.lock +++ b/yarn.lock @@ -26017,7 +26017,7 @@ typescript@^3.8.3: "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=493e53" + resolution: "typescript@patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=de8f8a" bin: tsc: bin/tsc tsserver: bin/tsserver @@ -26027,7 +26027,7 @@ typescript@^3.8.3: "typescript@patch:typescript@^3.8.3#~builtin": version: 3.9.5 - resolution: "typescript@patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=493e53" + resolution: "typescript@patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=de8f8a" bin: tsc: bin/tsc tsserver: bin/tsserver @@ -26037,11 +26037,11 @@ typescript@^3.8.3: "typescript@patch:typescript@^4.5.2#~builtin": version: 4.5.2 - resolution: "typescript@patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=493e53" + resolution: "typescript@patch:typescript@npm%3A4.5.2#~builtin::version=4.5.2&hash=de8f8a" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 53838d56aba6fcc947d63aa0771e5d966b1b648fddafed6e221d7f38c71219c4e036ece8cfe9e35ed80cf5a35ff4eb958934c993f99c3233773ec4f9ccd53f69 + checksum: e25e689eba64f7da7cfc43f8ea76cac7176b56caba42655f0a4cb29c0b7c36e67ca54f33df95902859f56108464245d8b45bcdfe21e3d66d9560feb8db780246 languageName: node linkType: hard