diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index 77fc8f1..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: CI
-on:
-  push:
-    branches:
-      - "**"
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
-
-      - run: npm install --frozen-lockfile
-      - run: npm run ci
diff --git a/.github/workflows/renovate-checks.yml b/.github/workflows/renovate-checks.yml
new file mode 100644
index 0000000..fa3c642
--- /dev/null
+++ b/.github/workflows/renovate-checks.yml
@@ -0,0 +1,34 @@
+name: Renovate Checks
+on:
+  push:
+    branches:
+      - "renovate/**"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Main
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          path: repo
+
+      - name: Install Dependencies in Main
+        run: (cd repo && npm install)
+      - name: Create Snapshot In Main
+        run: (cd repo && npx tt-cli take-snapshot ./snap.md)
+      - name: Copy Snapshot To Outer Directory
+        run: mv repo/snap.md ./snap.md
+      - name: Delete Main Directory
+        run: rm -rf repo
+      - name: Checkout Branch
+        uses: actions/checkout@v4
+        with:
+          path: repo
+      - name: Install Dependencies in Branch
+        run: (cd repo && npm install)
+      - name: Move Snapshot To Branch
+        run: mv ./snap.md repo/snap.md
+      - name: Compare Snapshot In Branch
+        run: (cd repo && npx tt-cli compare-snapshot ./snap.md)
diff --git a/.github/workflows/section-repos.yml b/.github/workflows/section-repos.yml
new file mode 100644
index 0000000..81f5e36
--- /dev/null
+++ b/.github/workflows/section-repos.yml
@@ -0,0 +1,24 @@
+name: Create Section Repos
+on:
+  push:
+    branches:
+      - "main"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+      - run: git config --global user.email "total-typescript@bot.com"
+      - run: git config --global user.name "Total TypeScript Bot"
+      - run: npx @total-typescript/exercise-cli@latest create-section-repos
+    env:
+      GITHUB_TOKEN: ${{ secrets.MY_GITHUB_TOKEN }}
+      GH_TOKEN: ${{ secrets.MY_GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 55371e5..bd2eb9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
 node_modules
-.vscode
\ No newline at end of file
+tsconfig.temp.json
+dist
+*.tsbuildinfo
+*.prompt.*
+.vscode/*.code-snippets
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..b6621bd
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,8 @@
+{
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "typescript.enablePromptUseWorkspaceTsdk": true,
+  "github.copilot.enable": {
+    "*": false,
+  },
+  "explorer.sortOrder": "mixed",
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index b4cd134..ec6cbe6 100644
--- a/README.md
+++ b/README.md
@@ -2,41 +2,34 @@
 
 ## Quickstart
 
-Clone this repo or [open in Gitpod](https://gitpod.io/#https://github.com/total-typescript/beginners-typescript).
+Clone this repo or [open in Gitpod](https://gitpod.io/#https://github.com/total-typescript/react-typescript-tutorial).
 
 ```sh
 # Installs all dependencies
 npm install
 
-# Starts the first exercise
-npm run exercise 01
-
-# Runs linting and tests on the solution
-npm run solution 01
+# Asks you which exercise you'd like to run, and runs it
+npm run exercise
 ```
 
 ## How to take the course
 
-You'll notice that the course is split into exercises. Each exercise is split into a `*.problem.ts` and a `*.solution.ts`.
+You'll notice that the course is split into exercises. Each exercise is split into a `*.problem` and a `*.solution`.
 
 To take an exercise:
 
-1. Go into `*.problem.ts`
-2. Run `npm run exercise 01`, where `01` is the number of the exercise you're on.
-
-The `exercise` script will run TypeScript typechecks and a test suite on the exercise.
+1. Run `npm run exercise`
+2. Choose which exercise you'd like to run.
 
 This course encourages **active, exploratory learning**. In the video, I'll explain a problem, and **you'll be asked to try to find a solution**. To attempt a solution, you'll need to:
 
-1. Check out [TypeScript's docs](https://www.typescriptlang.org/docs/handbook/intro.html)
-2. Try to find something that looks relevant.
-3. Give it a go to see if it solves the problem.
+1. Check out [TypeScript's docs](https://www.typescriptlang.org/docs/handbook/intro.html) or the [React TypeScript cheatsheet](https://react-typescript-cheatsheet.netlify.app/)
+1. Try to find something that looks relevant.
+1. Give it a go to see if it solves the problem.
 
 You'll know if you've succeeded because the tests will pass.
 
-**If you succeed**, or **if you get stuck**, unpause the video and check out the `*.solution.ts`. You can see if your solution is better or worse than mine!
-
-You can run `npm run solution 01` to run the tests and typechecking on the solution.
+**If you succeed**, or **if you get stuck**, unpause the video and check out the `*.solution`. You can see if your solution is better or worse than mine!
 
 ## Acknowledgements
 
@@ -44,14 +37,8 @@ Say thanks to Matt on [Twitter](https://twitter.com/mattpocockuk) or by joining
 
 ## Reference
 
-### `npm run exercise 01`
-
-Alias: `npm run e 01`
-
-Run the corresponding `*.problem.ts` file.
-
-### `npm run solution 01`
+### `npm run exercise`
 
-Alias: `npm run s 01`
+Alias: `npm run e`
 
-Run the corresponding `*.solution.ts` file. If there are multiple, it runs only the first one.
+Open a prompt for choosing which exercise you'd like to run.
diff --git a/notes/FUTURE.md b/notes/FUTURE.md
deleted file mode 100644
index 8a2da1b..0000000
--- a/notes/FUTURE.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Things to add
-
-Function overloads in custom hooks?
-function overloads in components?
-Omit, Pick, inferface extends with props
-Picking props from external libraries
-Running TypeScript on CI
diff --git a/package-lock.json b/package-lock.json
index 751900d..69903aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,28 +9,230 @@
       "version": "1.0.0",
       "license": "GPL",
       "dependencies": {
+        "@tanstack/react-query": "^4.29.12",
         "@types/express": "^4.17.13",
-        "@types/react": "^18.0.28",
-        "@types/react-dom": "^18.0.11",
+        "@types/react": "^18.2.8",
+        "@types/react-dom": "^18.2.4",
         "express": "^4.18.1",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
-        "zod": "^3.17.10"
+        "react-hook-form": "^7.44.3",
+        "react-select": "^5.7.3",
+        "zod": "^3.21.4"
       },
       "devDependencies": {
-        "@total-typescript/exercise-cli": "0.1.0",
+        "@total-typescript/exercise-cli": "^0.11.0",
         "cross-fetch": "^3.1.5",
         "jsdom": "^21.1.1",
         "prettier": "^2.8.7",
-        "typescript": "^5.0.3",
+        "typescript": "^5.4.5",
         "vite-tsconfig-paths": "^4.0.7",
-        "vitest": "^0.31.1"
+        "vitest": "^2.0.0"
       }
     },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.21.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",
+      "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
+      "dependencies": {
+        "@babel/highlight": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.21.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz",
+      "integrity": "sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==",
+      "dependencies": {
+        "@babel/types": "^7.21.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz",
+      "integrity": "sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.3.tgz",
+      "integrity": "sha512-XsDuspWKLUsxwCp6r7EhsExHtYfbe5oAGQ19kqngTdCPUoPQzOPdUbD/pB9PJiwb2ptYKQDjSJT3R6dC+EPqfQ==",
+      "dependencies": {
+        "regenerator-runtime": "^0.13.11"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.22.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.4.tgz",
+      "integrity": "sha512-Tx9x3UBHTTsMSW85WB2kphxYQVvrZ/t1FxD88IpSgIjiUJlCm9z+xWIDwyo1vffTwSqteqyznB8ZE9vYYk16zA==",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.21.5",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@emotion/babel-plugin": {
+      "version": "11.11.0",
+      "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz",
+      "integrity": "sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/runtime": "^7.18.3",
+        "@emotion/hash": "^0.9.1",
+        "@emotion/memoize": "^0.8.1",
+        "@emotion/serialize": "^1.1.2",
+        "babel-plugin-macros": "^3.1.0",
+        "convert-source-map": "^1.5.0",
+        "escape-string-regexp": "^4.0.0",
+        "find-root": "^1.1.0",
+        "source-map": "^0.5.7",
+        "stylis": "4.2.0"
+      }
+    },
+    "node_modules/@emotion/babel-plugin/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@emotion/cache": {
+      "version": "11.11.0",
+      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz",
+      "integrity": "sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==",
+      "dependencies": {
+        "@emotion/memoize": "^0.8.1",
+        "@emotion/sheet": "^1.2.2",
+        "@emotion/utils": "^1.2.1",
+        "@emotion/weak-memoize": "^0.3.1",
+        "stylis": "4.2.0"
+      }
+    },
+    "node_modules/@emotion/hash": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz",
+      "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ=="
+    },
+    "node_modules/@emotion/memoize": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
+      "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
+    },
+    "node_modules/@emotion/react": {
+      "version": "11.11.0",
+      "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.0.tgz",
+      "integrity": "sha512-ZSK3ZJsNkwfjT3JpDAWJZlrGD81Z3ytNDsxw1LKq1o+xkmO5pnWfr6gmCC8gHEFf3nSSX/09YrG67jybNPxSUw==",
+      "dependencies": {
+        "@babel/runtime": "^7.18.3",
+        "@emotion/babel-plugin": "^11.11.0",
+        "@emotion/cache": "^11.11.0",
+        "@emotion/serialize": "^1.1.2",
+        "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1",
+        "@emotion/utils": "^1.2.1",
+        "@emotion/weak-memoize": "^0.3.1",
+        "hoist-non-react-statics": "^3.3.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@emotion/serialize": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.2.tgz",
+      "integrity": "sha512-zR6a/fkFP4EAcCMQtLOhIgpprZOwNmCldtpaISpvz348+DP4Mz8ZoKaGGCQpbzepNIUWbq4w6hNZkwDyKoS+HA==",
+      "dependencies": {
+        "@emotion/hash": "^0.9.1",
+        "@emotion/memoize": "^0.8.1",
+        "@emotion/unitless": "^0.8.1",
+        "@emotion/utils": "^1.2.1",
+        "csstype": "^3.0.2"
+      }
+    },
+    "node_modules/@emotion/sheet": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.2.tgz",
+      "integrity": "sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA=="
+    },
+    "node_modules/@emotion/unitless": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz",
+      "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ=="
+    },
+    "node_modules/@emotion/use-insertion-effect-with-fallbacks": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz",
+      "integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==",
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      }
+    },
+    "node_modules/@emotion/utils": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.1.tgz",
+      "integrity": "sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg=="
+    },
+    "node_modules/@emotion/weak-memoize": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz",
+      "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww=="
+    },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz",
-      "integrity": "sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.8.tgz",
+      "integrity": "sha512-31E2lxlGM1KEfivQl8Yf5aYU/mflz9g06H6S15ITUFQueMFtFjESRMoDSkvMo8thYvLBax+VKTPlpnx+sPicOA==",
       "cpu": [
         "arm"
       ],
@@ -44,9 +246,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz",
-      "integrity": "sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.8.tgz",
+      "integrity": "sha512-B8JbS61bEunhfx8kasogFENgQfr/dIp+ggYXwTqdbMAgGDhRa3AaPpQMuQU0rNxDLECj6FhDzk1cF9WHMVwrtA==",
       "cpu": [
         "arm64"
       ],
@@ -60,9 +262,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz",
-      "integrity": "sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.8.tgz",
+      "integrity": "sha512-rdqqYfRIn4jWOp+lzQttYMa2Xar3OK9Yt2fhOhzFXqg0rVWEfSclJvZq5fZslnz6ypHvVf3CT7qyf0A5pM682A==",
       "cpu": [
         "x64"
       ],
@@ -76,9 +278,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz",
-      "integrity": "sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.8.tgz",
+      "integrity": "sha512-RQw9DemMbIq35Bprbboyf8SmOr4UXsRVxJ97LgB55VKKeJOOdvsIPy0nFyF2l8U+h4PtBx/1kRf0BelOYCiQcw==",
       "cpu": [
         "arm64"
       ],
@@ -92,9 +294,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz",
-      "integrity": "sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.8.tgz",
+      "integrity": "sha512-3sur80OT9YdeZwIVgERAysAbwncom7b4bCI2XKLjMfPymTud7e/oY4y+ci1XVp5TfQp/bppn7xLw1n/oSQY3/Q==",
       "cpu": [
         "x64"
       ],
@@ -108,9 +310,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz",
-      "integrity": "sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.8.tgz",
+      "integrity": "sha512-WAnPJSDattvS/XtPCTj1tPoTxERjcTpH6HsMr6ujTT+X6rylVe8ggxk8pVxzf5U1wh5sPODpawNicF5ta/9Tmw==",
       "cpu": [
         "arm64"
       ],
@@ -124,9 +326,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz",
-      "integrity": "sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.8.tgz",
+      "integrity": "sha512-ICvZyOplIjmmhjd6mxi+zxSdpPTKFfyPPQMQTK/w+8eNK6WV01AjIztJALDtwNNfFhfZLux0tZLC+U9nSyA5Zg==",
       "cpu": [
         "x64"
       ],
@@ -140,9 +342,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz",
-      "integrity": "sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.8.tgz",
+      "integrity": "sha512-H4vmI5PYqSvosPaTJuEppU9oz1dq2A7Mr2vyg5TF9Ga+3+MGgBdGzcyBP7qK9MrwFQZlvNyJrvz6GuCaj3OukQ==",
       "cpu": [
         "arm"
       ],
@@ -156,9 +358,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz",
-      "integrity": "sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.8.tgz",
+      "integrity": "sha512-z1zMZivxDLHWnyGOctT9JP70h0beY54xDDDJt4VpTX+iwA77IFsE1vCXWmprajJGa+ZYSqkSbRQ4eyLCpCmiCQ==",
       "cpu": [
         "arm64"
       ],
@@ -172,9 +374,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz",
-      "integrity": "sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.8.tgz",
+      "integrity": "sha512-1a8suQiFJmZz1khm/rDglOc8lavtzEMRo0v6WhPgxkrjcU0LkHj+TwBrALwoz/OtMExvsqbbMI0ChyelKabSvQ==",
       "cpu": [
         "ia32"
       ],
@@ -188,9 +390,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz",
-      "integrity": "sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.8.tgz",
+      "integrity": "sha512-fHZWS2JJxnXt1uYJsDv9+b60WCc2RlvVAy1F76qOLtXRO+H4mjt3Tr6MJ5l7Q78X8KgCFudnTuiQRBhULUyBKQ==",
       "cpu": [
         "loong64"
       ],
@@ -204,9 +406,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz",
-      "integrity": "sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.8.tgz",
+      "integrity": "sha512-Wy/z0EL5qZYLX66dVnEg9riiwls5IYnziwuju2oUiuxVc+/edvqXa04qNtbrs0Ukatg5HEzqT94Zs7J207dN5Q==",
       "cpu": [
         "mips64el"
       ],
@@ -220,9 +422,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz",
-      "integrity": "sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.8.tgz",
+      "integrity": "sha512-ETaW6245wK23YIEufhMQ3HSeHO7NgsLx8gygBVldRHKhOlD1oNeNy/P67mIh1zPn2Hr2HLieQrt6tWrVwuqrxg==",
       "cpu": [
         "ppc64"
       ],
@@ -236,9 +438,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz",
-      "integrity": "sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.8.tgz",
+      "integrity": "sha512-T2DRQk55SgoleTP+DtPlMrxi/5r9AeFgkhkZ/B0ap99zmxtxdOixOMI570VjdRCs9pE4Wdkz7JYrsPvsl7eESg==",
       "cpu": [
         "riscv64"
       ],
@@ -252,9 +454,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz",
-      "integrity": "sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.8.tgz",
+      "integrity": "sha512-NPxbdmmo3Bk7mbNeHmcCd7R7fptJaczPYBaELk6NcXxy7HLNyWwCyDJ/Xx+/YcNH7Im5dHdx9gZ5xIwyliQCbg==",
       "cpu": [
         "s390x"
       ],
@@ -268,9 +470,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz",
-      "integrity": "sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.8.tgz",
+      "integrity": "sha512-lytMAVOM3b1gPypL2TRmZ5rnXl7+6IIk8uB3eLsV1JwcizuolblXRrc5ShPrO9ls/b+RTp+E6gbsuLWHWi2zGg==",
       "cpu": [
         "x64"
       ],
@@ -284,9 +486,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz",
-      "integrity": "sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.8.tgz",
+      "integrity": "sha512-hvWVo2VsXz/8NVt1UhLzxwAfo5sioj92uo0bCfLibB0xlOmimU/DeAEsQILlBQvkhrGjamP0/el5HU76HAitGw==",
       "cpu": [
         "x64"
       ],
@@ -300,9 +502,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz",
-      "integrity": "sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.8.tgz",
+      "integrity": "sha512-/7Y7u77rdvmGTxR83PgaSvSBJCC2L3Kb1M/+dmSIvRvQPXXCuC97QAwMugBNG0yGcbEGfFBH7ojPzAOxfGNkwQ==",
       "cpu": [
         "x64"
       ],
@@ -316,9 +518,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz",
-      "integrity": "sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.8.tgz",
+      "integrity": "sha512-9Lc4s7Oi98GqFA4HzA/W2JHIYfnXbUYgekUP/Sm4BG9sfLjyv6GKKHKKVs83SMicBF2JwAX6A1PuOLMqpD001w==",
       "cpu": [
         "x64"
       ],
@@ -332,9 +534,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz",
-      "integrity": "sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.8.tgz",
+      "integrity": "sha512-rq6WzBGjSzihI9deW3fC2Gqiak68+b7qo5/3kmB6Gvbh/NYPA0sJhrnp7wgV4bNwjqM+R2AApXGxMO7ZoGhIJg==",
       "cpu": [
         "arm64"
       ],
@@ -348,9 +550,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz",
-      "integrity": "sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.8.tgz",
+      "integrity": "sha512-AIAbverbg5jMvJznYiGhrd3sumfwWs8572mIJL5NQjJa06P8KfCPWZQ0NwZbPQnbQi9OWSZhFVSUWjjIrn4hSw==",
       "cpu": [
         "ia32"
       ],
@@ -364,9 +566,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz",
-      "integrity": "sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.8.tgz",
+      "integrity": "sha512-bfZ0cQ1uZs2PqpulNL5j/3w+GDhP36k1K5c38QdQg+Swy51jFZWWeIkteNsufkQxp986wnqRRsb/bHbY1WQ7TA==",
       "cpu": [
         "x64"
       ],
@@ -379,12 +581,67 @@
         "node": ">=12"
       }
     },
+    "node_modules/@floating-ui/core": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.2.6.tgz",
+      "integrity": "sha512-EvYTiXet5XqweYGClEmpu3BoxmsQ4hkj3QaYA6qEnigCWffTP3vNRwBReTdrwDwo7OoJ3wM8Uoe9Uk4n+d4hfg=="
+    },
+    "node_modules/@floating-ui/dom": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.2.9.tgz",
+      "integrity": "sha512-sosQxsqgxMNkV3C+3UqTS6LxP7isRLwX8WMepp843Rb3/b0Wz8+MdUkxJksByip3C2WwLugLHN1b4ibn//zKwQ==",
+      "dependencies": {
+        "@floating-ui/core": "^1.2.6"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.4.15",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
       "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
       "dev": true
     },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -420,6 +677,197 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.6.1.tgz",
+      "integrity": "sha512-0WQ0ouLejaUCRsL93GD4uft3rOmB8qoQMU05Kb8CmMtMBe7XUDLAltxVZI1q6byNqEtU7N1ZX1Vw5lIpgulLQA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.6.1.tgz",
+      "integrity": "sha512-1TKm25Rn20vr5aTGGZqo6E4mzPicCUD79k17EgTLAsXc1zysyi4xXKACfUbwyANEPAEIxkzwue6JZ+stYzWUTA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.6.1.tgz",
+      "integrity": "sha512-cEXJQY/ZqMACb+nxzDeX9IPLAg7S94xouJJCNVE5BJM8JUEP4HeTF+ti3cmxWeSJo+5D+o8Tc0UAWUkfENdeyw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.6.1.tgz",
+      "integrity": "sha512-LoSU9Xu56isrkV2jLldcKspJ7sSXmZWkAxg7sW/RfF7GS4F5/v4EiqKSMCFbZtDu2Nc1gxxFdQdKwkKS4rwxNg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.6.1.tgz",
+      "integrity": "sha512-EfI3hzYAy5vFNDqpXsNxXcgRDcFHUWSx5nnRSCKwXuQlI5J9dD84g2Usw81n3FLBNsGCegKGwwTVsSKK9cooSQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.6.1.tgz",
+      "integrity": "sha512-9lhc4UZstsegbNLhH0Zu6TqvDfmhGzuCWtcTFXY10VjLLUe4Mr0Ye2L3rrtHaDd/J5+tFMEuo5LTCSCMXWfUKw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.6.1.tgz",
+      "integrity": "sha512-FfoOK1yP5ksX3wwZ4Zk1NgyGHZyuRhf99j64I5oEmirV8EFT7+OhUZEnP+x17lcP/QHJNWGsoJwrz4PJ9fBEXw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.6.1.tgz",
+      "integrity": "sha512-DNGZvZDO5YF7jN5fX8ZqmGLjZEXIJRdJEdTFMhiyXqyXubBa0WVLDWSNlQ5JR2PNgDbEV1VQowhVRUh+74D+RA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.6.1.tgz",
+      "integrity": "sha512-RkJVNVRM+piYy87HrKmhbexCHg3A6Z6MU0W9GHnJwBQNBeyhCJG9KDce4SAMdicQnpURggSvtbGo9xAWOfSvIQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.6.1.tgz",
+      "integrity": "sha512-v2FVT6xfnnmTe3W9bJXl6r5KwJglMK/iRlkKiIFfO6ysKs0rDgz7Cwwf3tjldxQUrHL9INT/1r4VA0n9L/F1vQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.6.1.tgz",
+      "integrity": "sha512-YEeOjxRyEjqcWphH9dyLbzgkF8wZSKAKUkldRY6dgNR5oKs2LZazqGB41cWJ4Iqqcy9/zqYgmzBkRoVz3Q9MLw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.6.1.tgz",
+      "integrity": "sha512-0zfTlFAIhgz8V2G8STq8toAjsYYA6eci1hnXuyOTUFnymrtJwnS6uGKiv3v5UrPZkBlamLvrLV2iiaeqCKzb0A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@tanstack/query-core": {
+      "version": "4.29.11",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-4.29.11.tgz",
+      "integrity": "sha512-8C+hF6SFAb/TlFZyS9FItgNwrw4PMa7YeX+KQYe2ZAiEz6uzg6yIr+QBzPkUwZ/L0bXvGd1sufTm3wotoz+GwQ==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      }
+    },
+    "node_modules/@tanstack/react-query": {
+      "version": "4.29.12",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-4.29.12.tgz",
+      "integrity": "sha512-zhcN6+zF6cxprxhTHQajHGlvxgK8npnp9uLe9yaWhGc6sYcPWXzyO4raL4HomUzQOPzu3jLvkriJQ7BOrDM8vA==",
+      "dependencies": {
+        "@tanstack/query-core": "4.29.11",
+        "use-sync-external-store": "^1.2.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-native": "*"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@tootallnate/once": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
@@ -430,17 +878,24 @@
       }
     },
     "node_modules/@total-typescript/exercise-cli": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@total-typescript/exercise-cli/-/exercise-cli-0.1.0.tgz",
-      "integrity": "sha512-A6DpA9BK88sdhgyH/Qy/rrFwnu93Eh0OQd/oOb/4dSVxNIfvJ155CsBCEtKyp5iM2QKfIHYNfdJFcPut090esQ==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@total-typescript/exercise-cli/-/exercise-cli-0.11.0.tgz",
+      "integrity": "sha512-VTRT1UTedPEburo5uQZLDchnbUAciOKsnO89y7DAKJS3/NMAObi6gr1/SNlCcEmCRa/Rya2mLG+iYBYhnmYsYA==",
       "dev": true,
       "dependencies": {
         "chokidar": "^3.5.3",
+        "colors": "^1.4.0",
         "commander": "^10.0.1",
-        "fast-glob": "^3.2.12"
+        "fast-glob": "^3.2.12",
+        "jsonc-parser": "^3.2.0",
+        "prompts": "^2.4.2"
       },
       "bin": {
         "tt-cli": "dist/bin.js"
+      },
+      "peerDependencies": {
+        "typescript": "*",
+        "vitest": "*"
       }
     },
     "node_modules/@types/body-parser": {
@@ -452,21 +907,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/chai": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.5.tgz",
-      "integrity": "sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==",
-      "dev": true
-    },
-    "node_modules/@types/chai-subset": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.3.tgz",
-      "integrity": "sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==",
-      "dev": true,
-      "dependencies": {
-        "@types/chai": "*"
-      }
-    },
     "node_modules/@types/connect": {
       "version": "3.4.35",
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
@@ -475,6 +915,12 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/estree": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "dev": true
+    },
     "node_modules/@types/express": {
       "version": "4.17.17",
       "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
@@ -507,6 +953,11 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.3.tgz",
       "integrity": "sha512-pg9d0yC4rVNWQzX8U7xb4olIOFuuVL9za3bzMT2pu2SU0SNEi66i2qrvhE2qt0HvkhuCaWJu7pLNOt/Pj8BIrw=="
     },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
+    },
     "node_modules/@types/prop-types": {
       "version": "15.7.5",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
@@ -523,27 +974,29 @@
       "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
     },
     "node_modules/@types/react": {
-      "version": "18.2.6",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.6.tgz",
-      "integrity": "sha512-wRZClXn//zxCFW+ye/D2qY65UsYP1Fpex2YXorHc8awoNamkMZSvBxwxdYVInsHOZZd2Ppq8isnSzJL5Mpf8OA==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.1.tgz",
+      "integrity": "sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==",
       "dependencies": {
         "@types/prop-types": "*",
-        "@types/scheduler": "*",
         "csstype": "^3.0.2"
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "18.2.4",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.4.tgz",
-      "integrity": "sha512-G2mHoTMTL4yoydITgOGwWdWMVd8sNgyEP85xVmMKAPUBwQWm9wBPQUmvbeF4V3WBY1P7mmL4BkjQ0SqUpf1snw==",
+      "version": "18.3.0",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
+      "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
       "dependencies": {
         "@types/react": "*"
       }
     },
-    "node_modules/@types/scheduler": {
-      "version": "0.16.3",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
-      "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="
+    "node_modules/@types/react-transition-group": {
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.6.tgz",
+      "integrity": "sha512-VnCdSxfcm08KjsJVQcfBmhEQAPnLB8G08hAxn39azX1qYBQ/5RVQuoHuKIcfKOdncuaUvEpFKFzEvbtIMsfVew==",
+      "dependencies": {
+        "@types/react": "*"
+      }
     },
     "node_modules/@types/send": {
       "version": "0.17.1",
@@ -564,69 +1017,81 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.31.1.tgz",
-      "integrity": "sha512-BV1LyNvhnX+eNYzJxlHIGPWZpwJFZaCcOIzp2CNG0P+bbetenTupk6EO0LANm4QFt0TTit+yqx7Rxd1qxi/SQA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.0.4.tgz",
+      "integrity": "sha512-39jr5EguIoanChvBqe34I8m1hJFI4+jxvdOpD7gslZrVQBKhh8H9eD7J/LJX4zakrw23W+dITQTDqdt43xVcJw==",
+      "dev": true,
+      "dependencies": {
+        "@vitest/spy": "2.0.4",
+        "@vitest/utils": "2.0.4",
+        "chai": "^5.1.1",
+        "tinyrainbow": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/pretty-format": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.0.4.tgz",
+      "integrity": "sha512-RYZl31STbNGqf4l2eQM1nvKPXE0NhC6Eq0suTTePc4mtMQ1Fn8qZmjV4emZdEdG2NOWGKSCrHZjmTqDCDoeFBw==",
       "dev": true,
       "dependencies": {
-        "@vitest/spy": "0.31.1",
-        "@vitest/utils": "0.31.1",
-        "chai": "^4.3.7"
+        "tinyrainbow": "^1.2.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.31.1.tgz",
-      "integrity": "sha512-imWuc82ngOtxdCUpXwtEzZIuc1KMr+VlQ3Ondph45VhWoQWit5yvG/fFcldbnCi8DUuFi+NmNx5ehMUw/cGLUw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.0.4.tgz",
+      "integrity": "sha512-Gk+9Su/2H2zNfNdeJR124gZckd5st4YoSuhF1Rebi37qTXKnqYyFCd9KP4vl2cQHbtuVKjfEKrNJxHHCW8thbQ==",
       "dev": true,
       "dependencies": {
-        "@vitest/utils": "0.31.1",
-        "concordance": "^5.0.4",
-        "p-limit": "^4.0.0",
-        "pathe": "^1.1.0"
+        "@vitest/utils": "2.0.4",
+        "pathe": "^1.1.2"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.31.1.tgz",
-      "integrity": "sha512-L3w5uU9bMe6asrNzJ8WZzN+jUTX4KSgCinEJPXyny0o90fG4FPQMV0OWsq7vrCWfQlAilMjDnOF9nP8lidsJ+g==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.0.4.tgz",
+      "integrity": "sha512-or6Mzoz/pD7xTvuJMFYEtso1vJo1S5u6zBTinfl+7smGUhqybn6VjzCDMhmTyVOFWwkCMuNjmNNxnyXPgKDoPw==",
       "dev": true,
       "dependencies": {
-        "magic-string": "^0.30.0",
-        "pathe": "^1.1.0",
-        "pretty-format": "^27.5.1"
+        "@vitest/pretty-format": "2.0.4",
+        "magic-string": "^0.30.10",
+        "pathe": "^1.1.2"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.31.1.tgz",
-      "integrity": "sha512-1cTpt2m9mdo3hRLDyCG2hDQvRrePTDgEJBFQQNz1ydHHZy03EiA6EpFxY+7ODaY7vMRCie+WlFZBZ0/dQWyssQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.0.4.tgz",
+      "integrity": "sha512-uTXU56TNoYrTohb+6CseP8IqNwlNdtPwEO0AWl+5j7NelS6x0xZZtP0bDWaLvOfUbaYwhhWp1guzXUxkC7mW7Q==",
       "dev": true,
       "dependencies": {
-        "tinyspy": "^2.1.0"
+        "tinyspy": "^3.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.31.1.tgz",
-      "integrity": "sha512-yFyRD5ilwojsZfo3E0BnH72pSVSuLg2356cN1tCEe/0RtDzxTPYwOomIC+eQbot7m6DRy4tPZw+09mB7NkbMmA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.0.4.tgz",
+      "integrity": "sha512-Zc75QuuoJhOBnlo99ZVUkJIuq4Oj0zAkrQ2VzCqNCx6wAwViHEh5Fnp4fiJTE9rA+sAoXRf00Z9xGgfEzV6fzQ==",
       "dev": true,
       "dependencies": {
-        "concordance": "^5.0.4",
-        "loupe": "^2.3.6",
-        "pretty-format": "^27.5.1"
+        "@vitest/pretty-format": "2.0.4",
+        "estree-walker": "^3.0.3",
+        "loupe": "^3.1.1",
+        "tinyrainbow": "^1.2.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
@@ -651,9 +1116,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -673,9 +1138,9 @@
       }
     },
     "node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
+      "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
       "dev": true,
       "engines": {
         "node": ">=0.4.0"
@@ -716,27 +1181,6 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/anymatch": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
@@ -756,12 +1200,12 @@
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
     "node_modules/assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
       "dev": true,
       "engines": {
-        "node": "*"
+        "node": ">=12"
       }
     },
     "node_modules/asynckit": {
@@ -770,6 +1214,20 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true
     },
+    "node_modules/babel-plugin-macros": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
+      "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "cosmiconfig": "^7.0.0",
+        "resolve": "^1.19.0"
+      },
+      "engines": {
+        "node": ">=10",
+        "npm": ">=6"
+      }
+    },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -779,12 +1237,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/blueimp-md5": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.19.0.tgz",
-      "integrity": "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==",
-      "dev": true
-    },
     "node_modules/body-parser": {
       "version": "1.20.1",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
@@ -849,31 +1301,69 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/chai": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
-      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.1.tgz",
+      "integrity": "sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==",
       "dev": true,
       "dependencies": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^4.1.2",
-        "get-func-name": "^2.0.0",
-        "loupe": "^2.3.1",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.5"
+        "assertion-error": "^2.0.1",
+        "check-error": "^2.1.1",
+        "deep-eql": "^5.0.1",
+        "loupe": "^3.1.0",
+        "pathval": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chalk/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
+    "node_modules/chalk/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
+      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
       "dev": true,
       "engines": {
-        "node": "*"
+        "node": ">= 16"
       }
     },
     "node_modules/chokidar": {
@@ -903,6 +1393,28 @@
         "fsevents": "~2.3.2"
       }
     },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -924,25 +1436,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/concordance": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/concordance/-/concordance-5.0.4.tgz",
-      "integrity": "sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw==",
-      "dev": true,
-      "dependencies": {
-        "date-time": "^3.1.0",
-        "esutils": "^2.0.3",
-        "fast-diff": "^1.2.0",
-        "js-string-escape": "^1.0.1",
-        "lodash": "^4.17.15",
-        "md5-hex": "^3.0.1",
-        "semver": "^7.3.2",
-        "well-known-symbols": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.18.0 <11 || >=12.14.0 <13 || >=14"
-      }
-    },
     "node_modules/content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -962,6 +1455,11 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+    },
     "node_modules/cookie": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
@@ -975,6 +1473,21 @@
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
       "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
+    "node_modules/cosmiconfig": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/cross-fetch": {
       "version": "3.1.6",
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.6.tgz",
@@ -984,6 +1497,20 @@
         "node-fetch": "^2.6.11"
       }
     },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/cssstyle": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz",
@@ -1015,18 +1542,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/date-time": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/date-time/-/date-time-3.1.0.tgz",
-      "integrity": "sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg==",
-      "dev": true,
-      "dependencies": {
-        "time-zone": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -1042,13 +1557,10 @@
       "dev": true
     },
     "node_modules/deep-eql": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
-      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
+      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
       "dev": true,
-      "dependencies": {
-        "type-detect": "^4.0.0"
-      },
       "engines": {
         "node": ">=6"
       }
@@ -1085,6 +1597,15 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
+    "node_modules/dom-helpers": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
+      "dependencies": {
+        "@babel/runtime": "^7.8.7",
+        "csstype": "^3.0.2"
+      }
+    },
     "node_modules/domexception": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
@@ -1122,10 +1643,18 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
     "node_modules/esbuild": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz",
-      "integrity": "sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.8.tgz",
+      "integrity": "sha512-l7iffQpT2OrZfH2rXIp7/FkmaeZM0vxbxN9KfiCwGYuZqzMg/JdvX26R31Zxn/Pxvsrg3Y9N6XTcnknqDyyv4w==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -1135,28 +1664,28 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/android-arm": "0.17.19",
-        "@esbuild/android-arm64": "0.17.19",
-        "@esbuild/android-x64": "0.17.19",
-        "@esbuild/darwin-arm64": "0.17.19",
-        "@esbuild/darwin-x64": "0.17.19",
-        "@esbuild/freebsd-arm64": "0.17.19",
-        "@esbuild/freebsd-x64": "0.17.19",
-        "@esbuild/linux-arm": "0.17.19",
-        "@esbuild/linux-arm64": "0.17.19",
-        "@esbuild/linux-ia32": "0.17.19",
-        "@esbuild/linux-loong64": "0.17.19",
-        "@esbuild/linux-mips64el": "0.17.19",
-        "@esbuild/linux-ppc64": "0.17.19",
-        "@esbuild/linux-riscv64": "0.17.19",
-        "@esbuild/linux-s390x": "0.17.19",
-        "@esbuild/linux-x64": "0.17.19",
-        "@esbuild/netbsd-x64": "0.17.19",
-        "@esbuild/openbsd-x64": "0.17.19",
-        "@esbuild/sunos-x64": "0.17.19",
-        "@esbuild/win32-arm64": "0.17.19",
-        "@esbuild/win32-ia32": "0.17.19",
-        "@esbuild/win32-x64": "0.17.19"
+        "@esbuild/android-arm": "0.19.8",
+        "@esbuild/android-arm64": "0.19.8",
+        "@esbuild/android-x64": "0.19.8",
+        "@esbuild/darwin-arm64": "0.19.8",
+        "@esbuild/darwin-x64": "0.19.8",
+        "@esbuild/freebsd-arm64": "0.19.8",
+        "@esbuild/freebsd-x64": "0.19.8",
+        "@esbuild/linux-arm": "0.19.8",
+        "@esbuild/linux-arm64": "0.19.8",
+        "@esbuild/linux-ia32": "0.19.8",
+        "@esbuild/linux-loong64": "0.19.8",
+        "@esbuild/linux-mips64el": "0.19.8",
+        "@esbuild/linux-ppc64": "0.19.8",
+        "@esbuild/linux-riscv64": "0.19.8",
+        "@esbuild/linux-s390x": "0.19.8",
+        "@esbuild/linux-x64": "0.19.8",
+        "@esbuild/netbsd-x64": "0.19.8",
+        "@esbuild/openbsd-x64": "0.19.8",
+        "@esbuild/sunos-x64": "0.19.8",
+        "@esbuild/win32-arm64": "0.19.8",
+        "@esbuild/win32-ia32": "0.19.8",
+        "@esbuild/win32-x64": "0.19.8"
       }
     },
     "node_modules/escape-html": {
@@ -1164,6 +1693,17 @@
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/escodegen": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
@@ -1208,6 +1748,15 @@
         "node": ">=4.0"
       }
     },
+    "node_modules/estree-walker": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
+    },
     "node_modules/esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@@ -1225,6 +1774,29 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/execa": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
+      "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^8.0.1",
+        "human-signals": "^5.0.0",
+        "is-stream": "^3.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^5.1.0",
+        "onetime": "^6.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-final-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=16.17"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
     "node_modules/express": {
       "version": "4.18.2",
       "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
@@ -1266,12 +1838,6 @@
         "node": ">= 0.10.0"
       }
     },
-    "node_modules/fast-diff": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
-      "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
-      "dev": true
-    },
     "node_modules/fast-glob": {
       "version": "3.2.12",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
@@ -1332,6 +1898,11 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/find-root": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
+    },
     "node_modules/form-data": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
@@ -1363,9 +1934,9 @@
       }
     },
     "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
       "optional": true,
@@ -1382,9 +1953,9 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "node_modules/get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
       "dev": true,
       "engines": {
         "node": "*"
@@ -1404,6 +1975,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-stream": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
+      "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/glob-parent": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -1430,7 +2013,15 @@
         "function-bind": "^1.1.1"
       },
       "engines": {
-        "node": ">= 0.4.0"
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/has-proto": {
@@ -1455,6 +2046,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "dependencies": {
+        "react-is": "^16.7.0"
+      }
+    },
+    "node_modules/hoist-non-react-statics/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
     "node_modules/html-encoding-sniffer": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
@@ -1555,6 +2159,15 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
+    "node_modules/human-signals": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
+      "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16.17.0"
+      }
+    },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -1566,6 +2179,21 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@@ -1579,6 +2207,11 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+    },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -1591,6 +2224,17 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-core-module": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -1627,15 +2271,24 @@
       "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "dev": true
     },
-    "node_modules/js-string-escape": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz",
-      "integrity": "sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==",
+    "node_modules/is-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
       "dev": true,
       "engines": {
-        "node": ">= 0.8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -1686,12 +2339,26 @@
         }
       }
     },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
     "node_modules/jsonc-parser": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
       "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
       "dev": true
     },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -1705,23 +2372,10 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/local-pkg": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz",
-      "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
     "node_modules/loose-envify": {
       "version": "1.4.0",
@@ -1735,48 +2389,21 @@
       }
     },
     "node_modules/loupe": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
-      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
-      "dev": true,
-      "dependencies": {
-        "get-func-name": "^2.0.0"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.1.tgz",
+      "integrity": "sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==",
       "dev": true,
       "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "get-func-name": "^2.0.1"
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.0",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
-      "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.13"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/md5-hex": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-3.0.1.tgz",
-      "integrity": "sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==",
+      "version": "0.30.10",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz",
+      "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
       "dev": true,
       "dependencies": {
-        "blueimp-md5": "^2.10.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "@jridgewell/sourcemap-codec": "^1.4.15"
       }
     },
     "node_modules/media-typer": {
@@ -1787,11 +2414,22 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/memoize-one": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
+      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
+    },
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
       "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -1852,16 +2490,16 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/mlly": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.2.1.tgz",
-      "integrity": "sha512-1aMEByaWgBPEbWV2BOPEMySRrzl7rIHXmQxam4DM8jVjalTQDjpN2ZKOLUrwyhfZQO7IXHml2StcHMhooDeEEQ==",
+    "node_modules/mimic-fn": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
       "dev": true,
-      "dependencies": {
-        "acorn": "^8.8.2",
-        "pathe": "^1.1.0",
-        "pkg-types": "^1.0.3",
-        "ufo": "^1.1.2"
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/ms": {
@@ -1870,9 +2508,9 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/nanoid": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
       "dev": true,
       "funding": [
         {
@@ -1946,12 +2584,47 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/npm-run-path": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
+      "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/npm-run-path/node_modules/path-key": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/nwsapi": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.4.tgz",
       "integrity": "sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g==",
       "dev": true
     },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/object-inspect": {
       "version": "1.12.3",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
@@ -1971,6 +2644,21 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/onetime": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
+      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/optionator": {
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
@@ -1988,16 +2676,29 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/p-limit": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
-      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
-      "dev": true,
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dependencies": {
-        "yocto-queue": "^1.0.0"
+        "callsites": "^3.0.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -2023,30 +2724,52 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
     "node_modules/path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
       "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/pathe": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.0.tgz",
-      "integrity": "sha512-ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+      "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
       "dev": true
     },
     "node_modules/pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
+      "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==",
       "dev": true,
       "engines": {
-        "node": "*"
+        "node": ">= 14.16"
       }
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
       "dev": true
     },
     "node_modules/picomatch": {
@@ -2061,21 +2784,10 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/pkg-types": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
-      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
-      "dev": true,
-      "dependencies": {
-        "jsonc-parser": "^3.2.0",
-        "mlly": "^1.2.0",
-        "pathe": "^1.1.0"
-      }
-    },
     "node_modules/postcss": {
-      "version": "8.4.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz",
-      "integrity": "sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==",
+      "version": "8.4.32",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz",
+      "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
       "dev": true,
       "funding": [
         {
@@ -2092,7 +2804,7 @@
         }
       ],
       "dependencies": {
-        "nanoid": "^3.3.6",
+        "nanoid": "^3.3.7",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       },
@@ -2124,20 +2836,34 @@
         "url": "https://github.com/prettier/prettier?sponsor=1"
       }
     },
-    "node_modules/pretty-format": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^17.0.1"
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">= 6"
+      }
+    },
+    "node_modules/prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "dependencies": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
       }
     },
+    "node_modules/prop-types/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -2228,9 +2954,9 @@
       }
     },
     "node_modules/react": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -2239,22 +2965,66 @@
       }
     },
     "node_modules/react-dom": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
       "dependencies": {
         "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
+        "scheduler": "^0.23.2"
       },
       "peerDependencies": {
-        "react": "^18.2.0"
+        "react": "^18.3.1"
       }
     },
-    "node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "dev": true
+    "node_modules/react-hook-form": {
+      "version": "7.44.3",
+      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.44.3.tgz",
+      "integrity": "sha512-/tHId6p2ViAka1wECMw8FEPn/oz/w226zehHrJyQ1oIzCBNMIJCaj6ZkQcv+MjDxYh9MWR7RQic7Qqwe4a5nkw==",
+      "engines": {
+        "node": ">=12.22.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/react-hook-form"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17 || ^18"
+      }
+    },
+    "node_modules/react-select": {
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.7.3.tgz",
+      "integrity": "sha512-z8i3NCuFFWL3w27xq92rBkVI2onT0jzIIPe480HlBjXJ3b5o6Q+Clp4ydyeKrj9DZZ3lrjawwLC5NGl0FSvUDg==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.0",
+        "@emotion/cache": "^11.4.0",
+        "@emotion/react": "^11.8.1",
+        "@floating-ui/dom": "^1.0.1",
+        "@types/react-transition-group": "^4.4.0",
+        "memoize-one": "^6.0.0",
+        "prop-types": "^15.6.0",
+        "react-transition-group": "^4.3.0",
+        "use-isomorphic-layout-effect": "^1.1.2"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/react-transition-group": {
+      "version": "4.4.5",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
+      "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "dom-helpers": "^5.0.1",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.6.2"
+      },
+      "peerDependencies": {
+        "react": ">=16.6.0",
+        "react-dom": ">=16.6.0"
+      }
     },
     "node_modules/readdirp": {
       "version": "3.6.0",
@@ -2268,12 +3038,41 @@
         "node": ">=8.10.0"
       }
     },
+    "node_modules/regenerator-runtime": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+    },
     "node_modules/requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
       "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
       "dev": true
     },
+    "node_modules/resolve": {
+      "version": "1.22.2",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+      "dependencies": {
+        "is-core-module": "^2.11.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -2285,18 +3084,30 @@
       }
     },
     "node_modules/rollup": {
-      "version": "3.23.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.23.0.tgz",
-      "integrity": "sha512-h31UlwEi7FHihLe1zbk+3Q7z1k/84rb9BSwmBSr/XjOCEaBJ2YyedQDuM0t/kfOS0IxM+vk1/zI9XxYj9V+NJQ==",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.6.1.tgz",
+      "integrity": "sha512-jZHaZotEHQaHLgKr8JnQiDT1rmatjgKlMekyksz+yk9jt/8z9quNjnKNRoaM0wd9DC2QKXjmWWuDYtM3jfF8pQ==",
       "dev": true,
       "bin": {
         "rollup": "dist/bin/rollup"
       },
       "engines": {
-        "node": ">=14.18.0",
+        "node": ">=18.0.0",
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.6.1",
+        "@rollup/rollup-android-arm64": "4.6.1",
+        "@rollup/rollup-darwin-arm64": "4.6.1",
+        "@rollup/rollup-darwin-x64": "4.6.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.6.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.6.1",
+        "@rollup/rollup-linux-arm64-musl": "4.6.1",
+        "@rollup/rollup-linux-x64-gnu": "4.6.1",
+        "@rollup/rollup-linux-x64-musl": "4.6.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.6.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.6.1",
+        "@rollup/rollup-win32-x64-msvc": "4.6.1",
         "fsevents": "~2.3.2"
       }
     },
@@ -2366,28 +3177,13 @@
       }
     },
     "node_modules/scheduler": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
       "dependencies": {
         "loose-envify": "^1.1.0"
       }
     },
-    "node_modules/semver": {
-      "version": "7.5.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
-      "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/send": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
@@ -2435,6 +3231,27 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -2454,6 +3271,24 @@
       "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
       "dev": true
     },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true
+    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -2488,21 +3323,48 @@
       }
     },
     "node_modules/std-env": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.3.3.tgz",
-      "integrity": "sha512-Rz6yejtVyWnVjC1RFvNmYL10kgjC49EOghxWn0RFqlCHGFpQx+Xe7yW3I4ceK1SGrWIGMjD5Kbue8W/udkbMJg==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz",
+      "integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==",
       "dev": true
     },
-    "node_modules/strip-literal": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.0.1.tgz",
-      "integrity": "sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q==",
+    "node_modules/strip-final-newline": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
       "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/stylis": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz",
+      "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw=="
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dependencies": {
-        "acorn": "^8.8.2"
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/antfu"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/symbol-tree": {
@@ -2511,39 +3373,47 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
       "dev": true
     },
-    "node_modules/time-zone": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-1.0.0.tgz",
-      "integrity": "sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/tinybench": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.0.tgz",
-      "integrity": "sha512-kRwSG8Zx4tjF9ZiyH4bhaebu+EDz1BOx9hOigYHlUW4xxI/wKIUQUqo018UlU4ar6ATPBsaMrdbKZ+tmPdohFA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.8.0.tgz",
+      "integrity": "sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==",
       "dev": true
     },
-    "node_modules/tinypool": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.5.0.tgz",
-      "integrity": "sha512-paHQtnrlS1QZYKF/GnLoOM/DN9fqaGOFbCbxzAhwniySnzl9Ebk8w73/dd34DAhe/obUbPAOldTyYXQZxnPBPQ==",
+    "node_modules/tinypool": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.0.tgz",
+      "integrity": "sha512-KIKExllK7jp3uvrNtvRBYBWBOAXSX8ZvoaD8T+7KB/QHIuoJW3Pmr60zucywjAlMb5TeXUkcs/MWeWLu0qvuAQ==",
+      "dev": true,
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      }
+    },
+    "node_modules/tinyrainbow": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz",
+      "integrity": "sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==",
       "dev": true,
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/tinyspy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.1.0.tgz",
-      "integrity": "sha512-7eORpyqImoOvkQJCSkL0d0mB4NHHIFAy4b1u8PHdDa7SjGS2njzl6/lyGoZLm+eyYEtlUmFGE0rFj66SWxZgQQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.0.tgz",
+      "integrity": "sha512-q5nmENpTHgiPVd1cJDDc9cVoYN5x4vCvwT3FMilvKPKneCBZAxn2YWQjDF0UMcE9k0Cay1gBiDfTMU0g+mPMQA==",
       "dev": true,
       "engines": {
         "node": ">=14.0.0"
       }
     },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -2592,18 +3462,18 @@
       }
     },
     "node_modules/tsconfck": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-2.1.1.tgz",
-      "integrity": "sha512-ZPCkJBKASZBmBUNqGHmRhdhM8pJYDdOXp4nRgj/O0JwUwsMq50lCDRQP/M5GBNAA0elPrq4gAeu4dkaVCuKWww==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.3.tgz",
+      "integrity": "sha512-ulNZP1SVpRDesxeMLON/LtWM8HIgAJEIVpVVhBM6gsmvQ8+Rh+ZG7FWGvHh7Ah3pRABwVJWklWCr/BTZSv0xnQ==",
       "dev": true,
       "bin": {
         "tsconfck": "bin/tsconfck.js"
       },
       "engines": {
-        "node": "^14.13.1 || ^16 || >=18"
+        "node": "^18 || >=20"
       },
       "peerDependencies": {
-        "typescript": "^4.3.5 || ^5.0.0"
+        "typescript": "^5.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -2623,15 +3493,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -2645,24 +3506,18 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
-      "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
+      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=12.20"
+        "node": ">=14.17"
       }
     },
-    "node_modules/ufo": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.1.2.tgz",
-      "integrity": "sha512-TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ==",
-      "dev": true
-    },
     "node_modules/universalify": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
@@ -2690,6 +3545,27 @@
         "requires-port": "^1.0.0"
       }
     },
+    "node_modules/use-isomorphic-layout-effect": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
+      "integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/use-sync-external-store": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
+      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -2707,27 +3583,31 @@
       }
     },
     "node_modules/vite": {
-      "version": "4.3.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.8.tgz",
-      "integrity": "sha512-uYB8PwN7hbMrf4j1xzGDk/lqjsZvCDbt/JC5dyfxc19Pg8kRm14LinK/uq+HSLNswZEoKmweGdtpbnxRtrAXiQ==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.6.tgz",
+      "integrity": "sha512-MD3joyAEBtV7QZPl2JVVUai6zHms3YOmLR+BpMzLlX2Yzjfcc4gTgNi09d/Rua3F4EtC8zdwPU8eQYyib4vVMQ==",
       "dev": true,
       "dependencies": {
-        "esbuild": "^0.17.5",
-        "postcss": "^8.4.23",
-        "rollup": "^3.21.0"
+        "esbuild": "^0.19.3",
+        "postcss": "^8.4.32",
+        "rollup": "^4.2.0"
       },
       "bin": {
         "vite": "bin/vite.js"
       },
       "engines": {
-        "node": "^14.18.0 || >=16.0.0"
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
       },
       "optionalDependencies": {
-        "fsevents": "~2.3.2"
+        "fsevents": "~2.3.3"
       },
       "peerDependencies": {
-        "@types/node": ">= 14",
+        "@types/node": "^18.0.0 || >=20.0.0",
         "less": "*",
+        "lightningcss": "^1.21.0",
         "sass": "*",
         "stylus": "*",
         "sugarss": "*",
@@ -2740,6 +3620,9 @@
         "less": {
           "optional": true
         },
+        "lightningcss": {
+          "optional": true
+        },
         "sass": {
           "optional": true
         },
@@ -2755,32 +3638,31 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.31.1.tgz",
-      "integrity": "sha512-BajE/IsNQ6JyizPzu9zRgHrBwczkAs0erQf/JRpgTIESpKvNj9/Gd0vxX905klLkb0I0SJVCKbdrl5c6FnqYKA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.0.4.tgz",
+      "integrity": "sha512-ZpJVkxcakYtig5iakNeL7N3trufe3M6vGuzYAr4GsbCTwobDeyPJpE4cjDhhPluv8OvQCFzu2LWp6GkoKRITXA==",
       "dev": true,
       "dependencies": {
         "cac": "^6.7.14",
-        "debug": "^4.3.4",
-        "mlly": "^1.2.0",
-        "pathe": "^1.1.0",
-        "picocolors": "^1.0.0",
-        "vite": "^3.0.0 || ^4.0.0"
+        "debug": "^4.3.5",
+        "pathe": "^1.1.2",
+        "tinyrainbow": "^1.2.0",
+        "vite": "^5.0.0"
       },
       "bin": {
         "vite-node": "vite-node.mjs"
       },
       "engines": {
-        "node": ">=v14.18.0"
+        "node": "^18.0.0 || >=20.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/vite-node/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -2801,14 +3683,14 @@
       "dev": true
     },
     "node_modules/vite-tsconfig-paths": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.0.tgz",
-      "integrity": "sha512-jGpus0eUy5qbbMVGiTxCL1iB9ZGN6Bd37VGLJU39kTDD6ZfULTTb1bcc5IeTWqWJKiWV5YihCaibeASPiGi8kw==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.2.tgz",
+      "integrity": "sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==",
       "dev": true,
       "dependencies": {
         "debug": "^4.1.1",
         "globrex": "^0.1.2",
-        "tsconfck": "^2.1.0"
+        "tsconfck": "^3.0.3"
       },
       "peerDependencies": {
         "vite": "*"
@@ -2820,12 +3702,12 @@
       }
     },
     "node_modules/vite-tsconfig-paths/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -2837,66 +3719,61 @@
       }
     },
     "node_modules/vite-tsconfig-paths/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
     "node_modules/vitest": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.31.1.tgz",
-      "integrity": "sha512-/dOoOgzoFk/5pTvg1E65WVaobknWREN15+HF+0ucudo3dDG/vCZoXTQrjIfEaWvQXmqScwkRodrTbM/ScMpRcQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.0.4.tgz",
+      "integrity": "sha512-luNLDpfsnxw5QSW4bISPe6tkxVvv5wn2BBs/PuDRkhXZ319doZyLOBr1sjfB5yCEpTiU7xCAdViM8TNVGPwoog==",
       "dev": true,
       "dependencies": {
-        "@types/chai": "^4.3.5",
-        "@types/chai-subset": "^1.3.3",
-        "@types/node": "*",
-        "@vitest/expect": "0.31.1",
-        "@vitest/runner": "0.31.1",
-        "@vitest/snapshot": "0.31.1",
-        "@vitest/spy": "0.31.1",
-        "@vitest/utils": "0.31.1",
-        "acorn": "^8.8.2",
-        "acorn-walk": "^8.2.0",
-        "cac": "^6.7.14",
-        "chai": "^4.3.7",
-        "concordance": "^5.0.4",
-        "debug": "^4.3.4",
-        "local-pkg": "^0.4.3",
-        "magic-string": "^0.30.0",
-        "pathe": "^1.1.0",
-        "picocolors": "^1.0.0",
-        "std-env": "^3.3.2",
-        "strip-literal": "^1.0.1",
-        "tinybench": "^2.5.0",
-        "tinypool": "^0.5.0",
-        "vite": "^3.0.0 || ^4.0.0",
-        "vite-node": "0.31.1",
-        "why-is-node-running": "^2.2.2"
+        "@ampproject/remapping": "^2.3.0",
+        "@vitest/expect": "2.0.4",
+        "@vitest/pretty-format": "^2.0.4",
+        "@vitest/runner": "2.0.4",
+        "@vitest/snapshot": "2.0.4",
+        "@vitest/spy": "2.0.4",
+        "@vitest/utils": "2.0.4",
+        "chai": "^5.1.1",
+        "debug": "^4.3.5",
+        "execa": "^8.0.1",
+        "magic-string": "^0.30.10",
+        "pathe": "^1.1.2",
+        "std-env": "^3.7.0",
+        "tinybench": "^2.8.0",
+        "tinypool": "^1.0.0",
+        "tinyrainbow": "^1.2.0",
+        "vite": "^5.0.0",
+        "vite-node": "2.0.4",
+        "why-is-node-running": "^2.3.0"
       },
       "bin": {
         "vitest": "vitest.mjs"
       },
       "engines": {
-        "node": ">=v14.18.0"
+        "node": "^18.0.0 || >=20.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
         "@edge-runtime/vm": "*",
-        "@vitest/browser": "*",
-        "@vitest/ui": "*",
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "@vitest/browser": "2.0.4",
+        "@vitest/ui": "2.0.4",
         "happy-dom": "*",
-        "jsdom": "*",
-        "playwright": "*",
-        "safaridriver": "*",
-        "webdriverio": "*"
+        "jsdom": "*"
       },
       "peerDependenciesMeta": {
         "@edge-runtime/vm": {
           "optional": true
         },
+        "@types/node": {
+          "optional": true
+        },
         "@vitest/browser": {
           "optional": true
         },
@@ -2908,22 +3785,13 @@
         },
         "jsdom": {
           "optional": true
-        },
-        "playwright": {
-          "optional": true
-        },
-        "safaridriver": {
-          "optional": true
-        },
-        "webdriverio": {
-          "optional": true
         }
       }
     },
     "node_modules/vitest/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -2964,15 +3832,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/well-known-symbols": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/well-known-symbols/-/well-known-symbols-2.0.0.tgz",
-      "integrity": "sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/whatwg-encoding": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
@@ -3019,10 +3878,25 @@
         "node": ">=14"
       }
     },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/why-is-node-running": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz",
-      "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
+      "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
       "dev": true,
       "dependencies": {
         "siginfo": "^2.0.0",
@@ -3080,194 +3954,394 @@
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true
     },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/yocto-queue": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
-      "dev": true,
+    "node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 6"
       }
     },
     "node_modules/zod": {
-      "version": "3.21.4",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
-      "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==",
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.3.tgz",
+      "integrity": "sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug==",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
     }
   },
   "dependencies": {
+    "@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "@babel/code-frame": {
+      "version": "7.21.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",
+      "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
+      "requires": {
+        "@babel/highlight": "^7.18.6"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.21.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz",
+      "integrity": "sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==",
+      "requires": {
+        "@babel/types": "^7.21.4"
+      }
+    },
+    "@babel/helper-string-parser": {
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz",
+      "integrity": "sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w=="
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
+    },
+    "@babel/highlight": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "@babel/runtime": {
+      "version": "7.22.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.3.tgz",
+      "integrity": "sha512-XsDuspWKLUsxwCp6r7EhsExHtYfbe5oAGQ19kqngTdCPUoPQzOPdUbD/pB9PJiwb2ptYKQDjSJT3R6dC+EPqfQ==",
+      "requires": {
+        "regenerator-runtime": "^0.13.11"
+      }
+    },
+    "@babel/types": {
+      "version": "7.22.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.4.tgz",
+      "integrity": "sha512-Tx9x3UBHTTsMSW85WB2kphxYQVvrZ/t1FxD88IpSgIjiUJlCm9z+xWIDwyo1vffTwSqteqyznB8ZE9vYYk16zA==",
+      "requires": {
+        "@babel/helper-string-parser": "^7.21.5",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@emotion/babel-plugin": {
+      "version": "11.11.0",
+      "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz",
+      "integrity": "sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/runtime": "^7.18.3",
+        "@emotion/hash": "^0.9.1",
+        "@emotion/memoize": "^0.8.1",
+        "@emotion/serialize": "^1.1.2",
+        "babel-plugin-macros": "^3.1.0",
+        "convert-source-map": "^1.5.0",
+        "escape-string-regexp": "^4.0.0",
+        "find-root": "^1.1.0",
+        "source-map": "^0.5.7",
+        "stylis": "4.2.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
+        }
+      }
+    },
+    "@emotion/cache": {
+      "version": "11.11.0",
+      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz",
+      "integrity": "sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==",
+      "requires": {
+        "@emotion/memoize": "^0.8.1",
+        "@emotion/sheet": "^1.2.2",
+        "@emotion/utils": "^1.2.1",
+        "@emotion/weak-memoize": "^0.3.1",
+        "stylis": "4.2.0"
+      }
+    },
+    "@emotion/hash": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz",
+      "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ=="
+    },
+    "@emotion/memoize": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
+      "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
+    },
+    "@emotion/react": {
+      "version": "11.11.0",
+      "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.0.tgz",
+      "integrity": "sha512-ZSK3ZJsNkwfjT3JpDAWJZlrGD81Z3ytNDsxw1LKq1o+xkmO5pnWfr6gmCC8gHEFf3nSSX/09YrG67jybNPxSUw==",
+      "requires": {
+        "@babel/runtime": "^7.18.3",
+        "@emotion/babel-plugin": "^11.11.0",
+        "@emotion/cache": "^11.11.0",
+        "@emotion/serialize": "^1.1.2",
+        "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1",
+        "@emotion/utils": "^1.2.1",
+        "@emotion/weak-memoize": "^0.3.1",
+        "hoist-non-react-statics": "^3.3.1"
+      }
+    },
+    "@emotion/serialize": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.2.tgz",
+      "integrity": "sha512-zR6a/fkFP4EAcCMQtLOhIgpprZOwNmCldtpaISpvz348+DP4Mz8ZoKaGGCQpbzepNIUWbq4w6hNZkwDyKoS+HA==",
+      "requires": {
+        "@emotion/hash": "^0.9.1",
+        "@emotion/memoize": "^0.8.1",
+        "@emotion/unitless": "^0.8.1",
+        "@emotion/utils": "^1.2.1",
+        "csstype": "^3.0.2"
+      }
+    },
+    "@emotion/sheet": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.2.tgz",
+      "integrity": "sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA=="
+    },
+    "@emotion/unitless": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz",
+      "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ=="
+    },
+    "@emotion/use-insertion-effect-with-fallbacks": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz",
+      "integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==",
+      "requires": {}
+    },
+    "@emotion/utils": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.1.tgz",
+      "integrity": "sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg=="
+    },
+    "@emotion/weak-memoize": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz",
+      "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww=="
+    },
     "@esbuild/android-arm": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz",
-      "integrity": "sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.8.tgz",
+      "integrity": "sha512-31E2lxlGM1KEfivQl8Yf5aYU/mflz9g06H6S15ITUFQueMFtFjESRMoDSkvMo8thYvLBax+VKTPlpnx+sPicOA==",
       "dev": true,
       "optional": true
     },
     "@esbuild/android-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz",
-      "integrity": "sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.8.tgz",
+      "integrity": "sha512-B8JbS61bEunhfx8kasogFENgQfr/dIp+ggYXwTqdbMAgGDhRa3AaPpQMuQU0rNxDLECj6FhDzk1cF9WHMVwrtA==",
       "dev": true,
       "optional": true
     },
     "@esbuild/android-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz",
-      "integrity": "sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.8.tgz",
+      "integrity": "sha512-rdqqYfRIn4jWOp+lzQttYMa2Xar3OK9Yt2fhOhzFXqg0rVWEfSclJvZq5fZslnz6ypHvVf3CT7qyf0A5pM682A==",
       "dev": true,
       "optional": true
     },
     "@esbuild/darwin-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz",
-      "integrity": "sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.8.tgz",
+      "integrity": "sha512-RQw9DemMbIq35Bprbboyf8SmOr4UXsRVxJ97LgB55VKKeJOOdvsIPy0nFyF2l8U+h4PtBx/1kRf0BelOYCiQcw==",
       "dev": true,
       "optional": true
     },
     "@esbuild/darwin-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz",
-      "integrity": "sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.8.tgz",
+      "integrity": "sha512-3sur80OT9YdeZwIVgERAysAbwncom7b4bCI2XKLjMfPymTud7e/oY4y+ci1XVp5TfQp/bppn7xLw1n/oSQY3/Q==",
       "dev": true,
       "optional": true
     },
     "@esbuild/freebsd-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz",
-      "integrity": "sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.8.tgz",
+      "integrity": "sha512-WAnPJSDattvS/XtPCTj1tPoTxERjcTpH6HsMr6ujTT+X6rylVe8ggxk8pVxzf5U1wh5sPODpawNicF5ta/9Tmw==",
       "dev": true,
       "optional": true
     },
     "@esbuild/freebsd-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz",
-      "integrity": "sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.8.tgz",
+      "integrity": "sha512-ICvZyOplIjmmhjd6mxi+zxSdpPTKFfyPPQMQTK/w+8eNK6WV01AjIztJALDtwNNfFhfZLux0tZLC+U9nSyA5Zg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-arm": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz",
-      "integrity": "sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.8.tgz",
+      "integrity": "sha512-H4vmI5PYqSvosPaTJuEppU9oz1dq2A7Mr2vyg5TF9Ga+3+MGgBdGzcyBP7qK9MrwFQZlvNyJrvz6GuCaj3OukQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz",
-      "integrity": "sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.8.tgz",
+      "integrity": "sha512-z1zMZivxDLHWnyGOctT9JP70h0beY54xDDDJt4VpTX+iwA77IFsE1vCXWmprajJGa+ZYSqkSbRQ4eyLCpCmiCQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-ia32": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz",
-      "integrity": "sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.8.tgz",
+      "integrity": "sha512-1a8suQiFJmZz1khm/rDglOc8lavtzEMRo0v6WhPgxkrjcU0LkHj+TwBrALwoz/OtMExvsqbbMI0ChyelKabSvQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-loong64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz",
-      "integrity": "sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.8.tgz",
+      "integrity": "sha512-fHZWS2JJxnXt1uYJsDv9+b60WCc2RlvVAy1F76qOLtXRO+H4mjt3Tr6MJ5l7Q78X8KgCFudnTuiQRBhULUyBKQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-mips64el": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz",
-      "integrity": "sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.8.tgz",
+      "integrity": "sha512-Wy/z0EL5qZYLX66dVnEg9riiwls5IYnziwuju2oUiuxVc+/edvqXa04qNtbrs0Ukatg5HEzqT94Zs7J207dN5Q==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-ppc64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz",
-      "integrity": "sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.8.tgz",
+      "integrity": "sha512-ETaW6245wK23YIEufhMQ3HSeHO7NgsLx8gygBVldRHKhOlD1oNeNy/P67mIh1zPn2Hr2HLieQrt6tWrVwuqrxg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-riscv64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz",
-      "integrity": "sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.8.tgz",
+      "integrity": "sha512-T2DRQk55SgoleTP+DtPlMrxi/5r9AeFgkhkZ/B0ap99zmxtxdOixOMI570VjdRCs9pE4Wdkz7JYrsPvsl7eESg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-s390x": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz",
-      "integrity": "sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.8.tgz",
+      "integrity": "sha512-NPxbdmmo3Bk7mbNeHmcCd7R7fptJaczPYBaELk6NcXxy7HLNyWwCyDJ/Xx+/YcNH7Im5dHdx9gZ5xIwyliQCbg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/linux-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz",
-      "integrity": "sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.8.tgz",
+      "integrity": "sha512-lytMAVOM3b1gPypL2TRmZ5rnXl7+6IIk8uB3eLsV1JwcizuolblXRrc5ShPrO9ls/b+RTp+E6gbsuLWHWi2zGg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/netbsd-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz",
-      "integrity": "sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.8.tgz",
+      "integrity": "sha512-hvWVo2VsXz/8NVt1UhLzxwAfo5sioj92uo0bCfLibB0xlOmimU/DeAEsQILlBQvkhrGjamP0/el5HU76HAitGw==",
       "dev": true,
       "optional": true
     },
     "@esbuild/openbsd-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz",
-      "integrity": "sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.8.tgz",
+      "integrity": "sha512-/7Y7u77rdvmGTxR83PgaSvSBJCC2L3Kb1M/+dmSIvRvQPXXCuC97QAwMugBNG0yGcbEGfFBH7ojPzAOxfGNkwQ==",
       "dev": true,
       "optional": true
     },
     "@esbuild/sunos-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz",
-      "integrity": "sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.8.tgz",
+      "integrity": "sha512-9Lc4s7Oi98GqFA4HzA/W2JHIYfnXbUYgekUP/Sm4BG9sfLjyv6GKKHKKVs83SMicBF2JwAX6A1PuOLMqpD001w==",
       "dev": true,
       "optional": true
     },
     "@esbuild/win32-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz",
-      "integrity": "sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.8.tgz",
+      "integrity": "sha512-rq6WzBGjSzihI9deW3fC2Gqiak68+b7qo5/3kmB6Gvbh/NYPA0sJhrnp7wgV4bNwjqM+R2AApXGxMO7ZoGhIJg==",
       "dev": true,
       "optional": true
     },
     "@esbuild/win32-ia32": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz",
-      "integrity": "sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.8.tgz",
+      "integrity": "sha512-AIAbverbg5jMvJznYiGhrd3sumfwWs8572mIJL5NQjJa06P8KfCPWZQ0NwZbPQnbQi9OWSZhFVSUWjjIrn4hSw==",
       "dev": true,
       "optional": true
     },
     "@esbuild/win32-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz",
-      "integrity": "sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==",
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.8.tgz",
+      "integrity": "sha512-bfZ0cQ1uZs2PqpulNL5j/3w+GDhP36k1K5c38QdQg+Swy51jFZWWeIkteNsufkQxp986wnqRRsb/bHbY1WQ7TA==",
       "dev": true,
       "optional": true
     },
+    "@floating-ui/core": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.2.6.tgz",
+      "integrity": "sha512-EvYTiXet5XqweYGClEmpu3BoxmsQ4hkj3QaYA6qEnigCWffTP3vNRwBReTdrwDwo7OoJ3wM8Uoe9Uk4n+d4hfg=="
+    },
+    "@floating-ui/dom": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.2.9.tgz",
+      "integrity": "sha512-sosQxsqgxMNkV3C+3UqTS6LxP7isRLwX8WMepp843Rb3/b0Wz8+MdUkxJksByip3C2WwLugLHN1b4ibn//zKwQ==",
+      "requires": {
+        "@floating-ui/core": "^1.2.6"
+      }
+    },
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true
+    },
+    "@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "dev": true
+    },
     "@jridgewell/sourcemap-codec": {
       "version": "1.4.15",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
       "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
       "dev": true
     },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3294,6 +4368,104 @@
         "fastq": "^1.6.0"
       }
     },
+    "@rollup/rollup-android-arm-eabi": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.6.1.tgz",
+      "integrity": "sha512-0WQ0ouLejaUCRsL93GD4uft3rOmB8qoQMU05Kb8CmMtMBe7XUDLAltxVZI1q6byNqEtU7N1ZX1Vw5lIpgulLQA==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-android-arm64": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.6.1.tgz",
+      "integrity": "sha512-1TKm25Rn20vr5aTGGZqo6E4mzPicCUD79k17EgTLAsXc1zysyi4xXKACfUbwyANEPAEIxkzwue6JZ+stYzWUTA==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-darwin-arm64": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.6.1.tgz",
+      "integrity": "sha512-cEXJQY/ZqMACb+nxzDeX9IPLAg7S94xouJJCNVE5BJM8JUEP4HeTF+ti3cmxWeSJo+5D+o8Tc0UAWUkfENdeyw==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-darwin-x64": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.6.1.tgz",
+      "integrity": "sha512-LoSU9Xu56isrkV2jLldcKspJ7sSXmZWkAxg7sW/RfF7GS4F5/v4EiqKSMCFbZtDu2Nc1gxxFdQdKwkKS4rwxNg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.6.1.tgz",
+      "integrity": "sha512-EfI3hzYAy5vFNDqpXsNxXcgRDcFHUWSx5nnRSCKwXuQlI5J9dD84g2Usw81n3FLBNsGCegKGwwTVsSKK9cooSQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.6.1.tgz",
+      "integrity": "sha512-9lhc4UZstsegbNLhH0Zu6TqvDfmhGzuCWtcTFXY10VjLLUe4Mr0Ye2L3rrtHaDd/J5+tFMEuo5LTCSCMXWfUKw==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-arm64-musl": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.6.1.tgz",
+      "integrity": "sha512-FfoOK1yP5ksX3wwZ4Zk1NgyGHZyuRhf99j64I5oEmirV8EFT7+OhUZEnP+x17lcP/QHJNWGsoJwrz4PJ9fBEXw==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-x64-gnu": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.6.1.tgz",
+      "integrity": "sha512-DNGZvZDO5YF7jN5fX8ZqmGLjZEXIJRdJEdTFMhiyXqyXubBa0WVLDWSNlQ5JR2PNgDbEV1VQowhVRUh+74D+RA==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-x64-musl": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.6.1.tgz",
+      "integrity": "sha512-RkJVNVRM+piYy87HrKmhbexCHg3A6Z6MU0W9GHnJwBQNBeyhCJG9KDce4SAMdicQnpURggSvtbGo9xAWOfSvIQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.6.1.tgz",
+      "integrity": "sha512-v2FVT6xfnnmTe3W9bJXl6r5KwJglMK/iRlkKiIFfO6ysKs0rDgz7Cwwf3tjldxQUrHL9INT/1r4VA0n9L/F1vQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.6.1.tgz",
+      "integrity": "sha512-YEeOjxRyEjqcWphH9dyLbzgkF8wZSKAKUkldRY6dgNR5oKs2LZazqGB41cWJ4Iqqcy9/zqYgmzBkRoVz3Q9MLw==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-win32-x64-msvc": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.6.1.tgz",
+      "integrity": "sha512-0zfTlFAIhgz8V2G8STq8toAjsYYA6eci1hnXuyOTUFnymrtJwnS6uGKiv3v5UrPZkBlamLvrLV2iiaeqCKzb0A==",
+      "dev": true,
+      "optional": true
+    },
+    "@tanstack/query-core": {
+      "version": "4.29.11",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-4.29.11.tgz",
+      "integrity": "sha512-8C+hF6SFAb/TlFZyS9FItgNwrw4PMa7YeX+KQYe2ZAiEz6uzg6yIr+QBzPkUwZ/L0bXvGd1sufTm3wotoz+GwQ=="
+    },
+    "@tanstack/react-query": {
+      "version": "4.29.12",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-4.29.12.tgz",
+      "integrity": "sha512-zhcN6+zF6cxprxhTHQajHGlvxgK8npnp9uLe9yaWhGc6sYcPWXzyO4raL4HomUzQOPzu3jLvkriJQ7BOrDM8vA==",
+      "requires": {
+        "@tanstack/query-core": "4.29.11",
+        "use-sync-external-store": "^1.2.0"
+      }
+    },
     "@tootallnate/once": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
@@ -3301,14 +4473,17 @@
       "dev": true
     },
     "@total-typescript/exercise-cli": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@total-typescript/exercise-cli/-/exercise-cli-0.1.0.tgz",
-      "integrity": "sha512-A6DpA9BK88sdhgyH/Qy/rrFwnu93Eh0OQd/oOb/4dSVxNIfvJ155CsBCEtKyp5iM2QKfIHYNfdJFcPut090esQ==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@total-typescript/exercise-cli/-/exercise-cli-0.11.0.tgz",
+      "integrity": "sha512-VTRT1UTedPEburo5uQZLDchnbUAciOKsnO89y7DAKJS3/NMAObi6gr1/SNlCcEmCRa/Rya2mLG+iYBYhnmYsYA==",
       "dev": true,
       "requires": {
         "chokidar": "^3.5.3",
+        "colors": "^1.4.0",
         "commander": "^10.0.1",
-        "fast-glob": "^3.2.12"
+        "fast-glob": "^3.2.12",
+        "jsonc-parser": "^3.2.0",
+        "prompts": "^2.4.2"
       }
     },
     "@types/body-parser": {
@@ -3320,21 +4495,6 @@
         "@types/node": "*"
       }
     },
-    "@types/chai": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.5.tgz",
-      "integrity": "sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==",
-      "dev": true
-    },
-    "@types/chai-subset": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.3.tgz",
-      "integrity": "sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==",
-      "dev": true,
-      "requires": {
-        "@types/chai": "*"
-      }
-    },
     "@types/connect": {
       "version": "3.4.35",
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
@@ -3343,6 +4503,12 @@
         "@types/node": "*"
       }
     },
+    "@types/estree": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "dev": true
+    },
     "@types/express": {
       "version": "4.17.17",
       "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
@@ -3375,6 +4541,11 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.3.tgz",
       "integrity": "sha512-pg9d0yC4rVNWQzX8U7xb4olIOFuuVL9za3bzMT2pu2SU0SNEi66i2qrvhE2qt0HvkhuCaWJu7pLNOt/Pj8BIrw=="
     },
+    "@types/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
+    },
     "@types/prop-types": {
       "version": "15.7.5",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
@@ -3391,27 +4562,29 @@
       "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
     },
     "@types/react": {
-      "version": "18.2.6",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.6.tgz",
-      "integrity": "sha512-wRZClXn//zxCFW+ye/D2qY65UsYP1Fpex2YXorHc8awoNamkMZSvBxwxdYVInsHOZZd2Ppq8isnSzJL5Mpf8OA==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.1.tgz",
+      "integrity": "sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==",
       "requires": {
         "@types/prop-types": "*",
-        "@types/scheduler": "*",
         "csstype": "^3.0.2"
       }
     },
     "@types/react-dom": {
-      "version": "18.2.4",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.4.tgz",
-      "integrity": "sha512-G2mHoTMTL4yoydITgOGwWdWMVd8sNgyEP85xVmMKAPUBwQWm9wBPQUmvbeF4V3WBY1P7mmL4BkjQ0SqUpf1snw==",
+      "version": "18.3.0",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
+      "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
       "requires": {
         "@types/react": "*"
       }
     },
-    "@types/scheduler": {
-      "version": "0.16.3",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
-      "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="
+    "@types/react-transition-group": {
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.6.tgz",
+      "integrity": "sha512-VnCdSxfcm08KjsJVQcfBmhEQAPnLB8G08hAxn39azX1qYBQ/5RVQuoHuKIcfKOdncuaUvEpFKFzEvbtIMsfVew==",
+      "requires": {
+        "@types/react": "*"
+      }
     },
     "@types/send": {
       "version": "0.17.1",
@@ -3432,57 +4605,66 @@
       }
     },
     "@vitest/expect": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.31.1.tgz",
-      "integrity": "sha512-BV1LyNvhnX+eNYzJxlHIGPWZpwJFZaCcOIzp2CNG0P+bbetenTupk6EO0LANm4QFt0TTit+yqx7Rxd1qxi/SQA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.0.4.tgz",
+      "integrity": "sha512-39jr5EguIoanChvBqe34I8m1hJFI4+jxvdOpD7gslZrVQBKhh8H9eD7J/LJX4zakrw23W+dITQTDqdt43xVcJw==",
+      "dev": true,
+      "requires": {
+        "@vitest/spy": "2.0.4",
+        "@vitest/utils": "2.0.4",
+        "chai": "^5.1.1",
+        "tinyrainbow": "^1.2.0"
+      }
+    },
+    "@vitest/pretty-format": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.0.4.tgz",
+      "integrity": "sha512-RYZl31STbNGqf4l2eQM1nvKPXE0NhC6Eq0suTTePc4mtMQ1Fn8qZmjV4emZdEdG2NOWGKSCrHZjmTqDCDoeFBw==",
       "dev": true,
       "requires": {
-        "@vitest/spy": "0.31.1",
-        "@vitest/utils": "0.31.1",
-        "chai": "^4.3.7"
+        "tinyrainbow": "^1.2.0"
       }
     },
     "@vitest/runner": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.31.1.tgz",
-      "integrity": "sha512-imWuc82ngOtxdCUpXwtEzZIuc1KMr+VlQ3Ondph45VhWoQWit5yvG/fFcldbnCi8DUuFi+NmNx5ehMUw/cGLUw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.0.4.tgz",
+      "integrity": "sha512-Gk+9Su/2H2zNfNdeJR124gZckd5st4YoSuhF1Rebi37qTXKnqYyFCd9KP4vl2cQHbtuVKjfEKrNJxHHCW8thbQ==",
       "dev": true,
       "requires": {
-        "@vitest/utils": "0.31.1",
-        "concordance": "^5.0.4",
-        "p-limit": "^4.0.0",
-        "pathe": "^1.1.0"
+        "@vitest/utils": "2.0.4",
+        "pathe": "^1.1.2"
       }
     },
     "@vitest/snapshot": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.31.1.tgz",
-      "integrity": "sha512-L3w5uU9bMe6asrNzJ8WZzN+jUTX4KSgCinEJPXyny0o90fG4FPQMV0OWsq7vrCWfQlAilMjDnOF9nP8lidsJ+g==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.0.4.tgz",
+      "integrity": "sha512-or6Mzoz/pD7xTvuJMFYEtso1vJo1S5u6zBTinfl+7smGUhqybn6VjzCDMhmTyVOFWwkCMuNjmNNxnyXPgKDoPw==",
       "dev": true,
       "requires": {
-        "magic-string": "^0.30.0",
-        "pathe": "^1.1.0",
-        "pretty-format": "^27.5.1"
+        "@vitest/pretty-format": "2.0.4",
+        "magic-string": "^0.30.10",
+        "pathe": "^1.1.2"
       }
     },
     "@vitest/spy": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.31.1.tgz",
-      "integrity": "sha512-1cTpt2m9mdo3hRLDyCG2hDQvRrePTDgEJBFQQNz1ydHHZy03EiA6EpFxY+7ODaY7vMRCie+WlFZBZ0/dQWyssQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.0.4.tgz",
+      "integrity": "sha512-uTXU56TNoYrTohb+6CseP8IqNwlNdtPwEO0AWl+5j7NelS6x0xZZtP0bDWaLvOfUbaYwhhWp1guzXUxkC7mW7Q==",
       "dev": true,
       "requires": {
-        "tinyspy": "^2.1.0"
+        "tinyspy": "^3.0.0"
       }
     },
     "@vitest/utils": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.31.1.tgz",
-      "integrity": "sha512-yFyRD5ilwojsZfo3E0BnH72pSVSuLg2356cN1tCEe/0RtDzxTPYwOomIC+eQbot7m6DRy4tPZw+09mB7NkbMmA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.0.4.tgz",
+      "integrity": "sha512-Zc75QuuoJhOBnlo99ZVUkJIuq4Oj0zAkrQ2VzCqNCx6wAwViHEh5Fnp4fiJTE9rA+sAoXRf00Z9xGgfEzV6fzQ==",
       "dev": true,
       "requires": {
-        "concordance": "^5.0.4",
-        "loupe": "^2.3.6",
-        "pretty-format": "^27.5.1"
+        "@vitest/pretty-format": "2.0.4",
+        "estree-walker": "^3.0.3",
+        "loupe": "^3.1.1",
+        "tinyrainbow": "^1.2.0"
       }
     },
     "abab": {
@@ -3501,9 +4683,9 @@
       }
     },
     "acorn": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
       "dev": true
     },
     "acorn-globals": {
@@ -3517,9 +4699,9 @@
       }
     },
     "acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
+      "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
       "dev": true
     },
     "agent-base": {
@@ -3548,18 +4730,6 @@
         }
       }
     },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true
-    },
     "anymatch": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
@@ -3576,9 +4746,9 @@
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
     "assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
       "dev": true
     },
     "asynckit": {
@@ -3587,18 +4757,22 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true
     },
+    "babel-plugin-macros": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
+      "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "cosmiconfig": "^7.0.0",
+        "resolve": "^1.19.0"
+      }
+    },
     "binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true
     },
-    "blueimp-md5": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.19.0.tgz",
-      "integrity": "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==",
-      "dev": true
-    },
     "body-parser": {
       "version": "1.20.1",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
@@ -3647,25 +4821,53 @@
         "get-intrinsic": "^1.0.2"
       }
     },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+    },
     "chai": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
-      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.1.tgz",
+      "integrity": "sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==",
       "dev": true,
       "requires": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^4.1.2",
-        "get-func-name": "^2.0.0",
-        "loupe": "^2.3.1",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.5"
+        "assertion-error": "^2.0.1",
+        "check-error": "^2.1.1",
+        "deep-eql": "^5.0.1",
+        "loupe": "^3.1.0",
+        "pathval": "^2.0.0"
+      }
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
+        }
       }
     },
     "check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
+      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
       "dev": true
     },
     "chokidar": {
@@ -3684,6 +4886,25 @@
         "readdirp": "~3.6.0"
       }
     },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true
+    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -3699,22 +4920,6 @@
       "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
       "dev": true
     },
-    "concordance": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/concordance/-/concordance-5.0.4.tgz",
-      "integrity": "sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw==",
-      "dev": true,
-      "requires": {
-        "date-time": "^3.1.0",
-        "esutils": "^2.0.3",
-        "fast-diff": "^1.2.0",
-        "js-string-escape": "^1.0.1",
-        "lodash": "^4.17.15",
-        "md5-hex": "^3.0.1",
-        "semver": "^7.3.2",
-        "well-known-symbols": "^2.0.0"
-      }
-    },
     "content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -3728,6 +4933,11 @@
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
       "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
     },
+    "convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+    },
     "cookie": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
@@ -3738,6 +4948,18 @@
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
       "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
+    "cosmiconfig": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+      "requires": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      }
+    },
     "cross-fetch": {
       "version": "3.1.6",
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.6.tgz",
@@ -3747,6 +4969,17 @@
         "node-fetch": "^2.6.11"
       }
     },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      }
+    },
     "cssstyle": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz",
@@ -3772,15 +5005,6 @@
         "whatwg-url": "^12.0.0"
       }
     },
-    "date-time": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/date-time/-/date-time-3.1.0.tgz",
-      "integrity": "sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg==",
-      "dev": true,
-      "requires": {
-        "time-zone": "^1.0.0"
-      }
-    },
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -3796,13 +5020,10 @@
       "dev": true
     },
     "deep-eql": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
-      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
-      "dev": true,
-      "requires": {
-        "type-detect": "^4.0.0"
-      }
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
+      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
+      "dev": true
     },
     "deep-is": {
       "version": "0.1.4",
@@ -3826,6 +5047,15 @@
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
     },
+    "dom-helpers": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
+      "requires": {
+        "@babel/runtime": "^7.8.7",
+        "csstype": "^3.0.2"
+      }
+    },
     "domexception": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
@@ -3851,34 +5081,42 @@
       "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "dev": true
     },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
     "esbuild": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz",
-      "integrity": "sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==",
-      "dev": true,
-      "requires": {
-        "@esbuild/android-arm": "0.17.19",
-        "@esbuild/android-arm64": "0.17.19",
-        "@esbuild/android-x64": "0.17.19",
-        "@esbuild/darwin-arm64": "0.17.19",
-        "@esbuild/darwin-x64": "0.17.19",
-        "@esbuild/freebsd-arm64": "0.17.19",
-        "@esbuild/freebsd-x64": "0.17.19",
-        "@esbuild/linux-arm": "0.17.19",
-        "@esbuild/linux-arm64": "0.17.19",
-        "@esbuild/linux-ia32": "0.17.19",
-        "@esbuild/linux-loong64": "0.17.19",
-        "@esbuild/linux-mips64el": "0.17.19",
-        "@esbuild/linux-ppc64": "0.17.19",
-        "@esbuild/linux-riscv64": "0.17.19",
-        "@esbuild/linux-s390x": "0.17.19",
-        "@esbuild/linux-x64": "0.17.19",
-        "@esbuild/netbsd-x64": "0.17.19",
-        "@esbuild/openbsd-x64": "0.17.19",
-        "@esbuild/sunos-x64": "0.17.19",
-        "@esbuild/win32-arm64": "0.17.19",
-        "@esbuild/win32-ia32": "0.17.19",
-        "@esbuild/win32-x64": "0.17.19"
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.8.tgz",
+      "integrity": "sha512-l7iffQpT2OrZfH2rXIp7/FkmaeZM0vxbxN9KfiCwGYuZqzMg/JdvX26R31Zxn/Pxvsrg3Y9N6XTcnknqDyyv4w==",
+      "dev": true,
+      "requires": {
+        "@esbuild/android-arm": "0.19.8",
+        "@esbuild/android-arm64": "0.19.8",
+        "@esbuild/android-x64": "0.19.8",
+        "@esbuild/darwin-arm64": "0.19.8",
+        "@esbuild/darwin-x64": "0.19.8",
+        "@esbuild/freebsd-arm64": "0.19.8",
+        "@esbuild/freebsd-x64": "0.19.8",
+        "@esbuild/linux-arm": "0.19.8",
+        "@esbuild/linux-arm64": "0.19.8",
+        "@esbuild/linux-ia32": "0.19.8",
+        "@esbuild/linux-loong64": "0.19.8",
+        "@esbuild/linux-mips64el": "0.19.8",
+        "@esbuild/linux-ppc64": "0.19.8",
+        "@esbuild/linux-riscv64": "0.19.8",
+        "@esbuild/linux-s390x": "0.19.8",
+        "@esbuild/linux-x64": "0.19.8",
+        "@esbuild/netbsd-x64": "0.19.8",
+        "@esbuild/openbsd-x64": "0.19.8",
+        "@esbuild/sunos-x64": "0.19.8",
+        "@esbuild/win32-arm64": "0.19.8",
+        "@esbuild/win32-ia32": "0.19.8",
+        "@esbuild/win32-x64": "0.19.8"
       }
     },
     "escape-html": {
@@ -3886,6 +5124,11 @@
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
+    "escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
+    },
     "escodegen": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
@@ -3911,6 +5154,15 @@
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true
     },
+    "estree-walker": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "dev": true,
+      "requires": {
+        "@types/estree": "^1.0.0"
+      }
+    },
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@@ -3922,6 +5174,23 @@
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
+    "execa": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
+      "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^8.0.1",
+        "human-signals": "^5.0.0",
+        "is-stream": "^3.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^5.1.0",
+        "onetime": "^6.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-final-newline": "^3.0.0"
+      }
+    },
     "express": {
       "version": "4.18.2",
       "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
@@ -3960,12 +5229,6 @@
         "vary": "~1.1.2"
       }
     },
-    "fast-diff": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
-      "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
-      "dev": true
-    },
     "fast-glob": {
       "version": "3.2.12",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
@@ -4017,6 +5280,11 @@
         "unpipe": "~1.0.0"
       }
     },
+    "find-root": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
+    },
     "form-data": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
@@ -4039,9 +5307,9 @@
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
     },
     "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "optional": true
     },
@@ -4051,9 +5319,9 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
       "dev": true
     },
     "get-intrinsic": {
@@ -4067,6 +5335,12 @@
         "has-symbols": "^1.0.3"
       }
     },
+    "get-stream": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
+      "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
+      "dev": true
+    },
     "glob-parent": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -4090,6 +5364,11 @@
         "function-bind": "^1.1.1"
       }
     },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
+    },
     "has-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
@@ -4100,6 +5379,21 @@
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
     },
+    "hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "requires": {
+        "react-is": "^16.7.0"
+      },
+      "dependencies": {
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+        }
+      }
+    },
     "html-encoding-sniffer": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
@@ -4176,6 +5470,12 @@
         }
       }
     },
+    "human-signals": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
+      "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
+      "dev": true
+    },
     "iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -4184,6 +5484,15 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@@ -4194,6 +5503,11 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
     },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+    },
     "is-binary-path": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -4203,6 +5517,14 @@
         "binary-extensions": "^2.0.0"
       }
     },
+    "is-core-module": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -4230,10 +5552,16 @@
       "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "dev": true
     },
-    "js-string-escape": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz",
-      "integrity": "sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==",
+    "is-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
     "js-tokens": {
@@ -4275,12 +5603,23 @@
         "xml-name-validator": "^4.0.0"
       }
     },
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
     "jsonc-parser": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
       "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
       "dev": true
     },
+    "kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true
+    },
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -4291,17 +5630,10 @@
         "type-check": "~0.3.2"
       }
     },
-    "local-pkg": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz",
-      "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
-      "dev": true
-    },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
+    "lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
     "loose-envify": {
       "version": "1.4.0",
@@ -4312,39 +5644,21 @@
       }
     },
     "loupe": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
-      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
-      "dev": true,
-      "requires": {
-        "get-func-name": "^2.0.0"
-      }
-    },
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.1.tgz",
+      "integrity": "sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==",
       "dev": true,
       "requires": {
-        "yallist": "^4.0.0"
+        "get-func-name": "^2.0.1"
       }
     },
     "magic-string": {
-      "version": "0.30.0",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
-      "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/sourcemap-codec": "^1.4.13"
-      }
-    },
-    "md5-hex": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-3.0.1.tgz",
-      "integrity": "sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==",
+      "version": "0.30.10",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz",
+      "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
       "dev": true,
       "requires": {
-        "blueimp-md5": "^2.10.0"
+        "@jridgewell/sourcemap-codec": "^1.4.15"
       }
     },
     "media-typer": {
@@ -4352,11 +5666,22 @@
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
     },
+    "memoize-one": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
+      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
+    },
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
       "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
+    "merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
     "merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -4396,17 +5721,11 @@
         "mime-db": "1.52.0"
       }
     },
-    "mlly": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.2.1.tgz",
-      "integrity": "sha512-1aMEByaWgBPEbWV2BOPEMySRrzl7rIHXmQxam4DM8jVjalTQDjpN2ZKOLUrwyhfZQO7IXHml2StcHMhooDeEEQ==",
-      "dev": true,
-      "requires": {
-        "acorn": "^8.8.2",
-        "pathe": "^1.1.0",
-        "pkg-types": "^1.0.3",
-        "ufo": "^1.1.2"
-      }
+    "mimic-fn": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
+      "dev": true
     },
     "ms": {
       "version": "2.0.0",
@@ -4414,9 +5733,9 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "nanoid": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
       "dev": true
     },
     "negotiator": {
@@ -4463,12 +5782,34 @@
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true
     },
+    "npm-run-path": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
+      "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
+      "dev": true,
+      "requires": {
+        "path-key": "^4.0.0"
+      },
+      "dependencies": {
+        "path-key": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+          "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+          "dev": true
+        }
+      }
+    },
     "nwsapi": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.4.tgz",
       "integrity": "sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g==",
       "dev": true
     },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+    },
     "object-inspect": {
       "version": "1.12.3",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
@@ -4482,6 +5823,15 @@
         "ee-first": "1.1.1"
       }
     },
+    "onetime": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
+      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^4.0.0"
+      }
+    },
     "optionator": {
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
@@ -4496,13 +5846,23 @@
         "word-wrap": "~1.2.3"
       }
     },
-    "p-limit": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
-      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
-      "dev": true,
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
+    "parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "requires": {
-        "yocto-queue": "^1.0.0"
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
       }
     },
     "parse5": {
@@ -4519,27 +5879,43 @@
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
     },
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
       "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
+    },
     "pathe": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.0.tgz",
-      "integrity": "sha512-ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+      "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
       "dev": true
     },
     "pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
+      "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==",
       "dev": true
     },
     "picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
       "dev": true
     },
     "picomatch": {
@@ -4548,24 +5924,13 @@
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true
     },
-    "pkg-types": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
-      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
-      "dev": true,
-      "requires": {
-        "jsonc-parser": "^3.2.0",
-        "mlly": "^1.2.0",
-        "pathe": "^1.1.0"
-      }
-    },
     "postcss": {
-      "version": "8.4.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz",
-      "integrity": "sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==",
+      "version": "8.4.32",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz",
+      "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
       "dev": true,
       "requires": {
-        "nanoid": "^3.3.6",
+        "nanoid": "^3.3.7",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       }
@@ -4582,15 +5947,31 @@
       "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true
     },
-    "pretty-format": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+    "prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dev": true,
       "requires": {
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^17.0.1"
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      }
+    },
+    "prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      },
+      "dependencies": {
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+        }
       }
     },
     "proxy-addr": {
@@ -4651,27 +6032,54 @@
       }
     },
     "react": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
       "requires": {
         "loose-envify": "^1.1.0"
       }
     },
     "react-dom": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
       "requires": {
         "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
+        "scheduler": "^0.23.2"
       }
     },
-    "react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "dev": true
+    "react-hook-form": {
+      "version": "7.44.3",
+      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.44.3.tgz",
+      "integrity": "sha512-/tHId6p2ViAka1wECMw8FEPn/oz/w226zehHrJyQ1oIzCBNMIJCaj6ZkQcv+MjDxYh9MWR7RQic7Qqwe4a5nkw==",
+      "requires": {}
+    },
+    "react-select": {
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.7.3.tgz",
+      "integrity": "sha512-z8i3NCuFFWL3w27xq92rBkVI2onT0jzIIPe480HlBjXJ3b5o6Q+Clp4ydyeKrj9DZZ3lrjawwLC5NGl0FSvUDg==",
+      "requires": {
+        "@babel/runtime": "^7.12.0",
+        "@emotion/cache": "^11.4.0",
+        "@emotion/react": "^11.8.1",
+        "@floating-ui/dom": "^1.0.1",
+        "@types/react-transition-group": "^4.4.0",
+        "memoize-one": "^6.0.0",
+        "prop-types": "^15.6.0",
+        "react-transition-group": "^4.3.0",
+        "use-isomorphic-layout-effect": "^1.1.2"
+      }
+    },
+    "react-transition-group": {
+      "version": "4.4.5",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
+      "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
+      "requires": {
+        "@babel/runtime": "^7.5.5",
+        "dom-helpers": "^5.0.1",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.6.2"
+      }
     },
     "readdirp": {
       "version": "3.6.0",
@@ -4682,12 +6090,32 @@
         "picomatch": "^2.2.1"
       }
     },
+    "regenerator-runtime": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+    },
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
       "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
       "dev": true
     },
+    "resolve": {
+      "version": "1.22.2",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+      "requires": {
+        "is-core-module": "^2.11.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
+    },
     "reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -4695,11 +6123,23 @@
       "dev": true
     },
     "rollup": {
-      "version": "3.23.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.23.0.tgz",
-      "integrity": "sha512-h31UlwEi7FHihLe1zbk+3Q7z1k/84rb9BSwmBSr/XjOCEaBJ2YyedQDuM0t/kfOS0IxM+vk1/zI9XxYj9V+NJQ==",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.6.1.tgz",
+      "integrity": "sha512-jZHaZotEHQaHLgKr8JnQiDT1rmatjgKlMekyksz+yk9jt/8z9quNjnKNRoaM0wd9DC2QKXjmWWuDYtM3jfF8pQ==",
       "dev": true,
       "requires": {
+        "@rollup/rollup-android-arm-eabi": "4.6.1",
+        "@rollup/rollup-android-arm64": "4.6.1",
+        "@rollup/rollup-darwin-arm64": "4.6.1",
+        "@rollup/rollup-darwin-x64": "4.6.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.6.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.6.1",
+        "@rollup/rollup-linux-arm64-musl": "4.6.1",
+        "@rollup/rollup-linux-x64-gnu": "4.6.1",
+        "@rollup/rollup-linux-x64-musl": "4.6.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.6.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.6.1",
+        "@rollup/rollup-win32-x64-msvc": "4.6.1",
         "fsevents": "~2.3.2"
       }
     },
@@ -4738,22 +6178,13 @@
       }
     },
     "scheduler": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
       "requires": {
         "loose-envify": "^1.1.0"
       }
     },
-    "semver": {
-      "version": "7.5.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
-      "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
-      "dev": true,
-      "requires": {
-        "lru-cache": "^6.0.0"
-      }
-    },
     "send": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
@@ -4797,6 +6228,21 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^3.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true
+    },
     "side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -4813,6 +6259,18 @@
       "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
       "dev": true
     },
+    "signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true
+    },
+    "sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true
+    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -4838,50 +6296,70 @@
       "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
     },
     "std-env": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.3.3.tgz",
-      "integrity": "sha512-Rz6yejtVyWnVjC1RFvNmYL10kgjC49EOghxWn0RFqlCHGFpQx+Xe7yW3I4ceK1SGrWIGMjD5Kbue8W/udkbMJg==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz",
+      "integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==",
       "dev": true
     },
-    "strip-literal": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.0.1.tgz",
-      "integrity": "sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q==",
-      "dev": true,
+    "strip-final-newline": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
+      "dev": true
+    },
+    "stylis": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz",
+      "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw=="
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "requires": {
-        "acorn": "^8.8.2"
+        "has-flag": "^3.0.0"
       }
     },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+    },
     "symbol-tree": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
       "dev": true
     },
-    "time-zone": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-1.0.0.tgz",
-      "integrity": "sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA==",
-      "dev": true
-    },
     "tinybench": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.0.tgz",
-      "integrity": "sha512-kRwSG8Zx4tjF9ZiyH4bhaebu+EDz1BOx9hOigYHlUW4xxI/wKIUQUqo018UlU4ar6ATPBsaMrdbKZ+tmPdohFA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.8.0.tgz",
+      "integrity": "sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==",
       "dev": true
     },
     "tinypool": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.5.0.tgz",
-      "integrity": "sha512-paHQtnrlS1QZYKF/GnLoOM/DN9fqaGOFbCbxzAhwniySnzl9Ebk8w73/dd34DAhe/obUbPAOldTyYXQZxnPBPQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.0.tgz",
+      "integrity": "sha512-KIKExllK7jp3uvrNtvRBYBWBOAXSX8ZvoaD8T+7KB/QHIuoJW3Pmr60zucywjAlMb5TeXUkcs/MWeWLu0qvuAQ==",
+      "dev": true
+    },
+    "tinyrainbow": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz",
+      "integrity": "sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==",
       "dev": true
     },
     "tinyspy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.1.0.tgz",
-      "integrity": "sha512-7eORpyqImoOvkQJCSkL0d0mB4NHHIFAy4b1u8PHdDa7SjGS2njzl6/lyGoZLm+eyYEtlUmFGE0rFj66SWxZgQQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.0.tgz",
+      "integrity": "sha512-q5nmENpTHgiPVd1cJDDc9cVoYN5x4vCvwT3FMilvKPKneCBZAxn2YWQjDF0UMcE9k0Cay1gBiDfTMU0g+mPMQA==",
       "dev": true
     },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
+    },
     "to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -4918,9 +6396,9 @@
       }
     },
     "tsconfck": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-2.1.1.tgz",
-      "integrity": "sha512-ZPCkJBKASZBmBUNqGHmRhdhM8pJYDdOXp4nRgj/O0JwUwsMq50lCDRQP/M5GBNAA0elPrq4gAeu4dkaVCuKWww==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.3.tgz",
+      "integrity": "sha512-ulNZP1SVpRDesxeMLON/LtWM8HIgAJEIVpVVhBM6gsmvQ8+Rh+ZG7FWGvHh7Ah3pRABwVJWklWCr/BTZSv0xnQ==",
       "dev": true,
       "requires": {}
     },
@@ -4933,12 +6411,6 @@
         "prelude-ls": "~1.1.2"
       }
     },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true
-    },
     "type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -4949,15 +6421,9 @@
       }
     },
     "typescript": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
-      "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
-      "dev": true
-    },
-    "ufo": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.1.2.tgz",
-      "integrity": "sha512-TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
+      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
       "dev": true
     },
     "universalify": {
@@ -4981,6 +6447,18 @@
         "requires-port": "^1.0.0"
       }
     },
+    "use-isomorphic-layout-effect": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
+      "integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==",
+      "requires": {}
+    },
+    "use-sync-external-store": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
+      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
+      "requires": {}
+    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -4992,35 +6470,34 @@
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
     },
     "vite": {
-      "version": "4.3.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.8.tgz",
-      "integrity": "sha512-uYB8PwN7hbMrf4j1xzGDk/lqjsZvCDbt/JC5dyfxc19Pg8kRm14LinK/uq+HSLNswZEoKmweGdtpbnxRtrAXiQ==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.6.tgz",
+      "integrity": "sha512-MD3joyAEBtV7QZPl2JVVUai6zHms3YOmLR+BpMzLlX2Yzjfcc4gTgNi09d/Rua3F4EtC8zdwPU8eQYyib4vVMQ==",
       "dev": true,
       "requires": {
-        "esbuild": "^0.17.5",
-        "fsevents": "~2.3.2",
-        "postcss": "^8.4.23",
-        "rollup": "^3.21.0"
+        "esbuild": "^0.19.3",
+        "fsevents": "~2.3.3",
+        "postcss": "^8.4.32",
+        "rollup": "^4.2.0"
       }
     },
     "vite-node": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.31.1.tgz",
-      "integrity": "sha512-BajE/IsNQ6JyizPzu9zRgHrBwczkAs0erQf/JRpgTIESpKvNj9/Gd0vxX905klLkb0I0SJVCKbdrl5c6FnqYKA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.0.4.tgz",
+      "integrity": "sha512-ZpJVkxcakYtig5iakNeL7N3trufe3M6vGuzYAr4GsbCTwobDeyPJpE4cjDhhPluv8OvQCFzu2LWp6GkoKRITXA==",
       "dev": true,
       "requires": {
         "cac": "^6.7.14",
-        "debug": "^4.3.4",
-        "mlly": "^1.2.0",
-        "pathe": "^1.1.0",
-        "picocolors": "^1.0.0",
-        "vite": "^3.0.0 || ^4.0.0"
+        "debug": "^4.3.5",
+        "pathe": "^1.1.2",
+        "tinyrainbow": "^1.2.0",
+        "vite": "^5.0.0"
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "version": "4.3.5",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+          "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -5035,70 +6512,64 @@
       }
     },
     "vite-tsconfig-paths": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.0.tgz",
-      "integrity": "sha512-jGpus0eUy5qbbMVGiTxCL1iB9ZGN6Bd37VGLJU39kTDD6ZfULTTb1bcc5IeTWqWJKiWV5YihCaibeASPiGi8kw==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.2.tgz",
+      "integrity": "sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==",
       "dev": true,
       "requires": {
         "debug": "^4.1.1",
         "globrex": "^0.1.2",
-        "tsconfck": "^2.1.0"
+        "tsconfck": "^3.0.3"
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "version": "4.3.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+          "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "ms": "^2.1.3"
           }
         },
         "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
           "dev": true
         }
       }
     },
     "vitest": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.31.1.tgz",
-      "integrity": "sha512-/dOoOgzoFk/5pTvg1E65WVaobknWREN15+HF+0ucudo3dDG/vCZoXTQrjIfEaWvQXmqScwkRodrTbM/ScMpRcQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.0.4.tgz",
+      "integrity": "sha512-luNLDpfsnxw5QSW4bISPe6tkxVvv5wn2BBs/PuDRkhXZ319doZyLOBr1sjfB5yCEpTiU7xCAdViM8TNVGPwoog==",
       "dev": true,
       "requires": {
-        "@types/chai": "^4.3.5",
-        "@types/chai-subset": "^1.3.3",
-        "@types/node": "*",
-        "@vitest/expect": "0.31.1",
-        "@vitest/runner": "0.31.1",
-        "@vitest/snapshot": "0.31.1",
-        "@vitest/spy": "0.31.1",
-        "@vitest/utils": "0.31.1",
-        "acorn": "^8.8.2",
-        "acorn-walk": "^8.2.0",
-        "cac": "^6.7.14",
-        "chai": "^4.3.7",
-        "concordance": "^5.0.4",
-        "debug": "^4.3.4",
-        "local-pkg": "^0.4.3",
-        "magic-string": "^0.30.0",
-        "pathe": "^1.1.0",
-        "picocolors": "^1.0.0",
-        "std-env": "^3.3.2",
-        "strip-literal": "^1.0.1",
-        "tinybench": "^2.5.0",
-        "tinypool": "^0.5.0",
-        "vite": "^3.0.0 || ^4.0.0",
-        "vite-node": "0.31.1",
-        "why-is-node-running": "^2.2.2"
+        "@ampproject/remapping": "^2.3.0",
+        "@vitest/expect": "2.0.4",
+        "@vitest/pretty-format": "^2.0.4",
+        "@vitest/runner": "2.0.4",
+        "@vitest/snapshot": "2.0.4",
+        "@vitest/spy": "2.0.4",
+        "@vitest/utils": "2.0.4",
+        "chai": "^5.1.1",
+        "debug": "^4.3.5",
+        "execa": "^8.0.1",
+        "magic-string": "^0.30.10",
+        "pathe": "^1.1.2",
+        "std-env": "^3.7.0",
+        "tinybench": "^2.8.0",
+        "tinypool": "^1.0.0",
+        "tinyrainbow": "^1.2.0",
+        "vite": "^5.0.0",
+        "vite-node": "2.0.4",
+        "why-is-node-running": "^2.3.0"
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "version": "4.3.5",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+          "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -5127,12 +6598,6 @@
       "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
       "dev": true
     },
-    "well-known-symbols": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/well-known-symbols/-/well-known-symbols-2.0.0.tgz",
-      "integrity": "sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==",
-      "dev": true
-    },
     "whatwg-encoding": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
@@ -5169,10 +6634,19 @@
         "webidl-conversions": "^7.0.0"
       }
     },
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
     "why-is-node-running": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz",
-      "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
+      "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
       "dev": true,
       "requires": {
         "siginfo": "^2.0.0",
@@ -5204,22 +6678,15 @@
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true
     },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "yocto-queue": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
-      "dev": true
+    "yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
     },
     "zod": {
-      "version": "3.21.4",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
-      "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw=="
+      "version": "3.22.3",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.3.tgz",
+      "integrity": "sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug=="
     }
   }
 }
diff --git a/package.json b/package.json
index b34038f..44ae77c 100644
--- a/package.json
+++ b/package.json
@@ -2,16 +2,16 @@
   "name": "react-typescript-tutorial",
   "version": "1.0.0",
   "main": "index.js",
-  "author": "Matt Pocock <mattpocockvoice@gmail.com>",
+  "author": "Matt Pocock <team@totaltypescript.com>",
   "license": "GPL",
   "devDependencies": {
-    "@total-typescript/exercise-cli": "0.1.0",
+    "@total-typescript/exercise-cli": "^0.11.0",
     "cross-fetch": "^3.1.5",
     "jsdom": "^21.1.1",
     "prettier": "^2.8.7",
-    "typescript": "^5.0.3",
+    "typescript": "^5.4.5",
     "vite-tsconfig-paths": "^4.0.7",
-    "vitest": "^0.31.1"
+    "vitest": "^2.0.0"
   },
   "scripts": {
     "exercise": "tt-cli run",
@@ -21,42 +21,10 @@
     "ci": "(cd scripts/tests && npx vitest run)",
     "update-snapshots": "(cd scripts/tests && npx vitest run -u)",
     "prepare": "tt-cli prepare-stackblitz",
-    "e-09": "tt-cli run 09",
-    "s-09": "tt-cli run 09 --solution",
-    "e-10": "tt-cli run 10",
-    "s-10": "tt-cli run 10 --solution",
-    "e-18": "npm run exercise -- 18",
-    "s-18": "npm run solution -- 18",
-    "e-19": "tt-cli run 19",
-    "s-19": "tt-cli run 19 --solution",
-    "e-20": "tt-cli run 20",
-    "s-20": "tt-cli run 20 --solution",
-    "e-21": "tt-cli run 21",
-    "s-21": "tt-cli run 21 --solution",
-    "e-22": "tt-cli run 22",
-    "s-22": "tt-cli run 22 --solution",
-    "e-26": "tt-cli run 26",
-    "s-26": "tt-cli run 26 --solution",
-    "e-28": "tt-cli run 28",
-    "s-28": "tt-cli run 28 --solution",
-    "e-12": "tt-cli run 12",
-    "s-12": "tt-cli run 12 --solution",
-    "e-14": "tt-cli run 14",
-    "s-14": "tt-cli run 14 --solution",
-    "e-32": "tt-cli run 32",
-    "s-32": "tt-cli run 32 --solution",
-    "e-33": "tt-cli run 33",
-    "s-33": "tt-cli run 33 --solution",
-    "e-34": "tt-cli run 34",
-    "s-34": "tt-cli run 34 --solution",
-    "e-35": "tt-cli run 35",
-    "s-35": "tt-cli run 35 --solution",
-    "e-39": "tt-cli run 39",
-    "s-39": "tt-cli run 39 --solution",
-    "e-36": "tt-cli run 36",
-    "s-36": "tt-cli run 36 --solution",
-    "e-40": "tt-cli run 40",
-    "s-40": "tt-cli run 40 --solution",
+    "e-01": "tt-cli run 01",
+    "s-01": "tt-cli run 01 --solution",
+    "e-02": "tt-cli run 02",
+    "s-02": "tt-cli run 02 --solution",
     "e-03": "tt-cli run 03",
     "s-03": "tt-cli run 03 --solution",
     "e-04": "tt-cli run 04",
@@ -69,38 +37,80 @@
     "s-07": "tt-cli run 07 --solution",
     "e-08": "tt-cli run 08",
     "s-08": "tt-cli run 08 --solution",
+    "e-09": "tt-cli run 09",
+    "s-09": "tt-cli run 09 --solution",
+    "e-10": "tt-cli run 10",
+    "s-10": "tt-cli run 10 --solution",
     "e-11": "tt-cli run 11",
     "s-11": "tt-cli run 11 --solution",
+    "e-12": "tt-cli run 12",
+    "s-12": "tt-cli run 12 --solution",
     "e-13": "tt-cli run 13",
     "s-13": "tt-cli run 13 --solution",
+    "e-14": "tt-cli run 14",
+    "s-14": "tt-cli run 14 --solution",
     "e-15": "tt-cli run 15",
     "s-15": "tt-cli run 15 --solution",
     "e-16": "tt-cli run 16",
     "s-16": "tt-cli run 16 --solution",
     "e-17": "tt-cli run 17",
     "s-17": "tt-cli run 17 --solution",
+    "e-18": "tt-cli run 18",
+    "s-18": "tt-cli run 18 --solution",
+    "e-19": "tt-cli run 19",
+    "s-19": "tt-cli run 19 --solution",
+    "e-20": "tt-cli run 20",
+    "s-20": "tt-cli run 20 --solution",
+    "e-21": "tt-cli run 21",
+    "s-21": "tt-cli run 21 --solution",
+    "e-22": "tt-cli run 22",
+    "s-22": "tt-cli run 22 --solution",
     "e-23": "tt-cli run 23",
     "s-23": "tt-cli run 23 --solution",
     "e-24": "tt-cli run 24",
     "s-24": "tt-cli run 24 --solution",
     "e-25": "tt-cli run 25",
     "s-25": "tt-cli run 25 --solution",
+    "e-26": "tt-cli run 26",
+    "s-26": "tt-cli run 26 --solution",
     "e-27": "tt-cli run 27",
     "s-27": "tt-cli run 27 --solution",
+    "e-28": "tt-cli run 28",
+    "s-28": "tt-cli run 28 --solution",
     "e-29": "tt-cli run 29",
     "s-29": "tt-cli run 29 --solution",
     "e-30": "tt-cli run 30",
     "s-30": "tt-cli run 30 --solution",
     "e-31": "tt-cli run 31",
     "s-31": "tt-cli run 31 --solution",
+    "e-32": "tt-cli run 32",
+    "s-32": "tt-cli run 32 --solution",
+    "e-33": "tt-cli run 33",
+    "s-33": "tt-cli run 33 --solution",
+    "e-34": "tt-cli run 34",
+    "s-34": "tt-cli run 34 --solution",
+    "e-35": "tt-cli run 35",
+    "s-35": "tt-cli run 35 --solution",
+    "e-36": "tt-cli run 36",
+    "s-36": "tt-cli run 36 --solution",
     "e-37": "tt-cli run 37",
     "s-37": "tt-cli run 37 --solution",
     "e-38": "tt-cli run 38",
     "s-38": "tt-cli run 38 --solution",
+    "e-39": "tt-cli run 39",
+    "s-39": "tt-cli run 39 --solution",
+    "e-40": "tt-cli run 40",
+    "s-40": "tt-cli run 40 --solution",
     "e-41": "tt-cli run 41",
     "s-41": "tt-cli run 41 --solution",
+    "e-42": "tt-cli run 42",
+    "s-42": "tt-cli run 42 --solution",
+    "e-43": "tt-cli run 43",
+    "s-43": "tt-cli run 43 --solution",
     "e-44": "tt-cli run 44",
     "s-44": "tt-cli run 44 --solution",
+    "e-45": "tt-cli run 45",
+    "s-45": "tt-cli run 45 --solution",
     "e-46": "tt-cli run 46",
     "s-46": "tt-cli run 46 --solution",
     "e-47": "tt-cli run 47",
@@ -113,6 +123,10 @@
     "s-50": "tt-cli run 50 --solution",
     "e-51": "tt-cli run 51",
     "s-51": "tt-cli run 51 --solution",
+    "e-52": "tt-cli run 52",
+    "s-52": "tt-cli run 52 --solution",
+    "e-53": "tt-cli run 53",
+    "s-53": "tt-cli run 53 --solution",
     "e-54": "tt-cli run 54",
     "s-54": "tt-cli run 54 --solution",
     "e-55": "tt-cli run 55",
@@ -133,22 +147,48 @@
     "s-62": "tt-cli run 62 --solution",
     "e-63": "tt-cli run 63",
     "s-63": "tt-cli run 63 --solution",
-    "e-42": "tt-cli run 42",
-    "s-42": "tt-cli run 42 --solution",
-    "e-45": "tt-cli run 45",
-    "s-45": "tt-cli run 45 --solution",
-    "e-52": "tt-cli run 52",
-    "s-52": "tt-cli run 52 --solution",
     "e-64": "tt-cli run 64",
-    "s-64": "tt-cli run 64 --solution"
+    "s-64": "tt-cli run 64 --solution",
+    "e-64.5": "tt-cli run 64.5",
+    "s-64.5": "tt-cli run 64.5 --solution",
+    "e-65": "tt-cli run 65",
+    "s-65": "tt-cli run 65 --solution",
+    "e-66": "tt-cli run 66",
+    "s-66": "tt-cli run 66 --solution",
+    "e-67": "tt-cli run 67",
+    "s-67": "tt-cli run 67 --solution",
+    "e-67.5": "tt-cli run 67.5",
+    "s-67.5": "tt-cli run 67.5 --solution",
+    "e-69": "tt-cli run 69",
+    "s-69": "tt-cli run 69 --solution",
+    "e-70": "tt-cli run 70",
+    "s-70": "tt-cli run 70 --solution",
+    "e-71": "tt-cli run 71",
+    "s-71": "tt-cli run 71 --solution",
+    "e-72": "tt-cli run 72",
+    "s-72": "tt-cli run 72 --solution",
+    "e-73": "tt-cli run 73",
+    "s-73": "tt-cli run 73 --solution",
+    "e-74": "tt-cli run 74",
+    "s-74": "tt-cli run 74 --solution",
+    "e-75": "tt-cli run 75",
+    "s-75": "tt-cli run 75 --solution",
+    "e-76": "tt-cli run 76",
+    "s-76": "tt-cli run 76 --solution",
+    "e-77": "tt-cli run 77",
+    "s-77": "tt-cli run 77 --solution"
   },
   "dependencies": {
+    "@tanstack/react-query": "^4.29.12",
     "@types/express": "^4.17.13",
-    "@types/react": "^18.0.28",
-    "@types/react-dom": "^18.0.11",
+    "@types/react": "^18.2.8",
+    "@types/react-dom": "^18.2.4",
     "express": "^4.18.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "zod": "^3.17.10"
-  }
-}
\ No newline at end of file
+    "react-hook-form": "^7.44.3",
+    "react-select": "^5.7.3",
+    "zod": "^3.21.4"
+  },
+  "type": "module"
+}
diff --git a/plan.json b/plan.json
deleted file mode 100644
index 6aa33f7..0000000
--- a/plan.json
+++ /dev/null
@@ -1,70 +0,0 @@
-[
-  {
-    "text": "Typing components",
-    "deps": []
-  },
-  {
-    "text": "Typing children",
-    "deps": ["Typing components"]
-  },
-  {
-    "text": "Typing components which inherit from native components",
-    "deps": ["Typing components"]
-  },
-  {
-    "text": "Typing onChange handlers",
-    "deps": []
-  },
-  {
-    "text": "Typing hooks",
-    "deps": []
-  },
-  {
-    "text": "Tuple return types from custom hooks",
-    "deps": []
-  },
-  {
-    "text": "useReducer",
-    "deps": []
-  },
-  {
-    "text": "Typing createContext",
-    "deps": []
-  },
-  {
-    "text": "useState overloads",
-    "deps": []
-  },
-  {
-    "text": "useRef overloads - For HTML elements - For values",
-    "deps": []
-  },
-  {
-    "text": "forwardRef",
-    "deps": []
-  },
-  {
-    "text": "Discriminated union props",
-    "deps": []
-  },
-  {
-    "text": "Generic components",
-    "deps": ["Typing components"]
-  },
-  {
-    "text": "Generic custom hooks",
-    "deps": ["Typing hooks"]
-  },
-  {
-    "text": "useState with a generic",
-    "deps": ["Generic custom hooks"]
-  },
-  {
-    "text": "Function overloads in custom hooks",
-    "deps": ["Generic custom hooks"]
-  },
-  {
-    "text": "Higher-order components",
-    "deps": []
-  }
-]
diff --git a/renovate.json b/renovate.json
new file mode 100644
index 0000000..29b50a8
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,21 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:base"],
+  "packageRules": [
+    {
+      "packagePatterns": ["*"],
+      "excludePackagePatterns": [
+        "typescript",
+        "vitest",
+        "jsdom",
+        "prettier",
+        "vite-tsconfig-paths",
+        "react",
+        "@types/react",
+        "@total-typescript/exercise-cli",
+        "zod"
+      ],
+      "enabled": false
+    }
+  ]
+}
diff --git a/scripts/setup.ts b/scripts/setup.ts
deleted file mode 100644
index 354d20d..0000000
--- a/scripts/setup.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { fetch } from "cross-fetch";
-
-global.fetch = fetch;
diff --git a/scripts/tests/__snapshots__/all.test.ts.snap b/scripts/tests/__snapshots__/all.test.ts.snap
deleted file mode 100644
index e8b1b9d..0000000
--- a/scripts/tests/__snapshots__/all.test.ts.snap
+++ /dev/null
@@ -1,1014 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`tsc > Should have the correct TypeScript errors 1`] = `
-",src/01-introduction/03-navigating-jsx-types.problem.tsx(5,21): error TS17000: JSX attributes must only be assigned a non-empty 'expression'.
-src/02-components/04-typing-components.problem.tsx(4,29): error TS18046: 'props' is of type 'unknown'.
-src/02-components/04-typing-components.problem.tsx(10,8): error TS2578: Unused '@ts-expect-error' directive.
-src/02-components/04-typing-components.problem.tsx(13,15): error TS2322: Type '{ className: string; }' is not assignable to type 'IntrinsicAttributes'.
-  Property 'className' does not exist on type 'IntrinsicAttributes'.
-src/02-components/05-typing-components-as-functions.problem.tsx(7,1): error TS2578: Unused '@ts-expect-error' directive.
-src/02-components/05-typing-components-as-functions.problem.tsx(17,8): error TS2786: 'Button' cannot be used as a JSX component.
-  Its return type '{ ohDear: string; }' is not a valid JSX element.
-    Type '{ ohDear: string; }' is missing the following properties from type 'ReactElement<any, any>': type, props, key
-src/02-components/06-typing-children.problem.tsx(4,25): error TS2339: Property 'children' does not exist on type '{}'.
-src/02-components/06-typing-children.problem.tsx(10,8): error TS2578: Unused '@ts-expect-error' directive.
-src/02-components/06-typing-children.problem.tsx(12,8): error TS2559: Type '{ children: string; }' has no properties in common with type 'IntrinsicAttributes'.
-src/02-components/07-typing-onclick-handlers.problem.tsx(8,47): error TS2339: Property 'onClick' does not exist on type 'ButtonProps'.
-src/02-components/08-using-html-props.problem.tsx(3,26): error TS2339: Property 'className' does not exist on type '{}'.
-src/02-components/08-using-html-props.problem.tsx(10,18): error TS2322: Type '{ onClick: () => void; type: string; }' is not assignable to type 'IntrinsicAttributes'.
-  Property 'onClick' does not exist on type 'IntrinsicAttributes'.
-src/02-components/09-html-props-with-one-changed.problem.tsx(23,28): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/02-components/10-extracting-props-from-custom-components.problem.tsx(18,3): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/03-hooks/11-use-state.problem.tsx(8,30): error TS2339: Property 'id' does not exist on type 'never'.
-src/03-hooks/11-use-state.problem.tsx(8,39): error TS2339: Property 'value' does not exist on type 'never'.
-src/03-hooks/11-use-state.problem.tsx(13,13): error TS2322: Type '{ id: number; value: string; }' is not assignable to type 'never'.
-src/03-hooks/11-use-state.problem.tsx(14,13): error TS2322: Type '{ id: number; value: string; }' is not assignable to type 'never'.
-src/03-hooks/12-use-state-with-undefined.problem.ts(18,15): error TS2345: Argument of type '{ id: number; name: string; }' is not assignable to parameter of type 'SetStateAction<undefined>'.
-  Type '{ id: number; name: string; }' provides no match for the signature '(prevState: undefined): undefined'.
-src/03-hooks/12-use-state-with-undefined.problem.ts(22,23): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/03-hooks/13-use-state-excess-properties.problem.tsx(22,17): error TS2578: Unused '@ts-expect-error' directive.
-src/03-hooks/13-use-state-excess-properties.problem.tsx(40,17): error TS2578: Unused '@ts-expect-error' directive.
-src/03-hooks/14-use-effect.problem.ts(6,7): error TS2322: Type 'Timeout' is not assignable to type 'void | Destructor'.
-src/03-hooks/15-use-callback.problem.tsx(5,31): error TS2344: Type 'string' does not satisfy the constraint 'Function'.
-src/03-hooks/15-use-callback.problem.tsx(6,6): error TS7006: Parameter 'buttonName' implicitly has an 'any' type.
-src/03-hooks/15-use-callback.problem.tsx(12,22): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/03-hooks/15-use-callback.problem.tsx(16,30): error TS2349: This expression is not callable.
-  Type 'String' has no call signatures.
-src/03-hooks/15-use-callback.problem.tsx(17,30): error TS2349: This expression is not callable.
-  Type 'String' has no call signatures.
-src/03-hooks/15-use-callback.problem.tsx(18,30): error TS2349: This expression is not callable.
-  Type 'String' has no call signatures.
-src/03-hooks/16-use-memo.problem.tsx(5,52): error TS2345: Argument of type '() => string[]' is not assignable to parameter of type '() => () => string[]'.
-  Type 'string[]' is not assignable to type '() => string[]'.
-    Type 'string[]' provides no match for the signature '(): string[]'.
-src/03-hooks/16-use-memo.problem.tsx(12,22): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/03-hooks/17-use-ref-basics.problem.tsx(7,5): error TS2322: Type '\\"Random value!\\"' is not assignable to type 'undefined'.
-src/03-hooks/18-element-refs.explainer.tsx(19,7): error TS2322: Type 'undefined' is not assignable to type 'HTMLDivElement | null'.
-src/03-hooks/19-use-ref-with-elements.problem.tsx(6,15): error TS2322: Type 'MutableRefObject<HTMLDivElement | undefined>' is not assignable to type 'LegacyRef<HTMLDivElement> | undefined'.
-  Type 'MutableRefObject<HTMLDivElement | undefined>' is not assignable to type 'RefObject<HTMLDivElement>'.
-    Types of property 'current' are incompatible.
-      Type 'HTMLDivElement | undefined' is not assignable to type 'HTMLDivElement | null'.
-        Type 'undefined' is not assignable to type 'HTMLDivElement | null'.
-src/03-hooks/20-why-is-my-ref-readonly.problem.tsx(7,7): error TS2540: Cannot assign to 'current' because it is a read-only property.
-src/03-hooks/20-why-is-my-ref-readonly.solution.tsx(10,18): error TS2540: Cannot assign to 'current' because it is a read-only property.
-src/03-hooks/21-use-reducer.problem.ts(5,11): error TS18046: 'action' is of type 'unknown'.
-src/03-hooks/21-use-reducer.problem.ts(7,23): error TS18046: 'state' is of type 'unknown'.
-src/03-hooks/21-use-reducer.problem.ts(7,37): error TS18046: 'action' is of type 'unknown'.
-src/03-hooks/21-use-reducer.problem.ts(9,23): error TS18046: 'state' is of type 'unknown'.
-src/03-hooks/21-use-reducer.problem.ts(9,37): error TS18046: 'action' is of type 'unknown'.
-src/03-hooks/21-use-reducer.problem.ts(17,22): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/03-hooks/21-use-reducer.problem.ts(21,1): error TS2578: Unused '@ts-expect-error' directive.
-src/03-hooks/21-use-reducer.problem.ts(24,1): error TS2578: Unused '@ts-expect-error' directive.
-src/03-hooks/21-use-reducer.problem.ts(27,1): error TS2578: Unused '@ts-expect-error' directive.
-src/04-advanced-components/22-discriminated-union-props.problem.tsx(27,9): error TS2578: Unused '@ts-expect-error' directive.
-src/04-advanced-components/23-destructuring-discriminated-unions.problem.tsx(13,34): error TS2339: Property 'title' does not exist on type 'ModalProps'.
-src/04-advanced-components/23-destructuring-discriminated-unions.solution.1.tsx(17,31): error TS2339: Property 'title' does not exist on type '{} | { title: string; }'.
-  Property 'title' does not exist on type '{}'.
-src/04-advanced-components/24-discriminated-union-with-other-props.problem.tsx(24,9): error TS2322: Type '{ buttonColor: string; variant: \\"no-title\\"; title: string; }' is not assignable to type 'IntrinsicAttributes & ModalProps'.
-  Property 'buttonColor' does not exist on type 'IntrinsicAttributes & { variant: \\"no-title\\"; }'.
-src/04-advanced-components/24-discriminated-union-with-other-props.problem.tsx(26,9): error TS2578: Unused '@ts-expect-error' directive.
-src/04-advanced-components/24-discriminated-union-with-other-props.problem.tsx(29,44): error TS2322: Type '{ variant: \\"title\\"; title: string; buttonColor: string; }' is not assignable to type 'IntrinsicAttributes & ModalProps'.
-  Property 'buttonColor' does not exist on type 'IntrinsicAttributes & { variant: \\"title\\"; title: string; }'.
-src/04-advanced-components/25-either-all-these-props-or-none.problem.tsx(30,8): error TS2578: Unused '@ts-expect-error' directive.
-src/04-advanced-components/25-either-all-these-props-or-none.problem.tsx(33,8): error TS2578: Unused '@ts-expect-error' directive.
-src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.problem.tsx(8,30): error TS2345: Argument of type 'ReactNode' is not assignable to parameter of type '(value: number, index: number, array: number[]) => ReactNode'.
-  Type 'undefined' is not assignable to type '(value: number, index: number, array: number[]) => ReactNode'.
-src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.problem.tsx(15,19): error TS2322: Type '(index: any) => Element' is not assignable to type 'ReactNode'.
-src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.problem.tsx(15,21): error TS7006: Parameter 'index' implicitly has an 'any' type.
-src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.problem.tsx(16,30): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.problem.tsx(21,19): error TS2322: Type '(index: any) => null' is not assignable to type 'ReactNode'.
-src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.problem.tsx(21,21): error TS7006: Parameter 'index' implicitly has an 'any' type.
-src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.problem.tsx(26,9): error TS2578: Unused '@ts-expect-error' directive.
-src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.problem.tsx(30,9): error TS2322: Type '(index: any) => any' is not assignable to type 'ReactNode'.
-src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.problem.tsx(30,21): error TS7006: Parameter 'index' implicitly has an 'any' type.
-src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.solution.1.tsx(30,9): error TS2322: Type '(index: number) => number' is not assignable to type 'FC<number>'.
-  Type 'number' is not assignable to type 'ReactElement<any, any>'.
-src/04-advanced-components/28-generic-props.problem.tsx(38,9): error TS2578: Unused '@ts-expect-error' directive.
-src/04-advanced-components/28-generic-props.problem.tsx(50,17): error TS2578: Unused '@ts-expect-error' directive.
-src/04-advanced-components/31-prop-groups-with-variants.problem.tsx(23,11): error TS2322: Type '{ children: string; className: string; type: string; } | { children: string; className: string; type: string; } | { children: string; className: string; type: string; }' is not assignable to type 'DetailedHTMLProps<ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>'.
-  Type '{ children: string; className: string; type: string; }' is not assignable to type 'DetailedHTMLProps<ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>'.
-    Type '{ children: string; className: string; type: string; }' is not assignable to type 'ButtonHTMLAttributes<HTMLButtonElement>'.
-      Types of property 'type' are incompatible.
-        Type 'string' is not assignable to type '\\"button\\" | \\"submit\\" | \\"reset\\" | undefined'.
-src/04-advanced-components/31-prop-groups-with-variants.solution.1.tsx(33,8): error TS2578: Unused '@ts-expect-error' directive.
-src/05-advanced-hooks/32-typing-custom-hooks.problem.ts(4,23): error TS7006: Parameter 'defaultId' implicitly has an 'any' type.
-src/05-advanced-hooks/32-typing-custom-hooks.problem.ts(10,22): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/05-advanced-hooks/33-tuple-return-type.problem.ts(13,10): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/05-advanced-hooks/33-tuple-return-type.problem.ts(14,10): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/05-advanced-hooks/35-generic-hooks.problem.ts(16,10): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/05-advanced-hooks/35-generic-hooks.problem.ts(18,5): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/05-advanced-hooks/35-generic-hooks.problem.ts(28,10): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/05-advanced-hooks/35-generic-hooks.problem.ts(29,10): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/05-advanced-hooks/36-function-overloads-in-hooks.problem.ts(25,13): error TS2554: Expected 1 arguments, but got 0.
-src/05-advanced-hooks/36-function-overloads-in-hooks.problem.ts(28,10): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/05-advanced-hooks/36-function-overloads-in-hooks.problem.ts(30,5): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/05-advanced-hooks/37-generic-localstorage-hook.problem.ts(15,30): error TS2558: Expected 0 type arguments, but got 1.
-src/05-advanced-hooks/37-generic-localstorage-hook.problem.ts(22,24): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/05-advanced-hooks/37-generic-localstorage-hook.problem.ts(28,5): error TS2578: Unused '@ts-expect-error' directive.
-src/05-advanced-hooks/38-generic-localstorage-hook-with-zod.problem.tsx(26,24): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/05-advanced-hooks/38-generic-localstorage-hook-with-zod.problem.tsx(32,5): error TS2578: Unused '@ts-expect-error' directive.
-src/05-advanced-hooks/39-unions-in-usestate.problem.tsx(49,3): error TS2578: Unused '@ts-expect-error' directive.
-src/05-advanced-hooks/39-unions-in-usestate.problem.tsx(66,22): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/05-advanced-hooks/40-discriminated-unions-in-usestate.problem.tsx(37,3): error TS2578: Unused '@ts-expect-error' directive.
-src/05-advanced-hooks/40-discriminated-unions-in-usestate.problem.tsx(40,3): error TS2578: Unused '@ts-expect-error' directive.
-src/05-advanced-hooks/40-discriminated-unions-in-usestate.problem.tsx(43,3): error TS2578: Unused '@ts-expect-error' directive.
-src/05-advanced-hooks/42-discriminated-tuples-from-custom-hooks.problem.tsx(31,25): error TS18048: 'value' is possibly 'undefined'.
-src/05-advanced-hooks/42-discriminated-tuples-from-custom-hooks.problem.tsx(31,31): error TS2339: Property 'message' does not exist on type 'Error | { title: string; }'.
-  Property 'message' does not exist on type '{ title: string; }'.
-src/05-advanced-hooks/42-discriminated-tuples-from-custom-hooks.problem.tsx(34,16): error TS18048: 'value' is possibly 'undefined'.
-src/05-advanced-hooks/42-discriminated-tuples-from-custom-hooks.problem.tsx(34,22): error TS2339: Property 'title' does not exist on type 'Error | { title: string; }'.
-  Property 'title' does not exist on type 'Error'.
-src/06-types-deep-dive/50-add-attribute-to-div-elements.problem.tsx(6,7): error TS2717: Subsequent property declarations must have the same type.  Property 'div' must be of type 'DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement>', but here has type 'ClassAttributes<HTMLDivElement> & HTMLAttributes<HTMLDivElement> & { something?: string | undefined; }'.
-src/06-types-deep-dive/50-add-attribute-to-div-elements.problem.tsx(13,30): error TS2322: Type '{ something: string; }' is not assignable to type 'DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement>'.
-  Property 'something' does not exist on type 'DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement>'.
-src/07-advanced-patterns/51-required-context.problem.tsx(20,55): error TS2558: Expected 0 type arguments, but got 1.
-src/07-advanced-patterns/51-required-context.problem.tsx(24,57): error TS2558: Expected 0 type arguments, but got 1.
-src/07-advanced-patterns/51-required-context.problem.tsx(32,5): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/07-advanced-patterns/51-required-context.problem.tsx(43,5): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/07-advanced-patterns/51-required-context.problem.tsx(57,21): error TS2322: Type '{ name: string; }' is not assignable to type 'null'.
-src/07-advanced-patterns/51-required-context.problem.tsx(59,11): error TS2322: Type '{ primaryColor: string; }' is not assignable to type 'null'.
-src/07-advanced-patterns/53-forward-ref-with-generics.explainer.1.tsx(26,28): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/07-advanced-patterns/53-forward-ref-with-generics.explainer.2.tsx(26,28): error TS2344: Type 'false' does not satisfy the constraint 'true'.
-src/07-advanced-patterns/55-as-prop.problem.tsx(13,5): error TS2578: Unused '@ts-expect-error' directive.
-src/07-advanced-patterns/56-as-prop-with-custom-components.problem.tsx(5,11): error TS2604: JSX element type 'Comp' does not have any construct or call signatures.
-src/07-advanced-patterns/56-as-prop-with-custom-components.problem.tsx(12,22): error TS2322: Type '{ as: (props: { href: string; children?: ReactNode; }) => Element; href: string; }' is not assignable to type 'IntrinsicAttributes & { as: unknown; }'.
-  Property 'href' does not exist on type 'IntrinsicAttributes & { as: unknown; }'.
-,"
-`;
-
-exports[`vitest > Should have the correct Vitest errors 1`] = `
-{
-  "success": false,
-  "testResults": [
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/01-introduction/01-react-in-typescript.explainer.tsx",
-      "name": "/src/01-introduction/01-react-in-typescript.explainer.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/01-introduction/02-typescript-in-react-frameworks.explainer.ts",
-      "name": "/src/01-introduction/02-typescript-in-react-frameworks.explainer.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "Transform failed with 1 error:
-/src/01-introduction/03-navigating-jsx-types.problem.tsx:5:21: ERROR: Unexpected \\"}\\"",
-      "name": "/src/01-introduction/03-navigating-jsx-types.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/01-introduction/03-navigating-jsx-types.solution.tsx",
-      "name": "/src/01-introduction/03-navigating-jsx-types.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/04-typing-components.problem.tsx",
-      "name": "/src/02-components/04-typing-components.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/04-typing-components.solution.1.tsx",
-      "name": "/src/02-components/04-typing-components.solution.1.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/04-typing-components.solution.2.tsx",
-      "name": "/src/02-components/04-typing-components.solution.2.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/04-typing-components.solution.3.tsx",
-      "name": "/src/02-components/04-typing-components.solution.3.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/04-typing-components.solution.4.tsx",
-      "name": "/src/02-components/04-typing-components.solution.4.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/05-typing-components-as-functions.problem.tsx",
-      "name": "/src/02-components/05-typing-components-as-functions.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/05-typing-components-as-functions.solution.tsx",
-      "name": "/src/02-components/05-typing-components-as-functions.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/06-typing-children.problem.tsx",
-      "name": "/src/02-components/06-typing-children.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/06-typing-children.solution.tsx",
-      "name": "/src/02-components/06-typing-children.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/07-typing-onclick-handlers.problem.tsx",
-      "name": "/src/02-components/07-typing-onclick-handlers.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/07-typing-onclick-handlers.solution.tsx",
-      "name": "/src/02-components/07-typing-onclick-handlers.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/08-using-html-props.problem.tsx",
-      "name": "/src/02-components/08-using-html-props.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/08-using-html-props.solution.1.tsx",
-      "name": "/src/02-components/08-using-html-props.solution.1.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/08-using-html-props.solution.2.tsx",
-      "name": "/src/02-components/08-using-html-props.solution.2.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/09-html-props-with-one-changed.problem.tsx",
-      "name": "/src/02-components/09-html-props-with-one-changed.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/09-html-props-with-one-changed.solution.1.tsx",
-      "name": "/src/02-components/09-html-props-with-one-changed.solution.1.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/09-html-props-with-one-changed.solution.2.tsx",
-      "name": "/src/02-components/09-html-props-with-one-changed.solution.2.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/09-html-props-with-one-changed.solution.3.tsx",
-      "name": "/src/02-components/09-html-props-with-one-changed.solution.3.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/09-html-props-with-one-changed.solution.4.tsx",
-      "name": "/src/02-components/09-html-props-with-one-changed.solution.4.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/10-extracting-props-from-custom-components.problem.tsx",
-      "name": "/src/02-components/10-extracting-props-from-custom-components.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/02-components/10-extracting-props-from-custom-components.solution.tsx",
-      "name": "/src/02-components/10-extracting-props-from-custom-components.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/11-use-state.problem.tsx",
-      "name": "/src/03-hooks/11-use-state.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/11-use-state.solution.tsx",
-      "name": "/src/03-hooks/11-use-state.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/12-use-state-with-undefined.problem.ts",
-      "name": "/src/03-hooks/12-use-state-with-undefined.problem.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/12-use-state-with-undefined.solution.1.ts",
-      "name": "/src/03-hooks/12-use-state-with-undefined.solution.1.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/12-use-state-with-undefined.solution.2.ts",
-      "name": "/src/03-hooks/12-use-state-with-undefined.solution.2.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/13-use-state-excess-properties.problem.tsx",
-      "name": "/src/03-hooks/13-use-state-excess-properties.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/13-use-state-excess-properties.solution.tsx",
-      "name": "/src/03-hooks/13-use-state-excess-properties.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/14-use-effect.problem.ts",
-      "name": "/src/03-hooks/14-use-effect.problem.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/14-use-effect.solution.ts",
-      "name": "/src/03-hooks/14-use-effect.solution.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/15-use-callback.problem.tsx",
-      "name": "/src/03-hooks/15-use-callback.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/15-use-callback.solution.tsx",
-      "name": "/src/03-hooks/15-use-callback.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/16-use-memo.problem.tsx",
-      "name": "/src/03-hooks/16-use-memo.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/16-use-memo.solution.1.tsx",
-      "name": "/src/03-hooks/16-use-memo.solution.1.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/16-use-memo.solution.2.tsx",
-      "name": "/src/03-hooks/16-use-memo.solution.2.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/16-use-memo.solution.3.tsx",
-      "name": "/src/03-hooks/16-use-memo.solution.3.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/17-use-ref-basics.problem.tsx",
-      "name": "/src/03-hooks/17-use-ref-basics.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/17-use-ref-basics.solution.tsx",
-      "name": "/src/03-hooks/17-use-ref-basics.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/18-element-refs.explainer.tsx",
-      "name": "/src/03-hooks/18-element-refs.explainer.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/19-use-ref-with-elements.problem.tsx",
-      "name": "/src/03-hooks/19-use-ref-with-elements.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/19-use-ref-with-elements.solution.tsx",
-      "name": "/src/03-hooks/19-use-ref-with-elements.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/20-why-is-my-ref-readonly.problem.tsx",
-      "name": "/src/03-hooks/20-why-is-my-ref-readonly.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/03-hooks/20-why-is-my-ref-readonly.solution.tsx",
-      "name": "/src/03-hooks/20-why-is-my-ref-readonly.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "Cannot read properties of null (reading 'useReducer')",
-      "name": "/src/03-hooks/21-use-reducer.problem.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "Cannot read properties of null (reading 'useReducer')",
-      "name": "/src/03-hooks/21-use-reducer.solution.1.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "Cannot read properties of null (reading 'useReducer')",
-      "name": "/src/03-hooks/21-use-reducer.solution.2.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "Cannot read properties of null (reading 'useReducer')",
-      "name": "/src/03-hooks/21-use-reducer.solution.3.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/22-discriminated-union-props.problem.tsx",
-      "name": "/src/04-advanced-components/22-discriminated-union-props.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/22-discriminated-union-props.solution.tsx",
-      "name": "/src/04-advanced-components/22-discriminated-union-props.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/23-destructuring-discriminated-unions.problem.tsx",
-      "name": "/src/04-advanced-components/23-destructuring-discriminated-unions.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/23-destructuring-discriminated-unions.solution.1.tsx",
-      "name": "/src/04-advanced-components/23-destructuring-discriminated-unions.solution.1.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/23-destructuring-discriminated-unions.solution.2.tsx",
-      "name": "/src/04-advanced-components/23-destructuring-discriminated-unions.solution.2.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/24-discriminated-union-with-other-props.problem.tsx",
-      "name": "/src/04-advanced-components/24-discriminated-union-with-other-props.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/24-discriminated-union-with-other-props.solution.tsx",
-      "name": "/src/04-advanced-components/24-discriminated-union-with-other-props.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/25-either-all-these-props-or-none.problem.tsx",
-      "name": "/src/04-advanced-components/25-either-all-these-props-or-none.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/25-either-all-these-props-or-none.solution.1.tsx",
-      "name": "/src/04-advanced-components/25-either-all-these-props-or-none.solution.1.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/25-either-all-these-props-or-none.solution.2.tsx",
-      "name": "/src/04-advanced-components/25-either-all-these-props-or-none.solution.2.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/25-either-all-these-props-or-none.solution.3.tsx",
-      "name": "/src/04-advanced-components/25-either-all-these-props-or-none.solution.3.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/26-partial-autocomplete.problem.tsx",
-      "name": "/src/04-advanced-components/26-partial-autocomplete.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.problem.tsx",
-      "name": "/src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.solution.1.tsx",
-      "name": "/src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.solution.1.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.solution.2.tsx",
-      "name": "/src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.solution.2.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/28-generic-props.problem.tsx",
-      "name": "/src/04-advanced-components/28-generic-props.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/28-generic-props.solution.tsx",
-      "name": "/src/04-advanced-components/28-generic-props.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/29-generics-vs-discriminated-unions.problem.tsx",
-      "name": "/src/04-advanced-components/29-generics-vs-discriminated-unions.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/29-generics-vs-discriminated-unions.solution.tsx",
-      "name": "/src/04-advanced-components/29-generics-vs-discriminated-unions.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/30-variants-with-classnames.problem.tsx",
-      "name": "/src/04-advanced-components/30-variants-with-classnames.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/30-variants-with-classnames.solution.tsx",
-      "name": "/src/04-advanced-components/30-variants-with-classnames.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/31-prop-groups-with-variants.problem.tsx",
-      "name": "/src/04-advanced-components/31-prop-groups-with-variants.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/31-prop-groups-with-variants.solution.1.tsx",
-      "name": "/src/04-advanced-components/31-prop-groups-with-variants.solution.1.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/04-advanced-components/31-prop-groups-with-variants.solution.2.tsx",
-      "name": "/src/04-advanced-components/31-prop-groups-with-variants.solution.2.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/05-advanced-hooks/32-typing-custom-hooks.problem.ts",
-      "name": "/src/05-advanced-hooks/32-typing-custom-hooks.problem.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/05-advanced-hooks/32-typing-custom-hooks.solution.1.ts",
-      "name": "/src/05-advanced-hooks/32-typing-custom-hooks.solution.1.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/05-advanced-hooks/32-typing-custom-hooks.solution.2.ts",
-      "name": "/src/05-advanced-hooks/32-typing-custom-hooks.solution.2.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/05-advanced-hooks/32-typing-custom-hooks.solution.3.ts",
-      "name": "/src/05-advanced-hooks/32-typing-custom-hooks.solution.3.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "Cannot read properties of null (reading 'useState')",
-      "name": "/src/05-advanced-hooks/33-tuple-return-type.problem.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "Cannot read properties of null (reading 'useState')",
-      "name": "/src/05-advanced-hooks/33-tuple-return-type.solution.1.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "Cannot read properties of null (reading 'useState')",
-      "name": "/src/05-advanced-hooks/33-tuple-return-type.solution.2.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/05-advanced-hooks/34-discriminated-unions-with-booleans.problem.ts",
-      "name": "/src/05-advanced-hooks/34-discriminated-unions-with-booleans.problem.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "Cannot read properties of null (reading 'useState')",
-      "name": "/src/05-advanced-hooks/35-generic-hooks.problem.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "Cannot read properties of null (reading 'useState')",
-      "name": "/src/05-advanced-hooks/35-generic-hooks.solution.1.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "Cannot read properties of null (reading 'useState')",
-      "name": "/src/05-advanced-hooks/35-generic-hooks.solution.2.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "Cannot read properties of null (reading 'useState')",
-      "name": "/src/05-advanced-hooks/35-generic-hooks.solution.3.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "Cannot read properties of null (reading 'useState')",
-      "name": "/src/05-advanced-hooks/35-generic-hooks.solution.4.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "Cannot read properties of null (reading 'useState')",
-      "name": "/src/05-advanced-hooks/35-generic-hooks.solution.5.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "Cannot read properties of null (reading 'useState')",
-      "name": "/src/05-advanced-hooks/36-function-overloads-in-hooks.problem.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "Cannot read properties of null (reading 'useState')",
-      "name": "/src/05-advanced-hooks/36-function-overloads-in-hooks.solution.1.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "Cannot read properties of null (reading 'useState')",
-      "name": "/src/05-advanced-hooks/36-function-overloads-in-hooks.solution.2.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [
-        {
-          "ancestorTitles": [
-            "",
-          ],
-          "failureMessages": [],
-          "fullName": " Should let you set and get values",
-          "status": "passed",
-          "title": "Should let you set and get values",
-        },
-        {
-          "ancestorTitles": [
-            "",
-          ],
-          "failureMessages": [],
-          "fullName": " Should not let you set a value that is not the same type as the type argument passed",
-          "status": "passed",
-          "title": "Should not let you set a value that is not the same type as the type argument passed",
-        },
-      ],
-      "message": "",
-      "name": "/src/05-advanced-hooks/37-generic-localstorage-hook.problem.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [
-        {
-          "ancestorTitles": [
-            "",
-          ],
-          "failureMessages": [],
-          "fullName": " Should let you set and get values",
-          "status": "passed",
-          "title": "Should let you set and get values",
-        },
-        {
-          "ancestorTitles": [
-            "",
-          ],
-          "failureMessages": [],
-          "fullName": " Should not let you set a value that is not the same type as the type argument passed",
-          "status": "passed",
-          "title": "Should not let you set a value that is not the same type as the type argument passed",
-        },
-      ],
-      "message": "",
-      "name": "/src/05-advanced-hooks/37-generic-localstorage-hook.solution.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [
-        {
-          "ancestorTitles": [
-            "",
-          ],
-          "failureMessages": [],
-          "fullName": " Should let you set and get values",
-          "status": "passed",
-          "title": "Should let you set and get values",
-        },
-        {
-          "ancestorTitles": [
-            "",
-          ],
-          "failureMessages": [],
-          "fullName": " Should not let you set a value that is not the same type as the type argument passed",
-          "status": "passed",
-          "title": "Should not let you set a value that is not the same type as the type argument passed",
-        },
-      ],
-      "message": "",
-      "name": "/src/05-advanced-hooks/38-generic-localstorage-hook-with-zod.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [
-        {
-          "ancestorTitles": [
-            "",
-          ],
-          "failureMessages": [],
-          "fullName": " Should let you set and get values",
-          "status": "passed",
-          "title": "Should let you set and get values",
-        },
-        {
-          "ancestorTitles": [
-            "",
-          ],
-          "failureMessages": [],
-          "fullName": " Should not let you set a value that is not the same type as the type argument passed",
-          "status": "passed",
-          "title": "Should not let you set a value that is not the same type as the type argument passed",
-        },
-      ],
-      "message": "",
-      "name": "/src/05-advanced-hooks/38-generic-localstorage-hook-with-zod.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/05-advanced-hooks/39-unions-in-usestate.problem.tsx",
-      "name": "/src/05-advanced-hooks/39-unions-in-usestate.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/05-advanced-hooks/39-unions-in-usestate.solution.tsx",
-      "name": "/src/05-advanced-hooks/39-unions-in-usestate.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/05-advanced-hooks/40-discriminated-unions-in-usestate.problem.tsx",
-      "name": "/src/05-advanced-hooks/40-discriminated-unions-in-usestate.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/05-advanced-hooks/40-discriminated-unions-in-usestate.solution.tsx",
-      "name": "/src/05-advanced-hooks/40-discriminated-unions-in-usestate.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/05-advanced-hooks/41-discriminated-union-returns-from-custom-hooks.problem.ts",
-      "name": "/src/05-advanced-hooks/41-discriminated-union-returns-from-custom-hooks.problem.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/05-advanced-hooks/42-discriminated-tuples-from-custom-hooks.problem.tsx",
-      "name": "/src/05-advanced-hooks/42-discriminated-tuples-from-custom-hooks.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/05-advanced-hooks/42-discriminated-tuples-from-custom-hooks.solution.tsx",
-      "name": "/src/05-advanced-hooks/42-discriminated-tuples-from-custom-hooks.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/06-types-deep-dive/43-understand-react-namespace-export.explainer.ts",
-      "name": "/src/06-types-deep-dive/43-understand-react-namespace-export.explainer.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/06-types-deep-dive/44-understanding-jsx-element.explainer.tsx",
-      "name": "/src/06-types-deep-dive/44-understanding-jsx-element.explainer.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/06-types-deep-dive/45-strongly-typing-children.problem.tsx",
-      "name": "/src/06-types-deep-dive/45-strongly-typing-children.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/06-types-deep-dive/46-how-does-react-represent-html.explainer.ts",
-      "name": "/src/06-types-deep-dive/46-how-does-react-represent-html.explainer.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/06-types-deep-dive/46-understanding-jsx-intrinsic-elements.explainer.ts",
-      "name": "/src/06-types-deep-dive/46-understanding-jsx-intrinsic-elements.explainer.ts",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/06-types-deep-dive/47-add-new-global-element.problem.tsx",
-      "name": "/src/06-types-deep-dive/47-add-new-global-element.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/06-types-deep-dive/48-add-attribute-to-all-elements.problem.tsx",
-      "name": "/src/06-types-deep-dive/48-add-attribute-to-all-elements.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/06-types-deep-dive/49-add-attribute-to-audio-elements.problem.tsx",
-      "name": "/src/06-types-deep-dive/49-add-attribute-to-audio-elements.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/06-types-deep-dive/50-add-attribute-to-div-elements.problem.tsx",
-      "name": "/src/06-types-deep-dive/50-add-attribute-to-div-elements.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/07-advanced-patterns/51-required-context.problem.tsx",
-      "name": "/src/07-advanced-patterns/51-required-context.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/07-advanced-patterns/51-required-context.solution.1.tsx",
-      "name": "/src/07-advanced-patterns/51-required-context.solution.1.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/07-advanced-patterns/51-required-context.solution.2.tsx",
-      "name": "/src/07-advanced-patterns/51-required-context.solution.2.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/07-advanced-patterns/52-compound-components.problem.tsx",
-      "name": "/src/07-advanced-patterns/52-compound-components.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/07-advanced-patterns/53-forward-ref-with-generics.explainer.1.tsx",
-      "name": "/src/07-advanced-patterns/53-forward-ref-with-generics.explainer.1.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/07-advanced-patterns/53-forward-ref-with-generics.explainer.2.tsx",
-      "name": "/src/07-advanced-patterns/53-forward-ref-with-generics.explainer.2.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/07-advanced-patterns/54-hoc-problem.tsx",
-      "name": "/src/07-advanced-patterns/54-hoc-problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/07-advanced-patterns/55-as-prop.problem.tsx",
-      "name": "/src/07-advanced-patterns/55-as-prop.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/07-advanced-patterns/55-as-prop.solution.1.tsx",
-      "name": "/src/07-advanced-patterns/55-as-prop.solution.1.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/07-advanced-patterns/55-as-prop.solution.2.tsx",
-      "name": "/src/07-advanced-patterns/55-as-prop.solution.2.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/07-advanced-patterns/56-as-prop-with-custom-components.problem.tsx",
-      "name": "/src/07-advanced-patterns/56-as-prop-with-custom-components.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/07-advanced-patterns/56-as-prop-with-custom-components.solution.tsx",
-      "name": "/src/07-advanced-patterns/56-as-prop-with-custom-components.solution.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/07-advanced-patterns/57-render-props.problem.tsx",
-      "name": "/src/07-advanced-patterns/57-render-props.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/07-advanced-patterns/58-render-props-with-generics.problem.tsx",
-      "name": "/src/07-advanced-patterns/58-render-props-with-generics.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/07-advanced-patterns/59-record-of-components-with-same-props.problem.tsx",
-      "name": "/src/07-advanced-patterns/59-record-of-components-with-same-props.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/08-external-libraries/60-react-hook-form.problem.tsx",
-      "name": "/src/08-external-libraries/60-react-hook-form.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/08-external-libraries/61-react-query.problem.tsx",
-      "name": "/src/08-external-libraries/61-react-query.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/08-external-libraries/62-redux-toolkit.problem.tsx",
-      "name": "/src/08-external-libraries/62-redux-toolkit.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/08-external-libraries/63-zustand.problem.tsx",
-      "name": "/src/08-external-libraries/63-zustand.problem.tsx",
-      "status": "passed",
-    },
-    {
-      "assertionResults": [],
-      "message": "No test found in suite src/08-external-libraries/64-reusable-form-library-with-zod.problem.tsx",
-      "name": "/src/08-external-libraries/64-reusable-form-library-with-zod.problem.tsx",
-      "status": "passed",
-    },
-  ],
-}
-`;
diff --git a/scripts/tests/all.test.ts b/scripts/tests/all.test.ts
deleted file mode 100644
index fe5ea8d..0000000
--- a/scripts/tests/all.test.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import path from "path";
-import { describe, expect, it } from "vitest";
-import { execSync } from "child_process";
-import { cleanVitestOutput } from "./cleanVitestOutput";
-
-const rootFolder = path.resolve(__dirname, "../..");
-
-const sanitizeForRegex = (str: string) => {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); // $& means the whole matched string
-};
-
-describe("tsc", async () => {
-  it("Should have the correct TypeScript errors", () => {
-    let result: string;
-
-    try {
-      result = execSync(`npx tsc`, {
-        cwd: rootFolder,
-      }).toString();
-    } catch (error) {
-      result = error.output.toString();
-    }
-
-    result = result.replace(new RegExp(sanitizeForRegex(rootFolder), "g"), "");
-
-    expect(result).toMatchSnapshot();
-  });
-});
-
-describe("vitest", async () => {
-  it("Should have the correct Vitest errors", () => {
-    let result: string;
-
-    try {
-      result = execSync(`npx vitest run --reporter=json`, {
-        cwd: rootFolder,
-        stdio: "pipe",
-      }).toString();
-    } catch (error) {
-      result = error.output.toString();
-    }
-
-    result = result.replace(new RegExp(sanitizeForRegex(rootFolder), "g"), "");
-
-    expect(
-      cleanVitestOutput(result, {
-        rootFolder,
-      }),
-    ).toMatchSnapshot();
-  });
-});
diff --git a/scripts/tests/cleanVitestOutput.ts b/scripts/tests/cleanVitestOutput.ts
deleted file mode 100644
index 81efa6b..0000000
--- a/scripts/tests/cleanVitestOutput.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import path from "path";
-
-export const cleanVitestOutput = (
-  result: string,
-  context: {
-    rootFolder: string;
-  },
-) => {
-  const asJson: {
-    startTime?: number;
-    endTime?: number;
-    duration?: number;
-    numFailedTestSuites?: number;
-    numFailedTests?: number;
-    numPassedTestSuites?: number;
-    numPassedTests?: number;
-    numPendingTestSuites?: number;
-    numPendingTests?: number;
-    numTodoTests?: number;
-    numTotalTestSuites?: number;
-    numTotalTests?: number;
-    testResults: {
-      name: string;
-      startTime?: number;
-      endTime?: number;
-      duration?: number;
-      assertionResults: {
-        duration?: number;
-      }[];
-    }[];
-  } = JSON.parse(result.slice(1, -1));
-
-  delete asJson.startTime;
-  delete asJson.endTime;
-  delete asJson.duration;
-  delete asJson.numFailedTestSuites;
-  delete asJson.numFailedTests;
-  delete asJson.numPassedTestSuites;
-  delete asJson.numPassedTests;
-  delete asJson.numPendingTestSuites;
-  delete asJson.numPendingTests;
-  delete asJson.numTodoTests;
-  delete asJson.numTotalTestSuites;
-  delete asJson.numTotalTests;
-
-  asJson.testResults.forEach((testResult) => {
-    delete testResult.startTime;
-    delete testResult.endTime;
-    delete testResult.duration;
-
-    // testResult.name = path.relative(context.rootFolder, testResult.name);
-
-    testResult.assertionResults.forEach((assertionResult) => {
-      delete assertionResult.duration;
-    });
-  });
-
-  asJson.testResults.sort((a, b) => a.name.localeCompare(b.name));
-
-  return asJson;
-};
diff --git a/scripts/tests/vite.config.ts b/scripts/tests/vite.config.ts
deleted file mode 100644
index 8fb6f2d..0000000
--- a/scripts/tests/vite.config.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { defineConfig } from "vitest/config";
-
-export default defineConfig({});
diff --git a/src/04-advanced-components/24-discriminated-union-with-other-props.problem.tsx b/src/04-advanced-components/24-discriminated-union-with-other-props.problem.tsx
deleted file mode 100644
index d40cdbe..0000000
--- a/src/04-advanced-components/24-discriminated-union-with-other-props.problem.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-type ModalProps =
-  | {
-      variant: "no-title";
-    }
-  | {
-      variant: "title";
-      title: string;
-    };
-
-export const Modal = (props: ModalProps) => {
-  if (props.variant === "no-title") {
-    return <div>No title</div>;
-  } else {
-    return <div>Title: {props.title}</div>;
-  }
-};
-
-export const Test = () => {
-  return (
-    <div>
-      {/* @ts-expect-error */}
-      <Modal buttonColor="red" />
-      <Modal
-        buttonColor="red"
-        variant="no-title"
-        // @ts-expect-error
-        title="Oh dear"
-      />
-      <Modal variant="title" title="Hello" buttonColor="red" />
-    </div>
-  );
-};
diff --git a/src/04-advanced-components/24-discriminated-union-with-other-props.solution.tsx b/src/04-advanced-components/24-discriminated-union-with-other-props.solution.tsx
deleted file mode 100644
index e73e067..0000000
--- a/src/04-advanced-components/24-discriminated-union-with-other-props.solution.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-// How to use discriminated unions in props
-// With variant
-
-type ModalProps = (
-  | {
-      variant: "no-title";
-    }
-  | {
-      variant: "title";
-      title: string;
-    }
-) & {
-  buttonColor: string;
-};
-
-export const Modal = (props: ModalProps) => {
-  if (props.variant === "no-title") {
-    return <div>No title</div>;
-  } else {
-    return <div>Title: {props.title}</div>;
-  }
-};
-
-export const Test = () => {
-  return (
-    <div>
-      {/* @ts-expect-error */}
-      <Modal buttonColor="red" />
-      <Modal
-        buttonColor="red"
-        variant="no-title"
-        // @ts-expect-error
-        title="Oh dear"
-      />
-      <Modal variant="title" title="Hello" buttonColor="red" />
-    </div>
-  );
-};
diff --git a/src/04-advanced-components/26-partial-autocomplete.problem.tsx b/src/04-advanced-components/26-partial-autocomplete.problem.tsx
deleted file mode 100644
index 70b786d..0000000
--- a/src/04-advanced-components/26-partial-autocomplete.problem.tsx
+++ /dev/null
@@ -1 +0,0 @@
-// TODO
diff --git a/src/04-advanced-components/31-prop-groups-with-variants.solution.1.tsx b/src/04-advanced-components/31-prop-groups-with-variants.solution.1.tsx
deleted file mode 100644
index c9389dc..0000000
--- a/src/04-advanced-components/31-prop-groups-with-variants.solution.1.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { ComponentProps } from "react";
-
-const buttonPropsMap: Record<string, ComponentProps<"button">> = {
-  reset: {
-    className: "bg-blue-500 text-white",
-    type: "reset",
-  },
-  submit: {
-    className: "bg-gray-200 text-black",
-    type: "submit",
-  },
-  next: {
-    className: "bg-green-500 text-white",
-    type: "button",
-  },
-};
-
-type ButtonProps = {
-  variant: keyof typeof buttonPropsMap;
-};
-
-export const Button = (props: ButtonProps) => {
-  return <button {...buttonPropsMap[props.variant]}>Click me</button>;
-};
-
-const Parent = () => {
-  return (
-    <>
-      <Button variant="next"></Button>
-      <Button variant="reset"></Button>
-      <Button variant="submit"></Button>
-
-      {/* @ts-expect-error */}
-      <Button variant="something"></Button>
-      {/* @ts-expect-error */}
-      <Button></Button>
-    </>
-  );
-};
diff --git a/src/04-advanced-components/22-discriminated-union-props.problem.tsx b/src/04-advanced-props/22-discriminated-union-props.problem.tsx
similarity index 60%
rename from src/04-advanced-components/22-discriminated-union-props.problem.tsx
rename to src/04-advanced-props/22-discriminated-union-props.problem.tsx
index 40cc325..6116410 100644
--- a/src/04-advanced-components/22-discriminated-union-props.problem.tsx
+++ b/src/04-advanced-props/22-discriminated-union-props.problem.tsx
@@ -1,5 +1,12 @@
-// How to use discriminated unions in props
-// With variant
+/**
+ * 1. Currently, ModalProps lets you pass in various impossible combinations of props.
+ *
+ * For instance, you can pass in a `variant` of "title" without passing in a title,
+ * or you can pass in a `variant` of "no-title" WITH a title.
+ *
+ * Try to find a way to express ModalProps so that it's impossible to pass in
+ * impossible combinations of props.
+ */
 
 type ModalProps = {
   variant: "no-title" | "title";
diff --git a/src/04-advanced-components/22-discriminated-union-props.solution.tsx b/src/04-advanced-props/22-discriminated-union-props.solution.tsx
similarity index 90%
rename from src/04-advanced-components/22-discriminated-union-props.solution.tsx
rename to src/04-advanced-props/22-discriminated-union-props.solution.tsx
index 3d33f9d..4e53792 100644
--- a/src/04-advanced-components/22-discriminated-union-props.solution.tsx
+++ b/src/04-advanced-props/22-discriminated-union-props.solution.tsx
@@ -1,6 +1,3 @@
-// How to use discriminated unions in props
-// With variant
-
 type ModalProps =
   | {
       variant: "no-title";
diff --git a/src/04-advanced-components/23-destructuring-discriminated-unions.problem.tsx b/src/04-advanced-props/23-destructuring-discriminated-unions.problem.tsx
similarity index 74%
rename from src/04-advanced-components/23-destructuring-discriminated-unions.problem.tsx
rename to src/04-advanced-props/23-destructuring-discriminated-unions.problem.tsx
index c8ea0f8..5a2c1c0 100644
--- a/src/04-advanced-components/23-destructuring-discriminated-unions.problem.tsx
+++ b/src/04-advanced-props/23-destructuring-discriminated-unions.problem.tsx
@@ -1,5 +1,11 @@
-// How to use discriminated unions in props
-// With variant
+/**
+ * We've got the same problem as the previous exercise, but this time we're
+ * destructuring our props.
+ *
+ * 1. Figure out why the error on 'title' is happening.
+ *
+ * 2. Find a way to fix the error.
+ */
 
 type ModalProps =
   | {
diff --git a/src/04-advanced-components/23-destructuring-discriminated-unions.solution.1.tsx b/src/04-advanced-props/23-destructuring-discriminated-unions.solution.1.tsx
similarity index 80%
rename from src/04-advanced-components/23-destructuring-discriminated-unions.solution.1.tsx
rename to src/04-advanced-props/23-destructuring-discriminated-unions.solution.1.tsx
index 18beba5..40824ab 100644
--- a/src/04-advanced-components/23-destructuring-discriminated-unions.solution.1.tsx
+++ b/src/04-advanced-props/23-destructuring-discriminated-unions.solution.1.tsx
@@ -1,6 +1,3 @@
-// How to use discriminated unions in props
-// With variant
-
 type ModalProps =
   | {
       variant: "no-title";
@@ -10,6 +7,10 @@ type ModalProps =
       title: string;
     };
 
+/**
+ * Sadly, this doesn't work - TypeScript can't figure out from narrowing
+ * the destructured variant that the title is now available.
+ */
 export const Modal = ({ variant, ...props }: ModalProps) => {
   if (variant === "no-title") {
     return <div>No title</div>;
diff --git a/src/04-advanced-components/23-destructuring-discriminated-unions.solution.2.tsx b/src/04-advanced-props/23-destructuring-discriminated-unions.solution.2.tsx
similarity index 73%
rename from src/04-advanced-components/23-destructuring-discriminated-unions.solution.2.tsx
rename to src/04-advanced-props/23-destructuring-discriminated-unions.solution.2.tsx
index 36f9f9b..d9a6866 100644
--- a/src/04-advanced-components/23-destructuring-discriminated-unions.solution.2.tsx
+++ b/src/04-advanced-props/23-destructuring-discriminated-unions.solution.2.tsx
@@ -1,6 +1,3 @@
-// How to use discriminated unions in props
-// With variant
-
 type ModalProps =
   | {
       variant: "no-title";
@@ -10,6 +7,12 @@ type ModalProps =
       title: string;
     };
 
+/**
+ * The best solution is to destructure AFTER the variant has been narrowed.
+ *
+ * This gives TypeScript the chance to apply the narrowing to the 'props' object,
+ * which it understands that 'variant' is a property of.
+ */
 export const Modal = (props: ModalProps) => {
   if (props.variant === "no-title") {
     return <div>No title</div>;
diff --git a/src/04-advanced-props/24-discriminated-union-with-other-props.problem.tsx b/src/04-advanced-props/24-discriminated-union-with-other-props.problem.tsx
new file mode 100644
index 0000000..358bc67
--- /dev/null
+++ b/src/04-advanced-props/24-discriminated-union-with-other-props.problem.tsx
@@ -0,0 +1,58 @@
+type ModalProps =
+  | {
+      variant: "no-title";
+    }
+  | {
+      variant: "title";
+      title: string;
+    };
+
+/**
+ * 1. How do we add a `buttonColor` prop to the `ModalProps` type that is
+ * _always_ required across different variants?
+ */
+export const Modal = (props: ModalProps) => {
+  if (props.variant === "no-title") {
+    return (
+      <div>
+        <span>No title</span>
+        <button
+          style={{
+            backgroundColor: props.buttonColor,
+          }}
+        >
+          Click me!
+        </button>
+      </div>
+    );
+  } else {
+    return (
+      <div>
+        <span>Title: {props.title}</span>
+        <button
+          style={{
+            backgroundColor: props.buttonColor,
+          }}
+        >
+          Click me!
+        </button>
+      </div>
+    );
+  }
+};
+
+export const Test = () => {
+  return (
+    <div>
+      {/* @ts-expect-error */}
+      <Modal buttonColor="red" />
+      <Modal
+        buttonColor="red"
+        variant="no-title"
+        // @ts-expect-error
+        title="Oh dear"
+      />
+      <Modal variant="title" title="Hello" buttonColor="red" />
+    </div>
+  );
+};
diff --git a/src/04-advanced-props/24-discriminated-union-with-other-props.solution.tsx b/src/04-advanced-props/24-discriminated-union-with-other-props.solution.tsx
new file mode 100644
index 0000000..942479a
--- /dev/null
+++ b/src/04-advanced-props/24-discriminated-union-with-other-props.solution.tsx
@@ -0,0 +1,62 @@
+/**
+ * This works because of the parentheses around the discriminated union.
+ *
+ * 1. Try removing the parentheses, and try to explain the behaviour you notice.
+ */
+type ModalProps = (
+  | {
+      variant: "no-title";
+    }
+  | {
+      variant: "title";
+      title: string;
+    }
+) & {
+  buttonColor: string;
+};
+
+export const Modal = (props: ModalProps) => {
+  if (props.variant === "no-title") {
+    return (
+      <div>
+        <span>No title</span>
+        <button
+          style={{
+            backgroundColor: props.buttonColor,
+          }}
+        >
+          Click me!
+        </button>
+      </div>
+    );
+  } else {
+    return (
+      <div>
+        <span>Title: {props.title}</span>
+        <button
+          style={{
+            backgroundColor: props.buttonColor,
+          }}
+        >
+          Click me!
+        </button>
+      </div>
+    );
+  }
+};
+
+export const Test = () => {
+  return (
+    <div>
+      {/* @ts-expect-error */}
+      <Modal buttonColor="red" />
+      <Modal
+        buttonColor="red"
+        variant="no-title"
+        // @ts-expect-error
+        title="Oh dear"
+      />
+      <Modal variant="title" title="Hello" buttonColor="red" />
+    </div>
+  );
+};
diff --git a/src/04-advanced-props/25-toggle-props.problem.tsx b/src/04-advanced-props/25-toggle-props.problem.tsx
new file mode 100644
index 0000000..b3fe172
--- /dev/null
+++ b/src/04-advanced-props/25-toggle-props.problem.tsx
@@ -0,0 +1,44 @@
+/**
+ * In this exercise, we've got an EmbeddedPlayground component that can either
+ * use Stackblitz or CodeSandbox.
+ *
+ * We want to make sure that if useStackblitz is true, then stackblitzId is
+ * required. If useStackblitz is false (or not specified), then codeSandboxId
+ * is required.
+ *
+ * 1. Rewrite the EmbeddedPlaygroundProps type so that it enforces this.
+ *
+ * Hint - you'll need a discriminated union!
+ */
+
+type EmbeddedPlaygroundProps = {
+  useStackblitz?: boolean;
+  stackblitzId?: string;
+  codeSandboxId?: string;
+};
+
+const EmbeddedPlayground = (props: EmbeddedPlaygroundProps) => {
+  if (props.useStackblitz) {
+    return (
+      <iframe
+        src={`https://stackblitz.com/edit/${props.stackblitzId}?embed=1`}
+      />
+    );
+  }
+
+  return <iframe src={`https://codesandbox.io/embed/${props.codeSandboxId}`} />;
+};
+
+<>
+  <EmbeddedPlayground useStackblitz stackblitzId="my-stackblitz-id" />
+  <EmbeddedPlayground codeSandboxId="my-codesandbox-id" />
+
+  <EmbeddedPlayground
+    useStackblitz
+    // @ts-expect-error
+    codeSandboxId="my-codesandbox-id"
+  />
+
+  {/* @ts-expect-error */}
+  <EmbeddedPlayground stackblitzId="my-stackblitz-id" />
+</>;
diff --git a/src/04-advanced-props/25-toggle-props.solution.tsx b/src/04-advanced-props/25-toggle-props.solution.tsx
new file mode 100644
index 0000000..44bcca9
--- /dev/null
+++ b/src/04-advanced-props/25-toggle-props.solution.tsx
@@ -0,0 +1,40 @@
+/**
+ * This is just another kind of discriminated union - one based on a
+ * boolean, not a string.
+ *
+ * Note that we use an optional property for the boolean in the
+ * CodeSandbox version, because if the user doesn't specify it (passes
+ * undefined), we want to default to it.
+ */
+type EmbeddedPlaygroundProps =
+  | {
+      useStackblitz: true;
+      stackblitzId: string;
+    }
+  | {
+      useStackblitz?: false;
+      codeSandboxId: string;
+    };
+
+const EmbeddedPlayground = (props: EmbeddedPlaygroundProps) => {
+  if (props.useStackblitz) {
+    return (
+      <iframe
+        src={`https://stackblitz.com/edit/${props.stackblitzId}?embed=1`}
+      />
+    );
+  }
+
+  return <iframe src={`https://codesandbox.io/embed/${props.codeSandboxId}`} />;
+};
+
+<>
+  <EmbeddedPlayground useStackblitz stackblitzId="my-stackblitz-id" />
+  <EmbeddedPlayground codeSandboxId="my-codesandbox-id" />
+
+  <EmbeddedPlayground
+    useStackblitz
+    // @ts-expect-error
+    codeSandboxId="my-codesandbox-id"
+  />
+</>;
diff --git a/src/04-advanced-props/26-empty-object-type.explainer.tsx b/src/04-advanced-props/26-empty-object-type.explainer.tsx
new file mode 100644
index 0000000..26b1471
--- /dev/null
+++ b/src/04-advanced-props/26-empty-object-type.explainer.tsx
@@ -0,0 +1,15 @@
+const Component = (props: { config: {} }) => {
+  return <div />;
+};
+
+/**
+ * Why can I pass _anything_ to config?
+ */
+<>
+  <Component
+    config={{
+      foo: "bar",
+      whatever: {},
+    }}
+  />
+</>;
diff --git a/src/04-advanced-components/25-either-all-these-props-or-none.problem.tsx b/src/04-advanced-props/27-either-all-these-props-or-none.problem.tsx
similarity index 68%
rename from src/04-advanced-components/25-either-all-these-props-or-none.problem.tsx
rename to src/04-advanced-props/27-either-all-these-props-or-none.problem.tsx
index b652c53..147cac7 100644
--- a/src/04-advanced-components/25-either-all-these-props-or-none.problem.tsx
+++ b/src/04-advanced-props/27-either-all-these-props-or-none.problem.tsx
@@ -1,5 +1,15 @@
 import { ChangeEventHandler } from "react";
 
+/**
+ * In this exercise, we want to create a component that can either have
+ * `value` and `onChange` props, or neither of those props.
+ *
+ * We ALSO want to have label as a required prop.
+ *
+ * 1. Figure out why the errors are occurring on the `Test` component.
+ *
+ * 2. Find a way to fix the errors.
+ */
 type InputProps = (
   | {
       value: string;
diff --git a/src/04-advanced-components/25-either-all-these-props-or-none.solution.1.tsx b/src/04-advanced-props/27-either-all-these-props-or-none.solution.tsx
similarity index 100%
rename from src/04-advanced-components/25-either-all-these-props-or-none.solution.1.tsx
rename to src/04-advanced-props/27-either-all-these-props-or-none.solution.tsx
diff --git a/src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.problem.tsx b/src/04-advanced-props/28-passing-react-components-vs-passing-react-nodes.problem.tsx
similarity index 73%
rename from src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.problem.tsx
rename to src/04-advanced-props/28-passing-react-components-vs-passing-react-nodes.problem.tsx
index e88422a..862a470 100644
--- a/src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.problem.tsx
+++ b/src/04-advanced-props/28-passing-react-components-vs-passing-react-nodes.problem.tsx
@@ -1,5 +1,12 @@
 import { Equal, Expect } from "../helpers/type-utils";
 
+/**
+ * 1. We've got a bunch of different errors below. See if you can figure
+ * out why the errors are happening.
+ *
+ * 2. Once you understand why the errors are happening, see if you can
+ * find a way to fix them by changing the definition of TableProps.
+ */
 interface TableProps {
   renderRow: React.ReactNode;
 }
diff --git a/src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.solution.2.tsx b/src/04-advanced-props/28-passing-react-components-vs-passing-react-nodes.solution.1.tsx
similarity index 78%
rename from src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.solution.2.tsx
rename to src/04-advanced-props/28-passing-react-components-vs-passing-react-nodes.solution.1.tsx
index d83fb6e..ec06f80 100644
--- a/src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.solution.2.tsx
+++ b/src/04-advanced-props/28-passing-react-components-vs-passing-react-nodes.solution.1.tsx
@@ -1,5 +1,13 @@
 import { Equal, Expect } from "../helpers/type-utils";
 
+/**
+ * The errors are happening because the dev didn't understand what
+ * React.ReactNode was for.
+ *
+ * By changing it to a function which returns a React.ReactNode,
+ * we can fix the errors.
+ */
+
 interface TableProps {
   renderRow: (rowIndex: number) => React.ReactNode;
 }
diff --git a/src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.solution.1.tsx b/src/04-advanced-props/28-passing-react-components-vs-passing-react-nodes.solution.2.tsx
similarity index 90%
rename from src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.solution.1.tsx
rename to src/04-advanced-props/28-passing-react-components-vs-passing-react-nodes.solution.2.tsx
index bc04410..e2c2e39 100644
--- a/src/04-advanced-components/27-passing-react-components-vs-passing-react-nodes.solution.1.tsx
+++ b/src/04-advanced-props/28-passing-react-components-vs-passing-react-nodes.solution.2.tsx
@@ -1,5 +1,8 @@
 import { Equal, Expect } from "../helpers/type-utils";
 
+/**
+ * We can also use React.FC in this position to fix the errors.
+ */
 interface TableProps {
   renderRow: React.FC<number>;
 }
diff --git a/src/04-advanced-components/30-variants-with-classnames.problem.tsx b/src/04-advanced-props/29-variants-with-classnames.problem.tsx
similarity index 84%
rename from src/04-advanced-components/30-variants-with-classnames.problem.tsx
rename to src/04-advanced-props/29-variants-with-classnames.problem.tsx
index ad71401..9d79660 100644
--- a/src/04-advanced-components/30-variants-with-classnames.problem.tsx
+++ b/src/04-advanced-props/29-variants-with-classnames.problem.tsx
@@ -9,8 +9,10 @@ type ButtonProps = {
    * This isn't ideal - we have to manually sync
    * the type of variant with the object above.
    *
-   * How do we type this so that there's a single
-   * source of truth for the variant?
+   * 1. How do we rearrange this code so that we don't
+   * have to manually sync the types?
+   *
+   * Hint: you'll need 'typeof' and 'keyof'.
    */
   variant: "primary" | "secondary" | "success";
 };
diff --git a/src/04-advanced-components/30-variants-with-classnames.solution.tsx b/src/04-advanced-props/29-variants-with-classnames.solution.tsx
similarity index 74%
rename from src/04-advanced-components/30-variants-with-classnames.solution.tsx
rename to src/04-advanced-props/29-variants-with-classnames.solution.tsx
index eddbe0e..736a5f1 100644
--- a/src/04-advanced-components/30-variants-with-classnames.solution.tsx
+++ b/src/04-advanced-props/29-variants-with-classnames.solution.tsx
@@ -1,11 +1,16 @@
-// keyof/typeof/as const
-
 const classNamesMap = {
   primary: "bg-blue-500 text-white",
   secondary: "bg-gray-200 text-black",
   success: "bg-green-500 text-white",
 };
 
+/**
+ * By using 'typeof' and 'keyof', we can _derive_ the type of
+ * variant from the classNamesMap object.
+ *
+ * 1. Try adding a new key to classNamesMap, and see how the
+ * type of variant automatically updates.
+ */
 type ButtonProps = {
   variant: keyof typeof classNamesMap;
 };
diff --git a/src/04-advanced-props/30-partial-autocomplete.problem.tsx b/src/04-advanced-props/30-partial-autocomplete.problem.tsx
new file mode 100644
index 0000000..55b2232
--- /dev/null
+++ b/src/04-advanced-props/30-partial-autocomplete.problem.tsx
@@ -0,0 +1,50 @@
+const presetSizes = {
+  xs: "0.5rem",
+  sm: "1rem",
+};
+
+type Size = keyof typeof presetSizes;
+
+/**
+ * In this exercise, we're using presetSizes to
+ * provide a set of preset sizes for our Icon component.
+ *
+ * We want to allow users to pass in either a string, or
+ * a Size. But there's an issue (see below).
+ */
+
+type LooseSize = Size | string;
+
+export const Icon = (props: { size: LooseSize }) => {
+  return (
+    <div
+      style={{
+        width:
+          props.size in presetSizes
+            ? presetSizes[
+                /**
+                 * The 'as' is necessary here because TS can't seem to narrow
+                 * props.size to Size properly
+                 */
+                props.size as Size
+              ]
+            : props.size,
+      }}
+    />
+  );
+};
+
+<>
+  {/* Autocomplete for sm and xs are no longer working! */}
+  {/* We want to have autocomplete for the 'size' while still being */}
+  {/* able to pass any value. */}
+
+  {/* 1. Try to find a way to express the type LooseSize in a way that */}
+  {/* gives autocomplete for 'sm' and 'xs' while also letting the user */}
+  {/* pass any value. */}
+  <Icon size="sm"></Icon>
+  <Icon size="xs"></Icon>
+  <Icon size="10px"></Icon>
+</>;
+
+// This is a tough one! If you get stuck, jump right to the solution.
diff --git a/src/04-advanced-props/30-partial-autocomplete.solution.tsx b/src/04-advanced-props/30-partial-autocomplete.solution.tsx
new file mode 100644
index 0000000..eb1eb9a
--- /dev/null
+++ b/src/04-advanced-props/30-partial-autocomplete.solution.tsx
@@ -0,0 +1,34 @@
+const presetSizes = {
+  xs: "0.5rem",
+  sm: "1rem",
+};
+
+type Size = keyof typeof presetSizes;
+
+/**
+ * Oddly, this works. Forcing string to intersect with {} does SOMETHING
+ * which makes TypeScript do what we want.
+ *
+ * Honestly, I'm not sure why this works. Some compiler-diving is required
+ * to figure it out.
+ */
+type LooseSize = Size | (string & {});
+
+export const Icon = (props: { size: LooseSize }) => {
+  return (
+    <div
+      style={{
+        width:
+          props.size in presetSizes
+            ? presetSizes[props.size as Size]
+            : props.size,
+      }}
+    />
+  );
+};
+
+<>
+  <Icon size="sm"></Icon>
+  <Icon size="xs"></Icon>
+  <Icon size="10px"></Icon>
+</>;
diff --git a/src/04-advanced-props/31-as-const.problem.ts b/src/04-advanced-props/31-as-const.problem.ts
new file mode 100644
index 0000000..9440b74
--- /dev/null
+++ b/src/04-advanced-props/31-as-const.problem.ts
@@ -0,0 +1,15 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+const BACKEND_TO_FRONTEND_STATUS_MAP = {
+  0: "pending",
+  1: "success",
+  2: "error",
+};
+
+type BackendStatus = unknown;
+type FrontendStatus = unknown;
+
+type test = [
+  Expect<Equal<BackendStatus, 0 | 1 | 2>>,
+  Expect<Equal<FrontendStatus, "pending" | "success" | "error">>
+];
diff --git a/src/04-advanced-props/31-as-const.solution.ts b/src/04-advanced-props/31-as-const.solution.ts
new file mode 100644
index 0000000..92507b2
--- /dev/null
+++ b/src/04-advanced-props/31-as-const.solution.ts
@@ -0,0 +1,17 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+const BACKEND_TO_FRONTEND_STATUS_MAP = {
+  0: "pending",
+  1: "success",
+  2: "error",
+} as const;
+
+type BackendStatusMap = typeof BACKEND_TO_FRONTEND_STATUS_MAP;
+
+type BackendStatus = keyof BackendStatusMap;
+type FrontendStatus = BackendStatusMap[BackendStatus];
+
+type test = [
+  Expect<Equal<BackendStatus, 0 | 1 | 2>>,
+  Expect<Equal<FrontendStatus, "pending" | "success" | "error">>
+];
diff --git a/src/04-advanced-props/32-satisfies-vs-annotation-vs-as.problem.tsx b/src/04-advanced-props/32-satisfies-vs-annotation-vs-as.problem.tsx
new file mode 100644
index 0000000..dc99375
--- /dev/null
+++ b/src/04-advanced-props/32-satisfies-vs-annotation-vs-as.problem.tsx
@@ -0,0 +1,16 @@
+import { ComponentProps } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+const buttonProps = {
+  type: "button",
+  // @ts-expect-error
+  illegalProperty: "I AM ILLEGAL",
+};
+
+<>
+  <button {...buttonProps}>Click Me!</button>
+</>;
+
+const buttonPropType = buttonProps.type;
+
+type test = Expect<Equal<typeof buttonPropType, "button">>;
diff --git a/src/04-advanced-props/32-satisfies-vs-annotation-vs-as.solution.tsx b/src/04-advanced-props/32-satisfies-vs-annotation-vs-as.solution.tsx
new file mode 100644
index 0000000..05e5a67
--- /dev/null
+++ b/src/04-advanced-props/32-satisfies-vs-annotation-vs-as.solution.tsx
@@ -0,0 +1,17 @@
+import { ComponentProps } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+const buttonProps = {
+  type: "button",
+  // This should be erroring! Why isn't it?
+  // @ts-expect-error
+  illegalProperty: "I AM ILLEGAL",
+} satisfies ComponentProps<"button">;
+
+<>
+  <button {...buttonProps}>Click Me!</button>
+</>;
+
+const buttonPropType = buttonProps.type;
+
+type test = Expect<Equal<typeof buttonPropType, "button">>;
diff --git a/src/04-advanced-components/31-prop-groups-with-variants.problem.tsx b/src/04-advanced-props/33-prop-groups-with-variants.problem.tsx
similarity index 50%
rename from src/04-advanced-components/31-prop-groups-with-variants.problem.tsx
rename to src/04-advanced-props/33-prop-groups-with-variants.problem.tsx
index ea7573d..e37923d 100644
--- a/src/04-advanced-components/31-prop-groups-with-variants.problem.tsx
+++ b/src/04-advanced-props/33-prop-groups-with-variants.problem.tsx
@@ -4,14 +4,20 @@ const buttonPropsMap = {
   reset: {
     className: "bg-blue-500 text-white",
     type: "reset",
+    // @ts-expect-error
+    illegalProperty: "whatever",
   },
   submit: {
     className: "bg-gray-200 text-black",
     type: "submit",
+    // @ts-expect-error
+    illegalProperty: "whatever",
   },
   next: {
     className: "bg-green-500 text-white",
     type: "button",
+    // @ts-expect-error
+    illegalProperty: "whatever",
   },
 };
 
@@ -19,6 +25,25 @@ type ButtonProps = {
   variant: keyof typeof buttonPropsMap;
 };
 
+/**
+ * 1. There's a loooong error message here. Try to decode what the error message
+ * is referring to.
+ *
+ * 2. You might also notice that inside buttonPropsMap above, we're not getting
+ * autocomplete for the props that are available on a button. Why is that?
+ *
+ * 3. Try to find a type for buttonPropsMap that makes the error go away, and
+ * keeps the tests working at the bottom of the file.
+ *
+ * We want to:
+ *
+ * - Make sure that 'variant' isn't manually typed
+ * - Make the error go away
+ * - Get autocomplete for buttonPropsMap
+ *
+ * Hint - you might be 'unsatisfied' if you don't find the right solution.
+ */
+
 export const Button = (props: ButtonProps) => {
   return <button {...buttonPropsMap[props.variant]}>Click me</button>;
 };
diff --git a/src/04-advanced-components/31-prop-groups-with-variants.solution.2.tsx b/src/04-advanced-props/33-prop-groups-with-variants.solution.tsx
similarity index 66%
rename from src/04-advanced-components/31-prop-groups-with-variants.solution.2.tsx
rename to src/04-advanced-props/33-prop-groups-with-variants.solution.tsx
index bd57e13..2731691 100644
--- a/src/04-advanced-components/31-prop-groups-with-variants.solution.2.tsx
+++ b/src/04-advanced-props/33-prop-groups-with-variants.solution.tsx
@@ -1,17 +1,30 @@
 import { ComponentProps } from "react";
 
+/**
+ * satisfies gives us what we need. Now, we get autocomplete inside
+ * buttonPropsMap, and we get type safety on the variant in ButtonProps.
+ *
+ * That's because satisfies ensures buttonPropsMap is a Record, but doesn't
+ * override its type.
+ */
 const buttonPropsMap = {
   reset: {
     className: "bg-blue-500 text-white",
     type: "reset",
+    // @ts-expect-error
+    illegalProperty: "whatever",
   },
   submit: {
     className: "bg-gray-200 text-black",
     type: "submit",
+    // @ts-expect-error
+    illegalProperty: "whatever",
   },
   next: {
     className: "bg-green-500 text-white",
     type: "button",
+    // @ts-expect-error
+    illegalProperty: "whatever",
   },
 } satisfies Record<string, ComponentProps<"button">>;
 
diff --git a/src/04-advanced-props/discussion.md b/src/04-advanced-props/discussion.md
new file mode 100644
index 0000000..fdecaf2
--- /dev/null
+++ b/src/04-advanced-props/discussion.md
@@ -0,0 +1,9 @@
+What's the most common issue you see with the way declare prop types in React?
+
+Have you used a discriminated union before? If so, what was your use case?
+
+What problems could you imagine solving with discriminated unions that AREN'T related to React?
+
+What use cases have you seen for the `satisfies` operator?
+
+What's the strangest type error you've ever seen in a React app?
diff --git a/src/05-advanced-hooks/32-typing-custom-hooks.problem.ts b/src/05-advanced-hooks/32-typing-custom-hooks.problem.ts
deleted file mode 100644
index fc1144b..0000000
--- a/src/05-advanced-hooks/32-typing-custom-hooks.problem.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { useState } from "react";
-import { Equal, Expect } from "../helpers/type-utils";
-
-export const useId = (defaultId) => {
-  const [id] = useState(defaultId);
-
-  return id;
-};
-
-type tests = [Expect<Equal<typeof useId, (defaultId: string) => string>>];
diff --git a/src/05-advanced-hooks/32-typing-custom-hooks.solution.1.ts b/src/05-advanced-hooks/32-typing-custom-hooks.solution.1.ts
deleted file mode 100644
index cc51090..0000000
--- a/src/05-advanced-hooks/32-typing-custom-hooks.solution.1.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { useState } from "react";
-import { Equal, Expect } from "../helpers/type-utils";
-
-export const useId = (defaultId: string) => {
-  const [id] = useState(defaultId);
-
-  return id;
-};
-
-type tests = [Expect<Equal<typeof useId, (defaultId: string) => string>>];
diff --git a/src/05-advanced-hooks/32-typing-custom-hooks.solution.2.ts b/src/05-advanced-hooks/32-typing-custom-hooks.solution.2.ts
deleted file mode 100644
index 35f4be4..0000000
--- a/src/05-advanced-hooks/32-typing-custom-hooks.solution.2.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { useState } from "react";
-import { Equal, Expect } from "../helpers/type-utils";
-
-export const useId = (defaultId: string): string => {
-  const [id] = useState(defaultId);
-
-  return id;
-};
-
-type tests = [Expect<Equal<typeof useId, (defaultId: string) => string>>];
diff --git a/src/05-advanced-hooks/32-typing-custom-hooks.solution.3.ts b/src/05-advanced-hooks/32-typing-custom-hooks.solution.3.ts
deleted file mode 100644
index 0f90c81..0000000
--- a/src/05-advanced-hooks/32-typing-custom-hooks.solution.3.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { useState } from "react";
-import { Equal, Expect } from "../helpers/type-utils";
-
-export const useId = (defaultId: string): string => {
-  const [id] = useState<string>(defaultId);
-
-  return id;
-};
-
-type tests = [Expect<Equal<typeof useId, (defaultId: string) => string>>];
diff --git a/src/05-advanced-hooks/34-discriminated-unions-with-booleans.problem.ts b/src/05-advanced-hooks/34-discriminated-unions-with-booleans.problem.ts
deleted file mode 100644
index 70b786d..0000000
--- a/src/05-advanced-hooks/34-discriminated-unions-with-booleans.problem.ts
+++ /dev/null
@@ -1 +0,0 @@
-// TODO
diff --git a/src/05-advanced-hooks/36-function-overloads-in-hooks.problem.ts b/src/05-advanced-hooks/36-function-overloads-in-hooks.problem.ts
deleted file mode 100644
index 23703a6..0000000
--- a/src/05-advanced-hooks/36-function-overloads-in-hooks.problem.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { useState } from "react";
-import { Equal, Expect } from "../helpers/type-utils";
-
-export const useStateAsObject = <T>(initial: T) => {
-  const [value, set] = useState(initial);
-
-  return {
-    value,
-    set,
-  };
-};
-
-const example = useStateAsObject({ name: "Matt" });
-
-type ExampleTests = [
-  Expect<Equal<typeof example.value, { name: string }>>,
-  Expect<
-    Equal<
-      typeof example.set,
-      React.Dispatch<React.SetStateAction<{ name: string }>>
-    >
-  >,
-];
-
-const num = useStateAsObject<number>();
-
-type NumTests = [
-  Expect<Equal<typeof num.value, number | undefined>>,
-  Expect<
-    Equal<
-      typeof num.set,
-      React.Dispatch<React.SetStateAction<number | undefined>>
-    >
-  >,
-];
diff --git a/src/05-advanced-hooks/38-generic-localstorage-hook-with-zod.problem.tsx b/src/05-advanced-hooks/38-generic-localstorage-hook-with-zod.problem.tsx
deleted file mode 100644
index 5937374..0000000
--- a/src/05-advanced-hooks/38-generic-localstorage-hook-with-zod.problem.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { it } from "vitest";
-import { Equal, Expect } from "../helpers/type-utils";
-import { z } from "zod";
-
-export const useLocalStorage = <T,>(prefix: string, schema: any) => {
-  const schemaOrNull = schema.nullable();
-  return {
-    get: (key: string): T | null => {
-      return schemaOrNull.parse(
-        JSON.parse(window.localStorage.getItem(prefix + key) || "null"),
-      );
-    },
-    set: (key: string, value: T) => {
-      window.localStorage.setItem(prefix + key, JSON.stringify(value));
-    },
-  };
-};
-
-const user = useLocalStorage("user", z.object({ name: z.string() }));
-
-it("Should let you set and get values", () => {
-  user.set("matt", { name: "Matt" });
-
-  const mattUser = user.get("matt");
-
-  type tests = [Expect<Equal<typeof mattUser, { name: string } | null>>];
-});
-
-it("Should not let you set a value that is not the same type as the type argument passed", () => {
-  user.set(
-    "something",
-    // @ts-expect-error
-    {},
-  );
-});
diff --git a/src/05-advanced-hooks/38-generic-localstorage-hook-with-zod.solution.tsx b/src/05-advanced-hooks/38-generic-localstorage-hook-with-zod.solution.tsx
deleted file mode 100644
index fcb8410..0000000
--- a/src/05-advanced-hooks/38-generic-localstorage-hook-with-zod.solution.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { it } from "vitest";
-import { Equal, Expect } from "../helpers/type-utils";
-import { z } from "zod";
-
-export const useLocalStorage = <T,>(prefix: string, schema: z.Schema<T>) => {
-  const schemaOrNull = schema.nullable();
-  return {
-    get: (key: string): T | null => {
-      return schemaOrNull.parse(
-        JSON.parse(window.localStorage.getItem(prefix + key) || "null"),
-      );
-    },
-    set: (key: string, value: T) => {
-      window.localStorage.setItem(prefix + key, JSON.stringify(value));
-    },
-  };
-};
-
-const user = useLocalStorage("user", z.object({ name: z.string() }));
-
-it("Should let you set and get values", () => {
-  user.set("matt", { name: "Matt" });
-
-  const mattUser = user.get("matt");
-
-  type tests = [Expect<Equal<typeof mattUser, { name: string } | null>>];
-});
-
-it("Should not let you set a value that is not the same type as the type argument passed", () => {
-  user.set(
-    "something",
-    // @ts-expect-error
-    {},
-  );
-});
diff --git a/src/05-advanced-hooks/41-discriminated-union-returns-from-custom-hooks.problem.ts b/src/05-advanced-hooks/41-discriminated-union-returns-from-custom-hooks.problem.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/src/05-generics/34-type-helpers.problem.tsx b/src/05-generics/34-type-helpers.problem.tsx
new file mode 100644
index 0000000..5ff08f7
--- /dev/null
+++ b/src/05-generics/34-type-helpers.problem.tsx
@@ -0,0 +1,22 @@
+type Icon = "home" | "settings" | "about";
+type ButtonVariant = "primary" | "secondary" | "tertiary";
+
+// How do we refactor this to make it DRY?
+type LooseIcon = Icon | (string & {});
+type LooseButtonVariant = ButtonVariant | (string & {});
+
+export const icons: LooseIcon[] = [
+  "home",
+  "settings",
+  "about",
+  "any-other-string",
+  // I should get autocomplete if I add a new item here!
+];
+
+export const buttonVariants: LooseButtonVariant[] = [
+  "primary",
+  "secondary",
+  "tertiary",
+  "any-other-string",
+  // I should get autocomplete if I add a new item here!
+];
diff --git a/src/05-generics/34-type-helpers.solution.tsx b/src/05-generics/34-type-helpers.solution.tsx
new file mode 100644
index 0000000..40c01cd
--- /dev/null
+++ b/src/05-generics/34-type-helpers.solution.tsx
@@ -0,0 +1,30 @@
+type Icon = "home" | "settings" | "about";
+type ButtonVariant = "primary" | "secondary" | "tertiary";
+
+type LooseIcon = LooseAutocomplete<Icon>;
+type LooseButtonVariant = LooseAutocomplete<ButtonVariant>;
+
+/**
+ * Comment explaining what LooseAutocomplete does
+ */
+type LooseAutocomplete<T> = T | (string & {});
+
+const looseAutocomplete = (t: any) => {
+  return "hello";
+};
+
+export const icons: LooseIcon[] = [
+  "home",
+  "settings",
+  "about",
+  "any-other-string",
+  // I should get autocomplete if I add a new item here!
+];
+
+export const buttonVariants: LooseButtonVariant[] = [
+  "primary",
+  "secondary",
+  "tertiary",
+  "any-other-string",
+  // I should get autocomplete if I add a new item here!
+];
diff --git a/src/04-advanced-components/25-either-all-these-props-or-none.solution.2.tsx b/src/05-generics/35-type-helpers-2.problem.tsx
similarity index 66%
rename from src/04-advanced-components/25-either-all-these-props-or-none.solution.2.tsx
rename to src/05-generics/35-type-helpers-2.problem.tsx
index 5029f7d..e7471d5 100644
--- a/src/04-advanced-components/25-either-all-these-props-or-none.solution.2.tsx
+++ b/src/05-generics/35-type-helpers-2.problem.tsx
@@ -1,13 +1,21 @@
 import { ChangeEventHandler } from "react";
 
-type InputProps = (
+/**
+ * It would be really nice to refactor this so that it's
+ * more reusable. We can do that with a type helper.
+ *
+ * We want to create a type helper that takes in a type,
+ * and returns it along with a union with all of its
+ * keys turned to undefined.
+ */
+export type InputProps = (
   | {
       value: string;
       onChange: ChangeEventHandler;
     }
   | {
-      value?: never;
-      onChange?: never;
+      value?: undefined;
+      onChange?: undefined;
     }
 ) & {
   label: string;
diff --git a/src/04-advanced-components/25-either-all-these-props-or-none.solution.3.tsx b/src/05-generics/35-type-helpers-2.solution.tsx
similarity index 80%
rename from src/04-advanced-components/25-either-all-these-props-or-none.solution.3.tsx
rename to src/05-generics/35-type-helpers-2.solution.tsx
index 16ace57..4a6907e 100644
--- a/src/04-advanced-components/25-either-all-these-props-or-none.solution.3.tsx
+++ b/src/05-generics/35-type-helpers-2.solution.tsx
@@ -1,18 +1,16 @@
 import { ChangeEventHandler } from "react";
 
-type InputProps = AllOrNothing<{
+type AllOrNothing<T> = T | ToUndefinedObject<T>;
+
+type ToUndefinedObject<T> = Partial<Record<keyof T, undefined>>;
+
+export type InputProps = AllOrNothing<{
   value: string;
   onChange: ChangeEventHandler;
 }> & {
   label: string;
 };
 
-type AllOrNothing<TProps extends Record<string, any>> =
-  | TProps
-  | {
-      [K in keyof TProps]?: undefined;
-    };
-
 export const Input = ({ label, ...props }: InputProps) => {
   return (
     <div>
diff --git a/src/05-generics/36-type-helpers-with-constraints.problem.tsx b/src/05-generics/36-type-helpers-with-constraints.problem.tsx
new file mode 100644
index 0000000..920f0fc
--- /dev/null
+++ b/src/05-generics/36-type-helpers-with-constraints.problem.tsx
@@ -0,0 +1,21 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+type AllOrNothing<T> = T | ToUndefinedObject<T>;
+
+type ToUndefinedObject<T> = Partial<Record<keyof T, undefined>>;
+
+/**
+ * There's a problem with our AllOrNothing type. It's letting
+ * us pass ANYTHING as T. We want to constrain it so that it
+ * only works with objects.
+ */
+
+type tests = [
+  // @ts-expect-error
+  AllOrNothing<string>,
+  // @ts-expect-error
+  AllOrNothing<number>,
+  // @ts-expect-error
+  AllOrNothing<undefined>,
+  Expect<Equal<AllOrNothing<{ a: string }>, { a: string } | { a?: undefined }>>
+];
diff --git a/src/05-generics/36-type-helpers-with-constraints.solution.1.tsx b/src/05-generics/36-type-helpers-with-constraints.solution.1.tsx
new file mode 100644
index 0000000..7e361a2
--- /dev/null
+++ b/src/05-generics/36-type-helpers-with-constraints.solution.1.tsx
@@ -0,0 +1,17 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+type AllOrNothing<T extends object> = T | ToUndefinedObject<T>;
+
+type ToUndefinedObject<T extends object> = Partial<Record<keyof T, undefined>>;
+
+type tests = [
+  // @ts-expect-error
+  AllOrNothing<string>,
+  // @ts-expect-error
+  AllOrNothing<number>,
+  // @ts-expect-error
+  AllOrNothing<undefined>,
+  Expect<Equal<AllOrNothing<{ a: string }>, { a: string } | { a?: undefined }>>
+];
+
+// Note that this isn't perfect! Try AllOrNothing<string[]>
diff --git a/src/05-generics/36-type-helpers-with-constraints.solution.2.tsx b/src/05-generics/36-type-helpers-with-constraints.solution.2.tsx
new file mode 100644
index 0000000..6ddf2f4
--- /dev/null
+++ b/src/05-generics/36-type-helpers-with-constraints.solution.2.tsx
@@ -0,0 +1,19 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+type AllOrNothing<T extends Record<string, any>> = T | ToUndefinedObject<T>;
+
+type ToUndefinedObject<T extends Record<string, any>> = Partial<
+  Record<keyof T, undefined>
+>;
+
+type tests = [
+  // @ts-expect-error
+  AllOrNothing<string>,
+  // @ts-expect-error
+  AllOrNothing<number>,
+  // @ts-expect-error
+  AllOrNothing<undefined>,
+  Expect<Equal<AllOrNothing<{ a: string }>, { a: string } | { a?: undefined }>>
+];
+
+// Note that this isn't perfect! Try AllOrNothing<string[]>
diff --git a/src/05-advanced-hooks/37-generic-localstorage-hook.problem.ts b/src/05-generics/37-generic-localstorage-hook.problem.ts
similarity index 67%
rename from src/05-advanced-hooks/37-generic-localstorage-hook.problem.ts
rename to src/05-generics/37-generic-localstorage-hook.problem.ts
index 9e54d2a..b368977 100644
--- a/src/05-advanced-hooks/37-generic-localstorage-hook.problem.ts
+++ b/src/05-generics/37-generic-localstorage-hook.problem.ts
@@ -1,6 +1,19 @@
 import { it } from "vitest";
 import { Equal, Expect } from "../helpers/type-utils";
 
+/**
+ * In this exercise, we want to create a generic useLocalStorage hook
+ * that allows us to store and retrieve values in localStorage.
+ *
+ * The way we're going to do this is by asking users to pass in type
+ * arguments, as below:
+ *
+ * const user = useLocalStorage<{ name: string }>("user");
+ *
+ * user.set("matt", { name: "Matt" });
+ *
+ * 1. Figure out a way to make this work using generics.
+ */
 export const useLocalStorage = (prefix: string) => {
   return {
     get: (key: string) => {
diff --git a/src/05-advanced-hooks/37-generic-localstorage-hook.solution.ts b/src/05-generics/37-generic-localstorage-hook.solution.ts
similarity index 100%
rename from src/05-advanced-hooks/37-generic-localstorage-hook.solution.ts
rename to src/05-generics/37-generic-localstorage-hook.solution.ts
diff --git a/src/05-advanced-hooks/35-generic-hooks.problem.ts b/src/05-generics/38-generic-hooks.problem.ts
similarity index 73%
rename from src/05-advanced-hooks/35-generic-hooks.problem.ts
rename to src/05-generics/38-generic-hooks.problem.ts
index 8cbafbb..716bbd9 100644
--- a/src/05-advanced-hooks/35-generic-hooks.problem.ts
+++ b/src/05-generics/38-generic-hooks.problem.ts
@@ -1,6 +1,13 @@
 import { useState } from "react";
 import { Equal, Expect } from "../helpers/type-utils";
 
+/**
+ * 1. In this exercise, we want to create a version of the useState
+ * hook that slightly modifies the API - returning it as an object
+ * instead of a tuple.
+ *
+ * There are _many_ different solutions - but they all involve generics.
+ */
 export const useStateAsObject = (initial: any) => {
   const [value, set] = useState(initial);
 
diff --git a/src/05-advanced-hooks/35-generic-hooks.solution.1.ts b/src/05-generics/38-generic-hooks.solution.1.ts
similarity index 75%
rename from src/05-advanced-hooks/35-generic-hooks.solution.1.ts
rename to src/05-generics/38-generic-hooks.solution.1.ts
index e949e6e..3192459 100644
--- a/src/05-advanced-hooks/35-generic-hooks.solution.1.ts
+++ b/src/05-generics/38-generic-hooks.solution.1.ts
@@ -1,6 +1,13 @@
 import { useState } from "react";
 import { Equal, Expect } from "../helpers/type-utils";
 
+/**
+ * 1. Take a look at each solution, noting the differences between each.
+ * With some, you might need to do some 'spot the diference' to see
+ * what's changed.
+ *
+ * 2. Which solution do you think is best? Why?
+ */
 export const useStateAsObject = <T>(initial: T) => {
   const [value, set] = useState(initial);
 
diff --git a/src/05-advanced-hooks/35-generic-hooks.solution.2.ts b/src/05-generics/38-generic-hooks.solution.2.ts
similarity index 100%
rename from src/05-advanced-hooks/35-generic-hooks.solution.2.ts
rename to src/05-generics/38-generic-hooks.solution.2.ts
diff --git a/src/05-advanced-hooks/35-generic-hooks.solution.3.ts b/src/05-generics/38-generic-hooks.solution.3.ts
similarity index 100%
rename from src/05-advanced-hooks/35-generic-hooks.solution.3.ts
rename to src/05-generics/38-generic-hooks.solution.3.ts
diff --git a/src/05-advanced-hooks/35-generic-hooks.solution.4.ts b/src/05-generics/38-generic-hooks.solution.4.ts
similarity index 100%
rename from src/05-advanced-hooks/35-generic-hooks.solution.4.ts
rename to src/05-generics/38-generic-hooks.solution.4.ts
diff --git a/src/05-advanced-hooks/35-generic-hooks.solution.5.ts b/src/05-generics/38-generic-hooks.solution.5.ts
similarity index 100%
rename from src/05-advanced-hooks/35-generic-hooks.solution.5.ts
rename to src/05-generics/38-generic-hooks.solution.5.ts
diff --git a/src/04-advanced-components/28-generic-props.problem.tsx b/src/05-generics/39-generic-props.problem.tsx
similarity index 52%
rename from src/04-advanced-components/28-generic-props.problem.tsx
rename to src/05-generics/39-generic-props.problem.tsx
index 1b77af2..20a3633 100644
--- a/src/04-advanced-components/28-generic-props.problem.tsx
+++ b/src/05-generics/39-generic-props.problem.tsx
@@ -1,17 +1,23 @@
-import { Key, ReactNode } from "react";
+import { ReactNode } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
 
 interface TableProps {
   rows: any[];
-  key: string;
   renderRow: (row: any) => ReactNode;
 }
 
+/**
+ * 1. Here, we have a table component. It takes an array of data and a function
+ * to render each row. The problem is that the type of the data is not
+ * generic. It's just `any`. We want to make it generic so that the type of
+ * the data is inferred from the `rows` prop.
+ */
 export const Table = (props: TableProps) => {
   return (
     <table>
       <tbody>
         {props.rows.map((row) => (
-          <tr key={row[props.key]}>{props.renderRow(row)}</tr>
+          <tr>{props.renderRow(row)}</tr>
         ))}
       </tbody>
     </table>
@@ -28,22 +34,11 @@ const data = [
 export const Parent = () => {
   return (
     <div>
+      <Table rows={data} renderRow={(row) => <td>{row.name}</td>} />
       <Table
         rows={data}
-        key="id"
-        renderRow={(row) => <td>{row.name}</td>}
-      ></Table>
-      <Table
-        rows={data}
-        // @ts-expect-error
-        key="doesNotExist"
-        renderRow={(row) => <td>{row.name}</td>}
-      ></Table>
-
-      <Table
-        rows={data}
-        key="id"
         renderRow={(row) => {
+          type test = Expect<Equal<typeof row, { id: number; name: string }>>;
           return (
             <td>
               {
diff --git a/src/04-advanced-components/28-generic-props.solution.tsx b/src/05-generics/39-generic-props.solution.tsx
similarity index 59%
rename from src/04-advanced-components/28-generic-props.solution.tsx
rename to src/05-generics/39-generic-props.solution.tsx
index dd0e79c..bef78c8 100644
--- a/src/04-advanced-components/28-generic-props.solution.tsx
+++ b/src/05-generics/39-generic-props.solution.tsx
@@ -1,17 +1,22 @@
-import { Key, ReactNode } from "react";
+import { ReactNode } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
 
 interface TableProps<T> {
   rows: T[];
-  key: keyof T;
   renderRow: (row: T) => ReactNode;
 }
 
+/**
+ * The solution is to add a type argument to the function, then
+ * use that type argument in the type of the `rows` prop and the
+ * `renderRow` function.
+ */
 export const Table = <T,>(props: TableProps<T>) => {
   return (
     <table>
       <tbody>
         {props.rows.map((row) => (
-          <tr key={row[props.key] as Key}>{props.renderRow(row)}</tr>
+          <tr>{props.renderRow(row)}</tr>
         ))}
       </tbody>
     </table>
@@ -28,22 +33,11 @@ const data = [
 export const Parent = () => {
   return (
     <div>
+      <Table rows={data} renderRow={(row) => <td>{row.name}</td>} />
       <Table
         rows={data}
-        key="id"
-        renderRow={(row) => <td>{row.name}</td>}
-      ></Table>
-      <Table
-        rows={data}
-        // @ts-expect-error
-        key="doesNotExist"
-        renderRow={(row) => <td>{row.name}</td>}
-      ></Table>
-
-      <Table
-        rows={data}
-        key="id"
         renderRow={(row) => {
+          type test = Expect<Equal<typeof row, { id: number; name: string }>>;
           return (
             <td>
               {
diff --git a/src/05-generics/40-generic-class-components.problem.tsx b/src/05-generics/40-generic-class-components.problem.tsx
new file mode 100644
index 0000000..774fccb
--- /dev/null
+++ b/src/05-generics/40-generic-class-components.problem.tsx
@@ -0,0 +1,50 @@
+import React, { ReactNode } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+interface TableProps {
+  rows: any[];
+  renderRow: (row: any) => ReactNode;
+}
+
+export class Table extends React.Component<TableProps> {
+  render(): ReactNode {
+    return (
+      <table>
+        <tbody>
+          {this.props.rows.map((row) => (
+            <tr>{this.props.renderRow(row)}</tr>
+          ))}
+        </tbody>
+      </table>
+    );
+  }
+}
+
+const data = [
+  {
+    id: 1,
+    name: "John",
+  },
+];
+
+export const Parent = () => {
+  return (
+    <div>
+      <Table rows={data} renderRow={(row) => <td>{row.name}</td>} />
+      <Table
+        rows={data}
+        renderRow={(row) => {
+          type test = Expect<Equal<typeof row, { id: number; name: string }>>;
+          return (
+            <td>
+              {
+                // @ts-expect-error
+                row.doesNotExist
+              }
+            </td>
+          );
+        }}
+      ></Table>
+    </div>
+  );
+};
diff --git a/src/05-generics/40-generic-class-components.solution.tsx b/src/05-generics/40-generic-class-components.solution.tsx
new file mode 100644
index 0000000..be529d8
--- /dev/null
+++ b/src/05-generics/40-generic-class-components.solution.tsx
@@ -0,0 +1,50 @@
+import React, { ReactNode } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+interface TableProps<TRow> {
+  rows: TRow[];
+  renderRow: (row: TRow) => ReactNode;
+}
+
+export class Table<TRow> extends React.Component<TableProps<TRow>> {
+  render(): ReactNode {
+    return (
+      <table>
+        <tbody>
+          {this.props.rows.map((row) => (
+            <tr>{this.props.renderRow(row)}</tr>
+          ))}
+        </tbody>
+      </table>
+    );
+  }
+}
+
+const data = [
+  {
+    id: 1,
+    name: "John",
+  },
+];
+
+export const Parent = () => {
+  return (
+    <div>
+      <Table rows={data} renderRow={(row) => <td>{row.name}</td>} />
+      <Table
+        rows={data}
+        renderRow={(row) => {
+          type test = Expect<Equal<typeof row, { id: number; name: string }>>;
+          return (
+            <td>
+              {
+                // @ts-expect-error
+                row.doesNotExist
+              }
+            </td>
+          );
+        }}
+      ></Table>
+    </div>
+  );
+};
diff --git a/src/05-generics/41-passing-types-to-components.problem.tsx b/src/05-generics/41-passing-types-to-components.problem.tsx
new file mode 100644
index 0000000..d272c49
--- /dev/null
+++ b/src/05-generics/41-passing-types-to-components.problem.tsx
@@ -0,0 +1,55 @@
+import { ReactNode } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+interface TableProps<T> {
+  rows: T[];
+  renderRow: (row: T) => ReactNode;
+}
+
+export const Table = <T,>(props: TableProps<T>) => {
+  return (
+    <table>
+      <tbody>
+        {props.rows.map((row) => (
+          <tr>{props.renderRow(row)}</tr>
+        ))}
+      </tbody>
+    </table>
+  );
+};
+
+interface User {
+  id: number;
+  name: string;
+  age: number;
+}
+
+<>
+  <Table
+    // @ts-expect-error rows should be User[]
+    rows={[1, 2, 3]}
+    renderRow={(row) => {
+      type test = Expect<Equal<typeof row, User>>;
+      return <td>{row.name}</td>;
+    }}
+  />
+  <Table
+    rows={[
+      {
+        id: 1,
+        name: "John",
+        age: 30,
+      },
+      {
+        // @ts-expect-error id should be string
+        id: "2",
+        name: "Jane",
+        age: 30,
+      },
+    ]}
+    renderRow={(row) => {
+      type test = Expect<Equal<typeof row, User>>;
+      return <td>{row.name}</td>;
+    }}
+  ></Table>
+</>;
diff --git a/src/05-generics/41-passing-types-to-components.solution.tsx b/src/05-generics/41-passing-types-to-components.solution.tsx
new file mode 100644
index 0000000..e54dd0e
--- /dev/null
+++ b/src/05-generics/41-passing-types-to-components.solution.tsx
@@ -0,0 +1,55 @@
+import { ReactNode } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+interface TableProps<T> {
+  rows: T[];
+  renderRow: (row: T) => ReactNode;
+}
+
+export const Table = <T,>(props: TableProps<T>) => {
+  return (
+    <table>
+      <tbody>
+        {props.rows.map((row) => (
+          <tr>{props.renderRow(row)}</tr>
+        ))}
+      </tbody>
+    </table>
+  );
+};
+
+interface User {
+  id: number;
+  name: string;
+  age: number;
+}
+
+<>
+  <Table<User>
+    // @ts-expect-error rows should be User[]
+    rows={[1, 2, 3]}
+    renderRow={(row) => {
+      type test = Expect<Equal<typeof row, User>>;
+      return <td>{row.name}</td>;
+    }}
+  />
+  <Table<User>
+    rows={[
+      {
+        id: 1,
+        name: "John",
+        age: 30,
+      },
+      {
+        // @ts-expect-error id should be string
+        id: "2",
+        name: "Jane",
+        age: 30,
+      },
+    ]}
+    renderRow={(row) => {
+      type test = Expect<Equal<typeof row, User>>;
+      return <td>{row.name}</td>;
+    }}
+  ></Table>
+</>;
diff --git a/src/05-generics/42-generic-inference-through-multiple-helpers.problem.tsx b/src/05-generics/42-generic-inference-through-multiple-helpers.problem.tsx
new file mode 100644
index 0000000..f9a7008
--- /dev/null
+++ b/src/05-generics/42-generic-inference-through-multiple-helpers.problem.tsx
@@ -0,0 +1,57 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+interface Button {
+  value: string;
+  label: string;
+}
+
+interface ButtonGroupProps {
+  buttons: Button[];
+  onClick: (value: string) => void;
+}
+
+/**
+ * In this exercise, we have a component called ButtonGroup. It takes an array
+ * of buttons and a function to call when a button is clicked.
+ *
+ * We want to improve the type of the onClick function so that the value passed
+ * to it is inferred from the buttons array.
+ *
+ * 1. Try to solve this problem using generics.
+ */
+const ButtonGroup = (props: ButtonGroupProps) => {
+  return (
+    <div>
+      {props.buttons.map((button) => {
+        return (
+          <button
+            key={button.value}
+            onClick={() => {
+              props.onClick(button.value);
+            }}
+          >
+            {button.label}
+          </button>
+        );
+      })}
+    </div>
+  );
+};
+
+<>
+  <ButtonGroup
+    onClick={(value) => {
+      type test = Expect<Equal<typeof value, "add" | "delete">>;
+    }}
+    buttons={[
+      {
+        value: "add",
+        label: "Add",
+      },
+      {
+        value: "delete",
+        label: "Delete",
+      },
+    ]}
+  ></ButtonGroup>
+</>;
diff --git a/src/05-generics/42-generic-inference-through-multiple-helpers.solution.tsx b/src/05-generics/42-generic-inference-through-multiple-helpers.solution.tsx
new file mode 100644
index 0000000..61ebeff
--- /dev/null
+++ b/src/05-generics/42-generic-inference-through-multiple-helpers.solution.tsx
@@ -0,0 +1,50 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+interface Button<TValue> {
+  value: TValue;
+  label: string;
+}
+
+interface ButtonGroupProps<TValue> {
+  buttons: Button<TValue>[];
+  onClick: (value: TValue) => void;
+}
+
+const ButtonGroup = <TValue extends string>(
+  props: ButtonGroupProps<TValue>
+) => {
+  return (
+    <div>
+      {props.buttons.map((button) => {
+        return (
+          <button
+            key={button.value}
+            onClick={() => {
+              props.onClick(button.value);
+            }}
+          >
+            {button.label}
+          </button>
+        );
+      })}
+    </div>
+  );
+};
+
+<>
+  <ButtonGroup
+    onClick={(value) => {
+      type test = Expect<Equal<typeof value, "add" | "delete">>;
+    }}
+    buttons={[
+      {
+        value: "add",
+        label: "Add",
+      },
+      {
+        value: "delete",
+        label: "Delete",
+      },
+    ]}
+  ></ButtonGroup>
+</>;
diff --git a/src/05-generics/43-inference-flow-with-constraints.problem.ts b/src/05-generics/43-inference-flow-with-constraints.problem.ts
new file mode 100644
index 0000000..9aae30b
--- /dev/null
+++ b/src/05-generics/43-inference-flow-with-constraints.problem.ts
@@ -0,0 +1,74 @@
+import { createUser } from "fake-external-lib";
+import { useState } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+type Mutation = (...args: any[]) => Promise<any>;
+
+interface UseMutationReturn {
+  mutate: Mutation;
+  isLoading: boolean;
+}
+
+interface UseMutationOptions {
+  mutation: Mutation;
+}
+
+export const useMutation = (opts: UseMutationOptions): UseMutationReturn => {
+  const [isLoading, setIsLoading] = useState(false);
+
+  return {
+    mutate: async (...args) => {
+      setIsLoading(true);
+
+      try {
+        const result = await opts.mutation(...args);
+        return result;
+      } catch (e) {
+        throw e;
+      } finally {
+        setIsLoading(false);
+      }
+    },
+    isLoading,
+  };
+};
+
+const mutation = useMutation({
+  mutation: createUser,
+});
+
+mutation.mutate({ name: "John Doe", email: "john@doe.com" });
+
+// @ts-expect-error email missing!
+mutation.mutate({ name: "John Doe" });
+
+mutation.mutate(
+  {
+    name: "John Doe",
+    email: "john@doe.com",
+  },
+  {
+    throwOnError: true,
+    // @ts-expect-error extra prop
+    extra: "oh dear",
+  },
+);
+
+type test = [
+  Expect<Equal<typeof mutation.isLoading, boolean>>,
+  Expect<
+    Equal<
+      typeof mutation.mutate,
+      (
+        user: { name: string; email: string },
+        opts?: {
+          throwOnError?: boolean;
+        },
+      ) => Promise<{
+        id: string;
+        name: string;
+        email: string;
+      }>
+    >
+  >,
+];
diff --git a/src/05-generics/43-inference-flow-with-constraints.solution.ts b/src/05-generics/43-inference-flow-with-constraints.solution.ts
new file mode 100644
index 0000000..da89c62
--- /dev/null
+++ b/src/05-generics/43-inference-flow-with-constraints.solution.ts
@@ -0,0 +1,78 @@
+import { createUser } from "fake-external-lib";
+import { useState } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+type Mutation<TArgs extends any[], TReturn> = (
+  ...args: TArgs
+) => Promise<TReturn>;
+
+interface UseMutationReturn<TArgs extends any[], TReturn> {
+  mutate: Mutation<TArgs, TReturn>;
+  isLoading: boolean;
+}
+
+interface UseMutationOptions<TArgs extends any[], TReturn> {
+  mutation: Mutation<TArgs, TReturn>;
+}
+
+export const useMutation = <TArgs extends any[], TReturn>(
+  opts: UseMutationOptions<TArgs, TReturn>
+): UseMutationReturn<TArgs, TReturn> => {
+  const [isLoading, setIsLoading] = useState(false);
+
+  return {
+    mutate: async (...args) => {
+      setIsLoading(true);
+
+      try {
+        const result = await opts.mutation(...args);
+        return result;
+      } catch (e) {
+        throw e;
+      } finally {
+        setIsLoading(false);
+      }
+    },
+    isLoading,
+  };
+};
+
+const mutation = useMutation({
+  mutation: createUser,
+});
+
+mutation.mutate({ name: "John Doe", email: "john@doe.com" });
+
+// @ts-expect-error email missing!
+mutation.mutate({ name: "John Doe" });
+
+mutation.mutate(
+  {
+    name: "John Doe",
+    email: "john@doe.com",
+  },
+  {
+    throwOnError: true,
+    // @ts-expect-error extra prop
+    extra: "oh dear",
+  }
+);
+
+type test = [
+  Expect<Equal<typeof mutation.isLoading, boolean>>,
+  Expect<
+    Equal<
+      typeof mutation.mutate,
+      (
+        user: { name: string; email: string },
+        opts?: {
+          throwOnError?: boolean;
+        }
+      ) => Promise<{
+        id: string;
+        name: string;
+        email: string;
+      }>
+    >
+  >
+];
diff --git a/src/04-advanced-components/29-generics-vs-discriminated-unions.problem.tsx b/src/05-generics/44-generics-vs-discriminated-unions.problem.tsx
similarity index 65%
rename from src/04-advanced-components/29-generics-vs-discriminated-unions.problem.tsx
rename to src/05-generics/44-generics-vs-discriminated-unions.problem.tsx
index d4f35e2..2a9fa5a 100644
--- a/src/04-advanced-components/29-generics-vs-discriminated-unions.problem.tsx
+++ b/src/05-generics/44-generics-vs-discriminated-unions.problem.tsx
@@ -1,3 +1,19 @@
+/**
+ * In this exercise, we'll look at an example where generics are NOT
+ * needed.
+ *
+ * 1. Take a look at the ModalProps type. Try to figure out what's
+ * going on in the type.
+ *
+ * Notice what type gets returned if you type:
+ *
+ * type Example = ModalProps<'with-button'>;
+ * type Example2 = ModalProps<'without-button'>;
+ *
+ * 2. There's a way of writing this type (and the component!) without
+ * generics that's much simpler. Try to figure out how to do that.
+ */
+
 export type ModalProps<TVariant extends PossibleVariants> = {
   isOpen: boolean;
   variant: TVariant;
diff --git a/src/04-advanced-components/29-generics-vs-discriminated-unions.solution.tsx b/src/05-generics/44-generics-vs-discriminated-unions.solution.tsx
similarity index 56%
rename from src/04-advanced-components/29-generics-vs-discriminated-unions.solution.tsx
rename to src/05-generics/44-generics-vs-discriminated-unions.solution.tsx
index d20cc60..3b10f60 100644
--- a/src/04-advanced-components/29-generics-vs-discriminated-unions.solution.tsx
+++ b/src/05-generics/44-generics-vs-discriminated-unions.solution.tsx
@@ -1,16 +1,22 @@
-export type ModalProps =
+/**
+ * Yep, a discriminated union is the way to go here. Instead of
+ * using a generic type (with a conditional type!), we can use
+ * a discriminated union to make sure that the correct props
+ * are passed in for each variant.
+ */
+
+export type ModalProps = {
+  isOpen: boolean;
+} & (
+  | {
+      variant: "with-button";
+      buttonLabel: string;
+      onButtonClick: () => void;
+    }
   | {
-      isOpen: boolean;
-    } & (
-      | {
-          variant: "with-button";
-          buttonLabel: string;
-          onButtonClick: () => void;
-        }
-      | {
-          variant: "without-button";
-        }
-    );
+      variant: "without-button";
+    }
+);
 
 export const Modal = (props: ModalProps) => {
   // ...
diff --git a/src/05-generics/discussion.md b/src/05-generics/discussion.md
new file mode 100644
index 0000000..6a1240d
--- /dev/null
+++ b/src/05-generics/discussion.md
@@ -0,0 +1,11 @@
+Why doesn't this code work without the comma (in a .tsx file)?
+
+```tsx
+const Component = <T,>() => {};
+```
+
+What problems have you solved with generics that aren't related to React?
+
+What libraries can you think of that rely on generics to do their magic?
+
+What use cases have you seen for `React.ComponentType` and `React.ComponentProps`?
diff --git a/src/05-advanced-hooks/33-tuple-return-type.problem.ts b/src/06-advanced-hooks/45-tuple-return-type.problem.ts
similarity index 55%
rename from src/05-advanced-hooks/33-tuple-return-type.problem.ts
rename to src/06-advanced-hooks/45-tuple-return-type.problem.ts
index 1fc3842..92c610f 100644
--- a/src/05-advanced-hooks/33-tuple-return-type.problem.ts
+++ b/src/06-advanced-hooks/45-tuple-return-type.problem.ts
@@ -1,6 +1,16 @@
 import { useState } from "react";
 import { Equal, Expect } from "../helpers/type-utils";
 
+/**
+ * Here, we've got a hook that returns a tuple of [value, setValue].
+ *
+ * But if we hover over id and setId below, you'll see that they're
+ * both inferred as string | React.Dispatch<React.SetStateAction<string>>,
+ * which is not ideal.
+ *
+ * 1. Find a way to fix the errors below.
+ */
+
 export const useId = (defaultId: string) => {
   const [id, setId] = useState(defaultId);
 
diff --git a/src/05-advanced-hooks/33-tuple-return-type.solution.2.ts b/src/06-advanced-hooks/45-tuple-return-type.solution.1.ts
similarity index 100%
rename from src/05-advanced-hooks/33-tuple-return-type.solution.2.ts
rename to src/06-advanced-hooks/45-tuple-return-type.solution.1.ts
diff --git a/src/05-advanced-hooks/33-tuple-return-type.solution.1.ts b/src/06-advanced-hooks/45-tuple-return-type.solution.2.ts
similarity index 100%
rename from src/05-advanced-hooks/33-tuple-return-type.solution.1.ts
rename to src/06-advanced-hooks/45-tuple-return-type.solution.2.ts
diff --git a/src/07-advanced-patterns/51-required-context.problem.tsx b/src/06-advanced-hooks/46-required-context.problem.tsx
similarity index 69%
rename from src/07-advanced-patterns/51-required-context.problem.tsx
rename to src/06-advanced-hooks/46-required-context.problem.tsx
index 61436c6..1b0726b 100644
--- a/src/07-advanced-patterns/51-required-context.problem.tsx
+++ b/src/06-advanced-hooks/46-required-context.problem.tsx
@@ -1,6 +1,19 @@
 import React from "react";
 import { Equal, Expect } from "../helpers/type-utils";
 
+/**
+ * Let's take a look at Context in React. Here, we're creating
+ * an abstraction that lets us create a context without having
+ * to worry about the context value being null.
+ *
+ * As you can see, it exposes a special useContext hook and
+ * a Provider component that we can use to wrap our application.
+ *
+ * But currently, it's not inferring any type information from our
+ * createRequiredContext function.
+ *
+ * 1. See if you can fix it!
+ */
 const createRequiredContext = () => {
   const context = React.createContext(null);
 
@@ -14,7 +27,7 @@ const createRequiredContext = () => {
     return contextValue;
   };
 
-  return [useContext, context.Provider] as const;
+  return [useContext, context.Provider];
 };
 
 const [useUser, UserProvider] = createRequiredContext<{
diff --git a/src/07-advanced-patterns/51-required-context.solution.1.tsx b/src/06-advanced-hooks/46-required-context.solution.1.tsx
similarity index 100%
rename from src/07-advanced-patterns/51-required-context.solution.1.tsx
rename to src/06-advanced-hooks/46-required-context.solution.1.tsx
diff --git a/src/07-advanced-patterns/51-required-context.solution.2.tsx b/src/06-advanced-hooks/46-required-context.solution.2.tsx
similarity index 100%
rename from src/07-advanced-patterns/51-required-context.solution.2.tsx
rename to src/06-advanced-hooks/46-required-context.solution.2.tsx
diff --git a/src/05-advanced-hooks/39-unions-in-usestate.problem.tsx b/src/06-advanced-hooks/47-unions-in-usestate.problem.tsx
similarity index 65%
rename from src/05-advanced-hooks/39-unions-in-usestate.problem.tsx
rename to src/06-advanced-hooks/47-unions-in-usestate.problem.tsx
index e361a74..e34471c 100644
--- a/src/05-advanced-hooks/39-unions-in-usestate.problem.tsx
+++ b/src/06-advanced-hooks/47-unions-in-usestate.problem.tsx
@@ -1,18 +1,17 @@
 import { useEffect, useState } from "react";
 import { Equal, Expect } from "../helpers/type-utils";
-
-const fetchVideo = (src: string, signal: AbortSignal) => {
-  return fetch(src, {
-    signal,
-  }).then((response) => response.blob());
-};
-
-const appendVideoToDomAndPlay = (blob: Blob) => {
-  const video = document.createElement("video");
-  video.src = URL.createObjectURL(blob);
-  video.play();
-};
-
+import { appendVideoToDomAndPlay, fetchVideo } from "fake-external-lib";
+
+/**
+ * This is a complex problem. We want to load a video from a URL and play it.
+ * We also want to show a loading spinner while it loads, and an error message
+ * if it fails.
+ *
+ * The code is handling this with several different states: "loading", "loaded",
+ * and "error". But currently, the type of state is just string.
+ *
+ * 1. See if you can fix the errors below by making the type of state more specific.
+ */
 export const useLoadAsyncVideo = (src: string) => {
   const [state, setState] = useState("loading");
 
@@ -21,9 +20,7 @@ export const useLoadAsyncVideo = (src: string) => {
 
     let cancelled = false;
 
-    const abortController = new AbortController();
-
-    fetchVideo(src, abortController.signal)
+    fetchVideo(src)
       .then((blob) => {
         if (cancelled) {
           return;
@@ -42,7 +39,6 @@ export const useLoadAsyncVideo = (src: string) => {
 
     return () => {
       cancelled = true;
-      abortController.abort();
     };
   }, [src]);
 
diff --git a/src/05-advanced-hooks/39-unions-in-usestate.solution.tsx b/src/06-advanced-hooks/47-unions-in-usestate.solution.tsx
similarity index 70%
rename from src/05-advanced-hooks/39-unions-in-usestate.solution.tsx
rename to src/06-advanced-hooks/47-unions-in-usestate.solution.tsx
index c54379d..9a7a690 100644
--- a/src/05-advanced-hooks/39-unions-in-usestate.solution.tsx
+++ b/src/06-advanced-hooks/47-unions-in-usestate.solution.tsx
@@ -1,20 +1,9 @@
 import { useEffect, useState } from "react";
 import { Equal, Expect } from "../helpers/type-utils";
+import { appendVideoToDomAndPlay, fetchVideo } from "fake-external-lib";
 
 type State = "loading" | "loaded" | "error";
 
-const fetchVideo = (src: string, signal: AbortSignal) => {
-  return fetch(src, {
-    signal,
-  }).then((response) => response.blob());
-};
-
-const appendVideoToDomAndPlay = (blob: Blob) => {
-  const video = document.createElement("video");
-  video.src = URL.createObjectURL(blob);
-  video.play();
-};
-
 export const useLoadAsyncVideo = (src: string) => {
   const [state, setState] = useState<State>("loading");
 
@@ -23,9 +12,7 @@ export const useLoadAsyncVideo = (src: string) => {
 
     let cancelled = false;
 
-    const abortController = new AbortController();
-
-    fetchVideo(src, abortController.signal)
+    fetchVideo(src)
       .then((blob) => {
         if (cancelled) {
           return;
@@ -44,7 +31,6 @@ export const useLoadAsyncVideo = (src: string) => {
 
     return () => {
       cancelled = true;
-      abortController.abort();
     };
   }, [src]);
 
diff --git a/src/05-advanced-hooks/40-discriminated-unions-in-usestate.problem.tsx b/src/06-advanced-hooks/48-discriminated-unions-in-usestate.problem.tsx
similarity index 62%
rename from src/05-advanced-hooks/40-discriminated-unions-in-usestate.problem.tsx
rename to src/06-advanced-hooks/48-discriminated-unions-in-usestate.problem.tsx
index 30a2ab4..9d36f1e 100644
--- a/src/05-advanced-hooks/40-discriminated-unions-in-usestate.problem.tsx
+++ b/src/06-advanced-hooks/48-discriminated-unions-in-usestate.problem.tsx
@@ -1,37 +1,36 @@
+import { appendVideoToDomAndPlay, fetchVideo } from "fake-external-lib";
 import { useEffect, useState } from "react";
 
-interface State {
-  status: "loading" | "loaded" | "error";
-  error?: Error;
-}
-
-const fetchVideo = (src: string) => {
-  return fetch(src).then((response) => response.blob());
-};
-
-const appendVideoToDomAndPlay = (blob: Blob) => {
-  const video = document.createElement("video");
-  video.src = URL.createObjectURL(blob);
-  video.play();
-};
-
 export const useLoadAsyncVideo = (src: string) => {
-  const [state, setState] = useState<State>({
+  const [state, setState] = useState({
     status: "loading",
   });
 
   useEffect(() => {
     setState({ status: "loading" });
 
+    let cancelled = false;
+
     fetchVideo(src)
       .then((blob) => {
+        if (cancelled) {
+          return;
+        }
+
         appendVideoToDomAndPlay(blob);
 
         setState({ status: "loaded" });
       })
       .catch((error) => {
+        if (cancelled) {
+          return;
+        }
         setState({ status: "error", error });
       });
+
+    return () => {
+      cancelled = true;
+    };
   }, [src]);
 
   // @ts-expect-error
@@ -42,4 +41,8 @@ export const useLoadAsyncVideo = (src: string) => {
 
   // @ts-expect-error
   setState({ status: "loaded", error: new Error("error") });
+
+  if (state.status === "error") {
+    console.error(state.error);
+  }
 };
diff --git a/src/05-advanced-hooks/40-discriminated-unions-in-usestate.solution.tsx b/src/06-advanced-hooks/48-discriminated-unions-in-usestate.solution.tsx
similarity index 67%
rename from src/05-advanced-hooks/40-discriminated-unions-in-usestate.solution.tsx
rename to src/06-advanced-hooks/48-discriminated-unions-in-usestate.solution.tsx
index 1728d72..45b8477 100644
--- a/src/05-advanced-hooks/40-discriminated-unions-in-usestate.solution.tsx
+++ b/src/06-advanced-hooks/48-discriminated-unions-in-usestate.solution.tsx
@@ -1,27 +1,15 @@
+import { appendVideoToDomAndPlay, fetchVideo } from "fake-external-lib";
 import { useEffect, useState } from "react";
 
 type State =
   | {
-      status: "loading";
-    }
-  | {
-      status: "loaded";
+      status: "loading" | "loaded";
     }
   | {
       status: "error";
       error: Error;
     };
 
-const fetchVideo = (src: string) => {
-  return fetch(src).then((response) => response.blob());
-};
-
-const appendVideoToDomAndPlay = (blob: Blob) => {
-  const video = document.createElement("video");
-  video.src = URL.createObjectURL(blob);
-  video.play();
-};
-
 export const useLoadAsyncVideo = (src: string) => {
   const [state, setState] = useState<State>({
     status: "loading",
@@ -30,15 +18,28 @@ export const useLoadAsyncVideo = (src: string) => {
   useEffect(() => {
     setState({ status: "loading" });
 
+    let cancelled = false;
+
     fetchVideo(src)
       .then((blob) => {
+        if (cancelled) {
+          return;
+        }
+
         appendVideoToDomAndPlay(blob);
 
         setState({ status: "loaded" });
       })
       .catch((error) => {
+        if (cancelled) {
+          return;
+        }
         setState({ status: "error", error });
       });
+
+    return () => {
+      cancelled = true;
+    };
   }, [src]);
 
   // @ts-expect-error
@@ -49,4 +50,8 @@ export const useLoadAsyncVideo = (src: string) => {
 
   // @ts-expect-error
   setState({ status: "loaded", error: new Error("error") });
+
+  if (state.status === "error") {
+    console.error(state.error);
+  }
 };
diff --git a/src/05-advanced-hooks/42-discriminated-tuples-from-custom-hooks.problem.tsx b/src/06-advanced-hooks/49-discriminated-tuples-from-custom-hooks.problem.tsx
similarity index 60%
rename from src/05-advanced-hooks/42-discriminated-tuples-from-custom-hooks.problem.tsx
rename to src/06-advanced-hooks/49-discriminated-tuples-from-custom-hooks.problem.tsx
index 52f7952..432baac 100644
--- a/src/05-advanced-hooks/42-discriminated-tuples-from-custom-hooks.problem.tsx
+++ b/src/06-advanced-hooks/49-discriminated-tuples-from-custom-hooks.problem.tsx
@@ -5,6 +5,21 @@ export type Result<T> = [
   T | Error | undefined,
 ];
 
+/**
+ * Let's look at one more example of discriminated unions. This time, we're
+ * going to use them to make the tuple return type of a hook smarter.
+ *
+ * 1. Change the Result type so that the second element is inferred
+ * from narrowing the first.
+ *
+ * const [status, value] = useData<{ title: string }>(
+ *   "https://jsonplaceholder.typicode.com/todos/1",
+ * );
+ *
+ * When status is 'loading', value should be undefined.
+ * When status is 'error', value should be an Error.
+ * When status is 'success', value should be T.
+ */
 export const useData = <T,>(url: string): Result<T> => {
   const [result, setResult] = useState<Result<T>>(["loading", undefined]);
 
diff --git a/src/05-advanced-hooks/42-discriminated-tuples-from-custom-hooks.solution.tsx b/src/06-advanced-hooks/49-discriminated-tuples-from-custom-hooks.solution.tsx
similarity index 65%
rename from src/05-advanced-hooks/42-discriminated-tuples-from-custom-hooks.solution.tsx
rename to src/06-advanced-hooks/49-discriminated-tuples-from-custom-hooks.solution.tsx
index 170e9ae..b1661c1 100644
--- a/src/05-advanced-hooks/42-discriminated-tuples-from-custom-hooks.solution.tsx
+++ b/src/06-advanced-hooks/49-discriminated-tuples-from-custom-hooks.solution.tsx
@@ -1,12 +1,18 @@
 import { useEffect, useState } from "react";
 
+/**
+ * A discriminated tuple!
+ *
+ * The really cool thing about this is that TypeScript can infer the type
+ * even after it's been destructured.
+ */
 export type Result<T> =
-  | ["loading", undefined]
-  | ["error", Error]
-  | ["success", T];
+  | ["loading", undefined?]
+  | ["success", T]
+  | ["error", Error];
 
 export const useData = <T,>(url: string): Result<T> => {
-  const [result, setResult] = useState<Result<T>>(["loading", undefined]);
+  const [result, setResult] = useState<Result<T>>(["loading"]);
 
   useEffect(() => {
     fetch(url)
@@ -20,7 +26,7 @@ export const useData = <T,>(url: string): Result<T> => {
 
 const Component = () => {
   const [status, value] = useData<{ title: string }>(
-    "https://jsonplaceholder.typicode.com/todos/1",
+    "https://jsonplaceholder.typicode.com/todos/1"
   );
 
   if (status === "loading") {
diff --git a/src/06-advanced-hooks/50-use-state-overloads.problem.ts b/src/06-advanced-hooks/50-use-state-overloads.problem.ts
new file mode 100644
index 0000000..0265ade
--- /dev/null
+++ b/src/06-advanced-hooks/50-use-state-overloads.problem.ts
@@ -0,0 +1,38 @@
+import { useState } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+useState;
+// ^^^^^ CMD-click to see the implementation of useState
+
+/**
+ * 1. Take a look at useState. You'll notice that it's composed of
+ * two overloads.
+ *
+ * 2. Try to figure out what the difference is between the two overloads.
+ *
+ * 3. Below, there's a simple function that expects to behave like useState.
+ * Try to write a set of function overloads that:
+ *
+ * - If it receives a string, returns a string
+ * - If it receives NOTHING, returns a string | undefined
+ *
+ * HINT - you'll need to use the function keyword THREE times.
+ */
+
+function maybeReturnsString(defaultString?: string) {
+  // If you pass a string, it always returns a string
+  if (defaultString) {
+    return defaultString;
+  }
+
+  // Otherwise, it MIGHT return a string or undefined
+  return Math.random() > 0.5 ? "hello" : undefined;
+}
+
+const example1 = maybeReturnsString("hello");
+const example2 = maybeReturnsString();
+
+type tests = [
+  Expect<Equal<typeof example1, string>>,
+  Expect<Equal<typeof example2, string | undefined>>,
+];
diff --git a/src/06-advanced-hooks/50-use-state-overloads.solution.1.ts b/src/06-advanced-hooks/50-use-state-overloads.solution.1.ts
new file mode 100644
index 0000000..7723958
--- /dev/null
+++ b/src/06-advanced-hooks/50-use-state-overloads.solution.1.ts
@@ -0,0 +1,21 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+function maybeReturnsString(defaultString: string): string;
+function maybeReturnsString(): string | undefined;
+function maybeReturnsString(defaultString?: string) {
+  // If you pass a string, it always returns a string
+  if (defaultString) {
+    return defaultString;
+  }
+
+  // Otherwise, it MIGHT return a string or undefined
+  return Math.random() > 0.5 ? "hello" : undefined;
+}
+
+const example1 = maybeReturnsString("hello");
+const example2 = maybeReturnsString();
+
+type tests = [
+  Expect<Equal<typeof example1, string>>,
+  Expect<Equal<typeof example2, string | undefined>>
+];
diff --git a/src/06-advanced-hooks/50-use-state-overloads.solution.2.ts b/src/06-advanced-hooks/50-use-state-overloads.solution.2.ts
new file mode 100644
index 0000000..9d1e63e
--- /dev/null
+++ b/src/06-advanced-hooks/50-use-state-overloads.solution.2.ts
@@ -0,0 +1,28 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+/**
+ * This approach also works - specifying defaultString?: string | undefined
+ * in the second overload.
+ */
+
+function maybeReturnsString(defaultString: string): string;
+function maybeReturnsString(
+  defaultString?: string | undefined
+): string | undefined;
+function maybeReturnsString(defaultString?: string) {
+  // If you pass a string, it always returns a string
+  if (defaultString) {
+    return defaultString;
+  }
+
+  // Otherwise, it MIGHT return a string or undefined
+  return Math.random() > 0.5 ? "hello" : undefined;
+}
+
+const example1 = maybeReturnsString("hello");
+const example2 = maybeReturnsString(undefined);
+
+type tests = [
+  Expect<Equal<typeof example1, string>>,
+  Expect<Equal<typeof example2, string | undefined>>
+];
diff --git a/src/06-advanced-hooks/51-function-overloads-in-hooks.problem.ts b/src/06-advanced-hooks/51-function-overloads-in-hooks.problem.ts
new file mode 100644
index 0000000..7c137fc
--- /dev/null
+++ b/src/06-advanced-hooks/51-function-overloads-in-hooks.problem.ts
@@ -0,0 +1,47 @@
+import { useState } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+/**
+ * Returning to our useStateAsObject function, we now want to make it work
+ * EXACTLY like useState, where if you pass NOTHING, it returns T | undefined.
+ *
+ * If you pass a default value, it should NOT include undefined.
+ */
+export function useStateAsObject<T>(initial: T) {
+  const [value, set] = useState(initial);
+
+  return {
+    value,
+    set,
+  };
+}
+
+/**
+ * If you DO pass a default value, the result should NOT include undefined
+ */
+const notUndefined = useStateAsObject({ name: "Matt" });
+
+type ExampleTests = [
+  Expect<Equal<typeof notUndefined.value, { name: string }>>,
+  Expect<
+    Equal<
+      typeof notUndefined.set,
+      React.Dispatch<React.SetStateAction<{ name: string }>>
+    >
+  >,
+];
+
+/**
+ * If you don't pass a value, it should be undefined
+ */
+const hasUndefined = useStateAsObject<number>();
+
+type NumTests = [
+  Expect<Equal<typeof hasUndefined.value, number | undefined>>,
+  Expect<
+    Equal<
+      typeof hasUndefined.set,
+      React.Dispatch<React.SetStateAction<number | undefined>>
+    >
+  >,
+];
diff --git a/src/05-advanced-hooks/36-function-overloads-in-hooks.solution.1.ts b/src/06-advanced-hooks/51-function-overloads-in-hooks.solution.1.ts
similarity index 61%
rename from src/05-advanced-hooks/36-function-overloads-in-hooks.solution.1.ts
rename to src/06-advanced-hooks/51-function-overloads-in-hooks.solution.1.ts
index 2cdeedf..933190c 100644
--- a/src/05-advanced-hooks/36-function-overloads-in-hooks.solution.1.ts
+++ b/src/06-advanced-hooks/51-function-overloads-in-hooks.solution.1.ts
@@ -18,25 +18,31 @@ export function useStateAsObject<T>(initial?: T) {
   };
 }
 
-const example = useStateAsObject({ name: "Matt" });
+/**
+ * If you DO pass a default value, the result should NOT include undefined
+ */
+const notUndefined = useStateAsObject({ name: "Matt" });
 
 type ExampleTests = [
-  Expect<Equal<typeof example.value, { name: string }>>,
+  Expect<Equal<typeof notUndefined.value, { name: string }>>,
   Expect<
     Equal<
-      typeof example.set,
+      typeof notUndefined.set,
       React.Dispatch<React.SetStateAction<{ name: string }>>
     >
   >,
 ];
 
-const num = useStateAsObject<number>();
+/**
+ * If you don't pass a value, it should be undefined
+ */
+const hasUndefined = useStateAsObject<number>();
 
 type NumTests = [
-  Expect<Equal<typeof num.value, number | undefined>>,
+  Expect<Equal<typeof hasUndefined.value, number | undefined>>,
   Expect<
     Equal<
-      typeof num.set,
+      typeof hasUndefined.set,
       React.Dispatch<React.SetStateAction<number | undefined>>
     >
   >,
diff --git a/src/05-advanced-hooks/36-function-overloads-in-hooks.solution.2.ts b/src/06-advanced-hooks/51-function-overloads-in-hooks.solution.2.ts
similarity index 61%
rename from src/05-advanced-hooks/36-function-overloads-in-hooks.solution.2.ts
rename to src/06-advanced-hooks/51-function-overloads-in-hooks.solution.2.ts
index 2e58922..5432703 100644
--- a/src/05-advanced-hooks/36-function-overloads-in-hooks.solution.2.ts
+++ b/src/06-advanced-hooks/51-function-overloads-in-hooks.solution.2.ts
@@ -17,25 +17,31 @@ export function useStateAsObject<T>(initial?: T) {
   };
 }
 
-const example = useStateAsObject({ name: "Matt" });
+/**
+ * If you DO pass a default value, the result should NOT include undefined
+ */
+const notUndefined = useStateAsObject({ name: "Matt" });
 
 type ExampleTests = [
-  Expect<Equal<typeof example.value, { name: string }>>,
+  Expect<Equal<typeof notUndefined.value, { name: string }>>,
   Expect<
     Equal<
-      typeof example.set,
+      typeof notUndefined.set,
       React.Dispatch<React.SetStateAction<{ name: string }>>
     >
   >,
 ];
 
-const num = useStateAsObject<number>();
+/**
+ * If you don't pass a value, it should be undefined
+ */
+const hasUndefined = useStateAsObject<number>();
 
 type NumTests = [
-  Expect<Equal<typeof num.value, number | undefined>>,
+  Expect<Equal<typeof hasUndefined.value, number | undefined>>,
   Expect<
     Equal<
-      typeof num.set,
+      typeof hasUndefined.set,
       React.Dispatch<React.SetStateAction<number | undefined>>
     >
   >,
diff --git a/src/06-advanced-hooks/52-currying-hooks.problem.ts b/src/06-advanced-hooks/52-currying-hooks.problem.ts
new file mode 100644
index 0000000..ccce13c
--- /dev/null
+++ b/src/06-advanced-hooks/52-currying-hooks.problem.ts
@@ -0,0 +1,39 @@
+import { DependencyList, useMemo, useState } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+const useCustomState = <TValue>(initial: TValue) => {
+  const [value, set] = useState<TValue>(initial);
+
+  return {
+    value,
+    set,
+    /**
+     * Here, we're returning a hook from our initial hook!
+     * This is a great way to compose behaviour.
+     *
+     * BUT - useComputed takes in a function which can return
+     * any type. We want to make sure that the type of the
+     * thing returned is inferred properly.
+     */
+    useComputed: (factory: (value: any) => any, deps?: DependencyList) => {
+      return useMemo(() => {
+        return factory(value);
+      }, [value, ...(deps || [])]);
+    },
+  };
+};
+
+const Component = () => {
+  const arrayOfNums = useCustomState([1, 2, 3, 4, 5, 6, 7, 8]);
+
+  /**
+   * Currently, this is typed as any. How do we type it
+   * based on the return type of the function passed to
+   * useComputed?
+   */
+  const reversedAsString = arrayOfNums.useComputed((nums) =>
+    Array.from(nums).reverse().map(String),
+  );
+
+  type test = Expect<Equal<typeof reversedAsString, string[]>>;
+};
diff --git a/src/06-advanced-hooks/52-currying-hooks.solution.ts b/src/06-advanced-hooks/52-currying-hooks.solution.ts
new file mode 100644
index 0000000..95bc7c3
--- /dev/null
+++ b/src/06-advanced-hooks/52-currying-hooks.solution.ts
@@ -0,0 +1,33 @@
+import { DependencyList, useMemo, useState } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+const useCustomState = <TValue>(initial: TValue) => {
+  const [value, set] = useState<TValue>(initial);
+
+  return {
+    value,
+    set,
+    /**
+     * We can use a generic _inline_ here to ensure
+     * this all still works.
+     */
+    useComputed: <TComputed>(
+      factory: (value: TValue) => TComputed,
+      deps?: DependencyList,
+    ) => {
+      return useMemo(() => {
+        return factory(value);
+      }, [value, ...(deps || [])]);
+    },
+  };
+};
+
+const Component = () => {
+  const arrayOfNums = useCustomState([1, 2, 3, 4, 5, 6, 7, 8]);
+
+  const reversedAsString = arrayOfNums.useComputed((nums) =>
+    Array.from(nums).reverse().map(String),
+  );
+
+  type test = Expect<Equal<typeof reversedAsString, string[]>>;
+};
diff --git a/src/06-advanced-hooks/discussion.md b/src/06-advanced-hooks/discussion.md
new file mode 100644
index 0000000..9fbece9
--- /dev/null
+++ b/src/06-advanced-hooks/discussion.md
@@ -0,0 +1,7 @@
+What use cases have you seen for function overloads that aren't related to React?
+
+How are function overloads different to generics? Which are safer? Which are more flexible?
+
+Which do you prefer - discriminated tuples or discriminated unions of objects? Why?
+
+Have you used 'as const' before? If so, what was your use case?
diff --git a/src/06-types-deep-dive/43-understand-react-namespace-export.explainer.ts b/src/06-types-deep-dive/43-understand-react-namespace-export.explainer.ts
deleted file mode 100644
index 23c10b6..0000000
--- a/src/06-types-deep-dive/43-understand-react-namespace-export.explainer.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from "react";
-
-/**
- * Try deleting each of these lines in the
- * types themselves:
- */
-
-// export = React;
-// export as namespace React;
-
-// What is ExoticComponent?
diff --git a/src/06-types-deep-dive/44-understanding-jsx-element.explainer.tsx b/src/06-types-deep-dive/44-understanding-jsx-element.explainer.tsx
deleted file mode 100644
index 786c751..0000000
--- a/src/06-types-deep-dive/44-understanding-jsx-element.explainer.tsx
+++ /dev/null
@@ -1 +0,0 @@
-// Talk about JSX.Element return type
diff --git a/src/06-types-deep-dive/45-strongly-typing-children.problem.tsx b/src/06-types-deep-dive/45-strongly-typing-children.problem.tsx
deleted file mode 100644
index 37082d3..0000000
--- a/src/06-types-deep-dive/45-strongly-typing-children.problem.tsx
+++ /dev/null
@@ -1 +0,0 @@
-// It's impossible!
diff --git a/src/06-types-deep-dive/46-how-does-react-represent-html.explainer.ts b/src/06-types-deep-dive/46-how-does-react-represent-html.explainer.ts
deleted file mode 100644
index 66372f1..0000000
--- a/src/06-types-deep-dive/46-how-does-react-represent-html.explainer.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// Understand JSX namespace
-// Understand JSX.IntrinsicElements
-// Understand React.*HTMLAttributes
diff --git a/src/06-types-deep-dive/46-understanding-jsx-intrinsic-elements.explainer.ts b/src/06-types-deep-dive/46-understanding-jsx-intrinsic-elements.explainer.ts
deleted file mode 100644
index ae3bc45..0000000
--- a/src/06-types-deep-dive/46-understanding-jsx-intrinsic-elements.explainer.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type JSXElementTypes = keyof JSX.IntrinsicElements;
diff --git a/src/06-types-deep-dive/47-add-new-global-element.problem.tsx b/src/06-types-deep-dive/47-add-new-global-element.problem.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/06-types-deep-dive/48-add-attribute-to-all-elements.problem.tsx b/src/06-types-deep-dive/48-add-attribute-to-all-elements.problem.tsx
deleted file mode 100644
index 9c50318..0000000
--- a/src/06-types-deep-dive/48-add-attribute-to-all-elements.problem.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-declare global {
-  namespace React {
-    interface HTMLAttributes<T> {
-      someCoolAttribute?: string;
-    }
-  }
-
-  interface HTMLDivElement {
-    someCoolAttribute?: string;
-  }
-
-  interface HTMLElement {
-    someOtherAttribute?: string;
-  }
-}
-
-export const example1 = (
-  <div
-    someCoolAttribute="awdawd"
-    onChange={(e) => {
-      console.log(e.currentTarget.someCoolAttribute);
-    }}
-  ></div>
-);
diff --git a/src/06-types-deep-dive/49-add-attribute-to-audio-elements.problem.tsx b/src/06-types-deep-dive/49-add-attribute-to-audio-elements.problem.tsx
deleted file mode 100644
index 4e52617..0000000
--- a/src/06-types-deep-dive/49-add-attribute-to-audio-elements.problem.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-declare global {
-  namespace React {
-    interface AudioHTMLAttributes<T> {
-      audioOnlyAttr?: string;
-    }
-  }
-}
-
-export const example1 = <audio audioOnlyAttr="awdawd"></audio>;
-
-// @ts-expect-error
-export const example2 = <span audioOnlyAttr="awdawd"></span>;
diff --git a/src/06-types-deep-dive/50-add-attribute-to-div-elements.problem.tsx b/src/06-types-deep-dive/50-add-attribute-to-div-elements.problem.tsx
deleted file mode 100644
index a88fda6..0000000
--- a/src/06-types-deep-dive/50-add-attribute-to-div-elements.problem.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { DetailedHTMLProps, HTMLAttributes } from "react";
-
-declare global {
-  namespace JSX {
-    interface IntrinsicElements {
-      div: DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement> & {
-        something?: string;
-      };
-    }
-  }
-}
-
-export const example1 = <div something="awdawd"></div>;
-
-// @ts-expect-error
-export const example2 = <span something="awdawd"></span>;
diff --git a/src/07-advanced-patterns/52-compound-components.problem.tsx b/src/07-advanced-patterns/52-compound-components.problem.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/07-advanced-patterns/53-forward-ref-with-generics.explainer.1.tsx b/src/07-advanced-patterns/53-forward-ref-with-generics.explainer.1.tsx
deleted file mode 100644
index bccbc84..0000000
--- a/src/07-advanced-patterns/53-forward-ref-with-generics.explainer.1.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { ForwardedRef, forwardRef } from "react";
-import { Equal, Expect } from "../helpers/type-utils";
-
-type Props<T> = {
-  data: T[];
-  renderRow: (item: T) => React.ReactNode;
-};
-
-// declare module "react" {
-//   function forwardRef<T, P = {}>(
-//     render: (props: P, ref: React.Ref<T>) => React.ReactElement | null,
-//   ): (props: P & React.RefAttributes<T>) => React.ReactElement | null;
-// }
-
-export const Table = <T,>(props: Props<T>, ref: ForwardedRef<any>) => {
-  return null;
-};
-
-const ForwardReffedTable = forwardRef(Table);
-
-const Parent = () => {
-  return (
-    <ForwardReffedTable
-      data={["123"]}
-      renderRow={(row) => {
-        type test = Expect<Equal<typeof row, string>>;
-        return <div>123</div>;
-      }}
-    ></ForwardReffedTable>
-  );
-};
diff --git a/src/07-advanced-patterns/54-hoc-problem.tsx b/src/07-advanced-patterns/54-hoc-problem.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/07-advanced-patterns/55-as-prop.problem.tsx b/src/07-advanced-patterns/55-as-prop.problem.tsx
deleted file mode 100644
index 6aeeeca..0000000
--- a/src/07-advanced-patterns/55-as-prop.problem.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-export const Component = (props: any) => {
-  const Comp = props.as;
-  return <Comp {...(props as any)}></Comp>;
-};
-
-// Should work, and you should get autocomplete on the
-// props for the 'a' tag
-const example1 = <Component as="a" href="awdawd"></Component>;
-
-const example2 = (
-  <Component
-    as="div"
-    // @ts-expect-error: Property 'href' does not exist
-    href="awdawd"
-  ></Component>
-);
diff --git a/src/07-advanced-patterns/55-as-prop.solution.1.tsx b/src/07-advanced-patterns/55-as-prop.solution.1.tsx
deleted file mode 100644
index a081ed2..0000000
--- a/src/07-advanced-patterns/55-as-prop.solution.1.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-type AsProps = {
-  [K in keyof JSX.IntrinsicElements]: {
-    as: K;
-  } & JSX.IntrinsicElements[K];
-}[keyof JSX.IntrinsicElements];
-
-export const Component = (props: AsProps) => {
-  const Comp = props.as;
-  return <Comp {...(props as any)}></Comp>;
-};
-
-const example1 = <Component as="a" href="awdawd"></Component>;
-
-const example2 = (
-  <Component
-    as="div"
-    // @ts-expect-error: Property 'href' does not exist
-    href="awdawd"
-  ></Component>
-);
diff --git a/src/07-advanced-patterns/55-as-prop.solution.2.tsx b/src/07-advanced-patterns/55-as-prop.solution.2.tsx
deleted file mode 100644
index 8129267..0000000
--- a/src/07-advanced-patterns/55-as-prop.solution.2.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-export const Component = <TAs extends keyof JSX.IntrinsicElements>(
-  props: {
-    as: TAs;
-  } & JSX.IntrinsicElements[TAs],
-) => {
-  const Comp = props.as as string;
-
-  // In this version, we can remove the 'as any' because
-  // TypeScript is able to keep up with the inference
-  return <Comp {...props}></Comp>;
-};
-
-const example1 = <Component as="a" href="awdawd"></Component>;
-
-const example2 = (
-  <Component
-    as="div"
-    // @ts-expect-error: Property 'href' does not exist
-    href="awdawd"
-  ></Component>
-);
diff --git a/src/07-advanced-patterns/56-as-prop-with-custom-components.problem.tsx b/src/07-advanced-patterns/56-as-prop-with-custom-components.problem.tsx
deleted file mode 100644
index e19c44a..0000000
--- a/src/07-advanced-patterns/56-as-prop-with-custom-components.problem.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from "react";
-
-export const Component = (props: { as: unknown }) => {
-  const Comp = props.as;
-  return <Comp {...props}></Comp>;
-};
-
-const Link = (props: { href: string; children?: React.ReactNode }) => {
-  return <a href={props.href}>{props.children}</a>;
-};
-
-<Component as={Link} href="awdawd"></Component>;
diff --git a/src/07-advanced-patterns/56-as-prop-with-custom-components.solution.tsx b/src/07-advanced-patterns/56-as-prop-with-custom-components.solution.tsx
deleted file mode 100644
index 7d51e2f..0000000
--- a/src/07-advanced-patterns/56-as-prop-with-custom-components.solution.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React, { ComponentProps, JSXElementConstructor } from "react";
-
-export const Component = <
-  T extends keyof JSX.IntrinsicElements | JSXElementConstructor<any>,
->(
-  props: {
-    as: T;
-  } & ComponentProps<T>,
-) => {
-  const Comp = props.as;
-  return (
-    <Comp
-      // The 'as any' is still needed, because 'as' is SO generic
-      // that TypeScript can't handle it.
-      {...props}
-    ></Comp>
-  );
-};
-
-const Link = (props: { href: string; children?: React.ReactNode }) => {
-  return <a href={props.href}>{props.children}</a>;
-};
-
-// It works!
-
-<Component as={Link} href="awdawd"></Component>;
diff --git a/src/07-advanced-patterns/57-render-props.problem.tsx b/src/07-advanced-patterns/57-render-props.problem.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/07-advanced-patterns/58-render-props-with-generics.problem.tsx b/src/07-advanced-patterns/58-render-props-with-generics.problem.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/07-advanced-patterns/59-record-of-components-with-same-props.problem.tsx b/src/07-advanced-patterns/59-record-of-components-with-same-props.problem.tsx
deleted file mode 100644
index 9289714..0000000
--- a/src/07-advanced-patterns/59-record-of-components-with-same-props.problem.tsx
+++ /dev/null
@@ -1 +0,0 @@
-// https://codesandbox.io/s/young-dream-ihjcq3?file=/src/App.tsx
diff --git a/src/07-types-deep-dive/53-understand-react-namespace-export.problem.ts b/src/07-types-deep-dive/53-understand-react-namespace-export.problem.ts
new file mode 100644
index 0000000..9ef28a5
--- /dev/null
+++ b/src/07-types-deep-dive/53-understand-react-namespace-export.problem.ts
@@ -0,0 +1,21 @@
+import React from "react";
+
+/**
+ * Questions to answer:
+ */
+
+// 1. What is the React namespace?
+type Example = React.ReactNode;
+//             ^?
+
+/**
+ * 2. How come React can be used BOTH as a value and a type?
+ *
+ * HINT - we're adding LOTS of things to React's namespace in
+ * later exercises, so make sure when you go-to-definition you
+ * go to its original definition, in @types/react/index.d.ts.
+ */
+const element = React.createElement("div");
+//              ^?
+
+export {};
diff --git a/src/07-types-deep-dive/53-understand-react-namespace-export.solution.ts b/src/07-types-deep-dive/53-understand-react-namespace-export.solution.ts
new file mode 100644
index 0000000..9ef28a5
--- /dev/null
+++ b/src/07-types-deep-dive/53-understand-react-namespace-export.solution.ts
@@ -0,0 +1,21 @@
+import React from "react";
+
+/**
+ * Questions to answer:
+ */
+
+// 1. What is the React namespace?
+type Example = React.ReactNode;
+//             ^?
+
+/**
+ * 2. How come React can be used BOTH as a value and a type?
+ *
+ * HINT - we're adding LOTS of things to React's namespace in
+ * later exercises, so make sure when you go-to-definition you
+ * go to its original definition, in @types/react/index.d.ts.
+ */
+const element = React.createElement("div");
+//              ^?
+
+export {};
diff --git a/src/07-types-deep-dive/54-understanding-jsx-element.problem.tsx b/src/07-types-deep-dive/54-understanding-jsx-element.problem.tsx
new file mode 100644
index 0000000..6b8506f
--- /dev/null
+++ b/src/07-types-deep-dive/54-understanding-jsx-element.problem.tsx
@@ -0,0 +1,53 @@
+/**
+ * 1. What's the difference between JSX.Element,
+ * React.ReactNode and React.ReactElement?
+ *
+ * CMD-click each of them to understand the difference.
+ */
+
+type ClickMe = React.ReactElement;
+type ClickMeToo = JSX.Element;
+type ClickMeThree = React.ReactNode;
+
+/**
+ * 2. What is the return type of this Component?
+ */
+const Component = () => {
+  return <div>Hello world</div>;
+};
+
+/**
+ * 3. Fun fact - this might break on your IDE! In
+ * TypeScript 5.0, this wouldn't work. But in TypeScript
+ * 5.1, it DOES work.
+ *
+ * If it's not working for you, try making your IDE use
+ * the 'workspace' version of TypeScript.
+ *
+ * https://stackoverflow.com/questions/39668731/what-typescript-version-is-visual-studio-code-using-how-to-update-it
+ */
+const Component2 = (): React.ReactNode => {
+  return <div></div>;
+};
+
+<>
+  <Component2 />
+</>;
+
+/**
+ * 4a. Why does this component NOT error...
+ */
+const Component3 = (): React.ReactElement => {
+  return <div></div>;
+};
+
+<>
+  <Component3 />
+</>;
+
+/**
+ * 4b. ...but this one does?
+ */
+const Component4 = (): React.ReactElement => {
+  return "hello!";
+};
diff --git a/src/07-types-deep-dive/54-understanding-jsx-element.solution.tsx b/src/07-types-deep-dive/54-understanding-jsx-element.solution.tsx
new file mode 100644
index 0000000..6b8506f
--- /dev/null
+++ b/src/07-types-deep-dive/54-understanding-jsx-element.solution.tsx
@@ -0,0 +1,53 @@
+/**
+ * 1. What's the difference between JSX.Element,
+ * React.ReactNode and React.ReactElement?
+ *
+ * CMD-click each of them to understand the difference.
+ */
+
+type ClickMe = React.ReactElement;
+type ClickMeToo = JSX.Element;
+type ClickMeThree = React.ReactNode;
+
+/**
+ * 2. What is the return type of this Component?
+ */
+const Component = () => {
+  return <div>Hello world</div>;
+};
+
+/**
+ * 3. Fun fact - this might break on your IDE! In
+ * TypeScript 5.0, this wouldn't work. But in TypeScript
+ * 5.1, it DOES work.
+ *
+ * If it's not working for you, try making your IDE use
+ * the 'workspace' version of TypeScript.
+ *
+ * https://stackoverflow.com/questions/39668731/what-typescript-version-is-visual-studio-code-using-how-to-update-it
+ */
+const Component2 = (): React.ReactNode => {
+  return <div></div>;
+};
+
+<>
+  <Component2 />
+</>;
+
+/**
+ * 4a. Why does this component NOT error...
+ */
+const Component3 = (): React.ReactElement => {
+  return <div></div>;
+};
+
+<>
+  <Component3 />
+</>;
+
+/**
+ * 4b. ...but this one does?
+ */
+const Component4 = (): React.ReactElement => {
+  return "hello!";
+};
diff --git a/src/07-types-deep-dive/55-strongly-typing-children.problem.tsx b/src/07-types-deep-dive/55-strongly-typing-children.problem.tsx
new file mode 100644
index 0000000..1a89bd9
--- /dev/null
+++ b/src/07-types-deep-dive/55-strongly-typing-children.problem.tsx
@@ -0,0 +1,33 @@
+import { ReactNode } from "react";
+
+/**
+ * In this example we have a Select component. Through some magic, we're
+ * attempting to strongly type the children of the Select component so
+ * that you can only pass 'Option' elements to it.
+ *
+ * 1. Try to understand the type of OptionType. What's the __brand property
+ * for?
+ *
+ * 2. There's an error happening at <Option /> below. Why is that?
+ *
+ * 3. Try changing <Option /> to {Option()}. This appears to work. Why?
+ * And why is this NOT a good idea?
+ *
+ * 4. Is what we're attempting to do even possible?
+ */
+
+type OptionType = {
+  __brand: "OPTION_TYPE";
+} & ReactNode;
+
+const Option = () => {
+  return (<option></option>) as OptionType;
+};
+
+const Select = (props: { children: OptionType }) => {
+  return <select>{props.children}</select>;
+};
+
+<Select>
+  <Option />
+</Select>;
diff --git a/src/07-types-deep-dive/55-strongly-typing-children.solution.tsx b/src/07-types-deep-dive/55-strongly-typing-children.solution.tsx
new file mode 100644
index 0000000..1a89bd9
--- /dev/null
+++ b/src/07-types-deep-dive/55-strongly-typing-children.solution.tsx
@@ -0,0 +1,33 @@
+import { ReactNode } from "react";
+
+/**
+ * In this example we have a Select component. Through some magic, we're
+ * attempting to strongly type the children of the Select component so
+ * that you can only pass 'Option' elements to it.
+ *
+ * 1. Try to understand the type of OptionType. What's the __brand property
+ * for?
+ *
+ * 2. There's an error happening at <Option /> below. Why is that?
+ *
+ * 3. Try changing <Option /> to {Option()}. This appears to work. Why?
+ * And why is this NOT a good idea?
+ *
+ * 4. Is what we're attempting to do even possible?
+ */
+
+type OptionType = {
+  __brand: "OPTION_TYPE";
+} & ReactNode;
+
+const Option = () => {
+  return (<option></option>) as OptionType;
+};
+
+const Select = (props: { children: OptionType }) => {
+  return <select>{props.children}</select>;
+};
+
+<Select>
+  <Option />
+</Select>;
diff --git a/src/07-types-deep-dive/56-understanding-jsx-intrinsic-elements.problem.tsx b/src/07-types-deep-dive/56-understanding-jsx-intrinsic-elements.problem.tsx
new file mode 100644
index 0000000..49419fe
--- /dev/null
+++ b/src/07-types-deep-dive/56-understanding-jsx-intrinsic-elements.problem.tsx
@@ -0,0 +1,30 @@
+/**
+ * 1. What is JSX.IntrinsicElements? CMD-click on .IntrinsicElements below
+ * to go to its definition.
+ *
+ * Hint - remember to go to the original definition of JSX.IntrinsicElements
+ * in @types/react/index.d.ts.
+ */
+
+export type Example = JSX.IntrinsicElements;
+
+/**
+ * 2. What is the structure of JSX.IntrinsicElements? It appears to have the
+ * HTML attributes as properties, but what are the values?
+ *
+ * 3. Let's have some fun. Edit the file to add a new property to
+ * JSX.IntrinsicElements:
+ *
+ * interface IntrinsicElements {
+ *   // ...
+ *   myNewElement: {
+ *     foo: string;
+ *   }
+ * }
+ *
+ * Notice that the error below goes away!
+ *
+ * 4. Now change it back, before anyone notices.
+ */
+
+<myNewElement foo="123" />;
diff --git a/src/07-types-deep-dive/56-understanding-jsx-intrinsic-elements.solution.tsx b/src/07-types-deep-dive/56-understanding-jsx-intrinsic-elements.solution.tsx
new file mode 100644
index 0000000..49419fe
--- /dev/null
+++ b/src/07-types-deep-dive/56-understanding-jsx-intrinsic-elements.solution.tsx
@@ -0,0 +1,30 @@
+/**
+ * 1. What is JSX.IntrinsicElements? CMD-click on .IntrinsicElements below
+ * to go to its definition.
+ *
+ * Hint - remember to go to the original definition of JSX.IntrinsicElements
+ * in @types/react/index.d.ts.
+ */
+
+export type Example = JSX.IntrinsicElements;
+
+/**
+ * 2. What is the structure of JSX.IntrinsicElements? It appears to have the
+ * HTML attributes as properties, but what are the values?
+ *
+ * 3. Let's have some fun. Edit the file to add a new property to
+ * JSX.IntrinsicElements:
+ *
+ * interface IntrinsicElements {
+ *   // ...
+ *   myNewElement: {
+ *     foo: string;
+ *   }
+ * }
+ *
+ * Notice that the error below goes away!
+ *
+ * 4. Now change it back, before anyone notices.
+ */
+
+<myNewElement foo="123" />;
diff --git a/src/07-types-deep-dive/57-react-component-type.explainer.tsx b/src/07-types-deep-dive/57-react-component-type.explainer.tsx
new file mode 100644
index 0000000..ab99ef4
--- /dev/null
+++ b/src/07-types-deep-dive/57-react-component-type.explainer.tsx
@@ -0,0 +1,35 @@
+type types = [React.ElementType, React.ComponentType];
+
+/**
+ * ElementType
+ *
+ * Lets you specify certain types of elements
+ * which can receive those props.
+ *
+ * For instance, Example accepts 'audio' and 'video'!
+ * As well as ComponentType<P>
+ */
+export type Example = React.ElementType<{
+  autoPlay?: boolean;
+}>;
+
+/**
+ * ComponentType
+ */
+const FuncComponent = (props: { prop1: string }) => {
+  return null;
+};
+
+class ClassComponent extends React.Component<{
+  prop1: string;
+}> {
+  render(): React.ReactNode {
+    this.props.prop1;
+    return null;
+  }
+}
+
+const tests2: Array<React.ComponentType<{ prop1: string }>> = [
+  FuncComponent,
+  ClassComponent,
+];
diff --git a/src/07-types-deep-dive/58-appending-to-global-namespace.problem.ts b/src/07-types-deep-dive/58-appending-to-global-namespace.problem.ts
new file mode 100644
index 0000000..761030b
--- /dev/null
+++ b/src/07-types-deep-dive/58-appending-to-global-namespace.problem.ts
@@ -0,0 +1,17 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+/**
+ * It's actually possible to change things in the global namespace
+ * in TypeScript.
+ *
+ * 1. Add a declaration for React.MyInterface to the global React
+ * namespace below.
+ */
+
+declare global {
+  namespace React {}
+}
+
+type test = Expect<Equal<React.MyInterface, { foo: string }>>;
+
+export {};
diff --git a/src/07-types-deep-dive/58-appending-to-global-namespace.solution.ts b/src/07-types-deep-dive/58-appending-to-global-namespace.solution.ts
new file mode 100644
index 0000000..a102b88
--- /dev/null
+++ b/src/07-types-deep-dive/58-appending-to-global-namespace.solution.ts
@@ -0,0 +1,14 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+declare global {
+  namespace React {
+    // Note that it doesn't need to be exported
+    interface MySolutionInterface {
+      foo: string;
+    }
+  }
+}
+
+type test = Expect<Equal<React.MySolutionInterface, { foo: string }>>;
+
+export {};
diff --git a/src/07-types-deep-dive/59-declaration-merging-in-global-namespace.problem.ts b/src/07-types-deep-dive/59-declaration-merging-in-global-namespace.problem.ts
new file mode 100644
index 0000000..470f2a0
--- /dev/null
+++ b/src/07-types-deep-dive/59-declaration-merging-in-global-namespace.problem.ts
@@ -0,0 +1,28 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+declare global {
+  namespace React {
+    interface MyAwesomeInterface {
+      foo: string;
+    }
+  }
+}
+
+/**
+ * We can use a feature called declaration merging in TypeScript to
+ * CHANGE interfaces in the global namespace.
+ *
+ * WITHOUT changing the code above, change MyAwesomeInterface to add
+ * a property called 'bar' that is a string.
+ *
+ * Clue: you'll need to use declare global, namespace, and interface
+ * again.
+ *
+ * https://www.typescriptlang.org/docs/handbook/declaration-merging.html#merging-interfaces
+ */
+
+type test = Expect<
+  Equal<React.MyAwesomeInterface, { foo: string; bar: string }>
+>;
+
+export {};
diff --git a/src/07-types-deep-dive/59-declaration-merging-in-global-namespace.solution.ts b/src/07-types-deep-dive/59-declaration-merging-in-global-namespace.solution.ts
new file mode 100644
index 0000000..a756472
--- /dev/null
+++ b/src/07-types-deep-dive/59-declaration-merging-in-global-namespace.solution.ts
@@ -0,0 +1,29 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+declare global {
+  namespace React {
+    interface MyAwesomeSolutionInterface {
+      foo: string;
+    }
+  }
+}
+
+/**
+ * By declaring MyAwesomeSolutionInferface for the second time
+ * in the same scope, we can add properties to it.
+ *
+ * The power of declaration merging!
+ */
+declare global {
+  namespace React {
+    interface MyAwesomeSolutionInterface {
+      bar: string;
+    }
+  }
+}
+
+type test = Expect<
+  Equal<React.MyAwesomeSolutionInterface, { foo: string; bar: string }>
+>;
+
+export {};
diff --git a/src/07-types-deep-dive/60-add-new-global-element.problem.tsx b/src/07-types-deep-dive/60-add-new-global-element.problem.tsx
new file mode 100644
index 0000000..a0b763d
--- /dev/null
+++ b/src/07-types-deep-dive/60-add-new-global-element.problem.tsx
@@ -0,0 +1,21 @@
+/**
+ * Let's say we're working with an external library that adds a new
+ * global element to the DOM. We want to strongly type this element
+ * so that it can only be used with the correct attributes.
+ *
+ * In this case, we're adding a <something /> element to the DOM,
+ * which takes a required `id` attribute.
+ *
+ * Hint - you'll need to declaration merge with an existing
+ * interface in the JSX namespace.
+ */
+
+<>
+  <something id="123"></something>
+
+  {/* @ts-expect-error */}
+  <something></something>
+
+  {/* @ts-expect-error */}
+  <something id={123}></something>
+</>;
diff --git a/src/07-types-deep-dive/60-add-new-global-element.solution.tsx b/src/07-types-deep-dive/60-add-new-global-element.solution.tsx
new file mode 100644
index 0000000..a607af0
--- /dev/null
+++ b/src/07-types-deep-dive/60-add-new-global-element.solution.tsx
@@ -0,0 +1,19 @@
+declare global {
+  namespace JSX {
+    interface IntrinsicElements {
+      "something-solution": {
+        id: string;
+      };
+    }
+  }
+}
+
+<>
+  <something-solution id="123" />
+
+  {/* @ts-expect-error */}
+  <something-solution />
+
+  {/* @ts-expect-error */}
+  <something-solution id={123} />
+</>;
diff --git a/src/07-types-deep-dive/61-html-attributes.problem.tsx b/src/07-types-deep-dive/61-html-attributes.problem.tsx
new file mode 100644
index 0000000..77c80da
--- /dev/null
+++ b/src/07-types-deep-dive/61-html-attributes.problem.tsx
@@ -0,0 +1,24 @@
+/**
+ * 1. How does React know which HTML attributes can be passed
+ * to each HTML element?
+ *
+ * On which interfaces/types are they stored?
+ */
+
+/**
+ * 2. Try CMD-clicking on the 'div' below. What information
+ * does that give you?
+ */
+<div />;
+
+/**
+ * 3. Try CMD-clicking on the className prop below. What
+ * interface does it lead you to?
+ */
+<div className="foo" />;
+
+/**
+ * 4. Finally, try CMD-clicking on the 'href' prop below.
+ * What interface does it lead you to?
+ */
+<a href="/" />;
diff --git a/src/07-types-deep-dive/61-html-attributes.solution.tsx b/src/07-types-deep-dive/61-html-attributes.solution.tsx
new file mode 100644
index 0000000..77c80da
--- /dev/null
+++ b/src/07-types-deep-dive/61-html-attributes.solution.tsx
@@ -0,0 +1,24 @@
+/**
+ * 1. How does React know which HTML attributes can be passed
+ * to each HTML element?
+ *
+ * On which interfaces/types are they stored?
+ */
+
+/**
+ * 2. Try CMD-clicking on the 'div' below. What information
+ * does that give you?
+ */
+<div />;
+
+/**
+ * 3. Try CMD-clicking on the className prop below. What
+ * interface does it lead you to?
+ */
+<div className="foo" />;
+
+/**
+ * 4. Finally, try CMD-clicking on the 'href' prop below.
+ * What interface does it lead you to?
+ */
+<a href="/" />;
diff --git a/src/07-types-deep-dive/62-add-attribute-to-all-elements.problem.tsx b/src/07-types-deep-dive/62-add-attribute-to-all-elements.problem.tsx
new file mode 100644
index 0000000..ae9b9f1
--- /dev/null
+++ b/src/07-types-deep-dive/62-add-attribute-to-all-elements.problem.tsx
@@ -0,0 +1,16 @@
+/**
+ * Let's say we wanted to add a new optional attribute to all React
+ * elements. How would we do that?
+ *
+ * 1. Make use of declaration merging in the global scope to add
+ * a new attribute to all React elements.
+ */
+
+<>
+  <div testId="123" />
+  <audio testId="123" />
+  <video testId="123" />
+  <a testId="123" />
+  <abbr testId="123" />
+  <address testId="123" />
+</>;
diff --git a/src/07-types-deep-dive/62-add-attribute-to-all-elements.solution.tsx b/src/07-types-deep-dive/62-add-attribute-to-all-elements.solution.tsx
new file mode 100644
index 0000000..2a12077
--- /dev/null
+++ b/src/07-types-deep-dive/62-add-attribute-to-all-elements.solution.tsx
@@ -0,0 +1,16 @@
+declare global {
+  namespace React {
+    interface HTMLAttributes<T> {
+      solutionTestId?: string;
+    }
+  }
+}
+
+<>
+  <div solutionTestId="123" />
+  <audio solutionTestId="123" />
+  <video solutionTestId="123" />
+  <a solutionTestId="123" />
+  <abbr solutionTestId="123" />
+  <address solutionTestId="123" />
+</>;
diff --git a/src/07-types-deep-dive/discussion.md b/src/07-types-deep-dive/discussion.md
new file mode 100644
index 0000000..18c267b
--- /dev/null
+++ b/src/07-types-deep-dive/discussion.md
@@ -0,0 +1,13 @@
+What's the difference between React.ComponentType and React.FC?
+
+Do you think it's safe to be editing things in the global namespace?
+
+Can you do declaration merging with types? Or is it only interfaces?
+
+What are some uses for `declare global` outside of React?
+
+Should you be putting your global namespace alterations in a `.d.ts` file, or inside normal `.ts` files?
+
+What cool API's would be possible if you could strongly type children?
+
+What are some use cases for `React.ReactElement`? Is it even useful?
diff --git a/src/08-advanced-patterns/63-lazy-load-component.problem.tsx b/src/08-advanced-patterns/63-lazy-load-component.problem.tsx
new file mode 100644
index 0000000..7fe3b5e
--- /dev/null
+++ b/src/08-advanced-patterns/63-lazy-load-component.problem.tsx
@@ -0,0 +1,40 @@
+import { lazy, Suspense, useMemo } from "react";
+
+type Props = {
+  loader: unknown;
+};
+
+/**
+ * 1. This component is supposed to take a loader function that returns a
+ * component, and render that component when it's loaded.
+ *
+ * But it's not typed correctly, and it's not generic enough.
+ * Fix the typing errors, and make it generic enough to support any component.
+ *
+ * Hints:
+ *
+ * - You'll need to make this a generic component!
+ * - React.ComponentProps will come in handy, as will React.ComponentType
+ */
+function LazyLoad({ loader, ...props }: Props) {
+  const LazyComponent = useMemo(() => lazy(loader), [loader]);
+
+  return (
+    <Suspense fallback={"Loading..."}>
+      <LazyComponent {...props} />
+    </Suspense>
+  );
+}
+
+<>
+  <LazyLoad loader={() => import("fake-external-component")} id="123" />
+
+  <LazyLoad
+    loader={() => import("fake-external-component")}
+    // @ts-expect-error number is not assignable to string
+    id={123}
+  />
+
+  {/* @ts-expect-error id is missing! */}
+  <LazyLoad loader={() => import("fake-external-component")} />
+</>;
diff --git a/src/08-advanced-patterns/63-lazy-load-component.solution.tsx b/src/08-advanced-patterns/63-lazy-load-component.solution.tsx
new file mode 100644
index 0000000..fd52b96
--- /dev/null
+++ b/src/08-advanced-patterns/63-lazy-load-component.solution.tsx
@@ -0,0 +1,33 @@
+import { ComponentProps, ComponentType, lazy, Suspense, useMemo } from "react";
+
+type Props<C extends ComponentType<any>> = {
+  loader: () => Promise<{
+    default: C;
+  }>;
+} & ComponentProps<C>;
+
+function LazyLoad<C extends ComponentType<any>>({
+  loader,
+  ...props
+}: Props<C>) {
+  const LazyComponent = useMemo(() => lazy(loader), [loader]);
+
+  return (
+    <Suspense fallback={"Loading..."}>
+      <LazyComponent {...props} />
+    </Suspense>
+  );
+}
+
+<>
+  <LazyLoad loader={() => import("fake-external-component")} id="123" />
+
+  <LazyLoad
+    loader={() => import("fake-external-component")}
+    // @ts-expect-error number is not assignable to string
+    id={123}
+  />
+
+  {/* @ts-expect-error id is missing! */}
+  <LazyLoad loader={() => import("fake-external-component")} />
+</>;
diff --git a/src/08-advanced-patterns/64-render-props.problem.tsx b/src/08-advanced-patterns/64-render-props.problem.tsx
new file mode 100644
index 0000000..e31815f
--- /dev/null
+++ b/src/08-advanced-patterns/64-render-props.problem.tsx
@@ -0,0 +1,55 @@
+import { useState } from "react";
+import { createPortal } from "react-dom";
+import { Equal, Expect } from "../helpers/type-utils";
+
+/**
+ * In this exercise, we're going to create a Modal component that uses the
+ * render props pattern. The Modal component should accept a render prop
+ * function that provides ModalChildProps.
+ *
+ * 1. Change the type of the props the Modal component accepts so that it
+ * accepts a render prop function providing ModalChildProps.
+ */
+
+interface ModalChildProps {
+  isOpen: boolean;
+  openModal: () => void;
+  closeModal: () => void;
+}
+
+const Modal = ({ children }: any) => {
+  const [isOpen, setIsOpen] = useState(false);
+
+  return (
+    <>
+      {children({
+        isOpen,
+        openModal: () => setIsOpen(true),
+        closeModal: () => setIsOpen(false),
+      })}
+      {createPortal(
+        <div>
+          <h1>Modal</h1>
+        </div>,
+        document.getElementById("modal-root")!,
+      )}
+    </>
+  );
+};
+
+const Parent = () => {
+  return (
+    <Modal>
+      {(props) => {
+        type test = Expect<Equal<typeof props, ModalChildProps>>;
+
+        return (
+          <>
+            <button onClick={props.openModal}>Open Modal</button>
+            <button onClick={props.closeModal}>Close Modal</button>
+          </>
+        );
+      }}
+    </Modal>
+  );
+};
diff --git a/src/08-advanced-patterns/64-render-props.solution.tsx b/src/08-advanced-patterns/64-render-props.solution.tsx
new file mode 100644
index 0000000..f88116a
--- /dev/null
+++ b/src/08-advanced-patterns/64-render-props.solution.tsx
@@ -0,0 +1,46 @@
+import { useState } from "react";
+import { createPortal } from "react-dom";
+import { Equal, Expect } from "../helpers/type-utils";
+
+interface ModalChildProps {
+  isOpen: boolean;
+  openModal: () => void;
+  closeModal: () => void;
+}
+
+const Modal = ({ children }: { children: React.FC<ModalChildProps> }) => {
+  const [isOpen, setIsOpen] = useState(false);
+
+  return (
+    <>
+      {children({
+        isOpen,
+        openModal: () => setIsOpen(true),
+        closeModal: () => setIsOpen(false),
+      })}
+      {createPortal(
+        <div>
+          <h1>Modal</h1>
+        </div>,
+        document.getElementById("modal-root")!,
+      )}
+    </>
+  );
+};
+
+const Parent = () => {
+  return (
+    <Modal>
+      {(props) => {
+        type test = Expect<Equal<typeof props, ModalChildProps>>;
+
+        return (
+          <>
+            <button onClick={props.openModal}>Open Modal</button>
+            <button onClick={props.closeModal}>Close Modal</button>
+          </>
+        );
+      }}
+    </Modal>
+  );
+};
diff --git a/src/08-advanced-patterns/64.5-record-of-components-with-same-props.problem.tsx b/src/08-advanced-patterns/64.5-record-of-components-with-same-props.problem.tsx
new file mode 100644
index 0000000..8a10719
--- /dev/null
+++ b/src/08-advanced-patterns/64.5-record-of-components-with-same-props.problem.tsx
@@ -0,0 +1,45 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+type InputProps = React.ComponentProps<"input">;
+
+/**
+ * All these components take the same props!
+ *
+ * We don't want to repeat ourselves by typing
+ * props: InputProps for each component.
+ *
+ * There must be a better way!
+ *
+ * Hint: Record and satisfies will come in handy.
+ */
+const COMPONENTS = {
+  text: (props) => {
+    return <input {...props} type="text" />;
+  },
+  number: (props) => {
+    return <input {...props} type="number" />;
+  },
+  password: (props) => {
+    return <input {...props} type="password" />;
+  },
+};
+
+export const Input = (props: unknown) => {
+  const Component = COMPONENTS[props.type];
+  return <Component {...props} />;
+};
+
+<>
+  <Input
+    type="number"
+    onChange={(e) => {
+      // e should be properly typed!
+      type test = Expect<Equal<typeof e, React.ChangeEvent<HTMLInputElement>>>;
+    }}
+  ></Input>
+  <Input type="text"></Input>
+  <Input type="password"></Input>
+
+  {/* @ts-expect-error */}
+  <Input type="email"></Input>
+</>;
diff --git a/src/08-advanced-patterns/64.5-record-of-components-with-same-props.solution.1.tsx b/src/08-advanced-patterns/64.5-record-of-components-with-same-props.solution.1.tsx
new file mode 100644
index 0000000..720c856
--- /dev/null
+++ b/src/08-advanced-patterns/64.5-record-of-components-with-same-props.solution.1.tsx
@@ -0,0 +1,40 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+type InputProps = React.ComponentProps<"input">;
+
+type Input = "text" | "number" | "password";
+
+/**
+ * We can do it by typing Input and making COMPONENTS
+ * restricted to only those inputs.
+ */
+const COMPONENTS: Record<Input, React.ComponentType<InputProps>> = {
+  text: (props) => {
+    return <input {...props} type="text" />;
+  },
+  number: (props) => {
+    return <input {...props} type="number" />;
+  },
+  password: (props) => {
+    return <input {...props} type="password" />;
+  },
+};
+
+export const Input = (props: { type: Input } & InputProps) => {
+  const Component = COMPONENTS[props.type];
+  return <Component {...props} />;
+};
+
+<>
+  <Input
+    type="number"
+    onChange={(e) => {
+      type test = Expect<Equal<typeof e, React.ChangeEvent<HTMLInputElement>>>;
+    }}
+  ></Input>
+  <Input type="text"></Input>
+  <Input type="password"></Input>
+
+  {/* @ts-expect-error */}
+  <Input type="email"></Input>
+</>;
diff --git a/src/08-advanced-patterns/64.5-record-of-components-with-same-props.solution.2.tsx b/src/08-advanced-patterns/64.5-record-of-components-with-same-props.solution.2.tsx
new file mode 100644
index 0000000..cdaca00
--- /dev/null
+++ b/src/08-advanced-patterns/64.5-record-of-components-with-same-props.solution.2.tsx
@@ -0,0 +1,44 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+type InputProps = React.ComponentProps<"input">;
+
+/**
+ * OR, we can do it by making COMPONENTS 'satisfy'
+ * a type that is a Record of React.FC<InputProps>.
+ */
+const COMPONENTS = {
+  text: (props) => {
+    return <input {...props} type="text" />;
+  },
+  number: (props) => {
+    return <input {...props} type="number" />;
+  },
+  password: (props) => {
+    return <input {...props} type="password" />;
+  },
+} satisfies Record<string, React.ComponentType<InputProps>>;
+
+/**
+ * Then, we can derive the type of input from the
+ * keys of COMPONENTS.
+ */
+type Input = keyof typeof COMPONENTS;
+
+export const Input = (props: { type: Input } & InputProps) => {
+  const Component = COMPONENTS[props.type];
+  return <Component {...props} />;
+};
+
+<>
+  <Input
+    type="number"
+    onChange={(e) => {
+      type test = Expect<Equal<typeof e, React.ChangeEvent<HTMLInputElement>>>;
+    }}
+  ></Input>
+  <Input type="text"></Input>
+  <Input type="password"></Input>
+
+  {/* @ts-expect-error */}
+  <Input type="email"></Input>
+</>;
diff --git a/src/08-advanced-patterns/65-forward-ref-with-generics.explainer.1.tsx b/src/08-advanced-patterns/65-forward-ref-with-generics.explainer.1.tsx
new file mode 100644
index 0000000..a0a1042
--- /dev/null
+++ b/src/08-advanced-patterns/65-forward-ref-with-generics.explainer.1.tsx
@@ -0,0 +1,66 @@
+import { ForwardedRef, forwardRef, useRef } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+type Props<T> = {
+  data: T[];
+  renderRow: (item: T) => React.ReactNode;
+};
+
+/**
+ * Try uncommenting the following code. You'll see that the type of the `row`
+ * prop is inferred to be `string`.
+ *
+ * This suggestion is from Stefan Baumgartner:
+ *
+ * https://fettblog.eu/typescript-react-generic-forward-refs/#option-3%3A-augment-forwardref
+ */
+
+// declare module "react" {
+//   function forwardRef<T, P = {}>(
+//     render: (props: P, ref: React.Ref<T>) => React.ReactNode,
+//   ): (props: P & React.RefAttributes<T>) => React.ReactNode;
+// }
+
+/**
+ * By ditching defaultProps and propTypes on the type passed ro render,
+ * we can make use of something called 'higher order function type
+ * inference':
+ *
+ * https://github.com/microsoft/TypeScript/pull/30215
+ *
+ * By doing it this way, we preserve the generic context of the function
+ * being passed in.
+ */
+export const Table = <T,>(
+  props: Props<T>,
+  ref: ForwardedRef<HTMLTableElement>,
+) => {
+  return <table ref={ref} />;
+};
+
+const ForwardReffedTable = forwardRef(Table);
+
+const Parent = () => {
+  const tableRef = useRef<HTMLTableElement>(null);
+  const wrongRef = useRef<HTMLDivElement>(null);
+  return (
+    <>
+      <ForwardReffedTable
+        ref={tableRef}
+        data={["123"]}
+        renderRow={(row) => {
+          type test = Expect<Equal<typeof row, string>>;
+          return <div>123</div>;
+        }}
+      />
+      <ForwardReffedTable
+        // @ts-expect-error
+        ref={wrongRef}
+        data={["123"]}
+        renderRow={(row) => {
+          return <div>123</div>;
+        }}
+      />
+    </>
+  );
+};
diff --git a/src/07-advanced-patterns/53-forward-ref-with-generics.explainer.2.tsx b/src/08-advanced-patterns/65-forward-ref-with-generics.explainer.2.tsx
similarity index 100%
rename from src/07-advanced-patterns/53-forward-ref-with-generics.explainer.2.tsx
rename to src/08-advanced-patterns/65-forward-ref-with-generics.explainer.2.tsx
diff --git a/src/08-advanced-patterns/65-forward-ref-with-generics.explainer.3.tsx b/src/08-advanced-patterns/65-forward-ref-with-generics.explainer.3.tsx
new file mode 100644
index 0000000..40fb1ed
--- /dev/null
+++ b/src/08-advanced-patterns/65-forward-ref-with-generics.explainer.3.tsx
@@ -0,0 +1,46 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+type TableProps<T> = {
+  data: T[];
+  renderRow: (item: T) => React.ReactNode;
+};
+
+export const Table = <T,>(props: TableProps<T>) => {
+  return null;
+};
+
+type FC<Props> = {
+  (arg: Props): React.ReactNode;
+  // Try uncommenting this - and it works!
+  someOtherThing?: string;
+};
+
+const removeInference = <Props,>(component: FC<Props>) => {
+  return component;
+};
+
+const TableWithoutInference = removeInference(Table);
+
+const Parent = () => {
+  return (
+    <>
+      <TableWithoutInference
+        data={["123"]}
+        renderRow={(row) => {
+          // Without inference, this is 'unknown'
+          type test = Expect<Equal<typeof row, string>>;
+          return <div>123</div>;
+        }}
+      ></TableWithoutInference>
+
+      <Table
+        data={["123"]}
+        renderRow={(row) => {
+          // With inference, it's 'string'
+          type test = Expect<Equal<typeof row, string>>;
+          return <div>123</div>;
+        }}
+      ></Table>
+    </>
+  );
+};
diff --git a/src/08-advanced-patterns/66-forward-ref-as-local-function.problem.tsx b/src/08-advanced-patterns/66-forward-ref-as-local-function.problem.tsx
new file mode 100644
index 0000000..c6931fb
--- /dev/null
+++ b/src/08-advanced-patterns/66-forward-ref-as-local-function.problem.tsx
@@ -0,0 +1,52 @@
+import { ForwardedRef, forwardRef, useRef } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+/**
+ * Using the forward-ref-with-generics explanation as a guide,
+ * give fixedForwardRef a type signature that allows it to
+ * work with the example below.
+ */
+function fixedForwardRef(
+  render: (props: any, ref: any) => any,
+): (props: any) => any {
+  return forwardRef(render) as any;
+}
+
+type Props<T> = {
+  data: T[];
+  renderRow: (item: T) => React.ReactNode;
+};
+
+export const Table = <T,>(
+  props: Props<T>,
+  ref: ForwardedRef<HTMLTableElement>,
+) => {
+  return <table ref={ref} />;
+};
+
+const ForwardReffedTable = fixedForwardRef(Table);
+
+const Parent = () => {
+  const tableRef = useRef<HTMLTableElement>(null);
+  const wrongRef = useRef<HTMLDivElement>(null);
+  return (
+    <>
+      <ForwardReffedTable
+        ref={tableRef}
+        data={["123"]}
+        renderRow={(row) => {
+          type test = Expect<Equal<typeof row, string>>;
+          return <div>123</div>;
+        }}
+      />
+      <ForwardReffedTable
+        // @ts-expect-error
+        ref={wrongRef}
+        data={["123"]}
+        renderRow={(row) => {
+          return <div>123</div>;
+        }}
+      />
+    </>
+  );
+};
diff --git a/src/08-advanced-patterns/66-forward-ref-as-local-function.solution.1.tsx b/src/08-advanced-patterns/66-forward-ref-as-local-function.solution.1.tsx
new file mode 100644
index 0000000..9a7a82d
--- /dev/null
+++ b/src/08-advanced-patterns/66-forward-ref-as-local-function.solution.1.tsx
@@ -0,0 +1,47 @@
+import { ForwardedRef, forwardRef, useRef } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+function fixedForwardRef<T, P = {}>(
+  render: (props: P, ref: React.Ref<T>) => React.ReactNode,
+): (props: P & React.RefAttributes<T>) => React.ReactNode {
+  return forwardRef(render) as any;
+}
+
+type Props<T> = {
+  data: T[];
+  renderRow: (item: T) => React.ReactNode;
+};
+
+export const Table = <T,>(
+  props: Props<T>,
+  ref: ForwardedRef<HTMLTableElement>,
+) => {
+  return <table ref={ref} />;
+};
+
+const ForwardReffedTable = fixedForwardRef(Table);
+
+const Parent = () => {
+  const tableRef = useRef<HTMLTableElement>(null);
+  const wrongRef = useRef<HTMLDivElement>(null);
+  return (
+    <>
+      <ForwardReffedTable
+        ref={tableRef}
+        data={["123"]}
+        renderRow={(row) => {
+          type test = Expect<Equal<typeof row, string>>;
+          return <div>123</div>;
+        }}
+      />
+      <ForwardReffedTable
+        // @ts-expect-error
+        ref={wrongRef}
+        data={["123"]}
+        renderRow={(row) => {
+          return <div>123</div>;
+        }}
+      />
+    </>
+  );
+};
diff --git a/src/08-advanced-patterns/66-forward-ref-as-local-function.solution.2.tsx b/src/08-advanced-patterns/66-forward-ref-as-local-function.solution.2.tsx
new file mode 100644
index 0000000..785c13c
--- /dev/null
+++ b/src/08-advanced-patterns/66-forward-ref-as-local-function.solution.2.tsx
@@ -0,0 +1,48 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+import { ForwardedRef, forwardRef, useRef } from "react";
+
+type FixedForwardRef = <T, P = {}>(
+  render: (props: P, ref: React.Ref<T>) => React.ReactNode,
+) => (props: P & React.RefAttributes<T>) => React.ReactNode;
+
+const fixedForwardRef = forwardRef as FixedForwardRef;
+
+type Props<T> = {
+  data: T[];
+  renderRow: (item: T) => React.ReactNode;
+};
+
+export const Table = <T,>(
+  props: Props<T>,
+  ref: ForwardedRef<HTMLTableElement>,
+) => {
+  return <table ref={ref} />;
+};
+
+const ForwardReffedTable = fixedForwardRef(Table);
+
+const Parent = () => {
+  const tableRef = useRef<HTMLTableElement>(null);
+  const wrongRef = useRef<HTMLDivElement>(null);
+  return (
+    <>
+      <ForwardReffedTable
+        ref={tableRef}
+        data={["123"]}
+        renderRow={(row) => {
+          type test = Expect<Equal<typeof row, string>>;
+          return <div>123</div>;
+        }}
+      />
+      <ForwardReffedTable
+        // @ts-expect-error
+        ref={wrongRef}
+        data={["123"]}
+        renderRow={(row) => {
+          return <div>123</div>;
+        }}
+      />
+    </>
+  );
+};
diff --git a/src/08-advanced-patterns/67-hoc.problem.tsx b/src/08-advanced-patterns/67-hoc.problem.tsx
new file mode 100644
index 0000000..70e4167
--- /dev/null
+++ b/src/08-advanced-patterns/67-hoc.problem.tsx
@@ -0,0 +1,31 @@
+import { Router, useRouter } from "fake-external-lib";
+
+export const withRouter = (Component: any) => {
+  const NewComponent = (props: any) => {
+    const router = useRouter();
+    return <Component {...props} router={router} />;
+  };
+
+  NewComponent.displayName = `withRouter(${Component.displayName})`;
+
+  return NewComponent;
+};
+
+const UnwrappedComponent = (props: { router: Router; id: string }) => {
+  return null;
+};
+
+const WrappedComponent = withRouter(UnwrappedComponent);
+
+<>
+  {/* @ts-expect-error needs a router! */}
+  <UnwrappedComponent id="123" />
+
+  {/* Doesn't need a router passed in! */}
+  <WrappedComponent id="123" />
+
+  <WrappedComponent
+    // @ts-expect-error id must be the correct property
+    id={123}
+  />
+</>;
diff --git a/src/08-advanced-patterns/67-hoc.solution.tsx b/src/08-advanced-patterns/67-hoc.solution.tsx
new file mode 100644
index 0000000..4a3dc0a
--- /dev/null
+++ b/src/08-advanced-patterns/67-hoc.solution.tsx
@@ -0,0 +1,31 @@
+import { Router, useRouter } from "fake-external-lib";
+
+export const withRouter = <TProps,>(Component: React.ComponentType<TProps>) => {
+  const NewComponent = (props: Omit<TProps, "router">) => {
+    const router = useRouter();
+    return <Component {...(props as TProps)} router={router} />;
+  };
+
+  NewComponent.displayName = `withRouter(${Component.displayName})`;
+
+  return NewComponent;
+};
+
+const UnwrappedComponent = (props: { router: Router; id: string }) => {
+  return null;
+};
+
+const WrappedComponent = withRouter(UnwrappedComponent);
+
+<>
+  {/* @ts-expect-error needs a router! */}
+  <UnwrappedComponent id="123" />
+
+  {/* Doesn't need a router passed in! */}
+  <WrappedComponent id="123" />
+
+  <WrappedComponent
+    // @ts-expect-error id must be the correct property
+    id={123}
+  />
+</>;
diff --git a/src/08-advanced-patterns/67.5-hoc-for-generic-components.problem.tsx b/src/08-advanced-patterns/67.5-hoc-for-generic-components.problem.tsx
new file mode 100644
index 0000000..781037c
--- /dev/null
+++ b/src/08-advanced-patterns/67.5-hoc-for-generic-components.problem.tsx
@@ -0,0 +1,52 @@
+import { Router, useRouter } from "fake-external-lib";
+import { Equal, Expect } from "../helpers/type-utils";
+
+export const withRouter = <TProps,>(Component: React.ComponentType<TProps>) => {
+  const NewComponent = (props: Omit<TProps, "router">) => {
+    const router = useRouter();
+    return <Component {...(props as TProps)} router={router} />;
+  };
+
+  NewComponent.displayName = `withRouter(${Component.displayName})`;
+
+  return NewComponent;
+};
+
+type TableProps<T> = {
+  data: T[];
+  renderRow: (item: T) => React.ReactNode;
+  router: Router;
+};
+
+export const Table = <T,>(props: TableProps<T>) => {
+  return <table />;
+};
+
+const WrappedTable = withRouter(Table);
+
+<>
+  {/* @ts-expect-error router is required! */}
+  <Table
+    data={[1, 2, 3]}
+    renderRow={(row) => {
+      type test = Expect<Equal<typeof row, number>>;
+      return <tr />;
+    }}
+  />
+
+  <WrappedTable
+    data={[1, 2, 3]}
+    renderRow={(row) => {
+      type test = Expect<Equal<typeof row, number>>;
+      return <tr />;
+    }}
+  />
+
+  <WrappedTable
+    data={[1, 2, 3]}
+    renderRow={(row) => {
+      type test = Expect<Equal<typeof row, number>>;
+      return <tr />;
+    }}
+  />
+</>;
diff --git a/src/08-advanced-patterns/67.5-hoc-for-generic-components.solution.tsx b/src/08-advanced-patterns/67.5-hoc-for-generic-components.solution.tsx
new file mode 100644
index 0000000..ffd22d9
--- /dev/null
+++ b/src/08-advanced-patterns/67.5-hoc-for-generic-components.solution.tsx
@@ -0,0 +1,60 @@
+import { Router, useRouter } from "fake-external-lib";
+import { Equal, Expect } from "../helpers/type-utils";
+
+export const withRouter = <TProps,>(
+  Component: (props: TProps) => React.ReactNode,
+): ((props: Omit<TProps, "router">) => React.ReactNode) => {
+  const NewComponent = (props: Omit<TProps, "router">) => {
+    const router = useRouter();
+    return <Component {...(props as TProps)} router={router} />;
+  };
+
+  NewComponent.displayName = `withRouter(${
+    (
+      Component as {
+        displayName?: string;
+      }
+    ).displayName
+  })`;
+
+  return NewComponent;
+};
+
+type TableProps<T> = {
+  data: T[];
+  renderRow: (item: T) => React.ReactNode;
+  router: Router;
+};
+
+export const Table = <T,>(props: TableProps<T>) => {
+  return <table />;
+};
+
+const WrappedTable = withRouter(Table);
+
+<>
+  {/* @ts-expect-error router is required! */}
+  <Table
+    data={[1, 2, 3]}
+    renderRow={(row) => {
+      type test = Expect<Equal<typeof row, number>>;
+      return <tr />;
+    }}
+  />
+
+  <WrappedTable
+    data={[1, 2, 3]}
+    renderRow={(row) => {
+      type test = Expect<Equal<typeof row, number>>;
+      return <tr />;
+    }}
+  />
+
+  <WrappedTable
+    data={[1, 2, 3]}
+    renderRow={(row) => {
+      type test = Expect<Equal<typeof row, number>>;
+      return <tr />;
+    }}
+  />
+</>;
diff --git a/src/08-advanced-patterns/69-as-prop.problem.tsx b/src/08-advanced-patterns/69-as-prop.problem.tsx
new file mode 100644
index 0000000..e75a490
--- /dev/null
+++ b/src/08-advanced-patterns/69-as-prop.problem.tsx
@@ -0,0 +1,80 @@
+/**
+ * The 'as' prop is notorious for being difficult to type correctly.
+ *
+ * Here, we've created a component that takes an 'as' prop. The 'as' prop
+ * is a string representing the HTML tag to render. The component will
+ * render that tag, and pass all the other props through.
+ *
+ * BUT currently the types of the props that go along with the 'as' prop
+ * are not inferred correctly.
+ *
+ * I've found two solutions. The first uses an IIMT:
+ *
+ * https://www.totaltypescript.com/immediately-indexed-mapped-type
+ *
+ * The second uses a generic type.
+ *
+ * Both solutions make use of:
+ *
+ * - JSX.IntrinsicElements
+ * - keyof
+ * - 'as'
+ * - Indexed access types
+ */
+
+import { Equal, Expect } from "../helpers/type-utils";
+
+export const Wrapper = (props: any) => {
+  const Comp = props.as;
+  return <Comp {...(props as any)}></Comp>;
+};
+
+/**
+ * Should work specifying a 'button'
+ */
+
+const Example1 = () => {
+  return (
+    <>
+      <Wrapper
+        as="button"
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Wrapper>
+
+      <Wrapper
+        as="button"
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<
+            Equal<typeof e, React.MouseEvent<HTMLButtonElement>>
+          >;
+        }}
+      ></Wrapper>
+    </>
+  );
+};
+
+/**
+ * Should work specifying a 'div'
+ */
+
+const Example2 = () => {
+  return (
+    <>
+      <Wrapper
+        as="div"
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Wrapper>
+
+      <Wrapper
+        as="div"
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<Equal<typeof e, React.MouseEvent<HTMLDivElement>>>;
+        }}
+      ></Wrapper>
+    </>
+  );
+};
diff --git a/src/08-advanced-patterns/69-as-prop.solution.1.tsx b/src/08-advanced-patterns/69-as-prop.solution.1.tsx
new file mode 100644
index 0000000..3d7d67a
--- /dev/null
+++ b/src/08-advanced-patterns/69-as-prop.solution.1.tsx
@@ -0,0 +1,65 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+// Commented out because it makes the whole repo slow to typecheck
+// Uncomment to see it working!
+
+// type AsProps = {
+//   [K in keyof JSX.IntrinsicElements]: {
+//     as: K;
+//   } & JSX.IntrinsicElements[K];
+// }[keyof JSX.IntrinsicElements];
+
+export const Wrapper = (props: AsProps) => {
+  const Comp = props.as;
+  return <Comp {...(props as any)}></Comp>;
+};
+
+/**
+ * Should work specifying a 'button'
+ */
+
+const Example1 = () => {
+  return (
+    <>
+      <Wrapper
+        as="button"
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Wrapper>
+
+      <Wrapper
+        as="button"
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<
+            Equal<typeof e, React.MouseEvent<HTMLButtonElement>>
+          >;
+        }}
+      ></Wrapper>
+    </>
+  );
+};
+
+/**
+ * Should work specifying a 'div'
+ */
+
+const Example2 = () => {
+  return (
+    <>
+      <Wrapper
+        as="div"
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Wrapper>
+
+      <Wrapper
+        as="div"
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<Equal<typeof e, React.MouseEvent<HTMLDivElement>>>;
+        }}
+      ></Wrapper>
+    </>
+  );
+};
diff --git a/src/08-advanced-patterns/69-as-prop.solution.2.tsx b/src/08-advanced-patterns/69-as-prop.solution.2.tsx
new file mode 100644
index 0000000..089ae87
--- /dev/null
+++ b/src/08-advanced-patterns/69-as-prop.solution.2.tsx
@@ -0,0 +1,61 @@
+import { Equal, Expect } from "../helpers/type-utils";
+
+export const Wrapper = <TAs extends keyof JSX.IntrinsicElements>(
+  props: {
+    as: TAs;
+  } & React.ComponentProps<TAs>,
+) => {
+  const Comp = props.as as string;
+
+  return <Comp {...(props as any)}></Comp>;
+};
+
+/**
+ * Should work specifying a 'button'
+ */
+
+const Example1 = () => {
+  return (
+    <>
+      <Wrapper
+        as="button"
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Wrapper>
+
+      <Wrapper
+        as="button"
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<
+            Equal<typeof e, React.MouseEvent<HTMLButtonElement>>
+          >;
+        }}
+      ></Wrapper>
+    </>
+  );
+};
+
+/**
+ * Should work specifying a 'div'
+ */
+
+const Example2 = () => {
+  return (
+    <>
+      <Wrapper
+        as="div"
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Wrapper>
+
+      <Wrapper
+        as="div"
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<Equal<typeof e, React.MouseEvent<HTMLDivElement>>>;
+        }}
+      ></Wrapper>
+    </>
+  );
+};
diff --git a/src/08-advanced-patterns/70-as-prop-with-custom-components.problem.tsx b/src/08-advanced-patterns/70-as-prop-with-custom-components.problem.tsx
new file mode 100644
index 0000000..fbd721f
--- /dev/null
+++ b/src/08-advanced-patterns/70-as-prop-with-custom-components.problem.tsx
@@ -0,0 +1,78 @@
+import React from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+/**
+ * This is a further extension of 'as'. This time, we can pass in
+ * _any_ component as a prop, and it'll be rendered with the other
+ * props passed in.
+ *
+ * 1. Figure out the correct typings for the `Wrapper` component.
+ *
+ * The solution uses:
+ *
+ * - Generics
+ * - ElementType
+ * - One of the following:
+ *   - ComponentPropsWithoutRef
+ *   - ComponentPropsWithRef
+ *   - ComponentProps
+ */
+export const Wrapper = <TAs extends keyof JSX.IntrinsicElements>(
+  props: {
+    as: TAs;
+  } & React.ComponentProps<TAs>,
+) => {
+  const Comp = props.as as string;
+
+  return <Comp {...(props as any)}></Comp>;
+};
+
+/**
+ * Should work specifying a 'button'
+ */
+
+const Example1 = () => {
+  return (
+    <>
+      <Wrapper
+        as="button"
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Wrapper>
+
+      <Wrapper
+        as="button"
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<
+            Equal<typeof e, React.MouseEvent<HTMLButtonElement>>
+          >;
+        }}
+      ></Wrapper>
+    </>
+  );
+};
+
+/**
+ * Should work with Custom components!
+ */
+
+const Custom = (props: { thisIsRequired: boolean }) => {
+  return <a />;
+};
+
+const Example2 = () => {
+  return (
+    <>
+      <Wrapper as={Custom} thisIsRequired />
+      <Wrapper
+        as={Custom}
+        // @ts-expect-error incorrectProp should not be allowed
+        incorrectProp
+      />
+
+      {/* @ts-expect-error thisIsRequired is not being passed */}
+      <Wrapper as={Custom}></Wrapper>
+    </>
+  );
+};
diff --git a/src/08-advanced-patterns/70-as-prop-with-custom-components.solution.tsx b/src/08-advanced-patterns/70-as-prop-with-custom-components.solution.tsx
new file mode 100644
index 0000000..e4238f4
--- /dev/null
+++ b/src/08-advanced-patterns/70-as-prop-with-custom-components.solution.tsx
@@ -0,0 +1,62 @@
+import React, { ElementType } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+export const Wrapper = <TAs extends ElementType>(
+  props: {
+    as: TAs;
+  } & React.ComponentPropsWithoutRef<TAs>,
+) => {
+  const Comp = props.as;
+
+  return <Comp {...(props as any)}></Comp>;
+};
+
+/**
+ * Should work specifying a 'button'
+ */
+
+const Example1 = () => {
+  return (
+    <>
+      <Wrapper
+        as="button"
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Wrapper>
+
+      <Wrapper
+        as="button"
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<
+            Equal<typeof e, React.MouseEvent<HTMLButtonElement>>
+          >;
+        }}
+      ></Wrapper>
+    </>
+  );
+};
+
+/**
+ * Should work with Custom components!
+ */
+
+const Custom = (props: { thisIsRequired: boolean }) => {
+  return <a />;
+};
+
+const Example2 = () => {
+  return (
+    <>
+      <Wrapper as={Custom} thisIsRequired />
+      <Wrapper
+        as={Custom}
+        // @ts-expect-error incorrectProp should not be allowed
+        incorrectProp
+      />
+
+      {/* @ts-expect-error thisIsRequired is not being passed */}
+      <Wrapper as={Custom}></Wrapper>
+    </>
+  );
+};
diff --git a/src/08-advanced-patterns/71-as-prop-with-default.problem.tsx b/src/08-advanced-patterns/71-as-prop-with-default.problem.tsx
new file mode 100644
index 0000000..28b2e79
--- /dev/null
+++ b/src/08-advanced-patterns/71-as-prop-with-default.problem.tsx
@@ -0,0 +1,88 @@
+import { ElementType } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+export const Link = <TAs extends ElementType>(
+  props: {
+    as: TAs;
+  } & React.ComponentPropsWithoutRef<TAs>,
+) => {
+  const { as: Comp = "a", ...rest } = props;
+  return <Comp {...rest}></Comp>;
+};
+
+/**
+ * Should work without specifying 'as'
+ */
+
+const Example1 = () => {
+  return (
+    <>
+      <Link
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Link>
+
+      <Link
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<
+            Equal<typeof e, React.MouseEvent<HTMLAnchorElement>>
+          >;
+        }}
+      ></Link>
+    </>
+  );
+};
+
+/**
+ * Should work specifying a 'button'
+ */
+
+const Example2 = () => {
+  return (
+    <>
+      <Link
+        as="button"
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Link>
+
+      <Link
+        as="button"
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<
+            Equal<typeof e, React.MouseEvent<HTMLButtonElement>>
+          >;
+        }}
+      ></Link>
+    </>
+  );
+};
+
+/**
+ * Should work with Custom components!
+ */
+
+const Custom = (
+  props: { thisIsRequired: boolean },
+  ref: React.ForwardedRef<HTMLAnchorElement>,
+) => {
+  return <a ref={ref} />;
+};
+
+const Example3 = () => {
+  return (
+    <>
+      <Link as={Custom} thisIsRequired />
+      <Link
+        as={Custom}
+        // @ts-expect-error incorrectProp should not be allowed
+        incorrectProp
+      />
+
+      {/* @ts-expect-error thisIsRequired is not being passed */}
+      <Link as={Custom}></Link>
+    </>
+  );
+};
diff --git a/src/08-advanced-patterns/71-as-prop-with-default.solution.1.tsx b/src/08-advanced-patterns/71-as-prop-with-default.solution.1.tsx
new file mode 100644
index 0000000..67e196a
--- /dev/null
+++ b/src/08-advanced-patterns/71-as-prop-with-default.solution.1.tsx
@@ -0,0 +1,91 @@
+import { ComponentPropsWithoutRef, ElementType } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+/**
+ * This NEARLY works, but removes autocomplete for the 'as' prop.
+ */
+export const Link = <T extends ElementType = "a">(
+  props: {
+    as?: T;
+  } & ComponentPropsWithoutRef<T>,
+) => {
+  const { as: Comp = "a", ...rest } = props;
+  return <Comp {...rest}></Comp>;
+};
+
+/**
+ * Should work without specifying 'as'
+ */
+
+const Example1 = () => {
+  return (
+    <>
+      <Link
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Link>
+
+      <Link
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<
+            Equal<typeof e, React.MouseEvent<HTMLAnchorElement>>
+          >;
+        }}
+      ></Link>
+    </>
+  );
+};
+
+/**
+ * Should work specifying a 'button'
+ */
+
+const Example2 = () => {
+  return (
+    <>
+      <Link
+        as="button"
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Link>
+
+      <Link
+        as="button"
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<
+            Equal<typeof e, React.MouseEvent<HTMLButtonElement>>
+          >;
+        }}
+      ></Link>
+    </>
+  );
+};
+
+/**
+ * Should work with Custom components!
+ */
+
+const Custom = (
+  props: { thisIsRequired: boolean },
+  ref: React.ForwardedRef<HTMLAnchorElement>,
+) => {
+  return <a ref={ref} />;
+};
+
+const Example3 = () => {
+  return (
+    <>
+      <Link as={Custom} thisIsRequired />
+      <Link
+        as={Custom}
+        // @ts-expect-error incorrectProp should not be allowed
+        incorrectProp
+      />
+
+      {/* @ts-expect-error thisIsRequired is not being passed */}
+      <Link as={Custom}></Link>
+    </>
+  );
+};
diff --git a/src/08-advanced-patterns/71-as-prop-with-default.solution.2.tsx b/src/08-advanced-patterns/71-as-prop-with-default.solution.2.tsx
new file mode 100644
index 0000000..85d3dac
--- /dev/null
+++ b/src/08-advanced-patterns/71-as-prop-with-default.solution.2.tsx
@@ -0,0 +1,88 @@
+import { ComponentPropsWithoutRef, ElementType, useRef } from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+export const Link = <T extends ElementType>(
+  props: {
+    as?: T;
+  } & ComponentPropsWithoutRef<ElementType extends T ? "a" : T>,
+) => {
+  const { as: Comp = "a", ...rest } = props;
+  return <Comp {...rest}></Comp>;
+};
+
+/**
+ * Should work without specifying 'as'
+ */
+
+const Example1 = () => {
+  return (
+    <>
+      <Link
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Link>
+
+      <Link
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<
+            Equal<typeof e, React.MouseEvent<HTMLAnchorElement>>
+          >;
+        }}
+      ></Link>
+    </>
+  );
+};
+
+/**
+ * Should work specifying a 'button'
+ */
+
+const Example2 = () => {
+  return (
+    <>
+      <Link
+        as="button"
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Link>
+
+      <Link
+        as="button"
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<
+            Equal<typeof e, React.MouseEvent<HTMLButtonElement>>
+          >;
+        }}
+      ></Link>
+    </>
+  );
+};
+
+/**
+ * Should work with Custom components!
+ */
+
+const Custom = (
+  props: { thisIsRequired: boolean },
+  ref: React.ForwardedRef<HTMLAnchorElement>,
+) => {
+  return <a ref={ref} />;
+};
+
+const Example3 = () => {
+  return (
+    <>
+      <Link as={Custom} thisIsRequired />
+      <Link
+        as={Custom}
+        // @ts-expect-error incorrectProp should not be allowed
+        incorrectProp
+      />
+
+      {/* @ts-expect-error thisIsRequired is not being passed */}
+      <Link as={Custom}></Link>
+    </>
+  );
+};
diff --git a/src/08-advanced-patterns/72-as-prop-with-forward-ref.problem.tsx b/src/08-advanced-patterns/72-as-prop-with-forward-ref.problem.tsx
new file mode 100644
index 0000000..f05136d
--- /dev/null
+++ b/src/08-advanced-patterns/72-as-prop-with-forward-ref.problem.tsx
@@ -0,0 +1,141 @@
+import {
+  ComponentPropsWithoutRef,
+  ElementType,
+  ForwardedRef,
+  forwardRef,
+  useRef,
+} from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+/**
+ * FYI - this solution took me the best part of a whole day to find,
+ * and the help of several TS experts in the community.
+ *
+ * So, don't feel bad if you don't find it at all.
+ */
+
+export const UnwrappedLink = <TAs extends ElementType>(
+  props: {
+    as?: TAs;
+  } & ComponentPropsWithoutRef<ElementType extends TAs ? "a" : TAs>,
+  ref: ForwardedRef<any>,
+) => {
+  const { as: Comp = "a", ...rest } = props;
+  return <Comp {...rest} ref={ref}></Comp>;
+};
+
+const Link = forwardRef(UnwrappedLink);
+
+/**
+ * Should work without specifying 'as'
+ */
+
+const Example1 = () => {
+  const ref = useRef<HTMLAnchorElement>(null);
+  const wrongRef = useRef<HTMLDivElement>(null);
+
+  return (
+    <>
+      <Link ref={ref} />
+
+      <Link
+        // @ts-expect-error incorrect ref
+        ref={wrongRef}
+      />
+
+      <Link
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Link>
+
+      <Link
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<
+            Equal<typeof e, React.MouseEvent<HTMLAnchorElement>>
+          >;
+        }}
+      ></Link>
+    </>
+  );
+};
+
+/**
+ * Should work specifying a 'button'
+ */
+
+const Example2 = () => {
+  const ref = useRef<HTMLButtonElement>(null);
+  const wrongRef = useRef<HTMLSpanElement>(null);
+
+  return (
+    <>
+      {/* CHECK ME! Check if autocomplete works on 'as' */}
+      <Link as="button" />
+
+      <Link as="button" ref={ref} />
+
+      <Link
+        as="button"
+        // @ts-expect-error incorrect ref
+        ref={wrongRef}
+      />
+
+      <Link
+        as="button"
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Link>
+
+      <Link
+        as="button"
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<
+            Equal<typeof e, React.MouseEvent<HTMLButtonElement>>
+          >;
+        }}
+      ></Link>
+    </>
+  );
+};
+
+/**
+ * Should work with Custom components!
+ */
+
+const Custom = forwardRef(
+  (
+    props: { thisIsRequired: boolean },
+    ref: React.ForwardedRef<HTMLAnchorElement>,
+  ) => {
+    return <a ref={ref} />;
+  },
+);
+
+const Example3 = () => {
+  const ref = useRef<HTMLAnchorElement>(null);
+  const wrongRef = useRef<HTMLDivElement>(null);
+  return (
+    <>
+      <Link as={Custom} thisIsRequired />
+      <Link
+        as={Custom}
+        // @ts-expect-error incorrectProp should not be allowed
+        incorrectProp
+      />
+
+      {/* @ts-expect-error thisIsRequired is not being passed */}
+      <Link as={Custom}></Link>
+
+      <Link as={Custom} ref={ref} thisIsRequired />
+
+      <Link
+        as={Custom}
+        // @ts-expect-error incorrect ref
+        ref={wrongRef}
+        thisIsRequired
+      />
+    </>
+  );
+};
diff --git a/src/08-advanced-patterns/72-as-prop-with-forward-ref.solution.tsx b/src/08-advanced-patterns/72-as-prop-with-forward-ref.solution.tsx
new file mode 100644
index 0000000..5b915de
--- /dev/null
+++ b/src/08-advanced-patterns/72-as-prop-with-forward-ref.solution.tsx
@@ -0,0 +1,151 @@
+import {
+  ComponentPropsWithRef,
+  ElementType,
+  ForwardedRef,
+  forwardRef,
+  useRef,
+} from "react";
+import { Equal, Expect } from "../helpers/type-utils";
+
+// Added fixedForwardRef from a previous exercise
+
+type FixedForwardRef = <T, P = {}>(
+  render: (props: P, ref: React.Ref<T>) => React.ReactNode,
+) => (props: P & React.RefAttributes<T>) => React.ReactNode;
+
+const fixedForwardRef = forwardRef as FixedForwardRef;
+
+// Added a DistributiveOmit type
+
+type DistributiveOmit<T, TOmitted extends PropertyKey> = T extends any
+  ? Omit<T, TOmitted>
+  : never;
+
+export const UnwrappedLink = <TAs extends ElementType>(
+  props: {
+    as?: TAs;
+  } & DistributiveOmit<
+    ComponentPropsWithRef<ElementType extends TAs ? "a" : TAs>,
+    "as"
+  >,
+  ref: ForwardedRef<any>,
+) => {
+  const { as: Comp = "a", ...rest } = props;
+  return <Comp {...rest} ref={ref}></Comp>;
+};
+
+const Link = fixedForwardRef(UnwrappedLink);
+
+/**
+ * Should work without specifying 'as'
+ */
+
+const Example1 = () => {
+  const ref = useRef<HTMLAnchorElement>(null);
+  const wrongRef = useRef<HTMLDivElement>(null);
+
+  return (
+    <>
+      <Link ref={ref} />
+
+      <Link
+        // @ts-expect-error incorrect ref
+        ref={wrongRef}
+      />
+
+      <Link
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Link>
+
+      <Link
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<
+            Equal<typeof e, React.MouseEvent<HTMLAnchorElement>>
+          >;
+        }}
+      ></Link>
+    </>
+  );
+};
+
+/**
+ * Should work specifying a 'button'
+ */
+
+const Example2 = () => {
+  const ref = useRef<HTMLButtonElement>(null);
+  const wrongRef = useRef<HTMLSpanElement>(null);
+
+  return (
+    <>
+      {/* CHECK ME! Check if autocomplete works on 'as' */}
+      <Link as="button" />
+
+      <Link as="button" ref={ref} />
+
+      <Link
+        as="button"
+        // @ts-expect-error incorrect ref
+        ref={wrongRef}
+      />
+
+      <Link
+        as="button"
+        // @ts-expect-error doesNotExist is not a valid prop
+        doesNotExist
+      ></Link>
+
+      <Link
+        as="button"
+        // e should be inferred correctly
+        onClick={(e) => {
+          type test = Expect<
+            Equal<typeof e, React.MouseEvent<HTMLButtonElement>>
+          >;
+        }}
+      ></Link>
+    </>
+  );
+};
+
+/**
+ * Should work with Custom components!
+ */
+
+const Custom = forwardRef(
+  (
+    props: { thisIsRequired: boolean },
+    ref: React.ForwardedRef<HTMLAnchorElement>,
+  ) => {
+    return <a ref={ref} />;
+  },
+);
+
+const Example3 = () => {
+  const ref = useRef<HTMLAnchorElement>(null);
+  const wrongRef = useRef<HTMLDivElement>(null);
+  return (
+    <>
+      <Link as={Custom} thisIsRequired />
+      <Link
+        as={Custom}
+        // @ts-expect-error incorrectProp should not be allowed
+        incorrectProp
+      />
+
+      {/* @ts-expect-error thisIsRequired is not being passed */}
+      <Link as={Custom}></Link>
+
+      <Link as={Custom} ref={ref} thisIsRequired />
+
+      <Link
+        as={Custom}
+        // @ts-expect-error incorrect ref
+        ref={wrongRef}
+        thisIsRequired
+      />
+    </>
+  );
+};
diff --git a/src/08-advanced-patterns/discussion.md b/src/08-advanced-patterns/discussion.md
new file mode 100644
index 0000000..5924982
--- /dev/null
+++ b/src/08-advanced-patterns/discussion.md
@@ -0,0 +1,7 @@
+What use cases can you think of for HOC's that aren't related to React?
+
+Do you have any experience with using libraries that use the 'as' props? What was your experience like?
+
+What are some alternative API's you could use instead of the 'as' prop? (Radix's 'asChild' is an extremely smart workaround for this.)
+
+Are render props and HOC's even useful now we have hooks? What are some use cases for them?
diff --git a/src/08-external-libraries/60-react-hook-form.problem.tsx b/src/08-external-libraries/60-react-hook-form.problem.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/08-external-libraries/61-react-query.problem.tsx b/src/08-external-libraries/61-react-query.problem.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/08-external-libraries/62-redux-toolkit.problem.tsx b/src/08-external-libraries/62-redux-toolkit.problem.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/08-external-libraries/63-zustand.problem.tsx b/src/08-external-libraries/63-zustand.problem.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/08-external-libraries/64-reusable-form-library-with-zod.problem.tsx b/src/08-external-libraries/64-reusable-form-library-with-zod.problem.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/08-external-libraries/readme.md b/src/08-external-libraries/readme.md
deleted file mode 100644
index 48cb68a..0000000
--- a/src/08-external-libraries/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-Talk about common external libraries and how they work
diff --git a/src/09-external-libraries/73-react-hook-form.problem.tsx b/src/09-external-libraries/73-react-hook-form.problem.tsx
new file mode 100644
index 0000000..94153a7
--- /dev/null
+++ b/src/09-external-libraries/73-react-hook-form.problem.tsx
@@ -0,0 +1,79 @@
+import { FieldValues, useForm } from "react-hook-form";
+import { Equal, Expect } from "../helpers/type-utils";
+
+/**
+ * 1. When you provide default values to useForm, the return type of getValues
+ * gets inferred as the shape of those values.
+ *
+ * Investigate why this is, and what TFieldValues is being used for.
+ */
+const Example1 = () => {
+  const form = useForm({
+    defaultValues: {
+      firstName: "",
+      lastName: "",
+    },
+  });
+
+  return (
+    <form
+      onSubmit={form.handleSubmit((values) => {
+        type test = Expect<
+          Equal<typeof values, { firstName: string; lastName: string }>
+        >;
+      })}
+    >
+      <input {...form.register("firstName")} />
+      <input {...form.register("lastName")} />
+    </form>
+  );
+};
+
+/**
+ * 2. When you don't pass a default value, the return type of getValues is
+ * inferred as FieldValues.
+ *
+ * Investigate why this is, and what type FieldValues is.
+ */
+
+const Example2 = () => {
+  const form = useForm();
+
+  return (
+    <form
+      onSubmit={form.handleSubmit((values) => {
+        type test = Expect<Equal<typeof values, FieldValues>>;
+      })}
+    >
+      <input {...form.register("firstName")} />
+      <input {...form.register("lastName")} />
+    </form>
+  );
+};
+
+/**
+ * 3. If we don't pass default values, how do we get
+ * react-hook-form to understand what type our fields are?
+ */
+
+type FormValues = {
+  firstName: string;
+  lastName: string;
+};
+
+const Example3 = () => {
+  const form = useForm();
+
+  return (
+    <form
+      onSubmit={form.handleSubmit((values) => {
+        type test = Expect<Equal<typeof values, FormValues>>;
+      })}
+    >
+      <input {...form.register("firstName")} />
+      <input {...form.register("lastName")} />
+      {/* @ts-expect-error */}
+      <input {...form.register("middleName")} />
+    </form>
+  );
+};
diff --git a/src/09-external-libraries/73-react-hook-form.solution.tsx b/src/09-external-libraries/73-react-hook-form.solution.tsx
new file mode 100644
index 0000000..db01003
--- /dev/null
+++ b/src/09-external-libraries/73-react-hook-form.solution.tsx
@@ -0,0 +1,79 @@
+import { FieldValues, useForm } from "react-hook-form";
+import { Equal, Expect } from "../helpers/type-utils";
+
+/**
+ * 1. When you provide default values to useForm, the return type of getValues
+ * gets inferred as the shape of those values.
+ *
+ * Investigate why this is, and what TFieldValues is being used for.
+ */
+const Example1 = () => {
+  const form = useForm({
+    defaultValues: {
+      firstName: "",
+      lastName: "",
+    },
+  });
+
+  return (
+    <form
+      onSubmit={form.handleSubmit((values) => {
+        type test = Expect<
+          Equal<typeof values, { firstName: string; lastName: string }>
+        >;
+      })}
+    >
+      <input {...form.register("firstName")} />
+      <input {...form.register("lastName")} />
+    </form>
+  );
+};
+
+/**
+ * 2. When you don't pass a default value, the return type of getValues is
+ * inferred as FieldValues.
+ *
+ * Investigate why this is, and what type FieldValues is.
+ */
+
+const Example2 = () => {
+  const form = useForm();
+
+  return (
+    <form
+      onSubmit={form.handleSubmit((values) => {
+        type test = Expect<Equal<typeof values, FieldValues>>;
+      })}
+    >
+      <input {...form.register("firstName")} />
+      <input {...form.register("lastName")} />
+    </form>
+  );
+};
+
+/**
+ * 3. If we don't pass default values, how do we get
+ * react-hook-form to understand what type our fields are?
+ */
+
+type FormValues = {
+  firstName: string;
+  lastName: string;
+};
+
+const Example3 = () => {
+  const form = useForm<FormValues>();
+
+  return (
+    <form
+      onSubmit={form.handleSubmit((values) => {
+        type test = Expect<Equal<typeof values, FormValues>>;
+      })}
+    >
+      <input {...form.register("firstName")} />
+      <input {...form.register("lastName")} />
+      {/* @ts-expect-error */}
+      <input {...form.register("middleName")} />
+    </form>
+  );
+};
diff --git a/src/09-external-libraries/74-react-hook-form-wrapper.problem.tsx b/src/09-external-libraries/74-react-hook-form-wrapper.problem.tsx
new file mode 100644
index 0000000..cc6591b
--- /dev/null
+++ b/src/09-external-libraries/74-react-hook-form-wrapper.problem.tsx
@@ -0,0 +1,59 @@
+import { useForm } from "react-hook-form";
+import { Equal, Expect, Extends } from "../helpers/type-utils";
+
+/**
+ * Here, we're creating a wrapper around react-hook-form's useForm hook.
+ *
+ * We want to change the API slightly so that only certain methods are
+ * exposed. We also want to make sure that defaultValues is ALWAYS
+ * required.
+ *
+ * A clue: you'll need this line of code:
+ *
+ * defaultValues as DefaultValues<TValues>
+ */
+const useCustomForm = (defaultValues: any) => {
+  const form = useForm({
+    defaultValues: defaultValues,
+  });
+
+  return {
+    register: form.register,
+    handleSubmit: form.handleSubmit,
+    getValues: form.getValues,
+  };
+};
+
+// ---- TESTS ----
+
+// @ts-expect-error defaultValues is required
+useCustomForm();
+
+useCustomForm(
+  // @ts-expect-error defaultValues must be an object
+  2,
+);
+
+const customForm = useCustomForm({
+  firstName: "",
+  lastName: "",
+});
+
+customForm.handleSubmit((values) => {
+  type test = Expect<
+    // Expect that inside handleSubmit, it's inferred as
+    // { firstName: string; lastName: string }
+    Extends<
+      {
+        firstName: string;
+        lastName: string;
+      },
+      typeof values
+    >
+  >;
+});
+
+// Expect that only the methods we want are exposed
+type test = Expect<
+  Equal<keyof typeof customForm, "register" | "handleSubmit" | "getValues">
+>;
diff --git a/src/09-external-libraries/74-react-hook-form-wrapper.solution.1.tsx b/src/09-external-libraries/74-react-hook-form-wrapper.solution.1.tsx
new file mode 100644
index 0000000..6857b57
--- /dev/null
+++ b/src/09-external-libraries/74-react-hook-form-wrapper.solution.1.tsx
@@ -0,0 +1,48 @@
+import { DefaultValues, FieldValues, useForm } from "react-hook-form";
+import { Equal, Expect, Extends } from "../helpers/type-utils";
+
+const useCustomForm = <TValues extends FieldValues>(defaultValues: TValues) => {
+  const form = useForm({
+    defaultValues: defaultValues as DefaultValues<TValues>,
+  });
+
+  return {
+    register: form.register,
+    handleSubmit: form.handleSubmit,
+    getValues: form.getValues,
+  };
+};
+
+// ---- TESTS ----
+
+// @ts-expect-error defaultValues is required
+useCustomForm();
+
+useCustomForm(
+  // @ts-expect-error defaultValues must be an object
+  2,
+);
+
+const customForm = useCustomForm({
+  firstName: "",
+  lastName: "",
+});
+
+customForm.handleSubmit((values) => {
+  type test = Expect<
+    // Expect that inside handleSubmit, it's inferred as
+    // { firstName: string; lastName: string }
+    Extends<
+      {
+        firstName: string;
+        lastName: string;
+      },
+      typeof values
+    >
+  >;
+});
+
+// Expect that only the methods we want are exposed
+type test = Expect<
+  Equal<keyof typeof customForm, "register" | "handleSubmit" | "getValues">
+>;
diff --git a/src/09-external-libraries/74-react-hook-form-wrapper.solution.2.tsx b/src/09-external-libraries/74-react-hook-form-wrapper.solution.2.tsx
new file mode 100644
index 0000000..663ed01
--- /dev/null
+++ b/src/09-external-libraries/74-react-hook-form-wrapper.solution.2.tsx
@@ -0,0 +1,61 @@
+import {
+  DefaultValues,
+  FieldValues,
+  UseFormGetValues,
+  UseFormHandleSubmit,
+  UseFormRegister,
+  useForm,
+} from "react-hook-form";
+import { Equal, Expect, Extends } from "../helpers/type-utils";
+
+const useCustomForm = <TValues extends FieldValues>(
+  defaultValues: TValues,
+): {
+  register: UseFormRegister<TValues>;
+  handleSubmit: UseFormHandleSubmit<TValues>;
+  getValues: UseFormGetValues<TValues>;
+} => {
+  const form = useForm({
+    defaultValues: defaultValues as DefaultValues<TValues>,
+  });
+
+  return {
+    register: form.register,
+    handleSubmit: form.handleSubmit,
+    getValues: form.getValues,
+  };
+};
+
+// ---- TESTS ----
+
+// @ts-expect-error defaultValues is required
+useCustomForm();
+
+useCustomForm(
+  // @ts-expect-error defaultValues must be an object
+  2,
+);
+
+const customForm = useCustomForm({
+  firstName: "",
+  lastName: "",
+});
+
+customForm.handleSubmit((values) => {
+  type test = Expect<
+    // Expect that inside handleSubmit, it's inferred as
+    // { firstName: string; lastName: string }
+    Extends<
+      {
+        firstName: string;
+        lastName: string;
+      },
+      typeof values
+    >
+  >;
+});
+
+// Expect that only the methods we want are exposed
+type test = Expect<
+  Equal<keyof typeof customForm, "register" | "handleSubmit" | "getValues">
+>;
diff --git a/src/09-external-libraries/75-react-select.problem.tsx b/src/09-external-libraries/75-react-select.problem.tsx
new file mode 100644
index 0000000..77dbf9f
--- /dev/null
+++ b/src/09-external-libraries/75-react-select.problem.tsx
@@ -0,0 +1,48 @@
+import ReactSelect from "react-select";
+import { Equal, Expect } from "../helpers/type-utils";
+
+/**
+ * 1. Try to figure out the types the props of the Select component should have,
+ * including the generic types!
+ *
+ * Here's a clue: ReactSelect exports a type called 'Props'...
+ */
+export const Select = (props) => {
+  return <ReactSelect {...props} />;
+};
+
+interface Option {
+  id: number;
+  label: string;
+}
+
+const guitarists: Option[] = [
+  {
+    id: 1,
+    label: "Jimi Hendrix",
+  },
+  {
+    id: 2,
+    label: "Stevie Ray Vaughan",
+  },
+];
+
+<>
+  <Select
+    options={guitarists}
+    onChange={(option) => {
+      // It should infer the type of option!
+      // If isMulti is false, it should NOT be an array
+      type test = Expect<Equal<typeof option, Option | null>>;
+    }}
+  />
+
+  <Select
+    options={guitarists}
+    isMulti
+    onChange={(option) => {
+      // If isMulti is true, it should be an array
+      type test = Expect<Equal<typeof option, readonly Option[]>>;
+    }}
+  />
+</>;
diff --git a/src/09-external-libraries/75-react-select.solution.tsx b/src/09-external-libraries/75-react-select.solution.tsx
new file mode 100644
index 0000000..1af56c8
--- /dev/null
+++ b/src/09-external-libraries/75-react-select.solution.tsx
@@ -0,0 +1,48 @@
+import ReactSelect, { GroupBase, Props } from "react-select";
+import { Equal, Expect } from "../helpers/type-utils";
+
+export const Select = <
+  Option = unknown,
+  IsMulti extends boolean = false,
+  Group extends GroupBase<Option> = GroupBase<Option>,
+>(
+  props: Props<Option, IsMulti, Group>,
+) => {
+  return <ReactSelect {...props} />;
+};
+
+interface Option {
+  id: number;
+  label: string;
+}
+
+const guitarists: Option[] = [
+  {
+    id: 1,
+    label: "Jimi Hendrix",
+  },
+  {
+    id: 2,
+    label: "Stevie Ray Vaughan",
+  },
+];
+
+<>
+  <Select
+    options={guitarists}
+    onChange={(option) => {
+      // It should infer the type of option!
+      // If isMulti is false, it should NOT be an array
+      type test = Expect<Equal<typeof option, Option | null>>;
+    }}
+  />
+
+  <Select
+    options={guitarists}
+    isMulti
+    onChange={(option) => {
+      // If isMulti is true, it should be an array
+      type test = Expect<Equal<typeof option, readonly Option[]>>;
+    }}
+  />
+</>;
diff --git a/src/09-external-libraries/76-react-query.problem.ts b/src/09-external-libraries/76-react-query.problem.ts
new file mode 100644
index 0000000..6b3a02b
--- /dev/null
+++ b/src/09-external-libraries/76-react-query.problem.ts
@@ -0,0 +1,53 @@
+import { useQuery } from "@tanstack/react-query";
+import { Equal, Expect } from "../helpers/type-utils";
+
+interface User {
+  fullName: string;
+  job: string;
+}
+
+const getUser = async (): Promise<User> => {
+  return Promise.resolve({
+    fullName: "Matt Pocock",
+    job: "Developer",
+  });
+};
+
+/**
+ * A bit of a hint to start with. useQuery has a LOT of overloads - but a lot
+ * of them are disappearing in the next major version. The ones that'll be
+ * sticking around are the first three.
+ *
+ * 1. How are the first three overloads different to the others? Put differently,
+ * what's the thing that's similar about the first three that's different to
+ * the other six?
+ */
+
+useQuery;
+// ^ CMD+click on this to see the overloads
+
+/**
+ * 2. When you provide queryFn to useQuery, the type of query.data is inferred
+ * as the return type of queryFn. Why is that?
+ */
+const query1 = useQuery({
+  queryFn: getUser,
+});
+
+// Without initialData, the type of query1.data is User | undefined
+type test1 = Expect<Equal<typeof query1.data, User | undefined>>;
+
+/**
+ * 3. When you provide initialData to useQuery, the type of query.data no longer
+ * has undefined in it. Why is that?
+ */
+const query2 = useQuery({
+  queryFn: getUser,
+  initialData: {
+    fullName: "",
+    job: "",
+  },
+});
+
+// WITH initialData, the type of query.data is just User
+type test2 = Expect<Equal<typeof query2.data, User>>;
diff --git a/src/09-external-libraries/76-react-query.solution.ts b/src/09-external-libraries/76-react-query.solution.ts
new file mode 100644
index 0000000..6b3a02b
--- /dev/null
+++ b/src/09-external-libraries/76-react-query.solution.ts
@@ -0,0 +1,53 @@
+import { useQuery } from "@tanstack/react-query";
+import { Equal, Expect } from "../helpers/type-utils";
+
+interface User {
+  fullName: string;
+  job: string;
+}
+
+const getUser = async (): Promise<User> => {
+  return Promise.resolve({
+    fullName: "Matt Pocock",
+    job: "Developer",
+  });
+};
+
+/**
+ * A bit of a hint to start with. useQuery has a LOT of overloads - but a lot
+ * of them are disappearing in the next major version. The ones that'll be
+ * sticking around are the first three.
+ *
+ * 1. How are the first three overloads different to the others? Put differently,
+ * what's the thing that's similar about the first three that's different to
+ * the other six?
+ */
+
+useQuery;
+// ^ CMD+click on this to see the overloads
+
+/**
+ * 2. When you provide queryFn to useQuery, the type of query.data is inferred
+ * as the return type of queryFn. Why is that?
+ */
+const query1 = useQuery({
+  queryFn: getUser,
+});
+
+// Without initialData, the type of query1.data is User | undefined
+type test1 = Expect<Equal<typeof query1.data, User | undefined>>;
+
+/**
+ * 3. When you provide initialData to useQuery, the type of query.data no longer
+ * has undefined in it. Why is that?
+ */
+const query2 = useQuery({
+  queryFn: getUser,
+  initialData: {
+    fullName: "",
+    job: "",
+  },
+});
+
+// WITH initialData, the type of query.data is just User
+type test2 = Expect<Equal<typeof query2.data, User>>;
diff --git a/src/09-external-libraries/77-react-query-wrapper.problem.ts b/src/09-external-libraries/77-react-query-wrapper.problem.ts
new file mode 100644
index 0000000..c759495
--- /dev/null
+++ b/src/09-external-libraries/77-react-query-wrapper.problem.ts
@@ -0,0 +1,54 @@
+import { useQuery } from "@tanstack/react-query";
+import { useAuthToken } from "fake-external-lib";
+import { Equal, Expect } from "../helpers/type-utils";
+
+/**
+ * Here, we're attempting to create a wrapper around react-query's useQuery
+ * hook. We're doing that so we can inject the auth token into the queryFn
+ * without having to pass it in every time.
+ *
+ * 1. Change the type definitions of useApi to fix the errors below. Where
+ * possible, use types from react-query to describe the types of the
+ * parameters.
+ */
+const useApi = (
+  queryKey: any[],
+  queryFn: (key: any, token: string) => Promise<any>,
+) => {
+  const token = useAuthToken();
+
+  return useQuery({
+    queryFn: (ctx) => queryFn(ctx, token),
+    queryKey,
+  });
+};
+
+// If you pass in an array of strings to queryFn, the type of ctx.queryKey
+// should be string[]
+const query = useApi(["users"], async (ctx, token) => {
+  type tests = [
+    Expect<Equal<typeof ctx.queryKey, string[]>>,
+    Expect<Equal<typeof token, string>>,
+  ];
+
+  return Promise.resolve([
+    {
+      id: 1,
+      name: "Matt Pocock",
+    },
+  ]);
+});
+
+// The type of query.data should be { id: number; name: string }[] | undefined
+type tests = [
+  Expect<Equal<typeof query.data, { id: number; name: string }[] | undefined>>,
+];
+
+// If you pass in an array of numbers in the queryKey, the type of ctx.queryKey
+// should be number[]
+useApi([1, 2], async (ctx, token) => {
+  type tests = [
+    Expect<Equal<typeof ctx.queryKey, number[]>>,
+    Expect<Equal<typeof token, string>>,
+  ];
+});
diff --git a/src/09-external-libraries/77-react-query-wrapper.solution.ts b/src/09-external-libraries/77-react-query-wrapper.solution.ts
new file mode 100644
index 0000000..5794500
--- /dev/null
+++ b/src/09-external-libraries/77-react-query-wrapper.solution.ts
@@ -0,0 +1,52 @@
+import {
+  useQuery,
+  QueryKey,
+  QueryFunctionContext,
+} from "@tanstack/react-query";
+import { useAuthToken } from "fake-external-lib";
+import { Equal, Expect } from "../helpers/type-utils";
+
+const useApi = <TQueryKey extends QueryKey, TQueryFnData>(
+  queryKey: TQueryKey,
+  queryFn: (
+    ctx: QueryFunctionContext<TQueryKey>,
+    token: string,
+  ) => Promise<TQueryFnData>,
+) => {
+  const token = useAuthToken();
+
+  return useQuery({
+    queryFn: (ctx) => queryFn(ctx, token),
+    queryKey,
+  });
+};
+
+// If you pass in an array of strings to queryFn, the type of ctx.queryKey
+// should be string[]
+const query = useApi(["users"], async (ctx, token) => {
+  type tests = [
+    Expect<Equal<typeof ctx.queryKey, string[]>>,
+    Expect<Equal<typeof token, string>>,
+  ];
+
+  return Promise.resolve([
+    {
+      id: 1,
+      name: "Matt Pocock",
+    },
+  ]);
+});
+
+// The type of query.data should be { id: number; name: string }[] | undefined
+type tests = [
+  Expect<Equal<typeof query.data, { id: number; name: string }[] | undefined>>,
+];
+
+// If you pass in an array of numbers in the queryKey, the type of ctx.queryKey
+// should be number[]
+useApi([1, 2], async (ctx, token) => {
+  type tests = [
+    Expect<Equal<typeof ctx.queryKey, number[]>>,
+    Expect<Equal<typeof token, string>>,
+  ];
+});
diff --git a/src/09-external-libraries/discussion.md b/src/09-external-libraries/discussion.md
new file mode 100644
index 0000000..3cff5d5
--- /dev/null
+++ b/src/09-external-libraries/discussion.md
@@ -0,0 +1,16 @@
+Which other libraries have you used with React? What was your experience like creating wrappers for them?
+
+What are some other libraries you can think of that could benefit from a wrapper?
+
+Try installing a third-party library that you love, and explore some of its types. Try to choose one you all know. Write down some of the things you notice - and how the types could be improved.
+
+Some libraries to try:
+
+- zod
+- radix
+- @material/ui
+- react-router
+- react-final-form
+- react-table
+- react-spring
+- framer-motion
diff --git a/src/fake-external-lib/component.tsx b/src/fake-external-lib/component.tsx
new file mode 100644
index 0000000..bde2757
--- /dev/null
+++ b/src/fake-external-lib/component.tsx
@@ -0,0 +1,5 @@
+const MyComponent = (props: { id: string }) => {
+  return <div>Hello!</div>;
+};
+
+export default MyComponent;
diff --git a/src/fake-external-lib/index.ts b/src/fake-external-lib/index.ts
new file mode 100644
index 0000000..a839398
--- /dev/null
+++ b/src/fake-external-lib/index.ts
@@ -0,0 +1,62 @@
+/**
+ * A fake function to create a user
+ */
+export const createUser = (
+  user: {
+    name: string;
+    email: string;
+  },
+  opts?: {
+    throwOnError?: boolean;
+  },
+): Promise<{
+  id: string;
+  name: string;
+  email: string;
+}> => {
+  return fetch("/user", {
+    method: "POST",
+    body: JSON.stringify(user),
+  }).then((response) => response.json());
+};
+
+/**
+ * A fake auth token hook.
+ */
+export const useAuthToken = () => {
+  return "123";
+};
+
+/**
+ * A fake video fetcher.
+ */
+export const fetchVideo = (src: string) => {
+  return fetch(src).then((response) => response.blob());
+};
+
+/**
+ * A fake video appender.
+ */
+export const appendVideoToDomAndPlay = (blob: Blob) => {
+  const video = document.createElement("video");
+  video.src = URL.createObjectURL(blob);
+  video.play();
+};
+
+/**
+ * A fake router interface
+ */
+export interface Router {
+  push: (path: string) => void;
+}
+
+/**
+ * A fake useRouter hook
+ */
+export const useRouter = () => {
+  return {
+    push: (path: string) => {
+      console.log(`Navigating to ${path}`);
+    },
+  };
+};
diff --git a/src/helpers/type-utils.ts b/src/helpers/type-utils.ts
index 5c10861..8f9a01a 100644
--- a/src/helpers/type-utils.ts
+++ b/src/helpers/type-utils.ts
@@ -22,9 +22,19 @@ export type MergeInsertions<T> = T extends object
 
 export type Alike<X, Y> = Equal<MergeInsertions<X>, MergeInsertions<Y>>;
 
-export type ExpectExtends<VALUE, EXPECTED> = EXPECTED extends VALUE
-  ? true
-  : false;
+/**
+ * Expect that one type is assignable to another.
+ *
+ * @example
+ *
+ * type tests = [
+ *   // Expect that `number` is assignable to `1`.
+ *   Expect<Extends<1, number>>,
+ *   // Expect that `abc` is assignable to `string`
+ *   Expect<Extends<'abc', string>>,
+ * ];
+ */
+export type Extends<VALUE, EXPECTED> = EXPECTED extends VALUE ? true : false;
 export type ExpectValidArgs<
   FUNC extends (...args: any[]) => any,
   ARGS extends any[],
diff --git a/tsconfig.json b/tsconfig.json
index add5bfc..9495bf4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,18 +1,24 @@
 {
   "compilerOptions": {
-    "types": [
-      "vitest/importMeta"
-    ],
     "target": "es2020",
     "jsx": "react-jsx",
     "module": "ES2022",
     "moduleResolution": "node",
     "noEmit": true,
     "isolatedModules": true,
+    "moduleDetection": "force",
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "strict": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "paths": {
+      "fake-external-lib": [
+        "./src/fake-external-lib/index"
+      ],
+      "fake-external-component": [
+        "./src/fake-external-lib/component"
+      ]
+    }
   },
   "include": [
     "src"
diff --git a/vite.config.ts b/vite.config.mts
similarity index 76%
rename from vite.config.ts
rename to vite.config.mts
index 251dac0..c5cfc0c 100644
--- a/vite.config.ts
+++ b/vite.config.mts
@@ -1,11 +1,9 @@
 import { defineConfig } from "vitest/config";
 import tsconfigPaths from "vite-tsconfig-paths";
-import path from "path";
 
 export default defineConfig({
   test: {
     include: ["src/**/*{problem,solution,explainer}*.{ts,tsx}"],
-    setupFiles: [path.resolve(__dirname, "scripts/setup.ts")],
     passWithNoTests: true,
     environment: "jsdom",
   },