diff --git a/.pnp.cjs b/.pnp.cjs
index 9ebec63ed219..f470340575dc 100755
--- a/.pnp.cjs
+++ b/.pnp.cjs
@@ -4544,24 +4544,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@chevrotain/types", [\
-        ["npm:9.1.0", {\
-          "packageLocation": "./.yarn/cache/@chevrotain-types-npm-9.1.0-80ac254cc2-95621f85dd.zip/node_modules/@chevrotain/types/",\
-          "packageDependencies": [\
-            ["@chevrotain/types", "npm:9.1.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["@chevrotain/utils", [\
-        ["npm:9.1.0", {\
-          "packageLocation": "./.yarn/cache/@chevrotain-utils-npm-9.1.0-5e5d6d7acc-3bf20cd22e.zip/node_modules/@chevrotain/utils/",\
-          "packageDependencies": [\
-            ["@chevrotain/utils", "npm:9.1.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["@cnakazawa/watch", [\
         ["npm:1.0.3", {\
           "packageLocation": "./.yarn/cache/@cnakazawa-watch-npm-1.0.3-e2afda3405-b14c8ffa80.zip/node_modules/@cnakazawa/watch/",\
@@ -8852,15 +8834,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@types/yup", [\
-        ["npm:0.29.11", {\
-          "packageLocation": "./.yarn/cache/@types-yup-npm-0.29.11-217570c70e-d33af937ef.zip/node_modules/@types/yup/",\
-          "packageDependencies": [\
-            ["@types/yup", "npm:0.29.11"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["@typescript-eslint/eslint-plugin", [\
         ["npm:4.31.2", {\
           "packageLocation": "./.yarn/cache/@typescript-eslint-eslint-plugin-npm-4.31.2-2012b2ef21-730ead01f9.zip/node_modules/@typescript-eslint/eslint-plugin/",\
@@ -9653,7 +9626,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/cli", "virtual:142f2540721377707149f0b1d7ad0188d020f822e234abcdca162642d42824b344a1ac44bd6035644a0ca9babd62eb7d72923350ac75b876b51e87eb92b3e464#workspace:packages/yarnpkg-cli"],\
             ["@types/semver", "npm:7.1.0"],\
             ["@types/yarnpkg__core", null],\
-            ["@types/yup", "npm:0.29.11"],\
             ["@yarnpkg/builder", "workspace:packages/yarnpkg-builder"],\
             ["@yarnpkg/core", "workspace:packages/yarnpkg-core"],\
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],\
@@ -9683,8 +9655,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["micromatch", "npm:4.0.4"],\
             ["semver", "npm:7.3.5"],\
             ["tslib", "npm:1.13.0"],\
-            ["typanion", "npm:3.3.2"],\
-            ["yup", "npm:0.32.9"]\
+            ["typanion", "npm:3.3.2"]\
           ],\
           "packagePeers": [\
             "@types/yarnpkg__core",\
@@ -9698,7 +9669,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/cli", "virtual:14a22fb3831dfc762a1bb8a042d17886271c56698e1a83233f09eaacff5a5b83fe6f87adb9255774eab3586392c18ff98cf87aa6b374d572d9b72f88829f6d9e#workspace:packages/yarnpkg-cli"],\
             ["@types/semver", "npm:7.1.0"],\
             ["@types/yarnpkg__core", null],\
-            ["@types/yup", "npm:0.29.11"],\
             ["@yarnpkg/builder", "workspace:packages/yarnpkg-builder"],\
             ["@yarnpkg/core", "workspace:packages/yarnpkg-core"],\
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],\
@@ -9728,8 +9698,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["micromatch", "npm:4.0.4"],\
             ["semver", "npm:7.3.5"],\
             ["tslib", "npm:1.13.0"],\
-            ["typanion", "npm:3.3.2"],\
-            ["yup", "npm:0.32.9"]\
+            ["typanion", "npm:3.3.2"]\
           ],\
           "packagePeers": [\
             "@types/yarnpkg__core",\
@@ -9743,7 +9712,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/cli", "virtual:3f21a2572d1fa6d1ff8d16d86e25bcefcbff7d17161c440fdbddbd871d9d675c377d66a2cbd98ddb8f2c024060bc7bc6c01e8ae328fa1fef861c72a9b2c30755#workspace:packages/yarnpkg-cli"],\
             ["@types/semver", "npm:7.1.0"],\
             ["@types/yarnpkg__core", null],\
-            ["@types/yup", "npm:0.29.11"],\
             ["@yarnpkg/builder", "workspace:packages/yarnpkg-builder"],\
             ["@yarnpkg/core", "workspace:packages/yarnpkg-core"],\
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],\
@@ -9773,8 +9741,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["micromatch", "npm:4.0.4"],\
             ["semver", "npm:7.3.5"],\
             ["tslib", "npm:1.13.0"],\
-            ["typanion", "npm:3.3.2"],\
-            ["yup", "npm:0.32.9"]\
+            ["typanion", "npm:3.3.2"]\
           ],\
           "packagePeers": [\
             "@types/yarnpkg__core",\
@@ -9788,7 +9755,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/cli", "virtual:4a733c8d9614e2148392368219d98ec1a70b4e8ce99164edd551241b22f6c5233e9d0ccf9f6d83265c8a5aafc617cfd3c4100b3efef1e092a42053c23770ed9a#workspace:packages/yarnpkg-cli"],\
             ["@types/semver", "npm:7.1.0"],\
             ["@types/yarnpkg__core", null],\
-            ["@types/yup", "npm:0.29.11"],\
             ["@yarnpkg/builder", "workspace:packages/yarnpkg-builder"],\
             ["@yarnpkg/core", "workspace:packages/yarnpkg-core"],\
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],\
@@ -9818,8 +9784,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["micromatch", "npm:4.0.4"],\
             ["semver", "npm:7.3.5"],\
             ["tslib", "npm:1.13.0"],\
-            ["typanion", "npm:3.3.2"],\
-            ["yup", "npm:0.32.9"]\
+            ["typanion", "npm:3.3.2"]\
           ],\
           "packagePeers": [\
             "@types/yarnpkg__core",\
@@ -9833,7 +9798,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/cli", "virtual:616a2ba0d005227805d037f4c8ec29f1dd09fdb3e3f49f7b5c4a07a62139a147d373d38bc5ebcb31bddab3956c3fc25d54edf8722741d9ebdbe9d36d21968f91#workspace:packages/yarnpkg-cli"],\
             ["@types/semver", "npm:7.1.0"],\
             ["@types/yarnpkg__core", null],\
-            ["@types/yup", "npm:0.29.11"],\
             ["@yarnpkg/builder", "workspace:packages/yarnpkg-builder"],\
             ["@yarnpkg/core", "workspace:packages/yarnpkg-core"],\
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],\
@@ -9863,8 +9827,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["micromatch", "npm:4.0.4"],\
             ["semver", "npm:7.3.5"],\
             ["tslib", "npm:1.13.0"],\
-            ["typanion", "npm:3.3.2"],\
-            ["yup", "npm:0.32.9"]\
+            ["typanion", "npm:3.3.2"]\
           ],\
           "packagePeers": [\
             "@types/yarnpkg__core",\
@@ -9878,7 +9841,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/cli", "virtual:712d04b0098634bdb13868ff8f85b327022bd7d3880873ada8c0ae56847ed36cf9da1fd74a88519380129cec528fe2bd2201426bc28ac9d4a8cc6734ff25c538#workspace:packages/yarnpkg-cli"],\
             ["@types/semver", "npm:7.1.0"],\
             ["@types/yarnpkg__core", null],\
-            ["@types/yup", "npm:0.29.11"],\
             ["@yarnpkg/builder", "workspace:packages/yarnpkg-builder"],\
             ["@yarnpkg/core", "workspace:packages/yarnpkg-core"],\
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],\
@@ -9908,8 +9870,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["micromatch", "npm:4.0.4"],\
             ["semver", "npm:7.3.5"],\
             ["tslib", "npm:1.13.0"],\
-            ["typanion", "npm:3.3.2"],\
-            ["yup", "npm:0.32.9"]\
+            ["typanion", "npm:3.3.2"]\
           ],\
           "packagePeers": [\
             "@types/yarnpkg__core",\
@@ -9923,7 +9884,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/cli", "virtual:743b60015fc887fe314a7ee01ea4843b516ac512d77939f47dc39d50bc7db742dc8994fe9bb2245ada0b3ce6f8aa58329d603fbc24093050cd499cb16a1a995f#workspace:packages/yarnpkg-cli"],\
             ["@types/semver", "npm:7.1.0"],\
             ["@types/yarnpkg__core", null],\
-            ["@types/yup", "npm:0.29.11"],\
             ["@yarnpkg/builder", "workspace:packages/yarnpkg-builder"],\
             ["@yarnpkg/core", "workspace:packages/yarnpkg-core"],\
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],\
@@ -9953,8 +9913,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["micromatch", "npm:4.0.4"],\
             ["semver", "npm:7.3.5"],\
             ["tslib", "npm:1.13.0"],\
-            ["typanion", "npm:3.3.2"],\
-            ["yup", "npm:0.32.9"]\
+            ["typanion", "npm:3.3.2"]\
           ],\
           "packagePeers": [\
             "@types/yarnpkg__core",\
@@ -9968,7 +9927,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/cli", "virtual:a027ddc7edcbf74025e90effce333897039d2c6f8e1ebe319fb72c52c5be1b885da91acc56476d19bb6ce2e31cbc2d5b11241940b82f833a2cac262496c0088f#workspace:packages/yarnpkg-cli"],\
             ["@types/semver", "npm:7.1.0"],\
             ["@types/yarnpkg__core", null],\
-            ["@types/yup", "npm:0.29.11"],\
             ["@yarnpkg/builder", "workspace:packages/yarnpkg-builder"],\
             ["@yarnpkg/core", "workspace:packages/yarnpkg-core"],\
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],\
@@ -9998,8 +9956,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["micromatch", "npm:4.0.4"],\
             ["semver", "npm:7.3.5"],\
             ["tslib", "npm:1.13.0"],\
-            ["typanion", "npm:3.3.2"],\
-            ["yup", "npm:0.32.9"]\
+            ["typanion", "npm:3.3.2"]\
           ],\
           "packagePeers": [\
             "@types/yarnpkg__core",\
@@ -10013,7 +9970,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/cli", "virtual:baf8bf095598663073ea5e8bd5af72409e894f8926160bf6fe0a24c693d417f91b536d9e3bbb0ea5f3d0ad8cd2f1ec38b71e964f9475ba719a1f5a8505cf10c3#workspace:packages/yarnpkg-cli"],\
             ["@types/semver", "npm:7.1.0"],\
             ["@types/yarnpkg__core", null],\
-            ["@types/yup", "npm:0.29.11"],\
             ["@yarnpkg/builder", "workspace:packages/yarnpkg-builder"],\
             ["@yarnpkg/core", "workspace:packages/yarnpkg-core"],\
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],\
@@ -10043,8 +9999,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["micromatch", "npm:4.0.4"],\
             ["semver", "npm:7.3.5"],\
             ["tslib", "npm:1.13.0"],\
-            ["typanion", "npm:3.3.2"],\
-            ["yup", "npm:0.32.9"]\
+            ["typanion", "npm:3.3.2"]\
           ],\
           "packagePeers": [\
             "@types/yarnpkg__core",\
@@ -10058,7 +10013,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/cli", "virtual:cfce476fbcac37853570c2d41665757b5f868b1c2f089ee6edbc8bb5aa32141e156cae7d75350d1095258d90afbabe2b2bb142142b995d133c3ee535c89d459b#workspace:packages/yarnpkg-cli"],\
             ["@types/semver", "npm:7.1.0"],\
             ["@types/yarnpkg__core", null],\
-            ["@types/yup", "npm:0.29.11"],\
             ["@yarnpkg/builder", "workspace:packages/yarnpkg-builder"],\
             ["@yarnpkg/core", "workspace:packages/yarnpkg-core"],\
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],\
@@ -10088,8 +10042,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["micromatch", "npm:4.0.4"],\
             ["semver", "npm:7.3.5"],\
             ["tslib", "npm:1.13.0"],\
-            ["typanion", "npm:3.3.2"],\
-            ["yup", "npm:0.32.9"]\
+            ["typanion", "npm:3.3.2"]\
           ],\
           "packagePeers": [\
             "@types/yarnpkg__core",\
@@ -10103,7 +10056,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/cli", "virtual:ef8e1544cc953676e27fe7445218564293b5a190d023e4610c14767688870b772297269e2848a1d8d72f54605aacc9da3b2b7dc56dca754d297b70b14e6a665e#workspace:packages/yarnpkg-cli"],\
             ["@types/semver", "npm:7.1.0"],\
             ["@types/yarnpkg__core", null],\
-            ["@types/yup", "npm:0.29.11"],\
             ["@yarnpkg/builder", "workspace:packages/yarnpkg-builder"],\
             ["@yarnpkg/core", "workspace:packages/yarnpkg-core"],\
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],\
@@ -10133,8 +10085,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["micromatch", "npm:4.0.4"],\
             ["semver", "npm:7.3.5"],\
             ["tslib", "npm:1.13.0"],\
-            ["typanion", "npm:3.3.2"],\
-            ["yup", "npm:0.32.9"]\
+            ["typanion", "npm:3.3.2"]\
           ],\
           "packagePeers": [\
             "@types/yarnpkg__core",\
@@ -10148,7 +10099,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@yarnpkg/cli", "virtual:f4e4f4a9a0213f122880195b39adaee7de5cb560c1d806ebc8bace6a3124e5b8f820bbb89ebecd4d535caeb6f527d343143210aa405689c118ff2813b78998a0#workspace:packages/yarnpkg-cli"],\
             ["@types/semver", "npm:7.1.0"],\
             ["@types/yarnpkg__core", null],\
-            ["@types/yup", "npm:0.29.11"],\
             ["@yarnpkg/builder", "workspace:packages/yarnpkg-builder"],\
             ["@yarnpkg/core", "workspace:packages/yarnpkg-core"],\
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],\
@@ -10178,8 +10128,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["micromatch", "npm:4.0.4"],\
             ["semver", "npm:7.3.5"],\
             ["tslib", "npm:1.13.0"],\
-            ["typanion", "npm:3.3.2"],\
-            ["yup", "npm:0.32.9"]\
+            ["typanion", "npm:3.3.2"]\
           ],\
           "packagePeers": [\
             "@types/yarnpkg__core",\
@@ -10192,7 +10141,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "packageDependencies": [\
             ["@yarnpkg/cli", "workspace:packages/yarnpkg-cli"],\
             ["@types/semver", "npm:7.1.0"],\
-            ["@types/yup", "npm:0.29.11"],\
             ["@yarnpkg/builder", "workspace:packages/yarnpkg-builder"],\
             ["@yarnpkg/core", "workspace:packages/yarnpkg-core"],\
             ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],\
@@ -10222,8 +10170,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["micromatch", "npm:4.0.4"],\
             ["semver", "npm:7.3.5"],\
             ["tslib", "npm:1.13.0"],\
-            ["typanion", "npm:3.3.2"],\
-            ["yup", "npm:0.32.9"]\
+            ["typanion", "npm:3.3.2"]\
           ],\
           "linkType": "SOFT"\
         }]\
