From eb70ab5a0d0e308977cf1ae36d69920587ea1417 Mon Sep 17 00:00:00 2001 From: merceyz Date: Thu, 19 Aug 2021 11:53:44 +0200 Subject: [PATCH] fix: backport references fix to 4.2 --- .pnp.cjs | 128 +++++++++--------- ...ypescript-patch-0de759e23a-9067b747c2.zip} | Bin ...ypescript-patch-7fa5ed0439-6a82cb02b2.zip} | Bin ...ypescript-patch-c8b799f2cb-bfea14f536.zip} | Bin .../extra/typescript/gen-typescript-patch.js | 2 +- ...tch-77b8c8e98784f95863d191b15ecdac90.diff} | 40 +++--- .../sources/patches/typescript.patch.ts | 2 +- yarn.lock | 6 +- 8 files changed, 91 insertions(+), 87 deletions(-) rename .yarn/cache/{typescript-patch-af5a148af7-9067b747c2.zip => typescript-patch-0de759e23a-9067b747c2.zip} (100%) rename .yarn/cache/{typescript-patch-771cb44791-6a82cb02b2.zip => typescript-patch-7fa5ed0439-6a82cb02b2.zip} (100%) rename .yarn/cache/{typescript-patch-2e6e910c4d-bfea14f536.zip => typescript-patch-c8b799f2cb-bfea14f536.zip} (100%) rename packages/plugin-compat/extra/typescript/{patch-aecb5a38a43d460a73aafc102b6927ac.diff => patch-77b8c8e98784f95863d191b15ecdac90.diff} (99%) diff --git a/.pnp.cjs b/.pnp.cjs index f9f82752aae3..659bec334314 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -285,7 +285,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "linkType": "SOFT", }] @@ -8753,7 +8753,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["regexpp", "npm:3.1.0"], ["semver", "npm:7.3.5"], ["tsutils", "virtual:f9757ae319815ac0f58d42cf0a9c6d8c36be107ea9d2a7c2404a1a7ed67a935a83935258cd26663439e607a4f7f3b48b0bf3ac24d96805420bec678b31011fdd#npm:3.21.0"], - ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/eslint", @@ -8903,7 +8903,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@typescript-eslint/typescript-estree", "virtual:e284df35cb54dbfcce36759498ed7ad082403dc825086cd5446a08b29d71ed1215922139a42316fa9353bee746689d467f5ab3f50890a5572764bdcc83192b8e#npm:4.26.1"], ["debug", "virtual:5dffae5dceca8d383e37ce1404983ff3eaf566153fb551aede58a16b625356caee63d9240a4386c2b8b44a2ff32b72c5d4444045ea31775b520ccbc9788f7985#npm:4.3.2"], ["eslint", "npm:6.8.0"], - ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/eslint", @@ -9008,7 +9008,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["is-glob", "npm:4.0.1"], ["semver", "npm:7.3.5"], ["tsutils", "virtual:f9757ae319815ac0f58d42cf0a9c6d8c36be107ea9d2a7c2404a1a7ed67a935a83935258cd26663439e607a4f7f3b48b0bf3ac24d96805420bec678b31011fdd#npm:3.21.0"], - ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "typescript" @@ -9486,7 +9486,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.38.1"], ["webpack-merge", "npm:4.2.2"] @@ -9527,7 +9527,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.38.1"], ["webpack-merge", "npm:4.2.2"] @@ -9568,7 +9568,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.38.1"], ["webpack-merge", "npm:4.2.2"] @@ -9608,7 +9608,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["val-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:2.1.1"], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.38.1"], ["webpack-merge", "npm:4.2.2"] @@ -9655,7 +9655,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -9702,7 +9702,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -9749,7 +9749,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -9796,7 +9796,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -9843,7 +9843,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -9890,7 +9890,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -9937,7 +9937,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -9984,7 +9984,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10031,7 +10031,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10078,7 +10078,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10125,7 +10125,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10172,7 +10172,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["yup", "npm:0.32.9"] ], "packagePeers": [ @@ -10218,7 +10218,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["yup", "npm:0.32.9"] ], "linkType": "SOFT", @@ -10300,7 +10300,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "linkType": "SOFT", }] @@ -10351,7 +10351,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.24.0"], - ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/eslint", @@ -10474,7 +10474,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["unescape-html", "npm:1.1.0"], ["unfetch", "npm:4.1.0"], ["unified", "npm:7.1.0"], @@ -10577,7 +10577,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "linkType": "SOFT", }] @@ -10966,7 +10966,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "linkType": "SOFT", }] @@ -11724,7 +11724,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "linkType": "SOFT", }] @@ -12173,7 +12173,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "linkType": "SOFT", }] @@ -14458,7 +14458,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -14480,7 +14480,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -14502,7 +14502,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -14524,7 +14524,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -14546,7 +14546,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -14568,7 +14568,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -14590,7 +14590,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -14612,7 +14612,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -14634,7 +14634,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -14656,7 +14656,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -14678,7 +14678,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -14700,7 +14700,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -14722,7 +14722,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/yarnpkg__cli", @@ -14742,7 +14742,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "linkType": "SOFT", }] @@ -14762,7 +14762,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "linkType": "SOFT", }] @@ -14787,7 +14787,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "linkType": "SOFT", }] @@ -14807,7 +14807,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "linkType": "SOFT", }] @@ -14824,7 +14824,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["webpack", "virtual:16110bda3ce959c103b1979c5d750ceb8ac9cfbd2049c118b6278e46e65aa65fd17e71e04a0ce5f75b7ca3203efd8e9c9b03c948a76c7f4bca807539915b5cfc#npm:5.38.1"], ["webpack-cli", "virtual:16110bda3ce959c103b1979c5d750ceb8ac9cfbd2049c118b6278e46e65aa65fd17e71e04a0ce5f75b7ca3203efd8e9c9b03c948a76c7f4bca807539915b5cfc#npm:4.0.0-beta.8"] ], @@ -22395,7 +22395,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["vue-template-compiler", null], ["webpack", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:5.38.1"] ], @@ -29456,7 +29456,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=bee422"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=c34a14"] ], "packagePeers": [ "@types/react-dom", @@ -37969,7 +37969,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/typescript", @@ -38099,7 +38099,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["tsutils", "virtual:f9757ae319815ac0f58d42cf0a9c6d8c36be107ea9d2a7c2404a1a7ed67a935a83935258cd26663439e607a4f7f3b48b0bf3ac24d96805420bec678b31011fdd#npm:3.21.0"], ["@types/typescript", null], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@types/typescript", @@ -38338,7 +38338,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.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "packagePeers": [ "@strictsoftware/typedoc-plugin-monorepo", @@ -38367,7 +38367,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=bee422"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=c34a14"] ], "packagePeers": [ "@strictsoftware/typedoc-plugin-monorepo", @@ -38395,7 +38395,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=bee422"] + ["typescript", "patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=c34a14"] ], "packagePeers": [ "@strictsoftware/typedoc-plugin-monorepo", @@ -38445,30 +38445,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=bee422"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=c34a14"] ], "linkType": "SOFT", }] ]], ["typescript", [ - ["patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=bee422", { - "packageLocation": "./.yarn/cache/typescript-patch-771cb44791-6a82cb02b2.zip/node_modules/typescript/", + ["patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=c34a14", { + "packageLocation": "./.yarn/cache/typescript-patch-7fa5ed0439-6a82cb02b2.zip/node_modules/typescript/", "packageDependencies": [ - ["typescript", "patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=bee422"] + ["typescript", "patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=c34a14"] ], "linkType": "HARD", }], - ["patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=bee422", { - "packageLocation": "./.yarn/cache/typescript-patch-2e6e910c4d-bfea14f536.zip/node_modules/typescript/", + ["patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=c34a14", { + "packageLocation": "./.yarn/cache/typescript-patch-c8b799f2cb-bfea14f536.zip/node_modules/typescript/", "packageDependencies": [ - ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=bee422"] + ["typescript", "patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=c34a14"] ], "linkType": "HARD", }], - ["patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422", { - "packageLocation": "./.yarn/cache/typescript-patch-af5a148af7-9067b747c2.zip/node_modules/typescript/", + ["patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14", { + "packageLocation": "./.yarn/cache/typescript-patch-0de759e23a-9067b747c2.zip/node_modules/typescript/", "packageDependencies": [ - ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"] + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"] ], "linkType": "HARD", }] @@ -39466,7 +39466,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@yarnpkg/pnpify", "workspace:packages/yarnpkg-pnpify"], ["ts-loader", "virtual:e04a2594c769771b96db34e7a92a8a3af1c98ae86dce662589a5c5d5209e16875506f8cb5f4c2230a2b2ae06335b14466352c4ed470d39edf9edb6c515984525#npm:7.0.5"], ["tslib", "npm:1.13.0"], - ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422"], + ["typescript", "patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14"], ["vsce", "npm:1.85.1"], ["webpack", "virtual:4bb0e72ae00ec402a28e80560124ee13357b1a5221665b7175877ddc6b8b2b98eebe4584a111245801ecf7cecb9de577d076505c0dbcf9292aaff35440a2302f#npm:5.38.1"], ["webpack-cli", "virtual:4bb0e72ae00ec402a28e80560124ee13357b1a5221665b7175877ddc6b8b2b98eebe4584a111245801ecf7cecb9de577d076505c0dbcf9292aaff35440a2302f#npm:4.0.0-beta.8"] diff --git a/.yarn/cache/typescript-patch-af5a148af7-9067b747c2.zip b/.yarn/cache/typescript-patch-0de759e23a-9067b747c2.zip similarity index 100% rename from .yarn/cache/typescript-patch-af5a148af7-9067b747c2.zip rename to .yarn/cache/typescript-patch-0de759e23a-9067b747c2.zip diff --git a/.yarn/cache/typescript-patch-771cb44791-6a82cb02b2.zip b/.yarn/cache/typescript-patch-7fa5ed0439-6a82cb02b2.zip similarity index 100% rename from .yarn/cache/typescript-patch-771cb44791-6a82cb02b2.zip rename to .yarn/cache/typescript-patch-7fa5ed0439-6a82cb02b2.zip diff --git a/.yarn/cache/typescript-patch-2e6e910c4d-bfea14f536.zip b/.yarn/cache/typescript-patch-c8b799f2cb-bfea14f536.zip similarity index 100% rename from .yarn/cache/typescript-patch-2e6e910c4d-bfea14f536.zip rename to .yarn/cache/typescript-patch-c8b799f2cb-bfea14f536.zip diff --git a/packages/plugin-compat/extra/typescript/gen-typescript-patch.js b/packages/plugin-compat/extra/typescript/gen-typescript-patch.js index fa28f67e0c8a..e36624135dec 100644 --- a/packages/plugin-compat/extra/typescript/gen-typescript-patch.js +++ b/packages/plugin-compat/extra/typescript/gen-typescript-patch.js @@ -60,7 +60,7 @@ const SLICES = [ // https://github.com/merceyz/TypeScript/tree/merceyz/pnp-4.2 { from: `8e0e8703b9c95013aec7819e4593d099cdf7763a`, - to: `61a0f0088a4d0cd89f113d40ac089cb2978c5ea0`, + to: `d1cd11e8d50d3bab758cc898b46867171c5e33ed`, onto: `bfc55b5762443c37ecdef08a3b5a4e057b4d1e85`, range: `>=4.2 <4.3`, }, diff --git a/packages/plugin-compat/extra/typescript/patch-aecb5a38a43d460a73aafc102b6927ac.diff b/packages/plugin-compat/extra/typescript/patch-77b8c8e98784f95863d191b15ecdac90.diff similarity index 99% rename from packages/plugin-compat/extra/typescript/patch-aecb5a38a43d460a73aafc102b6927ac.diff rename to packages/plugin-compat/extra/typescript/patch-77b8c8e98784f95863d191b15ecdac90.diff index f15a2ca18428..11d24a3dfe41 100644 --- a/packages/plugin-compat/extra/typescript/patch-aecb5a38a43d460a73aafc102b6927ac.diff +++ b/packages/plugin-compat/extra/typescript/patch-77b8c8e98784f95863d191b15ecdac90.diff @@ -299,7 +299,7 @@ semver exclusivity >=4.2 <4.3 ts.perfLogger.logStartUpdateProgram("SynchronizeProgram"); synchronizeProgram(); diff --git a/lib/tsserver.js b/lib/tsserver.js -index a1d0a7a17..ce5eda2cd 100644 +index a1d0a7a17..e142cf0ca 100644 semver exclusivity >=4.2 <4.3 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -794,7 +794,7 @@ semver exclusivity >=4.2 <4.3 } return statement; }); -@@ -154903,6 +155122,37 @@ var ts; +@@ -154903,6 +155122,39 @@ var ts; return this.projectReferences; }; ConfiguredProject.prototype.updateReferences = function (refs) { @@ -820,7 +820,9 @@ semver exclusivity >=4.2 <4.3 + var getPnpPath_1 = function (path) { + try { + var targetLocator = pnpApi_1.findPackageLocator(path + "/"); -+ return pnpApi_1.resolveToUnqualified(targetLocator.name, basePath_1 + "/"); ++ var packageLocation = pnpApi_1.getPackageInformation(targetLocator).packageLocation; ++ var request = ts.combinePaths(targetLocator.name, ts.getRelativePathFromDirectory(packageLocation, path, false)); ++ return pnpApi_1.resolveToUnqualified(request, basePath_1 + "/"); + } + catch (_a) { + // something went wrong with the resolution, try not to fail @@ -832,7 +834,7 @@ semver exclusivity >=4.2 <4.3 this.projectReferences = refs; this.potentialProjectReferences = undefined; }; -@@ -155532,6 +155782,7 @@ var ts; +@@ -155532,6 +155784,7 @@ var ts; watchDirectory: ts.returnNoopFileWatcher, } : ts.getWatchFactory(this.host, watchLogLevel, log, getDetailWatchInfo); @@ -840,7 +842,7 @@ semver exclusivity >=4.2 <4.3 } ProjectService.prototype.toPath = function (fileName) { return ts.toPath(fileName, this.currentDirectory, this.toCanonicalFileName); -@@ -157270,7 +157521,7 @@ var ts; +@@ -157270,7 +157523,7 @@ var ts; }; ProjectService.prototype.setHostConfiguration = function (args) { var _this = this; @@ -849,7 +851,7 @@ semver exclusivity >=4.2 <4.3 if (args.file) { var info = this.getScriptInfoForNormalizedPath(server.toNormalizedPath(args.file)); if (info) { -@@ -157288,7 +157539,7 @@ var ts; +@@ -157288,7 +157541,7 @@ var ts; this.logger.info("Format host information updated"); } if (args.preferences) { @@ -858,7 +860,7 @@ semver exclusivity >=4.2 <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 -@@ -157314,6 +157565,8 @@ var ts; +@@ -157314,6 +157567,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 +869,7 @@ semver exclusivity >=4.2 <4.3 } } }; -@@ -158293,6 +158546,25 @@ var ts; +@@ -158293,6 +158548,25 @@ var ts; }); }; /*@internal*/ @@ -893,7 +895,7 @@ semver exclusivity >=4.2 <4.3 ProjectService.prototype.watchPackageJsonFile = function (path) { var _this = this; var watchers = this.packageJsonFilesMap || (this.packageJsonFilesMap = new ts.Map()); -@@ -163000,6 +163272,9 @@ var ts; +@@ -163000,6 +163274,9 @@ var ts; } try { var args = [ts.combinePaths(__dirname, "watchGuard.js"), path]; @@ -903,7 +905,7 @@ semver exclusivity >=4.2 <4.3 if (logger.hasLevel(server.LogLevel.verbose)) { logger.info("Starting " + process.execPath + " with args:" + server.stringifyIndented(args)); } -@@ -163329,6 +163604,9 @@ var ts; +@@ -163329,6 +163606,9 @@ var ts; break; } } @@ -927,7 +929,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..425fe49f0 100644 +index e8537e466..b7dccf966 100644 semver exclusivity >=4.2 <4.3 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -1422,7 +1424,7 @@ semver exclusivity >=4.2 <4.3 } return statement; }); -@@ -155097,6 +155316,37 @@ var ts; +@@ -155097,6 +155316,39 @@ var ts; return this.projectReferences; }; ConfiguredProject.prototype.updateReferences = function (refs) { @@ -1448,7 +1450,9 @@ semver exclusivity >=4.2 <4.3 + var getPnpPath_1 = function (path) { + try { + var targetLocator = pnpApi_1.findPackageLocator(path + "/"); -+ return pnpApi_1.resolveToUnqualified(targetLocator.name, basePath_1 + "/"); ++ var packageLocation = pnpApi_1.getPackageInformation(targetLocator).packageLocation; ++ var request = ts.combinePaths(targetLocator.name, ts.getRelativePathFromDirectory(packageLocation, path, false)); ++ return pnpApi_1.resolveToUnqualified(request, basePath_1 + "/"); + } + catch (_a) { + // something went wrong with the resolution, try not to fail @@ -1460,7 +1464,7 @@ semver exclusivity >=4.2 <4.3 this.projectReferences = refs; this.potentialProjectReferences = undefined; }; -@@ -155726,6 +155976,7 @@ var ts; +@@ -155726,6 +155978,7 @@ var ts; watchDirectory: ts.returnNoopFileWatcher, } : ts.getWatchFactory(this.host, watchLogLevel, log, getDetailWatchInfo); @@ -1468,7 +1472,7 @@ semver exclusivity >=4.2 <4.3 } ProjectService.prototype.toPath = function (fileName) { return ts.toPath(fileName, this.currentDirectory, this.toCanonicalFileName); -@@ -157464,7 +157715,7 @@ var ts; +@@ -157464,7 +157717,7 @@ var ts; }; ProjectService.prototype.setHostConfiguration = function (args) { var _this = this; @@ -1477,7 +1481,7 @@ semver exclusivity >=4.2 <4.3 if (args.file) { var info = this.getScriptInfoForNormalizedPath(server.toNormalizedPath(args.file)); if (info) { -@@ -157482,7 +157733,7 @@ var ts; +@@ -157482,7 +157735,7 @@ var ts; this.logger.info("Format host information updated"); } if (args.preferences) { @@ -1486,7 +1490,7 @@ semver exclusivity >=4.2 <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 -@@ -157508,6 +157759,8 @@ var ts; +@@ -157508,6 +157761,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 +1499,7 @@ semver exclusivity >=4.2 <4.3 } } }; -@@ -158487,6 +158740,25 @@ var ts; +@@ -158487,6 +158742,25 @@ var ts; }); }; /*@internal*/ diff --git a/packages/plugin-compat/sources/patches/typescript.patch.ts b/packages/plugin-compat/sources/patches/typescript.patch.ts index be225bad4e3d..53b1e3faf52d 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/yarn.lock b/yarn.lock index f6b6811419d1..6e39ed065ff2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25774,7 +25774,7 @@ typescript@^4.4.1-rc: "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=bee422" + resolution: "typescript@patch:typescript@npm%3A3.7.5#~builtin::version=3.7.5&hash=c34a14" bin: tsc: bin/tsc tsserver: bin/tsserver @@ -25784,7 +25784,7 @@ typescript@^4.4.1-rc: "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=bee422" + resolution: "typescript@patch:typescript@npm%3A3.9.5#~builtin::version=3.9.5&hash=c34a14" bin: tsc: bin/tsc tsserver: bin/tsserver @@ -25794,7 +25794,7 @@ typescript@^4.4.1-rc: "typescript@patch:typescript@^4.4.1-rc#~builtin": version: 4.4.1-rc - resolution: "typescript@patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=bee422" + resolution: "typescript@patch:typescript@npm%3A4.4.1-rc#~builtin::version=4.4.1-rc&hash=c34a14" bin: tsc: bin/tsc tsserver: bin/tsserver