@@ -10274,7 +10221,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["semver", "npm:7.3.5"],\
             ["strip-ansi", "npm:6.0.1"],\
             ["tar", "npm:6.0.5"],\
-            ["tinylogic", "npm:1.0.3"],\
+            ["tinylogic", "npm:2.0.0"],\
             ["treeify", "npm:1.1.0"],\
             ["tslib", "npm:1.13.0"],\
             ["tunnel", "npm:0.0.6"]\
@@ -17786,18 +17733,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["chevrotain", [\
-        ["npm:9.1.0", {\
-          "packageLocation": "./.yarn/cache/chevrotain-npm-9.1.0-9280f9d77f-d8e5cd89c0.zip/node_modules/chevrotain/",\
-          "packageDependencies": [\
-            ["chevrotain", "npm:9.1.0"],\
-            ["@chevrotain/types", "npm:9.1.0"],\
-            ["@chevrotain/utils", "npm:9.1.0"],\
-            ["regexp-to-ast", "npm:0.5.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["chokidar", [\
         ["npm:2.1.8", {\
           "packageLocation": "./.yarn/cache/chokidar-npm-2.1.8-32fdcd020e-5e67bc26ee.zip/node_modules/chokidar/",\
@@ -28229,15 +28164,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["lodash-es", [\
-        ["npm:4.17.21", {\
-          "packageLocation": "./.yarn/cache/lodash-es-npm-4.17.21-b45832dfce-d1c3ee9411.zip/node_modules/lodash-es/",\
-          "packageDependencies": [\
-            ["lodash-es", "npm:4.17.21"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["lodash._reinterpolate", [\
         ["npm:3.0.0", {\
           "packageLocation": "./.yarn/cache/lodash._reinterpolate-npm-3.0.0-3c62ca439e-9facfc8cc4.zip/node_modules/lodash._reinterpolate/",\
@@ -30031,15 +29957,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["nanoclone", [\
-        ["npm:0.2.1", {\
-          "packageLocation": "./.yarn/cache/nanoclone-npm-0.2.1-972ee958a0-24a9268a93.zip/node_modules/nanoclone/",\
-          "packageDependencies": [\
-            ["nanoclone", "npm:0.2.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["nanocolors", [\
         ["npm:0.1.6", {\
           "packageLocation": "./.yarn/cache/nanocolors-npm-0.1.6-0c731dbf0b-53f8d706a5.zip/node_modules/nanocolors/",\
@@ -33052,13 +32969,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["property-expr", "npm:1.5.1"]\
           ],\
           "linkType": "HARD"\
-        }],\
-        ["npm:2.0.4", {\
-          "packageLocation": "./.yarn/cache/property-expr-npm-2.0.4-dffd410058-5c68f0d092.zip/node_modules/property-expr/",\
-          "packageDependencies": [\
-            ["property-expr", "npm:2.0.4"]\
-          ],\
-          "linkType": "HARD"\
         }]\
       ]],\
       ["property-information", [\
@@ -34456,15 +34366,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["regexp-to-ast", [\
-        ["npm:0.5.0", {\
-          "packageLocation": "./.yarn/cache/regexp-to-ast-npm-0.5.0-1e96b9f3a0-7f03ab0518.zip/node_modules/regexp-to-ast/",\
-          "packageDependencies": [\
-            ["regexp-to-ast", "npm:0.5.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["regexp.prototype.flags", [\
         ["npm:1.3.1", {\
           "packageLocation": "./.yarn/cache/regexp.prototype.flags-npm-1.3.1-f0c34f894f-764bd6e49c.zip/node_modules/regexp.prototype.flags/",\
@@ -37576,11 +37477,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["tinylogic", [\
-        ["npm:1.0.3", {\
-          "packageLocation": "./.yarn/cache/tinylogic-npm-1.0.3-bd596a96c4-c2df547384.zip/node_modules/tinylogic/",\
+        ["npm:2.0.0", {\
+          "packageLocation": "./.yarn/cache/tinylogic-npm-2.0.0-700fcc2fe0-8c97825b29.zip/node_modules/tinylogic/",\
           "packageDependencies": [\
-            ["tinylogic", "npm:1.0.3"],\
-            ["chevrotain", "npm:9.1.0"]\
+            ["tinylogic", "npm:2.0.0"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -40453,20 +40353,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["toposort", "npm:2.0.2"]\
           ],\
           "linkType": "HARD"\
-        }],\
-        ["npm:0.32.9", {\
-          "packageLocation": "./.yarn/cache/yup-npm-0.32.9-d884fe5f43-37ba8d0c0d.zip/node_modules/yup/",\
-          "packageDependencies": [\
-            ["yup", "npm:0.32.9"],\
-            ["@babel/runtime", "npm:7.15.4"],\
-            ["@types/lodash", "npm:4.14.172"],\
-            ["lodash", "npm:4.17.21"],\
-            ["lodash-es", "npm:4.17.21"],\
-            ["nanoclone", "npm:0.2.1"],\
-            ["property-expr", "npm:2.0.4"],\
-            ["toposort", "npm:2.0.2"]\
-          ],\
-          "linkType": "HARD"\
         }]\
       ]],\
       ["yurnalist", [\
diff --git a/.yarn/cache/@chevrotain-types-npm-9.1.0-80ac254cc2-95621f85dd.zip b/.yarn/cache/@chevrotain-types-npm-9.1.0-80ac254cc2-95621f85dd.zip
deleted file mode 100644
index c45e8795f17c..000000000000
Binary files a/.yarn/cache/@chevrotain-types-npm-9.1.0-80ac254cc2-95621f85dd.zip and /dev/null differ
diff --git a/.yarn/cache/@chevrotain-utils-npm-9.1.0-5e5d6d7acc-3bf20cd22e.zip b/.yarn/cache/@chevrotain-utils-npm-9.1.0-5e5d6d7acc-3bf20cd22e.zip
deleted file mode 100644
index 5134ba203265..000000000000
Binary files a/.yarn/cache/@chevrotain-utils-npm-9.1.0-5e5d6d7acc-3bf20cd22e.zip and /dev/null differ
diff --git a/.yarn/cache/@types-yup-npm-0.29.11-217570c70e-d33af937ef.zip b/.yarn/cache/@types-yup-npm-0.29.11-217570c70e-d33af937ef.zip
deleted file mode 100644
index e0d77aed78b3..000000000000
Binary files a/.yarn/cache/@types-yup-npm-0.29.11-217570c70e-d33af937ef.zip and /dev/null differ
diff --git a/.yarn/cache/chevrotain-npm-9.1.0-9280f9d77f-d8e5cd89c0.zip b/.yarn/cache/chevrotain-npm-9.1.0-9280f9d77f-d8e5cd89c0.zip
deleted file mode 100644
index 63de3ff0bea7..000000000000
Binary files a/.yarn/cache/chevrotain-npm-9.1.0-9280f9d77f-d8e5cd89c0.zip and /dev/null differ
diff --git a/.yarn/cache/lodash-es-npm-4.17.21-b45832dfce-d1c3ee9411.zip b/.yarn/cache/lodash-es-npm-4.17.21-b45832dfce-d1c3ee9411.zip
deleted file mode 100644
index 1ed0d0ef4fc0..000000000000
Binary files a/.yarn/cache/lodash-es-npm-4.17.21-b45832dfce-d1c3ee9411.zip and /dev/null differ
diff --git a/.yarn/cache/nanoclone-npm-0.2.1-972ee958a0-24a9268a93.zip b/.yarn/cache/nanoclone-npm-0.2.1-972ee958a0-24a9268a93.zip
deleted file mode 100644
index be8daa42ec20..000000000000
Binary files a/.yarn/cache/nanoclone-npm-0.2.1-972ee958a0-24a9268a93.zip and /dev/null differ
diff --git a/.yarn/cache/property-expr-npm-2.0.4-dffd410058-5c68f0d092.zip b/.yarn/cache/property-expr-npm-2.0.4-dffd410058-5c68f0d092.zip
deleted file mode 100644
index ba5faf6f7903..000000000000
Binary files a/.yarn/cache/property-expr-npm-2.0.4-dffd410058-5c68f0d092.zip and /dev/null differ
diff --git a/.yarn/cache/regexp-to-ast-npm-0.5.0-1e96b9f3a0-7f03ab0518.zip b/.yarn/cache/regexp-to-ast-npm-0.5.0-1e96b9f3a0-7f03ab0518.zip
deleted file mode 100644
index 35f1e79ada59..000000000000
Binary files a/.yarn/cache/regexp-to-ast-npm-0.5.0-1e96b9f3a0-7f03ab0518.zip and /dev/null differ
diff --git a/.yarn/cache/tinylogic-npm-1.0.3-bd596a96c4-c2df547384.zip b/.yarn/cache/tinylogic-npm-1.0.3-bd596a96c4-c2df547384.zip
deleted file mode 100644
index 015712ae2017..000000000000
Binary files a/.yarn/cache/tinylogic-npm-1.0.3-bd596a96c4-c2df547384.zip and /dev/null differ
diff --git a/.yarn/cache/tinylogic-npm-2.0.0-700fcc2fe0-8c97825b29.zip b/.yarn/cache/tinylogic-npm-2.0.0-700fcc2fe0-8c97825b29.zip
new file mode 100644
index 000000000000..ceac5c84fa4f
Binary files /dev/null and b/.yarn/cache/tinylogic-npm-2.0.0-700fcc2fe0-8c97825b29.zip differ
diff --git a/.yarn/cache/yup-npm-0.32.9-d884fe5f43-37ba8d0c0d.zip b/.yarn/cache/yup-npm-0.32.9-d884fe5f43-37ba8d0c0d.zip
deleted file mode 100644
index 4354beac533a..000000000000
Binary files a/.yarn/cache/yup-npm-0.32.9-d884fe5f43-37ba8d0c0d.zip and /dev/null differ
diff --git a/.yarn/versions/78804c3b.yml b/.yarn/versions/78804c3b.yml
new file mode 100644
index 000000000000..733dca37c14d
--- /dev/null
+++ b/.yarn/versions/78804c3b.yml
@@ -0,0 +1,37 @@
+releases:
+  "@yarnpkg/cli": major
+  "@yarnpkg/core": major
+  "@yarnpkg/libzip": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-exec"
+  - "@yarnpkg/plugin-file"
+  - "@yarnpkg/plugin-git"
+  - "@yarnpkg/plugin-github"
+  - "@yarnpkg/plugin-http"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-link"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - vscode-zipfs
+  - "@yarnpkg/builder"
+  - "@yarnpkg/doctor"
+  - "@yarnpkg/fslib"
+  - "@yarnpkg/nm"
+  - "@yarnpkg/pnp"
+  - "@yarnpkg/pnpify"
+  - "@yarnpkg/sdks"
diff --git a/packages/acceptance-tests/pkg-tests-specs/sources/commands/add.test.ts b/packages/acceptance-tests/pkg-tests-specs/sources/commands/add.test.ts
index 7abac7a73493..e31e9923b5b7 100644
--- a/packages/acceptance-tests/pkg-tests-specs/sources/commands/add.test.ts
+++ b/packages/acceptance-tests/pkg-tests-specs/sources/commands/add.test.ts
@@ -283,7 +283,7 @@ describe(`Commands`, () => {
         const content = await xfs.readFilePromise(`${path}/yarn.lock` as PortablePath, `utf8`);
         const lock = parseSyml(content);
 
-        await expect(lock).toMatchObject({
+        expect(lock).toMatchObject({
           [`inject-node-gyp@npm:^1.0.0`]: {
             dependencies: {
               [`node-gyp`]: `latest`,
diff --git a/packages/yarnpkg-cli/package.json b/packages/yarnpkg-cli/package.json
index 55e27be7fffd..76e7cc8e64fc 100644
--- a/packages/yarnpkg-cli/package.json
+++ b/packages/yarnpkg-cli/package.json
@@ -29,12 +29,10 @@
     "clipanion": "^3.2.0-rc.4",
     "semver": "^7.1.2",
     "tslib": "^1.13.0",
-    "typanion": "^3.3.0",
-    "yup": "^0.32.9"
+    "typanion": "^3.3.0"
   },
   "devDependencies": {
     "@types/semver": "^7.1.0",
-    "@types/yup": "^0",
     "@yarnpkg/builder": "workspace:^",
     "@yarnpkg/monorepo": "workspace:^",
     "@yarnpkg/pnpify": "workspace:^",
diff --git a/packages/yarnpkg-cli/sources/tools/getDynamicLibs.ts b/packages/yarnpkg-cli/sources/tools/getDynamicLibs.ts
index 5a6e9c64ba80..e9470a0ef42e 100644
--- a/packages/yarnpkg-cli/sources/tools/getDynamicLibs.ts
+++ b/packages/yarnpkg-cli/sources/tools/getDynamicLibs.ts
@@ -7,7 +7,6 @@ import * as shell     from '@yarnpkg/shell';
 import * as clipanion from 'clipanion';
 import * as semver    from 'semver';
 import * as typanion  from 'typanion';
-import * as yup       from 'yup';
 
 export const getDynamicLibs = () => new Map<string, any>([
   [`@yarnpkg/cli`, cli],
@@ -21,6 +20,4 @@ export const getDynamicLibs = () => new Map<string, any>([
   [`clipanion`, clipanion],
   [`semver`, semver],
   [`typanion`, typanion],
-  // TODO: remove in next major
-  [`yup`, yup],
 ]);
diff --git a/packages/yarnpkg-core/package.json b/packages/yarnpkg-core/package.json
index 3eac81eeb66a..ad99e2e3ff6a 100644
--- a/packages/yarnpkg-core/package.json
+++ b/packages/yarnpkg-core/package.json
@@ -26,7 +26,7 @@
     "semver": "^7.1.2",
     "strip-ansi": "^6.0.0",
     "tar": "^6.0.5",
-    "tinylogic": "^1.0.3",
+    "tinylogic": "^2.0.0",
     "treeify": "^1.1.0",
     "tslib": "^1.13.0",
     "tunnel": "^0.0.6"
diff --git a/packages/yarnpkg-core/sources/httpUtils.ts b/packages/yarnpkg-core/sources/httpUtils.ts
index ed42ef070c34..beb9ac69f4fa 100644
--- a/packages/yarnpkg-core/sources/httpUtils.ts
+++ b/packages/yarnpkg-core/sources/httpUtils.ts
@@ -1,19 +1,19 @@
-import {PortablePath, xfs}                                   from '@yarnpkg/fslib';
-import {ExtendOptions, RequestError, Response, TimeoutError} from 'got';
-import {Agent as HttpsAgent}                                 from 'https';
-import {Agent as HttpAgent}                                  from 'http';
-import micromatch                                            from 'micromatch';
-import tunnel, {ProxyOptions}                                from 'tunnel';
-import {URL}                                                 from 'url';
-
-import {ConfigurationValueMap, Configuration}                from './Configuration';
-import {MessageName}                                         from './MessageName';
-import {ReportError}                                         from './Report';
-import * as formatUtils                                      from './formatUtils';
-import {MapValue, MapValueToObjectValue}                     from './miscUtils';
-import * as miscUtils                                        from './miscUtils';
-
-export {RequestError} from 'got';
+import {PortablePath, xfs}                          from '@yarnpkg/fslib';
+import type {ExtendOptions, RequestError, Response} from 'got';
+import {Agent as HttpsAgent}                        from 'https';
+import {Agent as HttpAgent}                         from 'http';
+import micromatch                                   from 'micromatch';
+import tunnel, {ProxyOptions}                       from 'tunnel';
+import {URL}                                        from 'url';
+
+import {ConfigurationValueMap, Configuration}       from './Configuration';
+import {MessageName}                                from './MessageName';
+import {ReportError}                                from './Report';
+import * as formatUtils                             from './formatUtils';
+import {MapValue, MapValueToObjectValue}            from './miscUtils';
+import * as miscUtils                               from './miscUtils';
+
+export type {RequestError}                                   from 'got';
 
 const cache = new Map<string, Promise<Buffer> | Buffer>();
 const fileCache = new Map<PortablePath, Promise<Buffer> | Buffer>();
@@ -64,8 +64,8 @@ async function prettyNetworkError(response: Promise<Response<any>>, {configurati
       }
     }
 
-    if (err instanceof TimeoutError && err.event === `socket`)
-      message += ` (can be increased via ${formatUtils.pretty(configuration, `httpTimeout`, formatUtils.Type.SETTING)})`;
+    if (err.code === `ETIMEDOUT` && err.event === `socket`)
+      message += `(can be increased via ${formatUtils.pretty(configuration, `httpTimeout`, formatUtils.Type.SETTING)})`;
 
     const networkError = new ReportError(MessageName.NETWORK_ERROR, message, report => {
       if (err.response) {
diff --git a/packages/yarnpkg-libzip/sources/async.ts b/packages/yarnpkg-libzip/sources/async.ts
index 40012e2e04a4..a86c2ca3e06c 100644
--- a/packages/yarnpkg-libzip/sources/async.ts
+++ b/packages/yarnpkg-libzip/sources/async.ts
@@ -1,4 +1,3 @@
-import createModule            from './libzipAsync';
 import {Libzip, makeInterface} from './makeInterface';
 
 let promise: Promise<Libzip> | null = null;
@@ -8,8 +7,12 @@ export function getLibzipSync() {
 }
 
 export async function getLibzipPromise() {
-  if (promise === null)
-    promise = createModule().then(libzip => makeInterface(libzip));
+  if (promise === null) {
+    promise = import(`./libzipAsync`).then(async ({default: createModule}) => {
+      const libzip = await createModule();
+      return makeInterface(libzip);
+    });
+  }
 
   return promise;
 }
diff --git a/yarn.lock b/yarn.lock
index 309c5ae1a1c1..05660cb0f54e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1716,7 +1716,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.0, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.10.5, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.3.4, @babel/runtime@npm:^7.4.4, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.7, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7":
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.0, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.3.4, @babel/runtime@npm:^7.4.4, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.7, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7":
   version: 7.15.4
   resolution: "@babel/runtime@npm:7.15.4"
   dependencies:
@@ -1777,20 +1777,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@chevrotain/types@npm:^9.1.0":
-  version: 9.1.0
-  resolution: "@chevrotain/types@npm:9.1.0"
-  checksum: 95621f85dde7afbc3298440407814a04857f45fa0deefed0006441d1bdd1e09ae2243e141753ca2d1b08845f3c391dd03532f219e12be8c5e1d12b0b12ad342a
-  languageName: node
-  linkType: hard
-
-"@chevrotain/utils@npm:^9.1.0":
-  version: 9.1.0
-  resolution: "@chevrotain/utils@npm:9.1.0"
-  checksum: 3bf20cd22e2f5d64f9cfd968c6355e440abb833b8283a37ff67d1ba56a219f2c9f93a194f2c51befb9932475c6d1fa98376f2ace248c2e391639931e0305a783
-  languageName: node
-  linkType: hard
-
 "@cnakazawa/watch@npm:^1.0.3":
   version: 1.0.3
   resolution: "@cnakazawa/watch@npm:1.0.3"
@@ -4351,7 +4337,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/lodash@npm:*, @types/lodash@npm:^4.14.136, @types/lodash@npm:^4.14.165, @types/lodash@npm:^4.14.92":
+"@types/lodash@npm:*, @types/lodash@npm:^4.14.136, @types/lodash@npm:^4.14.92":
   version: 4.14.172
   resolution: "@types/lodash@npm:4.14.172"
   checksum: e93b14543aa7c9f14bd8f1fdd5e309927d00e13ad3a91f16be167ea0f36ad412901d648dd16dd6df68973c02b899c354a28c3b5f76ec881d6bc2e8a8ef1e3a41
@@ -4822,13 +4808,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/yup@npm:^0":
-  version: 0.29.11
-  resolution: "@types/yup@npm:0.29.11"
-  checksum: d33af937ef241499ee22e7a819c8fe8b07403c6aaaa750567a8daf79982df58a599f5c16fe405eb139fed49553731586620e04d4d0a21b7010597d8d643946b5
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/eslint-plugin@npm:^4.29.3":
   version: 4.31.2
   resolution: "@typescript-eslint/eslint-plugin@npm:4.31.2"
@@ -5407,7 +5386,6 @@ __metadata:
   resolution: "@yarnpkg/cli@workspace:packages/yarnpkg-cli"
   dependencies:
     "@types/semver": ^7.1.0
-    "@types/yup": ^0
     "@yarnpkg/builder": "workspace:^"
     "@yarnpkg/core": "workspace:^"
     "@yarnpkg/fslib": "workspace:^"
@@ -5438,7 +5416,6 @@ __metadata:
     semver: ^7.1.2
     tslib: ^1.13.0
     typanion: ^3.3.0
-    yup: ^0.32.9
   peerDependencies:
     "@yarnpkg/core": "workspace:^"
   languageName: unknown
@@ -5486,7 +5463,7 @@ __metadata:
     semver: ^7.1.2
     strip-ansi: ^6.0.0
     tar: ^6.0.5
-    tinylogic: ^1.0.3
+    tinylogic: ^2.0.0
     treeify: ^1.1.0
     tslib: ^1.13.0
     tunnel: ^0.0.6
@@ -8373,17 +8350,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chevrotain@npm:^9.1.0":
-  version: 9.1.0
-  resolution: "chevrotain@npm:9.1.0"
-  dependencies:
-    "@chevrotain/types": ^9.1.0
-    "@chevrotain/utils": ^9.1.0
-    regexp-to-ast: 0.5.0
-  checksum: d8e5cd89c0baa0b227ed39eb425cc8a1ffe533fe9993850f130bd7771963f30bb6095624e58c2acd0dc933b622834f17df0e5100f63d1008d64967a135f6e229
-  languageName: node
-  linkType: hard
-
 "chokidar@npm:^2.1.8":
   version: 2.1.8
   resolution: "chokidar@npm:2.1.8"
@@ -17102,13 +17068,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash-es@npm:^4.17.15":
-  version: 4.17.21
-  resolution: "lodash-es@npm:4.17.21"
-  checksum: d1c3ee94118daeeee47c630ab5f91e94cc4e41ebe2452d837edbe599e853eb2d4be7edf82b4fe62f9fc74f27a8ed7f82fdbd9d301d0acef88f00941db64c4843
-  languageName: node
-  linkType: hard
-
 "lodash._reinterpolate@npm:~3.0.0":
   version: 3.0.0
   resolution: "lodash._reinterpolate@npm:3.0.0"
@@ -18695,13 +18654,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nanoclone@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "nanoclone@npm:0.2.1"
-  checksum: 24a9268a93d4e40f5bda016777ebbc4bdf878ec92c062070fee95d0d77ae22869da6589eb1037116c9d59ded61fd30f8c4418bff24bec9d49f4c65ea7f0c4746
-  languageName: node
-  linkType: hard
-
 "nanocolors@npm:^0.1.5":
   version: 0.1.6
   resolution: "nanocolors@npm:0.1.6"
@@ -21077,13 +21029,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"property-expr@npm:^2.0.4":
-  version: 2.0.4
-  resolution: "property-expr@npm:2.0.4"
-  checksum: 5c68f0d092c0962469749a7913d11e43d43ae970cdd2dce80b653bdf53170625d41142d7f787d45d2d36633c82c2fee4221176aa3b87d3cdda438defb7206afa
-  languageName: node
-  linkType: hard
-
 "property-information@npm:^5.0.0, property-information@npm:^5.3.0":
   version: 5.6.0
   resolution: "property-information@npm:5.6.0"
@@ -22084,13 +22029,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regexp-to-ast@npm:0.5.0":
-  version: 0.5.0
-  resolution: "regexp-to-ast@npm:0.5.0"
-  checksum: 7f03ab05187a8e2bece21ef75ea844cf280202fc011e91408d109ea02f324d1662757f5a746ab68716606bb582e9490af4bf9ebece5f3200737fb99ac3132efc
-  languageName: node
-  linkType: hard
-
 "regexp.prototype.flags@npm:^1.3.1":
   version: 1.3.1
   resolution: "regexp.prototype.flags@npm:1.3.1"
@@ -24917,12 +24855,10 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"tinylogic@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "tinylogic@npm:1.0.3"
-  dependencies:
-    chevrotain: ^9.1.0
-  checksum: c2df54738430317f7900bb50502ee74ea57ccd31ce49bd42b51f05be7ef4460240ac18304a014ac51dd2457a873200114b424ee371a89f5bd017db47854fb936
+"tinylogic@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "tinylogic@npm:2.0.0"
+  checksum: 8c97825b2916ace0cee7dbd9f39762c063ca7cf27f5f0c3f0c16bab2de8580b07a8bb123ebcd52767ff5923919eb70f241ccc4f7d1889ad0c07aa77d88dcb409
   languageName: node
   linkType: hard
 
@@ -27430,21 +27366,6 @@ yoga-layout-prebuilt@1.10.0:
   languageName: node
   linkType: hard
 
-"yup@npm:^0.32.9":
-  version: 0.32.9
-  resolution: "yup@npm:0.32.9"
-  dependencies:
-    "@babel/runtime": ^7.10.5
-    "@types/lodash": ^4.14.165
-    lodash: ^4.17.20
-    lodash-es: ^4.17.15
-    nanoclone: ^0.2.1
-    property-expr: ^2.0.4
-    toposort: ^2.0.2
-  checksum: 37ba8d0c0de093b212ba0a7839dc385df914b60aff4c0e32af5173e7d54fad30d021c77ed7833c6283dbade9101c029357eb37c664e55c7216141e3c76720dd2
-  languageName: node
-  linkType: hard
-
 "yurnalist@npm:^2.1.0":
   version: 2.1.0
   resolution: "yurnalist@npm:2.1.0"