diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34615fcc..60289909 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/devmode Change Log
 
+## 2.6.0 - 2022.04.08
+### Changed
+* Switched over to Craft CMS 4.0.0-beta.4
+
 ## 2.5.8 - 2022.04.08
 ### Changed
 * Run migrations first via `composer.json` scripts, because Craft won't apply Project Config if there are pending migrations
diff --git a/buildchain/package-lock.json b/buildchain/package-lock.json
index 4d641e31..db13ed40 100644
--- a/buildchain/package-lock.json
+++ b/buildchain/package-lock.json
@@ -2641,9 +2641,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001325",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001325.tgz",
-      "integrity": "sha512-sB1bZHjseSjDtijV1Hb7PB2Zd58Kyx+n/9EotvZ4Qcz2K3d0lWB8dB4nb8wN/TsOGFq3UuAm0zQZNQ4SoR7TrQ==",
+      "version": "1.0.30001327",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001327.tgz",
+      "integrity": "sha512-1/Cg4jlD9qjZzhbzkzEaAC2JHsP0WrOc8Rd/3a3LuajGzGWR/hD7TVyvq99VqmTy99eVh8Zkmdq213OgvgXx7w==",
       "dev": true,
       "funding": [
         {
@@ -3784,9 +3784,9 @@
       "dev": true
     },
     "node_modules/domelementtype": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
       "dev": true,
       "funding": [
         {
@@ -3858,9 +3858,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.104",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.104.tgz",
-      "integrity": "sha512-2kjoAyiG7uMyGRM9mx25s3HAzmQG2ayuYXxsFmYugHSDcwxREgLtscZvbL1JcW9S/OemeQ3f/SG6JhDwpnCclQ==",
+      "version": "1.4.106",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz",
+      "integrity": "sha512-ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg==",
       "dev": true
     },
     "node_modules/emoji-regex": {
@@ -3979,9 +3979,9 @@
       "dev": true
     },
     "node_modules/esbuild": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.32.tgz",
-      "integrity": "sha512-RuzVUP/bkStmnVHK6Gh3gjaMjfXNLqBqvYVDiS9JKl5KdRdRLUeW5Wo8NrbL7cL6CW7Cyak7SvACqyPOBuA8vA==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.34.tgz",
+      "integrity": "sha512-QIWdPT/gFF6hCaf4m7kP0cJ+JIuFkdHibI7vVFvu3eJS1HpVmYHWDulyN5WXwbRA0SX/7ZDaJ/1DH8SdY9xOJg==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -3991,32 +3991,32 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "esbuild-android-64": "0.14.32",
-        "esbuild-android-arm64": "0.14.32",
-        "esbuild-darwin-64": "0.14.32",
-        "esbuild-darwin-arm64": "0.14.32",
-        "esbuild-freebsd-64": "0.14.32",
-        "esbuild-freebsd-arm64": "0.14.32",
-        "esbuild-linux-32": "0.14.32",
-        "esbuild-linux-64": "0.14.32",
-        "esbuild-linux-arm": "0.14.32",
-        "esbuild-linux-arm64": "0.14.32",
-        "esbuild-linux-mips64le": "0.14.32",
-        "esbuild-linux-ppc64le": "0.14.32",
-        "esbuild-linux-riscv64": "0.14.32",
-        "esbuild-linux-s390x": "0.14.32",
-        "esbuild-netbsd-64": "0.14.32",
-        "esbuild-openbsd-64": "0.14.32",
-        "esbuild-sunos-64": "0.14.32",
-        "esbuild-windows-32": "0.14.32",
-        "esbuild-windows-64": "0.14.32",
-        "esbuild-windows-arm64": "0.14.32"
+        "esbuild-android-64": "0.14.34",
+        "esbuild-android-arm64": "0.14.34",
+        "esbuild-darwin-64": "0.14.34",
+        "esbuild-darwin-arm64": "0.14.34",
+        "esbuild-freebsd-64": "0.14.34",
+        "esbuild-freebsd-arm64": "0.14.34",
+        "esbuild-linux-32": "0.14.34",
+        "esbuild-linux-64": "0.14.34",
+        "esbuild-linux-arm": "0.14.34",
+        "esbuild-linux-arm64": "0.14.34",
+        "esbuild-linux-mips64le": "0.14.34",
+        "esbuild-linux-ppc64le": "0.14.34",
+        "esbuild-linux-riscv64": "0.14.34",
+        "esbuild-linux-s390x": "0.14.34",
+        "esbuild-netbsd-64": "0.14.34",
+        "esbuild-openbsd-64": "0.14.34",
+        "esbuild-sunos-64": "0.14.34",
+        "esbuild-windows-32": "0.14.34",
+        "esbuild-windows-64": "0.14.34",
+        "esbuild-windows-arm64": "0.14.34"
       }
     },
     "node_modules/esbuild-android-64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.32.tgz",
-      "integrity": "sha512-q1qjB2UcoWehR9Yp9dO2RdJUeLLrXAYsbOU4tkYa+GmJzxTwuvOrMdvaemsXYqb7F4STVTca9KpfqGicEChtUg==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.34.tgz",
+      "integrity": "sha512-XfxcfJqmMYsT/LXqrptzFxmaR3GWzXHDLdFNIhm6S00zPaQF1TBBWm+9t0RZ6LRR7iwH57DPjaOeW20vMqI4Yw==",
       "cpu": [
         "x64"
       ],
@@ -4030,9 +4030,9 @@
       }
     },
     "node_modules/esbuild-android-arm64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.32.tgz",
-      "integrity": "sha512-bs1uu+RuM15f8yjFc0FhPDE/6NID4fKl7beDVsGCme6Q8ld2IzRXmp5QaHurlcH93PFyQnUgVvdahIWgtK2QZw==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.34.tgz",
+      "integrity": "sha512-T02+NXTmSRL1Mc6puz+R9CB54rSPICkXKq6+tw8B6vxZFnCPzbJxgwIX4kcluz9p8nYBjF3+lSilTGWb7+Xgew==",
       "cpu": [
         "arm64"
       ],
@@ -4046,9 +4046,9 @@
       }
     },
     "node_modules/esbuild-darwin-64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.32.tgz",
-      "integrity": "sha512-6MekflAld28wYtzanwZTxQlxMPeYw/yv1ToFG2hpo3LGxOIE2mBD5IJaMCcyy1//EYvGnGToO3p6XKdbS8E1QQ==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.34.tgz",
+      "integrity": "sha512-pLRip2Bh4Ng7Bf6AMgCrSp3pPe/qZyf11h5Qo2mOfJqLWzSVjxrXW+CFRJfrOVP7TCnh/gmZSM2AFdCPB72vtw==",
       "cpu": [
         "x64"
       ],
@@ -4062,9 +4062,9 @@
       }
     },
     "node_modules/esbuild-darwin-arm64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.32.tgz",
-      "integrity": "sha512-BHYIjiPDYQTD+4zwqdqRo+I2bbg3fn9mah/gZm4SCCy+7uwTTYOYobIunHT7wVCgxnFCr50PJUdaMrEoCImRbw==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.34.tgz",
+      "integrity": "sha512-vpidSJEBxx6lf1NWgXC+DCmGqesJuZ5Y8aQVVsaoO4i8tRXbXb0whChRvop/zd3nfNM4dIl5EXAky0knRX5I6w==",
       "cpu": [
         "arm64"
       ],
@@ -4078,9 +4078,9 @@
       }
     },
     "node_modules/esbuild-freebsd-64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.32.tgz",
-      "integrity": "sha512-6BOBhtfAf9AlfjL1AvtfVOxwY82tHPfYrA0lskJpFjfiEMGTLU6e0vdOwb4+4x++gGz49azuGK0woYqdfL03uw==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.34.tgz",
+      "integrity": "sha512-m0HBjePhe0hAQJgtMRMNV9kMgIyV4/qSnzPx42kRMQBcPhgjAq1JRu4Il26czC+9FgpMbFkUktb07f/Lwnc6CA==",
       "cpu": [
         "x64"
       ],
@@ -4094,9 +4094,9 @@
       }
     },
     "node_modules/esbuild-freebsd-arm64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.32.tgz",
-      "integrity": "sha512-zIRR4gKQW56p/xLM8TlpxVBNiX0w3VoR9ZxfH4nrfJ7QiL0SYHRy8YPL5C7zMWRjSze2WxQRHfS9bHKdVrVXBw==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.34.tgz",
+      "integrity": "sha512-cpRc2B94L1KvMPPYB4D6G39jLqpKlD3noAMY4/e86iXXXkhUYJJEtTuyNFTa9JRpWM0xCAp4mxjHjoIiLuoCLA==",
       "cpu": [
         "arm64"
       ],
@@ -4110,9 +4110,9 @@
       }
     },
     "node_modules/esbuild-linux-32": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.32.tgz",
-      "integrity": "sha512-kn0AkGtPvzA6xiv93/mavvZ7DVinu/ewh2F2S0/8mE8/PXi3D4+svZ6V3beV5DIH7vcHVuGhoooWav8HPF04tg==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.34.tgz",
+      "integrity": "sha512-8nQaEaoW7MH/K/RlozJa+lE1ejHIr8fuPIHhc513UebRav7HtXgQvxHQ6VZRUkWtep23M6dd7UqhwO1tMOfzQQ==",
       "cpu": [
         "ia32"
       ],
@@ -4126,9 +4126,9 @@
       }
     },
     "node_modules/esbuild-linux-64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.32.tgz",
-      "integrity": "sha512-Ie+PMvrPj/HCOmSc0QubKttDxP2iBtPzDu+b+V3HGDGwkGmVpDkyXx1NXp5LjkIphIay2QekMwy1dSw3KDqCew==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.34.tgz",
+      "integrity": "sha512-Y3of4qQoLLlAgf042MlrY1P+7PnN9zWj8nVtw9XQG5hcLOZLz7IKpU35oeu7n4wvyaZHwvQqDJ93gRLqdJekcQ==",
       "cpu": [
         "x64"
       ],
@@ -4142,9 +4142,9 @@
       }
     },
     "node_modules/esbuild-linux-arm": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.32.tgz",
-      "integrity": "sha512-R/Bvn/YQNDyvfN0SERh/I7hKPqN+nSSruQdVeiYEJ+jc3fUi73jXYAscpTQgIBeER/yXnEsgJGU/UQ9+sscr7A==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.34.tgz",
+      "integrity": "sha512-9lpq1NcJqssAF7alCO6zL3gvBVVt/lKw4oetUM7OgNnRX0OWpB+ZIO9FwCrSj/dMdmgDhPLf+119zB8QxSMmAg==",
       "cpu": [
         "arm"
       ],
@@ -4158,9 +4158,9 @@
       }
     },
     "node_modules/esbuild-linux-arm64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.32.tgz",
-      "integrity": "sha512-ykoqKaxX95nB+lk2K/+qxr0ke+BxkeVi0yKOnymCR5Ive7IZDHa4BJX53NEGSBKLfWPwKE6SXTz8qcEewSntoA==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.34.tgz",
+      "integrity": "sha512-IlWaGtj9ir7+Nrume1DGcyzBDlK8GcnJq0ANKwcI9pVw8tqr+6GD0eqyF9SF1mR8UmAp+odrx1H5NdR2cHdFHA==",
       "cpu": [
         "arm64"
       ],
@@ -4174,9 +4174,9 @@
       }
     },
     "node_modules/esbuild-linux-mips64le": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.32.tgz",
-      "integrity": "sha512-IilnlBexpHpt/5po0cle/L/S6CYnwaq23UuAqWzxp+opHLOCNnyANpC1jOoP551aRx4JuZ7z3xZZ7bYQZB147w==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.34.tgz",
+      "integrity": "sha512-k3or+01Rska1AjUyNjA4buEwB51eyN/xPQAoOx1CjzAQC3l8rpjUDw55kXyL63O/1MUi4ISvtNtl8gLwdyEcxw==",
       "cpu": [
         "mips64el"
       ],
@@ -4190,9 +4190,9 @@
       }
     },
     "node_modules/esbuild-linux-ppc64le": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.32.tgz",
-      "integrity": "sha512-TR6l5nWZbfq7jSY+1vsiQjT4m67NWplNhbX6GBieZq6DBt0nTx1XgTZAdKROF7jTuaK7YrCYlPXtfO3w86Mysw==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.34.tgz",
+      "integrity": "sha512-+qxb8M9FfM2CJaVU7GgYpJOHM1ngQOx+/VrtBjb4C8oVqaPcESCeg2anjl+HRZy8VpYc71q/iBYausPPbJ+Keg==",
       "cpu": [
         "ppc64"
       ],
@@ -4206,9 +4206,9 @@
       }
     },
     "node_modules/esbuild-linux-riscv64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.32.tgz",
-      "integrity": "sha512-aSOcUzTeIAslfri8e+bMpyzQuxhcIiNhWyuCGGXum2PtxwYiUqR8/UCMYfwYtYkhr1yABOFOfs83mm9KBy5qCQ==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.34.tgz",
+      "integrity": "sha512-Y717ltBdQ5j5sZIHdy1DV9kieo0wMip0dCmVSTceowCPYSn1Cg33Kd6981+F/3b9FDMzNWldZFOBRILViENZSA==",
       "cpu": [
         "riscv64"
       ],
@@ -4222,9 +4222,9 @@
       }
     },
     "node_modules/esbuild-linux-s390x": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.32.tgz",
-      "integrity": "sha512-dNlip+EvexxKjRZitFCWCd7DVk64c7R5ySr8aFEMHCb/RriNiyDxYJGzYWm4EMJsMRMupMUHlMY64BAa3Op9FA==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.34.tgz",
+      "integrity": "sha512-bDDgYO4LhL4+zPs+WcBkXph+AQoPcQRTv18FzZS0WhjfH8TZx2QqlVPGhmhZ6WidrY+jKthUqO6UhGyIb4MpmA==",
       "cpu": [
         "s390x"
       ],
@@ -4238,9 +4238,9 @@
       }
     },
     "node_modules/esbuild-netbsd-64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.32.tgz",
-      "integrity": "sha512-Pa3QByYqxzlBFQQQhjYBPg3WUfSjwibqzh1hC6mPDRUHnCeUcrLoBuIiG4xqOYEpQM9/kDowIBsrGIQEVWWdQA==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.34.tgz",
+      "integrity": "sha512-cfaFGXdRt0+vHsjNPyF0POM4BVSHPSbhLPe8mppDc7GDDxjIl08mV1Zou14oDWMp/XZMjYN1kWYRSfftiD0vvQ==",
       "cpu": [
         "x64"
       ],
@@ -4254,9 +4254,9 @@
       }
     },
     "node_modules/esbuild-openbsd-64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.32.tgz",
-      "integrity": "sha512-uWKKqpCjkMY8TCIobFvaSETonQY3OrmgnoTCC3tF+lvMoneYjppB6akx7L5Xv0kP+1tnSbrIof1ca8PfqGUyjw==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.34.tgz",
+      "integrity": "sha512-vmy9DxXVnRiI14s8GKuYBtess+EVcDALkbpTqd5jw4XITutIzyB7n4x0Tj5utAkKsgZJB22lLWGekr0ABnSLow==",
       "cpu": [
         "x64"
       ],
@@ -4270,9 +4270,9 @@
       }
     },
     "node_modules/esbuild-sunos-64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.32.tgz",
-      "integrity": "sha512-Ar+u3mBk0oVV4Fwv/qlinJZNIPPtTBSG+1W42o8lOaVxJ+rJgecDoeUN+5uyd9at0BK1SVrQ1qZ4wjHKB0qFpQ==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.34.tgz",
+      "integrity": "sha512-eNPVatNET1F7tRMhii7goL/eptfxc0ALRjrj9SPFNqp0zmxrehBFD6BaP3R4LjMn6DbMO0jOAnTLFKr8NqcJAA==",
       "cpu": [
         "x64"
       ],
@@ -4286,9 +4286,9 @@
       }
     },
     "node_modules/esbuild-windows-32": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.32.tgz",
-      "integrity": "sha512-rLMsbflMY6Hjh3rmQnCDVZahJQ7n+XfT6o1+no5pHRpDlMh38MHthgGh35q+EcOMgrGP3ppnw70rhJq80SaYTQ==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.34.tgz",
+      "integrity": "sha512-EFhpXyHEcnqWYe2rAHFd8dRw8wkrd9U+9oqcyoEL84GbanAYjiiIjBZsnR8kl0sCQ5w6bLpk7vCEIA2VS32Vcg==",
       "cpu": [
         "ia32"
       ],
@@ -4302,9 +4302,9 @@
       }
     },
     "node_modules/esbuild-windows-64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.32.tgz",
-      "integrity": "sha512-OHnMMxYufVgLXIMnwLynLMKguHMrsVnWcehieSP9i6ZX31KEsOFYWrorcnTWOn4rbZVLSL10ofxLuVIgRW3SWw==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.34.tgz",
+      "integrity": "sha512-a8fbl8Ky7PxNEjf1aJmtxdDZj32/hC7S1OcA2ckEpCJRTjiKslI9vAdPpSjrKIWhws4Galpaawy0nB7fjHYf5Q==",
       "cpu": [
         "x64"
       ],
@@ -4318,9 +4318,9 @@
       }
     },
     "node_modules/esbuild-windows-arm64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.32.tgz",
-      "integrity": "sha512-ddavy6IPUBySMfqDfG243TgtuqwQBNJQJPVaA4DaavmMfpBsUxFrSV+HzBWXTKU3I9EcuoEvIATLuQ7NJKxjwg==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.34.tgz",
+      "integrity": "sha512-EYvmKbSa2B3sPnpC28UEu9jBK5atGV4BaVRE7CYGUci2Hlz4AvtV/LML+TcDMT6gBgibnN2gcltWclab3UutMg==",
       "cpu": [
         "arm64"
       ],
@@ -4437,9 +4437,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz",
-      "integrity": "sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.13.0.tgz",
+      "integrity": "sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ==",
       "dev": true,
       "dependencies": {
         "@eslint/eslintrc": "^1.2.1",
@@ -6380,9 +6380,9 @@
       }
     },
     "node_modules/keyv": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.2.1.tgz",
-      "integrity": "sha512-cAJq5cTfxQdq1DHZEVNpnk4mEvhP+8UP8UQftLtTtJ98beKkRHf+62M0mIDM2u/IWXyP8bmGB375/6uGdSX2MA==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.2.2.tgz",
+      "integrity": "sha512-uYS0vKTlBIjNCAUqrjlxmruxOEiZxZIHXyp32sdcGmP+ukFrmWUnE//RcPXJH3Vxrni1H2gsQbjHE0bH7MtMQQ==",
       "dev": true,
       "dependencies": {
         "compress-brotli": "^1.3.6",
@@ -8656,9 +8656,9 @@
       }
     },
     "node_modules/semver/node_modules/lru-cache": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz",
-      "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.0.tgz",
+      "integrity": "sha512-AmXqneQZL3KZMIgBpaPTeI6pfwh+xQ2vutMsyqOu1TBdEXFZgpG/80wuJ531w2ZN7TI0/oc8CPxzh/DKQudZqg==",
       "dev": true,
       "engines": {
         "node": ">=12"
@@ -12880,9 +12880,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001325",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001325.tgz",
-      "integrity": "sha512-sB1bZHjseSjDtijV1Hb7PB2Zd58Kyx+n/9EotvZ4Qcz2K3d0lWB8dB4nb8wN/TsOGFq3UuAm0zQZNQ4SoR7TrQ==",
+      "version": "1.0.30001327",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001327.tgz",
+      "integrity": "sha512-1/Cg4jlD9qjZzhbzkzEaAC2JHsP0WrOc8Rd/3a3LuajGzGWR/hD7TVyvq99VqmTy99eVh8Zkmdq213OgvgXx7w==",
       "dev": true
     },
     "caseless": {
@@ -13809,9 +13809,9 @@
       "dev": true
     },
     "domelementtype": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
       "dev": true
     },
     "domexception": {
@@ -13864,9 +13864,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.104",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.104.tgz",
-      "integrity": "sha512-2kjoAyiG7uMyGRM9mx25s3HAzmQG2ayuYXxsFmYugHSDcwxREgLtscZvbL1JcW9S/OemeQ3f/SG6JhDwpnCclQ==",
+      "version": "1.4.106",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz",
+      "integrity": "sha512-ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg==",
       "dev": true
     },
     "emoji-regex": {
@@ -13963,170 +13963,170 @@
       "dev": true
     },
     "esbuild": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.32.tgz",
-      "integrity": "sha512-RuzVUP/bkStmnVHK6Gh3gjaMjfXNLqBqvYVDiS9JKl5KdRdRLUeW5Wo8NrbL7cL6CW7Cyak7SvACqyPOBuA8vA==",
-      "dev": true,
-      "requires": {
-        "esbuild-android-64": "0.14.32",
-        "esbuild-android-arm64": "0.14.32",
-        "esbuild-darwin-64": "0.14.32",
-        "esbuild-darwin-arm64": "0.14.32",
-        "esbuild-freebsd-64": "0.14.32",
-        "esbuild-freebsd-arm64": "0.14.32",
-        "esbuild-linux-32": "0.14.32",
-        "esbuild-linux-64": "0.14.32",
-        "esbuild-linux-arm": "0.14.32",
-        "esbuild-linux-arm64": "0.14.32",
-        "esbuild-linux-mips64le": "0.14.32",
-        "esbuild-linux-ppc64le": "0.14.32",
-        "esbuild-linux-riscv64": "0.14.32",
-        "esbuild-linux-s390x": "0.14.32",
-        "esbuild-netbsd-64": "0.14.32",
-        "esbuild-openbsd-64": "0.14.32",
-        "esbuild-sunos-64": "0.14.32",
-        "esbuild-windows-32": "0.14.32",
-        "esbuild-windows-64": "0.14.32",
-        "esbuild-windows-arm64": "0.14.32"
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.34.tgz",
+      "integrity": "sha512-QIWdPT/gFF6hCaf4m7kP0cJ+JIuFkdHibI7vVFvu3eJS1HpVmYHWDulyN5WXwbRA0SX/7ZDaJ/1DH8SdY9xOJg==",
+      "dev": true,
+      "requires": {
+        "esbuild-android-64": "0.14.34",
+        "esbuild-android-arm64": "0.14.34",
+        "esbuild-darwin-64": "0.14.34",
+        "esbuild-darwin-arm64": "0.14.34",
+        "esbuild-freebsd-64": "0.14.34",
+        "esbuild-freebsd-arm64": "0.14.34",
+        "esbuild-linux-32": "0.14.34",
+        "esbuild-linux-64": "0.14.34",
+        "esbuild-linux-arm": "0.14.34",
+        "esbuild-linux-arm64": "0.14.34",
+        "esbuild-linux-mips64le": "0.14.34",
+        "esbuild-linux-ppc64le": "0.14.34",
+        "esbuild-linux-riscv64": "0.14.34",
+        "esbuild-linux-s390x": "0.14.34",
+        "esbuild-netbsd-64": "0.14.34",
+        "esbuild-openbsd-64": "0.14.34",
+        "esbuild-sunos-64": "0.14.34",
+        "esbuild-windows-32": "0.14.34",
+        "esbuild-windows-64": "0.14.34",
+        "esbuild-windows-arm64": "0.14.34"
       }
     },
     "esbuild-android-64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.32.tgz",
-      "integrity": "sha512-q1qjB2UcoWehR9Yp9dO2RdJUeLLrXAYsbOU4tkYa+GmJzxTwuvOrMdvaemsXYqb7F4STVTca9KpfqGicEChtUg==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.34.tgz",
+      "integrity": "sha512-XfxcfJqmMYsT/LXqrptzFxmaR3GWzXHDLdFNIhm6S00zPaQF1TBBWm+9t0RZ6LRR7iwH57DPjaOeW20vMqI4Yw==",
       "dev": true,
       "optional": true
     },
     "esbuild-android-arm64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.32.tgz",
-      "integrity": "sha512-bs1uu+RuM15f8yjFc0FhPDE/6NID4fKl7beDVsGCme6Q8ld2IzRXmp5QaHurlcH93PFyQnUgVvdahIWgtK2QZw==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.34.tgz",
+      "integrity": "sha512-T02+NXTmSRL1Mc6puz+R9CB54rSPICkXKq6+tw8B6vxZFnCPzbJxgwIX4kcluz9p8nYBjF3+lSilTGWb7+Xgew==",
       "dev": true,
       "optional": true
     },
     "esbuild-darwin-64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.32.tgz",
-      "integrity": "sha512-6MekflAld28wYtzanwZTxQlxMPeYw/yv1ToFG2hpo3LGxOIE2mBD5IJaMCcyy1//EYvGnGToO3p6XKdbS8E1QQ==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.34.tgz",
+      "integrity": "sha512-pLRip2Bh4Ng7Bf6AMgCrSp3pPe/qZyf11h5Qo2mOfJqLWzSVjxrXW+CFRJfrOVP7TCnh/gmZSM2AFdCPB72vtw==",
       "dev": true,
       "optional": true
     },
     "esbuild-darwin-arm64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.32.tgz",
-      "integrity": "sha512-BHYIjiPDYQTD+4zwqdqRo+I2bbg3fn9mah/gZm4SCCy+7uwTTYOYobIunHT7wVCgxnFCr50PJUdaMrEoCImRbw==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.34.tgz",
+      "integrity": "sha512-vpidSJEBxx6lf1NWgXC+DCmGqesJuZ5Y8aQVVsaoO4i8tRXbXb0whChRvop/zd3nfNM4dIl5EXAky0knRX5I6w==",
       "dev": true,
       "optional": true
     },
     "esbuild-freebsd-64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.32.tgz",
-      "integrity": "sha512-6BOBhtfAf9AlfjL1AvtfVOxwY82tHPfYrA0lskJpFjfiEMGTLU6e0vdOwb4+4x++gGz49azuGK0woYqdfL03uw==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.34.tgz",
+      "integrity": "sha512-m0HBjePhe0hAQJgtMRMNV9kMgIyV4/qSnzPx42kRMQBcPhgjAq1JRu4Il26czC+9FgpMbFkUktb07f/Lwnc6CA==",
       "dev": true,
       "optional": true
     },
     "esbuild-freebsd-arm64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.32.tgz",
-      "integrity": "sha512-zIRR4gKQW56p/xLM8TlpxVBNiX0w3VoR9ZxfH4nrfJ7QiL0SYHRy8YPL5C7zMWRjSze2WxQRHfS9bHKdVrVXBw==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.34.tgz",
+      "integrity": "sha512-cpRc2B94L1KvMPPYB4D6G39jLqpKlD3noAMY4/e86iXXXkhUYJJEtTuyNFTa9JRpWM0xCAp4mxjHjoIiLuoCLA==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-32": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.32.tgz",
-      "integrity": "sha512-kn0AkGtPvzA6xiv93/mavvZ7DVinu/ewh2F2S0/8mE8/PXi3D4+svZ6V3beV5DIH7vcHVuGhoooWav8HPF04tg==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.34.tgz",
+      "integrity": "sha512-8nQaEaoW7MH/K/RlozJa+lE1ejHIr8fuPIHhc513UebRav7HtXgQvxHQ6VZRUkWtep23M6dd7UqhwO1tMOfzQQ==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.32.tgz",
-      "integrity": "sha512-Ie+PMvrPj/HCOmSc0QubKttDxP2iBtPzDu+b+V3HGDGwkGmVpDkyXx1NXp5LjkIphIay2QekMwy1dSw3KDqCew==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.34.tgz",
+      "integrity": "sha512-Y3of4qQoLLlAgf042MlrY1P+7PnN9zWj8nVtw9XQG5hcLOZLz7IKpU35oeu7n4wvyaZHwvQqDJ93gRLqdJekcQ==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-arm": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.32.tgz",
-      "integrity": "sha512-R/Bvn/YQNDyvfN0SERh/I7hKPqN+nSSruQdVeiYEJ+jc3fUi73jXYAscpTQgIBeER/yXnEsgJGU/UQ9+sscr7A==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.34.tgz",
+      "integrity": "sha512-9lpq1NcJqssAF7alCO6zL3gvBVVt/lKw4oetUM7OgNnRX0OWpB+ZIO9FwCrSj/dMdmgDhPLf+119zB8QxSMmAg==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-arm64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.32.tgz",
-      "integrity": "sha512-ykoqKaxX95nB+lk2K/+qxr0ke+BxkeVi0yKOnymCR5Ive7IZDHa4BJX53NEGSBKLfWPwKE6SXTz8qcEewSntoA==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.34.tgz",
+      "integrity": "sha512-IlWaGtj9ir7+Nrume1DGcyzBDlK8GcnJq0ANKwcI9pVw8tqr+6GD0eqyF9SF1mR8UmAp+odrx1H5NdR2cHdFHA==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-mips64le": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.32.tgz",
-      "integrity": "sha512-IilnlBexpHpt/5po0cle/L/S6CYnwaq23UuAqWzxp+opHLOCNnyANpC1jOoP551aRx4JuZ7z3xZZ7bYQZB147w==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.34.tgz",
+      "integrity": "sha512-k3or+01Rska1AjUyNjA4buEwB51eyN/xPQAoOx1CjzAQC3l8rpjUDw55kXyL63O/1MUi4ISvtNtl8gLwdyEcxw==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-ppc64le": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.32.tgz",
-      "integrity": "sha512-TR6l5nWZbfq7jSY+1vsiQjT4m67NWplNhbX6GBieZq6DBt0nTx1XgTZAdKROF7jTuaK7YrCYlPXtfO3w86Mysw==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.34.tgz",
+      "integrity": "sha512-+qxb8M9FfM2CJaVU7GgYpJOHM1ngQOx+/VrtBjb4C8oVqaPcESCeg2anjl+HRZy8VpYc71q/iBYausPPbJ+Keg==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-riscv64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.32.tgz",
-      "integrity": "sha512-aSOcUzTeIAslfri8e+bMpyzQuxhcIiNhWyuCGGXum2PtxwYiUqR8/UCMYfwYtYkhr1yABOFOfs83mm9KBy5qCQ==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.34.tgz",
+      "integrity": "sha512-Y717ltBdQ5j5sZIHdy1DV9kieo0wMip0dCmVSTceowCPYSn1Cg33Kd6981+F/3b9FDMzNWldZFOBRILViENZSA==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-s390x": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.32.tgz",
-      "integrity": "sha512-dNlip+EvexxKjRZitFCWCd7DVk64c7R5ySr8aFEMHCb/RriNiyDxYJGzYWm4EMJsMRMupMUHlMY64BAa3Op9FA==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.34.tgz",
+      "integrity": "sha512-bDDgYO4LhL4+zPs+WcBkXph+AQoPcQRTv18FzZS0WhjfH8TZx2QqlVPGhmhZ6WidrY+jKthUqO6UhGyIb4MpmA==",
       "dev": true,
       "optional": true
     },
     "esbuild-netbsd-64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.32.tgz",
-      "integrity": "sha512-Pa3QByYqxzlBFQQQhjYBPg3WUfSjwibqzh1hC6mPDRUHnCeUcrLoBuIiG4xqOYEpQM9/kDowIBsrGIQEVWWdQA==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.34.tgz",
+      "integrity": "sha512-cfaFGXdRt0+vHsjNPyF0POM4BVSHPSbhLPe8mppDc7GDDxjIl08mV1Zou14oDWMp/XZMjYN1kWYRSfftiD0vvQ==",
       "dev": true,
       "optional": true
     },
     "esbuild-openbsd-64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.32.tgz",
-      "integrity": "sha512-uWKKqpCjkMY8TCIobFvaSETonQY3OrmgnoTCC3tF+lvMoneYjppB6akx7L5Xv0kP+1tnSbrIof1ca8PfqGUyjw==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.34.tgz",
+      "integrity": "sha512-vmy9DxXVnRiI14s8GKuYBtess+EVcDALkbpTqd5jw4XITutIzyB7n4x0Tj5utAkKsgZJB22lLWGekr0ABnSLow==",
       "dev": true,
       "optional": true
     },
     "esbuild-sunos-64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.32.tgz",
-      "integrity": "sha512-Ar+u3mBk0oVV4Fwv/qlinJZNIPPtTBSG+1W42o8lOaVxJ+rJgecDoeUN+5uyd9at0BK1SVrQ1qZ4wjHKB0qFpQ==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.34.tgz",
+      "integrity": "sha512-eNPVatNET1F7tRMhii7goL/eptfxc0ALRjrj9SPFNqp0zmxrehBFD6BaP3R4LjMn6DbMO0jOAnTLFKr8NqcJAA==",
       "dev": true,
       "optional": true
     },
     "esbuild-windows-32": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.32.tgz",
-      "integrity": "sha512-rLMsbflMY6Hjh3rmQnCDVZahJQ7n+XfT6o1+no5pHRpDlMh38MHthgGh35q+EcOMgrGP3ppnw70rhJq80SaYTQ==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.34.tgz",
+      "integrity": "sha512-EFhpXyHEcnqWYe2rAHFd8dRw8wkrd9U+9oqcyoEL84GbanAYjiiIjBZsnR8kl0sCQ5w6bLpk7vCEIA2VS32Vcg==",
       "dev": true,
       "optional": true
     },
     "esbuild-windows-64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.32.tgz",
-      "integrity": "sha512-OHnMMxYufVgLXIMnwLynLMKguHMrsVnWcehieSP9i6ZX31KEsOFYWrorcnTWOn4rbZVLSL10ofxLuVIgRW3SWw==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.34.tgz",
+      "integrity": "sha512-a8fbl8Ky7PxNEjf1aJmtxdDZj32/hC7S1OcA2ckEpCJRTjiKslI9vAdPpSjrKIWhws4Galpaawy0nB7fjHYf5Q==",
       "dev": true,
       "optional": true
     },
     "esbuild-windows-arm64": {
-      "version": "0.14.32",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.32.tgz",
-      "integrity": "sha512-ddavy6IPUBySMfqDfG243TgtuqwQBNJQJPVaA4DaavmMfpBsUxFrSV+HzBWXTKU3I9EcuoEvIATLuQ7NJKxjwg==",
+      "version": "0.14.34",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.34.tgz",
+      "integrity": "sha512-EYvmKbSa2B3sPnpC28UEu9jBK5atGV4BaVRE7CYGUci2Hlz4AvtV/LML+TcDMT6gBgibnN2gcltWclab3UutMg==",
       "dev": true,
       "optional": true
     },
@@ -14203,9 +14203,9 @@
       }
     },
     "eslint": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz",
-      "integrity": "sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.13.0.tgz",
+      "integrity": "sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ==",
       "dev": true,
       "requires": {
         "@eslint/eslintrc": "^1.2.1",
@@ -15668,9 +15668,9 @@
       }
     },
     "keyv": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.2.1.tgz",
-      "integrity": "sha512-cAJq5cTfxQdq1DHZEVNpnk4mEvhP+8UP8UQftLtTtJ98beKkRHf+62M0mIDM2u/IWXyP8bmGB375/6uGdSX2MA==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.2.2.tgz",
+      "integrity": "sha512-uYS0vKTlBIjNCAUqrjlxmruxOEiZxZIHXyp32sdcGmP+ukFrmWUnE//RcPXJH3Vxrni1H2gsQbjHE0bH7MtMQQ==",
       "dev": true,
       "requires": {
         "compress-brotli": "^1.3.6",
@@ -17381,9 +17381,9 @@
       },
       "dependencies": {
         "lru-cache": {
-          "version": "7.7.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz",
-          "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==",
+          "version": "7.8.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.0.tgz",
+          "integrity": "sha512-AmXqneQZL3KZMIgBpaPTeI6pfwh+xQ2vutMsyqOu1TBdEXFZgpG/80wuJ531w2ZN7TI0/oc8CPxzh/DKQudZqg==",
           "dev": true
         }
       }
diff --git a/cms/bootstrap.php b/cms/bootstrap.php
index 06278f93..812b8e3a 100644
--- a/cms/bootstrap.php
+++ b/cms/bootstrap.php
@@ -20,4 +20,4 @@
 define('CRAFT_ENVIRONMENT', getenv('ENVIRONMENT') ?: 'production');
 
 // Set license key via .env
-define('CRAFT_LICENSE_KEY', getenv('LICENSE_KEY'));
+define('CRAFT_LICENSE_KEY', trim(getenv('LICENSE_KEY'), '"'));
diff --git a/cms/composer.json b/cms/composer.json
index b64b587e..dc06fdf2 100644
--- a/cms/composer.json
+++ b/cms/composer.json
@@ -20,22 +20,22 @@
   "minimum-stability": "beta",
   "prefer-stable": true,
   "require": {
-    "craftcms/cms": "^3.7.26",
-    "craftcms/aws-s3": "^1.2",
-    "craftcms/redactor": "^2.3.0",
+    "php": "^8.0.2",
+    "craftcms/cms": "^4.0.0-beta.4",
+    "craftcms/aws-s3": "^2.0.0-beta.2",
     "jean85/pretty-package-versions": "^1.5 || ^2.0",
     "league/csv": "^8.2 || ^9.0",
-    "nystudio107/craft-imageoptimize": "^1.0.0",
-    "nystudio107/craft-fastcgicachebust": "^1.0.0",
-    "nystudio107/craft-icalendar": "^1.1.0",
-    "nystudio107/craft-minify": "^1.2.10",
-    "nystudio107/craft-typogrify": "^1.1.4",
-    "nystudio107/craft-transcoder": "^1.0.9",
-    "nystudio107/craft-disqus": "^1.1.3",
-    "nystudio107/craft-retour": "^3.0.0",
-    "nystudio107/craft-seomatic": "^3.2.0",
-    "nystudio107/craft-webperf": "^1.0.0",
-    "nystudio107/craft-vite": "^1.0.19",
+    "nystudio107/craft-imageoptimize": "^4.0.0-beta.2",
+    "nystudio107/craft-fastcgicachebust": "^4.0.0-beta.1",
+    "nystudio107/craft-icalendar": "^4.0.0-beta.1",
+    "nystudio107/craft-minify": "^4.0.0-beta.1",
+    "nystudio107/craft-typogrify": "^4.0.0-beta.1",
+    "nystudio107/craft-transcoder": "^4.0.0-beta.4",
+    "nystudio107/craft-disqus": "^4.0.0-beta.1",
+    "nystudio107/craft-retour": "^4.0.0-beta.1",
+    "nystudio107/craft-seomatic": "^4.0.0-beta.1",
+    "nystudio107/craft-webperf": "^4.0.0-beta.1",
+    "nystudio107/craft-vite": "^4.0.0-beta.1",
     "vlucas/phpdotenv": "^5.4.0",
     "yiisoft/yii2-redis": "^2.0.6"
   },
@@ -53,10 +53,7 @@
       "craftcms/plugin-installer": true,
       "yiisoft/yii2-composer": true
     },
-    "optimize-autoloader": true,
-    "platform": {
-      "php": "7.2.5"
-    }
+    "optimize-autoloader": true
   },
   "scripts": {
     "craft-update": [
diff --git a/cms/composer.lock b/cms/composer.lock
index c6e5b294..f3fbd830 100644
--- a/cms/composer.lock
+++ b/cms/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "939e77000a3fb6aea59660d33d958f6c",
+    "content-hash": "5340dc5c706ab6445a55de72b7118778",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -58,16 +58,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.218.4",
+            "version": "3.219.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "db59241a678720d50deb166d7bfe332100898964"
+                "reference": "e77a9bc31fdd98d3893f398468a36e00b12db3dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/db59241a678720d50deb166d7bfe332100898964",
-                "reference": "db59241a678720d50deb166d7bfe332100898964",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e77a9bc31fdd98d3893f398468a36e00b12db3dc",
+                "reference": "e77a9bc31fdd98d3893f398468a36e00b12db3dc",
                 "shasum": ""
             },
             "require": {
@@ -75,9 +75,9 @@
                 "ext-json": "*",
                 "ext-pcre": "*",
                 "ext-simplexml": "*",
-                "guzzlehttp/guzzle": "^5.3.3|^6.2.1|^7.0",
+                "guzzlehttp/guzzle": "^5.3.3 || ^6.2.1 || ^7.0",
                 "guzzlehttp/promises": "^1.4.0",
-                "guzzlehttp/psr7": "^1.7.0|^2.0",
+                "guzzlehttp/psr7": "^1.7.0 || ^2.1.1",
                 "mtdowling/jmespath.php": "^2.6",
                 "php": ">=5.5"
             },
@@ -92,7 +92,7 @@
                 "ext-sockets": "*",
                 "nette/neon": "^2.3",
                 "paragonie/random_compat": ">= 2",
-                "phpunit/phpunit": "^4.8.35|^5.4.3",
+                "phpunit/phpunit": "^4.8.35 || ^5.6.3",
                 "psr/cache": "^1.0",
                 "psr/simple-cache": "^1.0",
                 "sebastian/comparator": "^1.2.3"
@@ -143,9 +143,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.218.4"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.219.0"
             },
-            "time": "2022-04-06T18:16:53+00:00"
+            "time": "2022-04-08T18:16:00+00:00"
         },
         {
             "name": "cebe/markdown",
@@ -211,6 +211,70 @@
             },
             "time": "2018-03-26T11:24:36+00:00"
         },
+        {
+            "name": "commerceguys/addressing",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/commerceguys/addressing.git",
+                "reference": "566febd56ca71e31dd383b014c4e1bec680507bf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/commerceguys/addressing/zipball/566febd56ca71e31dd383b014c4e1bec680507bf",
+                "reference": "566febd56ca71e31dd383b014c4e1bec680507bf",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/collections": "~1.0",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "ext-json": "*",
+                "mikey179/vfsstream": "1.*",
+                "phpunit/phpunit": "^9.5",
+                "squizlabs/php_codesniffer": "3.*",
+                "symfony/validator": "^4.4 || ^5.4"
+            },
+            "suggest": {
+                "symfony/validator": "to validate addresses"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "CommerceGuys\\Addressing\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bojan Zivanovic"
+                },
+                {
+                    "name": "Damien Tournoud"
+                }
+            ],
+            "description": "Addressing library powered by CLDR and Google's address data.",
+            "keywords": [
+                "address",
+                "internationalization",
+                "localization",
+                "postal"
+            ],
+            "support": {
+                "issues": "https://github.com/commerceguys/addressing/issues",
+                "source": "https://github.com/commerceguys/addressing/tree/v1.3.0"
+            },
+            "time": "2022-04-08T13:06:51+00:00"
+        },
         {
             "name": "composer/ca-bundle",
             "version": "1.3.1",
@@ -754,24 +818,28 @@
         },
         {
             "name": "craftcms/aws-s3",
-            "version": "1.3.0",
+            "version": "2.0.0-beta.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/craftcms/aws-s3.git",
-                "reference": "d8515e3e8dc8867b635ea87b9ed578c06184e497"
+                "reference": "85f09e54fd4e832b27a5b39188a89ca899795dd6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/craftcms/aws-s3/zipball/d8515e3e8dc8867b635ea87b9ed578c06184e497",
-                "reference": "d8515e3e8dc8867b635ea87b9ed578c06184e497",
+                "url": "https://api.github.com/repos/craftcms/aws-s3/zipball/85f09e54fd4e832b27a5b39188a89ca899795dd6",
+                "reference": "85f09e54fd4e832b27a5b39188a89ca899795dd6",
                 "shasum": ""
             },
             "require": {
-                "craftcms/cms": "^3.4.0",
-                "league/flysystem-aws-s3-v3": "^1.0.28"
+                "craftcms/cms": "^4.0.0-alpha.1",
+                "craftcms/flysystem": "^1.0.0-beta.2",
+                "league/flysystem-aws-s3-v3": "^3.0.0",
+                "php": "^8.0.2"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.96"
+                "craftcms/ecs": "dev-main",
+                "craftcms/phpstan": "dev-main",
+                "craftcms/rector": "dev-main"
             },
             "type": "craft-plugin",
             "extra": {
@@ -810,82 +878,91 @@
                 "rss": "https://github.com/craftcms/aws-s3/commits/master.atom",
                 "source": "https://github.com/craftcms/aws-s3"
             },
-            "time": "2021-10-21T15:06:05+00:00"
+            "time": "2022-03-28T23:35:26+00:00"
         },
         {
             "name": "craftcms/cms",
-            "version": "3.7.38",
+            "version": "4.0.0-beta.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/craftcms/cms.git",
-                "reference": "7e5b2ee7be865ec223c8e0923f41b17c21f07766"
+                "reference": "867af8684b1cc90c9b0bb0a6fb8e4f2a369b45de"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/craftcms/cms/zipball/7e5b2ee7be865ec223c8e0923f41b17c21f07766",
-                "reference": "7e5b2ee7be865ec223c8e0923f41b17c21f07766",
+                "url": "https://api.github.com/repos/craftcms/cms/zipball/867af8684b1cc90c9b0bb0a6fb8e4f2a369b45de",
+                "reference": "867af8684b1cc90c9b0bb0a6fb8e4f2a369b45de",
                 "shasum": ""
             },
             "require": {
+                "commerceguys/addressing": "^1.2",
                 "composer/composer": "2.1.9",
                 "craftcms/oauth2-craftid": "~1.0.0",
                 "craftcms/plugin-installer": "~1.5.6",
-                "craftcms/server-check": "~1.2.0",
+                "craftcms/server-check": "~2.1.2",
                 "creocoder/yii2-nested-sets": "~0.9.0",
                 "elvanto/litemoji": "^3.0.1",
-                "enshrined/svg-sanitize": "~0.15.2",
+                "enshrined/svg-sanitize": "~0.15.0",
+                "ext-bcmath": "*",
                 "ext-curl": "*",
                 "ext-dom": "*",
+                "ext-intl": "*",
                 "ext-json": "*",
                 "ext-mbstring": "*",
                 "ext-openssl": "*",
                 "ext-pcre": "*",
                 "ext-pdo": "*",
                 "ext-zip": "*",
-                "guzzlehttp/guzzle": "^6.5.5|^7.2.0",
-                "laminas/laminas-feed": "~2.12.3|^2.13.1",
-                "league/flysystem": "^1.1.4",
+                "guzzlehttp/guzzle": "^7.2.0",
+                "illuminate/collections": "^9.1.0",
                 "league/oauth2-client": "^2.6.0",
                 "mikehaertl/php-shellcommand": "^1.6.3",
-                "php": ">=7.2.5",
+                "moneyphp/money": "^4.0",
+                "monolog/monolog": "^2.3",
+                "php": "^8.0.2",
                 "pixelandtonic/imagine": "~1.2.4.1",
+                "samdark/yii2-psr-log-target": "^1.1",
                 "seld/cli-prompt": "^1.0.4",
-                "symfony/yaml": "^5.2.1",
+                "symfony/http-client": "^6.0.3",
+                "symfony/var-dumper": "^5.0|^6.0",
+                "symfony/yaml": "^5.2.3",
+                "theiconic/name-parser": "^1.2",
                 "true/punycode": "^2.1.1",
-                "twig/twig": "~2.14.3",
+                "twig/twig": "~3.3.0",
                 "voku/stringy": "^6.4.0",
                 "webonyx/graphql-php": "~14.11.5",
                 "yiisoft/yii2": "~2.0.45.0",
                 "yiisoft/yii2-debug": "^2.1.16",
                 "yiisoft/yii2-queue": "~2.3.2",
-                "yiisoft/yii2-swiftmailer": "^2.1.2"
+                "yiisoft/yii2-symfonymailer": "^2.0.0"
             },
             "conflict": {
                 "league/oauth2-client": "2.4.0"
             },
             "provide": {
-                "bower-asset/inputmask": "~3.2.2 | ~3.3.5",
-                "bower-asset/jquery": "3.5.*@stable | 3.4.*@stable | 3.3.*@stable | 3.2.*@stable | 3.1.*@stable | 2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
+                "bower-asset/inputmask": "~3.2.2|~3.3.5",
+                "bower-asset/jquery": "3.5.*@stable|3.4.*@stable|3.3.*@stable|3.2.*@stable|3.1.*@stable|2.2.*@stable|2.1.*@stable|1.11.*@stable|1.12.*@stable",
                 "bower-asset/punycode": "1.3.*",
                 "bower-asset/yii2-pjax": "~2.0.1",
                 "yii2tech/ar-softdelete": "1.0.4"
             },
             "require-dev": {
-                "codeception/codeception": "^4.0.0",
-                "codeception/module-asserts": "^1.0.0",
-                "codeception/module-datafactory": "^1.0.0",
-                "codeception/module-phpbrowser": "^1.0.0",
-                "codeception/module-rest": "^1.0.0",
-                "codeception/module-yii2": "^1.0.0",
+                "codeception/codeception": "^4.1.29",
+                "codeception/module-asserts": "^1.3.1",
+                "codeception/module-datafactory": "^1.1.0",
+                "codeception/module-phpbrowser": "^1.0.2",
+                "codeception/module-rest": "^1.4.2",
+                "codeception/module-yii2": "^1.1.5",
                 "craftcms/ecs": "dev-main",
-                "fzaninotto/faker": "^1.8",
-                "league/factory-muffin": "^3.0",
-                "vlucas/phpdotenv": "^3.0"
+                "fakerphp/faker": "^1.19.0",
+                "league/factory-muffin": "^3.3.0",
+                "phpstan/phpstan": "^1.4.6",
+                "vlucas/phpdotenv": "^5.4.1"
             },
             "suggest": {
+                "ext-exif": "Adds support for parsing image EXIF data.",
                 "ext-iconv": "Adds support for more character encodings than PHP’s built-in mb_convert_encoding() function, which Craft will take advantage of when converting strings to UTF-8.",
-                "ext-imagick": "Adds support for more image processing formats and options.",
-                "ext-intl": "Adds rich internationalization support."
+                "ext-imagick": "Adds support for more image processing formats and options."
             },
             "type": "library",
             "autoload": {
@@ -912,39 +989,43 @@
                 "yii2"
             ],
             "support": {
-                "docs": "https://craftcms.com/docs/3.x/",
+                "docs": "https://docs.craftcms.com/v3/",
                 "email": "support@craftcms.com",
                 "forum": "https://craftcms.stackexchange.com/",
                 "issues": "https://github.com/craftcms/cms/issues?state=open",
                 "rss": "https://github.com/craftcms/cms/releases.atom",
                 "source": "https://github.com/craftcms/cms"
             },
-            "time": "2022-04-06T18:24:35+00:00"
+            "time": "2022-04-06T18:49:33+00:00"
         },
         {
-            "name": "craftcms/html-field",
-            "version": "1.0.6",
+            "name": "craftcms/flysystem",
+            "version": "1.0.0-beta.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/craftcms/html-field.git",
-                "reference": "fd3d400643fccbe27583102f581640f465987a06"
+                "url": "https://github.com/craftcms/flysystem.git",
+                "reference": "4a71cfc3fa8421ff6e69b6e94d1cb948dc9c4533"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/craftcms/html-field/zipball/fd3d400643fccbe27583102f581640f465987a06",
-                "reference": "fd3d400643fccbe27583102f581640f465987a06",
+                "url": "https://api.github.com/repos/craftcms/flysystem/zipball/4a71cfc3fa8421ff6e69b6e94d1cb948dc9c4533",
+                "reference": "4a71cfc3fa8421ff6e69b6e94d1cb948dc9c4533",
                 "shasum": ""
             },
             "require": {
-                "craftcms/cms": "^3.6.0"
+                "craftcms/cms": "^4.0.0-alpha.1",
+                "league/flysystem": "^3.0.0",
+                "php": "^8.0.2"
             },
             "require-dev": {
-                "craftcms/phpstan": "dev-main"
+                "craftcms/ecs": "dev-main",
+                "craftcms/phpstan": "dev-main",
+                "craftcms/rector": "dev-main"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "craft\\htmlfield\\": "src/"
+                    "craft\\flysystem\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -957,15 +1038,20 @@
                     "homepage": "https://pixelandtonic.com/"
                 }
             ],
-            "description": "Base class for Craft CMS field types with HTML values.",
+            "description": "Base Flysystem implementation for Craft CMS",
+            "keywords": [
+                "Flysystem",
+                "craftcms",
+                "yii2"
+            ],
             "support": {
-                "docs": "https://github.com/craftcms/html-field/blob/main/README.md",
+                "docs": "https://github.com/craftcms/flysystem",
                 "email": "support@craftcms.com",
-                "issues": "https://github.com/craftcms/html-field/issues?state=open",
-                "rss": "https://github.com/craftcms/html-field/commits/main.atom",
-                "source": "https://github.com/craftcms/html-field"
+                "issues": "https://github.com/craftcms/flysystem/issues?state=open",
+                "rss": "https://github.com/craftcms/flysystem/commits/master.atom",
+                "source": "https://github.com/craftcms/flysystem"
             },
-            "time": "2022-03-10T14:39:24+00:00"
+            "time": "2022-03-28T23:14:48+00:00"
         },
         {
             "name": "craftcms/oauth2-craftid",
@@ -1075,77 +1161,18 @@
             },
             "time": "2021-02-18T02:01:38+00:00"
         },
-        {
-            "name": "craftcms/redactor",
-            "version": "2.10.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/craftcms/redactor.git",
-                "reference": "b4d5d8e9b034e8f0018c560505022d0b8f5750ce"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/craftcms/redactor/zipball/b4d5d8e9b034e8f0018c560505022d0b8f5750ce",
-                "reference": "b4d5d8e9b034e8f0018c560505022d0b8f5750ce",
-                "shasum": ""
-            },
-            "require": {
-                "craftcms/cms": "^3.6.0",
-                "craftcms/html-field": "^1.0.4"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^0.12.96"
-            },
-            "type": "craft-plugin",
-            "extra": {
-                "name": "Redactor",
-                "handle": "redactor",
-                "documentationUrl": "https://github.com/craftcms/redactor/blob/v2/README.md"
-            },
-            "autoload": {
-                "psr-4": {
-                    "craft\\redactor\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Pixel & Tonic",
-                    "homepage": "https://pixelandtonic.com/"
-                }
-            ],
-            "description": "Edit rich text content in Craft CMS using Redactor by Imperavi.",
-            "keywords": [
-                "Redactor",
-                "cms",
-                "craftcms",
-                "html",
-                "yii2"
-            ],
-            "support": {
-                "docs": "https://github.com/craftcms/redactor/blob/v2/README.md",
-                "email": "support@craftcms.com",
-                "issues": "https://github.com/craftcms/redactor/issues?state=open",
-                "rss": "https://github.com/craftcms/redactor/commits/v2.atom",
-                "source": "https://github.com/craftcms/redactor"
-            },
-            "time": "2022-02-25T08:14:08+00:00"
-        },
         {
             "name": "craftcms/server-check",
-            "version": "1.2.3",
+            "version": "2.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/craftcms/server-check.git",
-                "reference": "9d8345bc7920b6657bd3fac396efee6bf8609ed6"
+                "reference": "1e052b2a4dc5751b7fe6f96fff5b89e4b1bba9d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/craftcms/server-check/zipball/9d8345bc7920b6657bd3fac396efee6bf8609ed6",
-                "reference": "9d8345bc7920b6657bd3fac396efee6bf8609ed6",
+                "url": "https://api.github.com/repos/craftcms/server-check/zipball/1e052b2a4dc5751b7fe6f96fff5b89e4b1bba9d9",
+                "reference": "1e052b2a4dc5751b7fe6f96fff5b89e4b1bba9d9",
                 "shasum": ""
             },
             "type": "library",
@@ -1174,7 +1201,7 @@
                 "rss": "https://github.com/craftcms/server-check/releases.atom",
                 "source": "https://github.com/craftcms/server-check"
             },
-            "time": "2021-08-18T14:46:23+00:00"
+            "time": "2022-02-15T17:25:51+00:00"
         },
         {
             "name": "creocoder/yii2-nested-sets",
@@ -1341,6 +1368,75 @@
             },
             "time": "2021-04-09T23:57:26+00:00"
         },
+        {
+            "name": "doctrine/collections",
+            "version": "1.6.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/collections.git",
+                "reference": "1958a744696c6bb3bb0d28db2611dc11610e78af"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/collections/zipball/1958a744696c6bb3bb0d28db2611dc11610e78af",
+                "reference": "1958a744696c6bb3bb0d28db2611dc11610e78af",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3 || ^8.0"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^9.0",
+                "phpstan/phpstan": "^0.12",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.1.5",
+                "vimeo/psalm": "^4.2.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "PHP Doctrine Collections library that adds additional functionality on top of PHP arrays.",
+            "homepage": "https://www.doctrine-project.org/projects/collections.html",
+            "keywords": [
+                "array",
+                "collections",
+                "iterators",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/collections/issues",
+                "source": "https://github.com/doctrine/collections/tree/1.6.8"
+            },
+            "time": "2021-08-10T18:51:53+00:00"
+        },
         {
             "name": "doctrine/lexer",
             "version": "1.2.3",
@@ -2009,80 +2105,86 @@
             "time": "2022-03-20T21:55:58+00:00"
         },
         {
-            "name": "imgix/imgix-php",
-            "version": "3.3.0",
+            "name": "illuminate/collections",
+            "version": "v9.7.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/imgix/imgix-php.git",
-                "reference": "6995ca3440fe442b1175c12dc63b41617568b606"
+                "url": "https://github.com/illuminate/collections.git",
+                "reference": "03fc7ae1689cffef8729dc5bad37dcaa3f7064d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/imgix/imgix-php/zipball/6995ca3440fe442b1175c12dc63b41617568b606",
-                "reference": "6995ca3440fe442b1175c12dc63b41617568b606",
+                "url": "https://api.github.com/repos/illuminate/collections/zipball/03fc7ae1689cffef8729dc5bad37dcaa3f7064d3",
+                "reference": "03fc7ae1689cffef8729dc5bad37dcaa3f7064d3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3"
+                "illuminate/conditionable": "^9.0",
+                "illuminate/contracts": "^9.0",
+                "illuminate/macroable": "^9.0",
+                "php": "^8.0.2"
             },
-            "require-dev": {
-                "phpunit/phpunit": "*"
+            "suggest": {
+                "symfony/var-dumper": "Required to use the dump method (^6.0)."
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "9.x-dev"
+                }
+            },
             "autoload": {
-                "psr-0": {
-                    "Imgix\\": "src/"
+                "files": [
+                    "helpers.php"
+                ],
+                "psr-4": {
+                    "Illuminate\\Support\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-2-Clause"
+                "MIT"
             ],
-            "description": "A PHP client library for generating URLs with imgix.",
-            "keywords": [
-                "imgix"
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                }
             ],
+            "description": "The Illuminate Collections package.",
+            "homepage": "https://laravel.com",
             "support": {
-                "issues": "https://github.com/imgix/imgix-php/issues",
-                "source": "https://github.com/imgix/imgix-php/tree/3.3.0"
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
             },
-            "time": "2020-06-05T21:57:36+00:00"
+            "time": "2022-03-30T14:36:23+00:00"
         },
         {
-            "name": "intervention/httpauth",
-            "version": "3.0.1",
+            "name": "illuminate/conditionable",
+            "version": "v9.7.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Intervention/httpauth.git",
-                "reference": "825202e88c0918f5249bd5af6ff1fb8ef6e3271e"
+                "url": "https://github.com/illuminate/conditionable.git",
+                "reference": "56b4ba1166c264064bf63896f498a2bee320d16a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/httpauth/zipball/825202e88c0918f5249bd5af6ff1fb8ef6e3271e",
-                "reference": "825202e88c0918f5249bd5af6ff1fb8ef6e3271e",
+                "url": "https://api.github.com/repos/illuminate/conditionable/zipball/56b4ba1166c264064bf63896f498a2bee320d16a",
+                "reference": "56b4ba1166c264064bf63896f498a2bee320d16a",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^0.12.11",
-                "phpunit/phpunit": "^8.0"
+                "php": "^8.0.2"
             },
             "type": "library",
             "extra": {
-                "laravel": {
-                    "providers": [
-                        "Intervention\\HttpAuth\\Laravel\\HttpAuthServiceProvider"
-                    ],
-                    "aliases": {
-                        "HttpAuth": "Intervention\\HttpAuth\\Laravel\\Facades\\HttpAuth"
-                    }
+                "branch-alias": {
+                    "dev-master": "9.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Intervention\\HttpAuth\\": "src/"
+                    "Illuminate\\Support\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2091,48 +2193,46 @@
             ],
             "authors": [
                 {
-                    "name": "Oliver Vogel",
-                    "email": "oliver@olivervogel.com",
-                    "homepage": "https://olivervogel.com/"
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
                 }
             ],
-            "description": "HTTP authentication (Basic & Digest) including ServiceProviders for easy Laravel integration",
-            "homepage": "https://github.com/Intervention/httpauth",
-            "keywords": [
-                "Authentication",
-                "http",
-                "laravel"
-            ],
+            "description": "The Illuminate Conditionable package.",
+            "homepage": "https://laravel.com",
             "support": {
-                "issues": "https://github.com/Intervention/httpauth/issues",
-                "source": "https://github.com/Intervention/httpauth/tree/3.0.1"
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
             },
-            "time": "2020-03-09T16:18:28+00:00"
+            "time": "2022-02-28T16:37:46+00:00"
         },
         {
-            "name": "jaybizzle/crawler-detect",
-            "version": "v1.2.111",
+            "name": "illuminate/contracts",
+            "version": "v9.7.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/JayBizzle/Crawler-Detect.git",
-                "reference": "d572ed4a65a70a2d2871dc5137c9c5b7e69745ab"
+                "url": "https://github.com/illuminate/contracts.git",
+                "reference": "de0878799e3eaccb5efdf714c516522fa53b7c81"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/d572ed4a65a70a2d2871dc5137c9c5b7e69745ab",
-                "reference": "d572ed4a65a70a2d2871dc5137c9c5b7e69745ab",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/de0878799e3eaccb5efdf714c516522fa53b7c81",
+                "reference": "de0878799e3eaccb5efdf714c516522fa53b7c81",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8|^5.5|^6.5|^9.4"
+                "php": "^8.0.2",
+                "psr/container": "^1.1.1|^2.0.1",
+                "psr/simple-cache": "^1.0|^2.0|^3.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "9.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "Jaybizzle\\CrawlerDetect\\": "src/"
+                    "Illuminate\\Contracts\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2141,60 +2241,44 @@
             ],
             "authors": [
                 {
-                    "name": "Mark Beech",
-                    "email": "m@rkbee.ch",
-                    "role": "Developer"
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
                 }
             ],
-            "description": "CrawlerDetect is a PHP class for detecting bots/crawlers/spiders via the user agent",
-            "homepage": "https://github.com/JayBizzle/Crawler-Detect/",
-            "keywords": [
-                "crawler",
-                "crawler detect",
-                "crawler detector",
-                "crawlerdetect",
-                "php crawler detect"
-            ],
+            "description": "The Illuminate Contracts package.",
+            "homepage": "https://laravel.com",
             "support": {
-                "issues": "https://github.com/JayBizzle/Crawler-Detect/issues",
-                "source": "https://github.com/JayBizzle/Crawler-Detect/tree/v1.2.111"
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
             },
-            "time": "2022-03-15T22:19:01+00:00"
+            "time": "2022-03-18T14:48:15+00:00"
         },
         {
-            "name": "jean85/pretty-package-versions",
-            "version": "2.0.5",
+            "name": "illuminate/macroable",
+            "version": "v9.7.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Jean85/pretty-package-versions.git",
-                "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af"
+                "url": "https://github.com/illuminate/macroable.git",
+                "reference": "25a2c6dac2b7541ecbadef952702e84ae15f5354"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/ae547e455a3d8babd07b96966b17d7fd21d9c6af",
-                "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af",
+                "url": "https://api.github.com/repos/illuminate/macroable/zipball/25a2c6dac2b7541ecbadef952702e84ae15f5354",
+                "reference": "25a2c6dac2b7541ecbadef952702e84ae15f5354",
                 "shasum": ""
             },
             "require": {
-                "composer-runtime-api": "^2.0.0",
-                "php": "^7.1|^8.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.17",
-                "jean85/composer-provided-replaced-stub-package": "^1.0",
-                "phpstan/phpstan": "^0.12.66",
-                "phpunit/phpunit": "^7.5|^8.5|^9.4",
-                "vimeo/psalm": "^4.3"
+                "php": "^8.0.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-master": "9.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Jean85\\": "src/"
+                    "Illuminate\\Support\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2203,26 +2287,233 @@
             ],
             "authors": [
                 {
-                    "name": "Alessandro Lai",
-                    "email": "alessandro.lai85@gmail.com"
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
                 }
             ],
-            "description": "A library to get pretty versions strings of installed dependencies",
-            "keywords": [
-                "composer",
-                "package",
-                "release",
-                "versions"
-            ],
+            "description": "The Illuminate Macroable package.",
+            "homepage": "https://laravel.com",
             "support": {
-                "issues": "https://github.com/Jean85/pretty-package-versions/issues",
-                "source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.5"
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
             },
-            "time": "2021-10-08T21:21:46+00:00"
+            "time": "2022-02-01T14:44:21+00:00"
         },
         {
-            "name": "johngrogg/ics-parser",
-            "version": "v2.2.2",
+            "name": "imgix/imgix-php",
+            "version": "3.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/imgix/imgix-php.git",
+                "reference": "ddb7e427b601bc3534f108180c81292d5b29bc39"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/imgix/imgix-php/zipball/ddb7e427b601bc3534f108180c81292d5b29bc39",
+                "reference": "ddb7e427b601bc3534f108180c81292d5b29bc39",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Imgix\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "description": "A PHP client library for generating URLs with imgix.",
+            "keywords": [
+                "imgix"
+            ],
+            "support": {
+                "issues": "https://github.com/imgix/imgix-php/issues",
+                "source": "https://github.com/imgix/imgix-php/tree/3.3.1"
+            },
+            "time": "2021-03-25T15:10:34+00:00"
+        },
+        {
+            "name": "intervention/httpauth",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Intervention/httpauth.git",
+                "reference": "7742aa013e1a72f94379cb6623286f06fa1ea5f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Intervention/httpauth/zipball/7742aa013e1a72f94379cb6623286f06fa1ea5f7",
+                "reference": "7742aa013e1a72f94379cb6623286f06fa1ea5f7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3|^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.11",
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Intervention\\HttpAuth\\Laravel\\HttpAuthServiceProvider"
+                    ],
+                    "aliases": {
+                        "HttpAuth": "Intervention\\HttpAuth\\Laravel\\Facades\\HttpAuth"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Intervention\\HttpAuth\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Oliver Vogel",
+                    "email": "oliver@olivervogel.com",
+                    "homepage": "https://olivervogel.com/"
+                }
+            ],
+            "description": "HTTP authentication (Basic & Digest) including ServiceProviders for easy Laravel integration",
+            "homepage": "https://github.com/Intervention/httpauth",
+            "keywords": [
+                "Authentication",
+                "http",
+                "laravel"
+            ],
+            "support": {
+                "issues": "https://github.com/Intervention/httpauth/issues",
+                "source": "https://github.com/Intervention/httpauth/tree/3.0.3"
+            },
+            "time": "2021-01-22T15:08:35+00:00"
+        },
+        {
+            "name": "jaybizzle/crawler-detect",
+            "version": "v1.2.111",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/JayBizzle/Crawler-Detect.git",
+                "reference": "d572ed4a65a70a2d2871dc5137c9c5b7e69745ab"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/d572ed4a65a70a2d2871dc5137c9c5b7e69745ab",
+                "reference": "d572ed4a65a70a2d2871dc5137c9c5b7e69745ab",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8|^5.5|^6.5|^9.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Jaybizzle\\CrawlerDetect\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Beech",
+                    "email": "m@rkbee.ch",
+                    "role": "Developer"
+                }
+            ],
+            "description": "CrawlerDetect is a PHP class for detecting bots/crawlers/spiders via the user agent",
+            "homepage": "https://github.com/JayBizzle/Crawler-Detect/",
+            "keywords": [
+                "crawler",
+                "crawler detect",
+                "crawler detector",
+                "crawlerdetect",
+                "php crawler detect"
+            ],
+            "support": {
+                "issues": "https://github.com/JayBizzle/Crawler-Detect/issues",
+                "source": "https://github.com/JayBizzle/Crawler-Detect/tree/v1.2.111"
+            },
+            "time": "2022-03-15T22:19:01+00:00"
+        },
+        {
+            "name": "jean85/pretty-package-versions",
+            "version": "2.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Jean85/pretty-package-versions.git",
+                "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/ae547e455a3d8babd07b96966b17d7fd21d9c6af",
+                "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af",
+                "shasum": ""
+            },
+            "require": {
+                "composer-runtime-api": "^2.0.0",
+                "php": "^7.1|^8.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^2.17",
+                "jean85/composer-provided-replaced-stub-package": "^1.0",
+                "phpstan/phpstan": "^0.12.66",
+                "phpunit/phpunit": "^7.5|^8.5|^9.4",
+                "vimeo/psalm": "^4.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Jean85\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Alessandro Lai",
+                    "email": "alessandro.lai85@gmail.com"
+                }
+            ],
+            "description": "A library to get pretty versions strings of installed dependencies",
+            "keywords": [
+                "composer",
+                "package",
+                "release",
+                "versions"
+            ],
+            "support": {
+                "issues": "https://github.com/Jean85/pretty-package-versions/issues",
+                "source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.5"
+            },
+            "time": "2021-10-08T21:21:46+00:00"
+        },
+        {
+            "name": "johngrogg/ics-parser",
+            "version": "v2.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/u01jmg3/ics-parser.git",
@@ -2413,395 +2704,133 @@
             "time": "2018-10-27T18:57:38+00:00"
         },
         {
-            "name": "laminas/laminas-escaper",
-            "version": "2.6.1",
+            "name": "league/csv",
+            "version": "9.8.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/laminas/laminas-escaper.git",
-                "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70"
+                "url": "https://github.com/thephpleague/csv.git",
+                "reference": "9d2e0265c5d90f5dd601bc65ff717e05cec19b47"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/25f2a053eadfa92ddacb609dcbbc39362610da70",
-                "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70",
+                "url": "https://api.github.com/repos/thephpleague/csv/zipball/9d2e0265c5d90f5dd601bc65ff717e05cec19b47",
+                "reference": "9d2e0265c5d90f5dd601bc65ff717e05cec19b47",
                 "shasum": ""
             },
             "require": {
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-escaper": "self.version"
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+                "ext-curl": "*",
+                "ext-dom": "*",
+                "friendsofphp/php-cs-fixer": "^v3.4.0",
+                "phpstan/phpstan": "^1.3.0",
+                "phpstan/phpstan-phpunit": "^1.0.0",
+                "phpstan/phpstan-strict-rules": "^1.1.0",
+                "phpunit/phpunit": "^9.5.11"
+            },
+            "suggest": {
+                "ext-dom": "Required to use the XMLConverter and or the HTMLConverter classes",
+                "ext-iconv": "Needed to ease transcoding CSV using iconv stream filters"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6.x-dev",
-                    "dev-develop": "2.7.x-dev"
+                    "dev-master": "9.x-dev"
                 }
             },
             "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
                 "psr-4": {
-                    "Laminas\\Escaper\\": "src/"
+                    "League\\Csv\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ignace Nyamagana Butera",
+                    "email": "nyamsprod@gmail.com",
+                    "homepage": "https://github.com/nyamsprod/",
+                    "role": "Developer"
+                }
             ],
-            "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
-            "homepage": "https://laminas.dev",
+            "description": "CSV data manipulation made easy in PHP",
+            "homepage": "https://csv.thephpleague.com",
             "keywords": [
-                "escaper",
-                "laminas"
+                "convert",
+                "csv",
+                "export",
+                "filter",
+                "import",
+                "read",
+                "transform",
+                "write"
             ],
             "support": {
-                "chat": "https://laminas.dev/chat",
-                "docs": "https://docs.laminas.dev/laminas-escaper/",
-                "forum": "https://discourse.laminas.dev",
-                "issues": "https://github.com/laminas/laminas-escaper/issues",
-                "rss": "https://github.com/laminas/laminas-escaper/releases.atom",
-                "source": "https://github.com/laminas/laminas-escaper"
+                "docs": "https://csv.thephpleague.com",
+                "issues": "https://github.com/thephpleague/csv/issues",
+                "rss": "https://github.com/thephpleague/csv/releases.atom",
+                "source": "https://github.com/thephpleague/csv"
             },
-            "time": "2019-12-31T16:43:30+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/nyamsprod",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-01-04T00:13:07+00:00"
         },
         {
-            "name": "laminas/laminas-feed",
-            "version": "2.12.3",
+            "name": "league/flysystem",
+            "version": "3.0.15",
             "source": {
                 "type": "git",
-                "url": "https://github.com/laminas/laminas-feed.git",
-                "reference": "3c91415633cb1be6f9d78683d69b7dcbfe6b4012"
+                "url": "https://github.com/thephpleague/flysystem.git",
+                "reference": "3b71cd136dc0331ee87b636b25f4ee339368c718"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/3c91415633cb1be6f9d78683d69b7dcbfe6b4012",
-                "reference": "3c91415633cb1be6f9d78683d69b7dcbfe6b4012",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3b71cd136dc0331ee87b636b25f4ee339368c718",
+                "reference": "3b71cd136dc0331ee87b636b25f4ee339368c718",
                 "shasum": ""
             },
             "require": {
-                "ext-dom": "*",
-                "ext-libxml": "*",
-                "laminas/laminas-escaper": "^2.5.2",
-                "laminas/laminas-stdlib": "^3.2.1",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
+                "league/mime-type-detection": "^1.0.0",
+                "php": "^8.0.2"
             },
-            "replace": {
-                "zendframework/zend-feed": "^2.12.0"
+            "conflict": {
+                "aws/aws-sdk-php": "3.209.31 || 3.210.0",
+                "guzzlehttp/guzzle": "<7.0",
+                "guzzlehttp/ringphp": "<1.1.1",
+                "symfony/http-client": "<5.2"
             },
             "require-dev": {
-                "laminas/laminas-cache": "^2.7.2",
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-db": "^2.8.2",
-                "laminas/laminas-http": "^2.7",
-                "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
-                "laminas/laminas-validator": "^2.10.1",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20",
-                "psr/http-message": "^1.0.1"
-            },
-            "suggest": {
-                "laminas/laminas-cache": "Laminas\\Cache component, for optionally caching feeds between requests",
-                "laminas/laminas-db": "Laminas\\Db component, for use with PubSubHubbub",
-                "laminas/laminas-http": "Laminas\\Http for PubSubHubbub, and optionally for use with Laminas\\Feed\\Reader",
-                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component, for easily extending ExtensionManager implementations",
-                "laminas/laminas-validator": "Laminas\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent",
-                "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Laminas\\Feed\\Reader\\Http\\Psr7ResponseDecorator"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.12.x-dev",
-                    "dev-develop": "2.13.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Feed\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "provides functionality for consuming RSS and Atom feeds",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "feed",
-                "laminas"
-            ],
-            "support": {
-                "chat": "https://laminas.dev/chat",
-                "docs": "https://docs.laminas.dev/laminas-feed/",
-                "forum": "https://discourse.laminas.dev",
-                "issues": "https://github.com/laminas/laminas-feed/issues",
-                "rss": "https://github.com/laminas/laminas-feed/releases.atom",
-                "source": "https://github.com/laminas/laminas-feed"
-            },
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
-            "time": "2020-08-18T13:45:04+00:00"
-        },
-        {
-            "name": "laminas/laminas-stdlib",
-            "version": "3.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-stdlib.git",
-                "reference": "2b18347625a2f06a1a485acfbc870f699dbe51c6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/2b18347625a2f06a1a485acfbc870f699dbe51c6",
-                "reference": "2b18347625a2f06a1a485acfbc870f699dbe51c6",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-stdlib": "self.version"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "phpbench/phpbench": "^0.13",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2.x-dev",
-                    "dev-develop": "3.3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Stdlib\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "SPL extensions, array utilities, error handlers, and more",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "stdlib"
-            ],
-            "support": {
-                "chat": "https://laminas.dev/chat",
-                "docs": "https://docs.laminas.dev/laminas-stdlib/",
-                "forum": "https://discourse.laminas.dev",
-                "issues": "https://github.com/laminas/laminas-stdlib/issues",
-                "rss": "https://github.com/laminas/laminas-stdlib/releases.atom",
-                "source": "https://github.com/laminas/laminas-stdlib"
-            },
-            "time": "2019-12-31T17:51:15+00:00"
-        },
-        {
-            "name": "laminas/laminas-zendframework-bridge",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
-                "reference": "6ede70583e101030bcace4dcddd648f760ddf642"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6ede70583e101030bcace4dcddd648f760ddf642",
-                "reference": "6ede70583e101030bcace4dcddd648f760ddf642",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3",
-                "squizlabs/php_codesniffer": "^3.5"
-            },
-            "type": "library",
-            "extra": {
-                "laminas": {
-                    "module": "Laminas\\ZendFrameworkBridge"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/autoload.php"
-                ],
-                "psr-4": {
-                    "Laminas\\ZendFrameworkBridge\\": "src//"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Alias legacy ZF class names to Laminas Project equivalents.",
-            "keywords": [
-                "ZendFramework",
-                "autoloading",
-                "laminas",
-                "zf"
-            ],
-            "support": {
-                "forum": "https://discourse.laminas.dev/",
-                "issues": "https://github.com/laminas/laminas-zendframework-bridge/issues",
-                "rss": "https://github.com/laminas/laminas-zendframework-bridge/releases.atom",
-                "source": "https://github.com/laminas/laminas-zendframework-bridge"
-            },
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
-            "time": "2020-09-14T14:23:00+00:00"
-        },
-        {
-            "name": "league/csv",
-            "version": "9.6.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/csv.git",
-                "reference": "f28da6e483bf979bac10e2add384c90ae9983e4e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/csv/zipball/f28da6e483bf979bac10e2add384c90ae9983e4e",
-                "reference": "f28da6e483bf979bac10e2add384c90ae9983e4e",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "php": ">=7.2.5"
-            },
-            "require-dev": {
-                "ext-curl": "*",
-                "ext-dom": "*",
-                "friendsofphp/php-cs-fixer": "^2.16",
-                "phpstan/phpstan": "^0.12.0",
-                "phpstan/phpstan-phpunit": "^0.12.0",
-                "phpstan/phpstan-strict-rules": "^0.12.0",
-                "phpunit/phpunit": "^8.5"
-            },
-            "suggest": {
-                "ext-dom": "Required to use the XMLConverter and or the HTMLConverter classes",
-                "ext-iconv": "Needed to ease transcoding CSV using iconv stream filters"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "9.x-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
-                "psr-4": {
-                    "League\\Csv\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ignace Nyamagana Butera",
-                    "email": "nyamsprod@gmail.com",
-                    "homepage": "https://github.com/nyamsprod/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "CSV data manipulation made easy in PHP",
-            "homepage": "http://csv.thephpleague.com",
-            "keywords": [
-                "convert",
-                "csv",
-                "export",
-                "filter",
-                "import",
-                "read",
-                "transform",
-                "write"
-            ],
-            "support": {
-                "docs": "https://csv.thephpleague.com",
-                "issues": "https://github.com/thephpleague/csv/issues",
-                "rss": "https://github.com/thephpleague/csv/releases.atom",
-                "source": "https://github.com/thephpleague/csv"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sponsors/nyamsprod",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-12-10T19:40:30+00:00"
-        },
-        {
-            "name": "league/flysystem",
-            "version": "1.1.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "094defdb4a7001845300334e7c1ee2335925ef99"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/094defdb4a7001845300334e7c1ee2335925ef99",
-                "reference": "094defdb4a7001845300334e7c1ee2335925ef99",
-                "shasum": ""
-            },
-            "require": {
-                "ext-fileinfo": "*",
-                "league/mime-type-detection": "^1.3",
-                "php": "^7.2.5 || ^8.0"
-            },
-            "conflict": {
-                "league/flysystem-sftp": "<1.0.6"
-            },
-            "require-dev": {
-                "phpspec/prophecy": "^1.11.1",
-                "phpunit/phpunit": "^8.5.8"
-            },
-            "suggest": {
-                "ext-ftp": "Allows you to use FTP server storage",
-                "ext-openssl": "Allows you to use FTPS server storage",
-                "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
-                "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3",
-                "league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
-                "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
-                "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem",
-                "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
-                "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
-                "league/flysystem-webdav": "Allows you to use WebDAV storage",
-                "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
-                "spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
-                "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications"
+                "async-aws/s3": "^1.5",
+                "async-aws/simple-s3": "^1.0",
+                "aws/aws-sdk-php": "^3.198.1",
+                "composer/semver": "^3.0",
+                "ext-fileinfo": "*",
+                "ext-ftp": "*",
+                "ext-zip": "*",
+                "friendsofphp/php-cs-fixer": "^3.5",
+                "google/cloud-storage": "^1.23",
+                "microsoft/azure-storage-blob": "^1.1",
+                "phpseclib/phpseclib": "^2.0",
+                "phpstan/phpstan": "^0.12.26",
+                "phpunit/phpunit": "^9.5.11",
+                "sabre/dav": "^4.3.1"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "League\\Flysystem\\": "src/"
+                    "League\\Flysystem\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2811,73 +2840,71 @@
             "authors": [
                 {
                     "name": "Frank de Jonge",
-                    "email": "info@frenky.net"
+                    "email": "info@frankdejonge.nl"
                 }
             ],
-            "description": "Filesystem abstraction: Many filesystems, one API.",
+            "description": "File storage abstraction for PHP",
             "keywords": [
-                "Cloud Files",
                 "WebDAV",
-                "abstraction",
                 "aws",
                 "cloud",
-                "copy.com",
-                "dropbox",
-                "file systems",
+                "file",
                 "files",
                 "filesystem",
                 "filesystems",
                 "ftp",
-                "rackspace",
-                "remote",
                 "s3",
                 "sftp",
                 "storage"
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/1.1.9"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.0.15"
             },
             "funding": [
                 {
                     "url": "https://offset.earth/frankdejonge",
-                    "type": "other"
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/frankdejonge",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/league/flysystem",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2021-12-09T09:40:50+00:00"
+            "time": "2022-04-08T18:36:06+00:00"
         },
         {
             "name": "league/flysystem-aws-s3-v3",
-            "version": "1.0.29",
+            "version": "3.0.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
-                "reference": "4e25cc0582a36a786c31115e419c6e40498f6972"
+                "reference": "0074cf016e21a6d1eb99b6db70acdd23743fc371"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972",
-                "reference": "4e25cc0582a36a786c31115e419c6e40498f6972",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/0074cf016e21a6d1eb99b6db70acdd23743fc371",
+                "reference": "0074cf016e21a6d1eb99b6db70acdd23743fc371",
                 "shasum": ""
             },
             "require": {
-                "aws/aws-sdk-php": "^3.20.0",
-                "league/flysystem": "^1.0.40",
-                "php": ">=5.5.0"
+                "aws/aws-sdk-php": "^3.132.4",
+                "league/flysystem": "^2.0.0 || ^3.0.0",
+                "league/mime-type-detection": "^1.0.0",
+                "php": "^8.0.2"
             },
-            "require-dev": {
-                "henrikbjorn/phpspec-code-coverage": "~1.0.1",
-                "phpspec/phpspec": "^2.0.0"
+            "conflict": {
+                "guzzlehttp/guzzle": "<7.0",
+                "guzzlehttp/ringphp": "<1.1.1"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "League\\Flysystem\\AwsS3v3\\": "src/"
+                    "League\\Flysystem\\AwsS3V3\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2887,15 +2914,24 @@
             "authors": [
                 {
                     "name": "Frank de Jonge",
-                    "email": "info@frenky.net"
+                    "email": "info@frankdejonge.nl"
                 }
             ],
-            "description": "Flysystem adapter for the AWS S3 SDK v3.x",
+            "description": "AWS S3 filesystem adapter for Flysystem.",
+            "keywords": [
+                "Flysystem",
+                "aws",
+                "file",
+                "files",
+                "filesystem",
+                "s3",
+                "storage"
+            ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues",
-                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/1.0.29"
+                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.0.13"
             },
-            "time": "2020-10-08T18:58:37+00:00"
+            "time": "2022-04-01T22:05:11+00:00"
         },
         {
             "name": "league/mime-type-detection",
@@ -3248,18 +3284,107 @@
             },
             "time": "2021-03-17T06:54:33+00:00"
         },
+        {
+            "name": "moneyphp/money",
+            "version": "v4.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/moneyphp/money.git",
+                "reference": "d945f775bd6ab0920d9d205813d8831a899a8844"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/moneyphp/money/zipball/d945f775bd6ab0920d9d205813d8831a899a8844",
+                "reference": "d945f775bd6ab0920d9d205813d8831a899a8844",
+                "shasum": ""
+            },
+            "require": {
+                "ext-bcmath": "*",
+                "ext-filter": "*",
+                "ext-json": "*",
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "cache/taggable-cache": "^1.1.0",
+                "doctrine/coding-standard": "^9.0",
+                "doctrine/instantiator": "^1.4.0",
+                "ext-gmp": "*",
+                "ext-intl": "*",
+                "florianv/exchanger": "^2.6.3",
+                "florianv/swap": "^4.3.0",
+                "moneyphp/iso-currencies": "^3.2.1",
+                "php-http/message": "^1.11.0",
+                "php-http/mock-client": "^1.4.1",
+                "phpbench/phpbench": "1.0.0-beta1@BETA",
+                "phpspec/phpspec": "^7.0.1",
+                "phpunit/phpunit": "^9.5.4",
+                "psalm/plugin-phpunit": "^0.15.1",
+                "psr/cache": "^1.0.1",
+                "roave/infection-static-analysis-plugin": "^1.7",
+                "vimeo/psalm": "~4.7.0 || ^4.8.2"
+            },
+            "suggest": {
+                "ext-gmp": "Calculate without integer limits",
+                "ext-intl": "Format Money objects with intl",
+                "florianv/exchanger": "Exchange rates library for PHP",
+                "florianv/swap": "Exchange rates library for PHP",
+                "psr/cache-implementation": "Used for Currency caching"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Money\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mathias Verraes",
+                    "email": "mathias@verraes.net",
+                    "homepage": "http://verraes.net"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                },
+                {
+                    "name": "Frederik Bosch",
+                    "email": "f.bosch@genkgo.nl"
+                }
+            ],
+            "description": "PHP implementation of Fowler's Money pattern",
+            "homepage": "http://moneyphp.org",
+            "keywords": [
+                "Value Object",
+                "money",
+                "vo"
+            ],
+            "support": {
+                "issues": "https://github.com/moneyphp/money/issues",
+                "source": "https://github.com/moneyphp/money/tree/v4.0.3"
+            },
+            "time": "2021-12-01T10:39:00+00:00"
+        },
         {
             "name": "monolog/monolog",
-            "version": "2.4.0",
+            "version": "2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "d7fd7450628561ba697b7097d86db72662f54aef"
+                "reference": "4192345e260f1d51b365536199744b987e160edc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d7fd7450628561ba697b7097d86db72662f54aef",
-                "reference": "d7fd7450628561ba697b7097d86db72662f54aef",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4192345e260f1d51b365536199744b987e160edc",
+                "reference": "4192345e260f1d51b365536199744b987e160edc",
                 "shasum": ""
             },
             "require": {
@@ -3333,7 +3458,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/2.4.0"
+                "source": "https://github.com/Seldaek/monolog/tree/2.5.0"
             },
             "funding": [
                 {
@@ -3345,7 +3470,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-14T12:44:37+00:00"
+            "time": "2022-04-08T15:43:54+00:00"
         },
         {
             "name": "mrclay/jsmin-php",
@@ -3656,27 +3781,26 @@
         },
         {
             "name": "nystudio107/craft-disqus",
-            "version": "1.1.3",
+            "version": "4.0.0-beta.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nystudio107/craft-disqus.git",
-                "reference": "1e35a16b8ea693e0b7b8a626ebe9fd6ee7ed0407"
+                "reference": "e8a48a6edafed9bcae1ceb6a8e284d097e4e48e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nystudio107/craft-disqus/zipball/1e35a16b8ea693e0b7b8a626ebe9fd6ee7ed0407",
-                "reference": "1e35a16b8ea693e0b7b8a626ebe9fd6ee7ed0407",
+                "url": "https://api.github.com/repos/nystudio107/craft-disqus/zipball/e8a48a6edafed9bcae1ceb6a8e284d097e4e48e7",
+                "reference": "e8a48a6edafed9bcae1ceb6a8e284d097e4e48e7",
                 "shasum": ""
             },
             "require": {
-                "craftcms/cms": "^3.0.0"
+                "craftcms/cms": "^4.0.0-beta.1"
             },
             "type": "craft-plugin",
             "extra": {
-                "name": "Disqus",
+                "class": "nystudio107\\disqus\\Disqus",
                 "handle": "disqus",
-                "changelogUrl": "https://raw.githubusercontent.com/nystudio107/craft-disqus/v1/CHANGELOG.md",
-                "class": "nystudio107\\disqus\\Disqus"
+                "name": "Disqus"
             },
             "autoload": {
                 "psr-4": {
@@ -3702,28 +3826,34 @@
                 "disqus"
             ],
             "support": {
-                "docs": "https://nystudio107.com/plugins/disqus/documentation",
+                "docs": "https://nystudio107.com/docs/disqus/",
                 "issues": "https://nystudio107.com/plugins/disqus/support",
-                "source": "https://github.com/nystudio107/craft-disqus/tree/1.1.3"
+                "source": "https://github.com/nystudio107/craft-disqus"
             },
-            "time": "2021-04-20T16:16:30+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/khalwat",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-03-25T20:01:05+00:00"
         },
         {
             "name": "nystudio107/craft-fastcgicachebust",
-            "version": "1.0.10",
+            "version": "4.0.0-beta.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nystudio107/craft-fastcgicachebust.git",
-                "reference": "55de0bbf7a28d12c78e23aa36efc5de13f75d2b3"
+                "reference": "30cc3f0740de4565a02f3314acecd7a8edfffe59"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nystudio107/craft-fastcgicachebust/zipball/55de0bbf7a28d12c78e23aa36efc5de13f75d2b3",
-                "reference": "55de0bbf7a28d12c78e23aa36efc5de13f75d2b3",
+                "url": "https://api.github.com/repos/nystudio107/craft-fastcgicachebust/zipball/30cc3f0740de4565a02f3314acecd7a8edfffe59",
+                "reference": "30cc3f0740de4565a02f3314acecd7a8edfffe59",
                 "shasum": ""
             },
             "require": {
-                "craftcms/cms": "^3.1.0"
+                "craftcms/cms": "^4.0.0-beta.1"
             },
             "type": "craft-plugin",
             "extra": {
@@ -3765,38 +3895,31 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-13T05:24:13+00:00"
+            "time": "2022-03-13T06:12:04+00:00"
         },
         {
             "name": "nystudio107/craft-icalendar",
-            "version": "1.1.2",
+            "version": "4.0.0-beta.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nystudio107/craft-icalendar.git",
-                "reference": "c6e2d98cccea8b612f245e022b28cefbb8fc919a"
+                "reference": "91c68eb3a99499e9fc861fc60e8f4befe4aa8e18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nystudio107/craft-icalendar/zipball/c6e2d98cccea8b612f245e022b28cefbb8fc919a",
-                "reference": "c6e2d98cccea8b612f245e022b28cefbb8fc919a",
+                "url": "https://api.github.com/repos/nystudio107/craft-icalendar/zipball/91c68eb3a99499e9fc861fc60e8f4befe4aa8e18",
+                "reference": "91c68eb3a99499e9fc861fc60e8f4befe4aa8e18",
                 "shasum": ""
             },
             "require": {
-                "craftcms/cms": "^3.0.0",
+                "craftcms/cms": "^4.0.0-beta.1",
                 "johngrogg/ics-parser": "^2.1.0"
             },
             "type": "craft-plugin",
             "extra": {
-                "name": "iCalendar",
+                "class": "nystudio107\\icalendar\\ICalendar",
                 "handle": "icalendar",
-                "hasCpSettings": false,
-                "hasCpSection": false,
-                "changelogUrl": "https://raw.githubusercontent.com/nystudio107/craft-icalendar/v1/CHANGELOG.md",
-                "components": {
-                    "convert": "nystudio107\\icalendar\\services\\Convert",
-                    "parse": "nystudio107\\icalendar\\services\\Parse"
-                },
-                "class": "nystudio107\\icalendar\\ICalendar"
+                "name": "iCalendar"
             },
             "autoload": {
                 "psr-4": {
@@ -3822,9 +3945,9 @@
                 "iCalendar"
             ],
             "support": {
-                "docs": "https://nystudio107.com/plugins/icalendar/documentation",
+                "docs": "https://nystudio107.com/docs/icalendar/",
                 "issues": "https://nystudio107.com/plugins/icalendar/support",
-                "source": "https://github.com/nystudio107/craft-icalendar/tree/1.1.2"
+                "source": "https://github.com/nystudio107/craft-icalendar"
             },
             "funding": [
                 {
@@ -3832,37 +3955,36 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-10-10T18:28:52+00:00"
+            "time": "2022-03-27T19:23:03+00:00"
         },
         {
             "name": "nystudio107/craft-imageoptimize",
-            "version": "1.6.44",
+            "version": "4.0.0-beta.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nystudio107/craft-imageoptimize.git",
-                "reference": "f851e8227f4575f97ea3ecf73df14ab205f420f0"
+                "reference": "6cd76331a21133d192e5cddf8aabaf3cc730d4ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nystudio107/craft-imageoptimize/zipball/f851e8227f4575f97ea3ecf73df14ab205f420f0",
-                "reference": "f851e8227f4575f97ea3ecf73df14ab205f420f0",
+                "url": "https://api.github.com/repos/nystudio107/craft-imageoptimize/zipball/6cd76331a21133d192e5cddf8aabaf3cc730d4ac",
+                "reference": "6cd76331a21133d192e5cddf8aabaf3cc730d4ac",
                 "shasum": ""
             },
             "require": {
-                "craftcms/cms": "^3.1.19",
+                "craftcms/cms": "^4.0.0-beta.4",
                 "ksubileau/color-thief-php": "^1.3",
                 "mikehaertl/php-shellcommand": "~1.2",
-                "nystudio107/craft-imageoptimize-imgix": "^1.2.4",
-                "nystudio107/craft-imageoptimize-sharp": "^1.0.8",
-                "nystudio107/craft-imageoptimize-thumbor": "^1.3.1",
-                "nystudio107/craft-plugin-vite": "^1.0.20"
+                "nystudio107/craft-imageoptimize-imgix": "^4.0.0-beta.1",
+                "nystudio107/craft-imageoptimize-sharp": "^4.0.0-beta.1",
+                "nystudio107/craft-imageoptimize-thumbor": "^4.0.0-beta.1",
+                "nystudio107/craft-plugin-vite": "^4.0.0-beta.1"
             },
             "type": "craft-plugin",
             "extra": {
-                "name": "ImageOptimize",
+                "class": "nystudio107\\imageoptimize\\ImageOptimize",
                 "handle": "image-optimize",
-                "changelogUrl": "https://raw.githubusercontent.com/nystudio107/craft-imageoptimize/v1/CHANGELOG.md",
-                "class": "nystudio107\\imageoptimize\\ImageOptimize"
+                "name": "ImageOptimize"
             },
             "autoload": {
                 "psr-4": {
@@ -3892,9 +4014,9 @@
                 "optimize-images"
             ],
             "support": {
-                "docs": "https://nystudio107.com/plugins/imageoptimize/documentation",
+                "docs": "https://nystudio107.com/docs/image-optimize/",
                 "issues": "https://nystudio107.com/plugins/imageoptimize/support",
-                "source": "https://github.com/nystudio107/craft-imageoptimize/tree/1.6.44"
+                "source": "https://github.com/nystudio107/craft-imageoptimize"
             },
             "funding": [
                 {
@@ -3902,25 +4024,25 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-24T22:53:05+00:00"
+            "time": "2022-04-08T22:53:54+00:00"
         },
         {
             "name": "nystudio107/craft-imageoptimize-imgix",
-            "version": "1.2.6",
+            "version": "4.0.0-beta.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nystudio107/craft-imageoptimize-imgix.git",
-                "reference": "eaafa8e544c2dba73be6d27e17a449ac4def95e1"
+                "reference": "1eb75597dff9219e1d20dcbdda29f722d22fce27"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nystudio107/craft-imageoptimize-imgix/zipball/eaafa8e544c2dba73be6d27e17a449ac4def95e1",
-                "reference": "eaafa8e544c2dba73be6d27e17a449ac4def95e1",
+                "url": "https://api.github.com/repos/nystudio107/craft-imageoptimize-imgix/zipball/1eb75597dff9219e1d20dcbdda29f722d22fce27",
+                "reference": "1eb75597dff9219e1d20dcbdda29f722d22fce27",
                 "shasum": ""
             },
             "require": {
                 "imgix/imgix-php": "^3.0.0",
-                "nystudio107/craft-imageoptimize": "^1.6.33"
+                "nystudio107/craft-imageoptimize": "^4.0.0-beta.1"
             },
             "type": "image-transform",
             "autoload": {
@@ -3948,7 +4070,7 @@
             "support": {
                 "docs": "https://github.com/nystudio107/craft-imageoptimize-imgix/blob/v1/README.md",
                 "issues": "https://github.com/nystudio107/craft-imageoptimize-imgix/issues",
-                "source": "https://github.com/nystudio107/craft-imageoptimize-imgix/tree/1.2.6"
+                "source": "https://github.com/nystudio107/craft-imageoptimize-imgix/tree/4.0.0-beta.1"
             },
             "funding": [
                 {
@@ -3956,24 +4078,24 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-30T03:12:33+00:00"
+            "time": "2022-03-30T03:20:47+00:00"
         },
         {
             "name": "nystudio107/craft-imageoptimize-sharp",
-            "version": "1.0.10",
+            "version": "4.0.0-beta.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nystudio107/craft-imageoptimize-sharp.git",
-                "reference": "e4e8b5fe591f9f567604dce1bf03bddcdd300fef"
+                "reference": "c008c85c90925d9b1cddfdc8a1ace34818c7837b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nystudio107/craft-imageoptimize-sharp/zipball/e4e8b5fe591f9f567604dce1bf03bddcdd300fef",
-                "reference": "e4e8b5fe591f9f567604dce1bf03bddcdd300fef",
+                "url": "https://api.github.com/repos/nystudio107/craft-imageoptimize-sharp/zipball/c008c85c90925d9b1cddfdc8a1ace34818c7837b",
+                "reference": "c008c85c90925d9b1cddfdc8a1ace34818c7837b",
                 "shasum": ""
             },
             "require": {
-                "nystudio107/craft-imageoptimize": "^1.6.33"
+                "nystudio107/craft-imageoptimize": "^4.0.0-beta.1"
             },
             "type": "image-transform",
             "autoload": {
@@ -4001,7 +4123,7 @@
             "support": {
                 "docs": "https://github.com/nystudio107/craft-imageoptimize-sharp/blob/v1/README.md",
                 "issues": "https://github.com/nystudio107/craft-imageoptimize-sharp/issues",
-                "source": "https://github.com/nystudio107/craft-imageoptimize-sharp/tree/1.0.10"
+                "source": "https://github.com/nystudio107/craft-imageoptimize-sharp/tree/4.0.0-beta.1"
             },
             "funding": [
                 {
@@ -4009,24 +4131,24 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-30T03:14:44+00:00"
+            "time": "2022-03-30T03:22:13+00:00"
         },
         {
             "name": "nystudio107/craft-imageoptimize-thumbor",
-            "version": "1.3.3",
+            "version": "4.0.0-beta.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nystudio107/craft-imageoptimize-thumbor.git",
-                "reference": "77b449e43801e5474e0d1abb6d053f195ccd8d0d"
+                "reference": "366ed087750f8804d3ec69919c896535dee9b4e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nystudio107/craft-imageoptimize-thumbor/zipball/77b449e43801e5474e0d1abb6d053f195ccd8d0d",
-                "reference": "77b449e43801e5474e0d1abb6d053f195ccd8d0d",
+                "url": "https://api.github.com/repos/nystudio107/craft-imageoptimize-thumbor/zipball/366ed087750f8804d3ec69919c896535dee9b4e7",
+                "reference": "366ed087750f8804d3ec69919c896535dee9b4e7",
                 "shasum": ""
             },
             "require": {
-                "nystudio107/craft-imageoptimize": "^1.6.33",
+                "nystudio107/craft-imageoptimize": "^4.0.0-beta.1",
                 "webfactory/phumbor": "^1.2"
             },
             "type": "image-transform",
@@ -4055,7 +4177,7 @@
             "support": {
                 "docs": "https://github.com/nystudio107/craft-imageoptimize-thumbor/blob/v1/README.md",
                 "issues": "https://github.com/nystudio107/craft-imageoptimize-thumbor/issues",
-                "source": "https://github.com/nystudio107/craft-imageoptimize-thumbor/tree/1.3.3"
+                "source": "https://github.com/nystudio107/craft-imageoptimize-thumbor/tree/4.0.0-beta.1"
             },
             "funding": [
                 {
@@ -4063,38 +4185,31 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-30T03:16:55+00:00"
+            "time": "2022-03-30T03:23:43+00:00"
         },
         {
             "name": "nystudio107/craft-minify",
-            "version": "1.2.11",
+            "version": "4.0.0-beta.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nystudio107/craft-minify.git",
-                "reference": "992402df6f5f893b41fc9ba7755ced94b07bf5bf"
+                "reference": "8ed542b3b67a52893c36814934e59914487da26a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nystudio107/craft-minify/zipball/992402df6f5f893b41fc9ba7755ced94b07bf5bf",
-                "reference": "992402df6f5f893b41fc9ba7755ced94b07bf5bf",
+                "url": "https://api.github.com/repos/nystudio107/craft-minify/zipball/8ed542b3b67a52893c36814934e59914487da26a",
+                "reference": "8ed542b3b67a52893c36814934e59914487da26a",
                 "shasum": ""
             },
             "require": {
-                "craftcms/cms": "^3.0.0",
+                "craftcms/cms": "^4.0.0-alpha",
                 "mrclay/minify": "^3.0.10"
             },
             "type": "craft-plugin",
             "extra": {
-                "name": "Minify",
-                "handle": "minify",
-                "schemaVersion": "1.0.0",
-                "hasCpSettings": false,
-                "hasCpSection": false,
-                "changelogUrl": "https://raw.githubusercontent.com/nystudio107/craft-minify/v1/CHANGELOG.md",
                 "class": "nystudio107\\minify\\Minify",
-                "components": {
-                    "minify": "nystudio107\\minify\\services\\MinifyService"
-                }
+                "handle": "minify",
+                "name": "Minify"
             },
             "autoload": {
                 "psr-4": {
@@ -4120,9 +4235,9 @@
                 "minify"
             ],
             "support": {
-                "docs": "https://nystudio107.com/plugins/minify/documentation",
+                "docs": "https://nystudio107.com/docs/minify/",
                 "issues": "https://nystudio107.com/plugins/minify/support",
-                "source": "https://github.com/nystudio107/craft-minify/tree/1.2.11"
+                "source": "https://github.com/nystudio107/craft-minify"
             },
             "funding": [
                 {
@@ -4130,24 +4245,24 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-23T03:31:18+00:00"
+            "time": "2022-03-09T03:37:27+00:00"
         },
         {
             "name": "nystudio107/craft-plugin-manifest",
-            "version": "1.0.8",
+            "version": "4.0.0-beta.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nystudio107/craft-plugin-manifest.git",
-                "reference": "47087da878be95b7bd79bb1b8f5f4f49f2bfbe5c"
+                "reference": "3947e52f2cdbdc8ba5cdc13ac0907a439c2ee1d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nystudio107/craft-plugin-manifest/zipball/47087da878be95b7bd79bb1b8f5f4f49f2bfbe5c",
-                "reference": "47087da878be95b7bd79bb1b8f5f4f49f2bfbe5c",
+                "url": "https://api.github.com/repos/nystudio107/craft-plugin-manifest/zipball/3947e52f2cdbdc8ba5cdc13ac0907a439c2ee1d3",
+                "reference": "3947e52f2cdbdc8ba5cdc13ac0907a439c2ee1d3",
                 "shasum": ""
             },
             "require": {
-                "craftcms/cms": "^3.0.0"
+                "craftcms/cms": "^4.0.0-alpha"
             },
             "type": "library",
             "autoload": {
@@ -4172,9 +4287,9 @@
                 "plugin"
             ],
             "support": {
-                "docs": "https://github.com/nystudio107/craft-plugin-manifest/blob/v1/README.md",
+                "docs": "https://github.com/nystudio107/craft-plugin-manifest/blob/v4/README.md",
                 "issues": "https://github.com/nystudio107/craft-plugin-manifest/issues",
-                "source": "https://github.com/nystudio107/craft-plugin-manifest/tree/1.0.8"
+                "source": "https://github.com/nystudio107/craft-plugin-manifest/tree/4.0.0-beta.1"
             },
             "funding": [
                 {
@@ -4182,24 +4297,24 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-10-11T16:38:14+00:00"
+            "time": "2022-02-24T05:46:09+00:00"
         },
         {
             "name": "nystudio107/craft-plugin-vite",
-            "version": "1.0.23",
+            "version": "4.0.0-beta.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nystudio107/craft-plugin-vite.git",
-                "reference": "7e6011c0c6b1a70c2d9fcb0b45d217a07d9bb7ab"
+                "reference": "f800319063225fab5dc655eeebd1140d8bb1abc0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nystudio107/craft-plugin-vite/zipball/7e6011c0c6b1a70c2d9fcb0b45d217a07d9bb7ab",
-                "reference": "7e6011c0c6b1a70c2d9fcb0b45d217a07d9bb7ab",
+                "url": "https://api.github.com/repos/nystudio107/craft-plugin-vite/zipball/f800319063225fab5dc655eeebd1140d8bb1abc0",
+                "reference": "f800319063225fab5dc655eeebd1140d8bb1abc0",
                 "shasum": ""
             },
             "require": {
-                "craftcms/cms": "^3.0.0"
+                "craftcms/cms": "^4.0.0-alpha"
             },
             "type": "library",
             "autoload": {
@@ -4226,7 +4341,7 @@
             "support": {
                 "docs": "https://github.com/nystudio107/craft-plugin-vite/blob/v1/README.md",
                 "issues": "https://github.com/nystudio107/craft-plugin-vite/issues",
-                "source": "https://github.com/nystudio107/craft-plugin-vite/tree/1.0.23"
+                "source": "https://github.com/nystudio107/craft-plugin-vite/tree/4.0.0-beta.2"
             },
             "funding": [
                 {
@@ -4234,27 +4349,27 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-23T03:42:56+00:00"
+            "time": "2022-03-23T03:57:02+00:00"
         },
         {
             "name": "nystudio107/craft-retour",
-            "version": "3.1.70",
+            "version": "4.0.0-beta.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nystudio107/craft-retour.git",
-                "reference": "204d129ed28cabe241563ecdf81d6beceb4ee9ac"
+                "reference": "6f144924972e29ac06923857b67126d75c535937"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nystudio107/craft-retour/zipball/204d129ed28cabe241563ecdf81d6beceb4ee9ac",
-                "reference": "204d129ed28cabe241563ecdf81d6beceb4ee9ac",
+                "url": "https://api.github.com/repos/nystudio107/craft-retour/zipball/6f144924972e29ac06923857b67126d75c535937",
+                "reference": "6f144924972e29ac06923857b67126d75c535937",
                 "shasum": ""
             },
             "require": {
-                "craftcms/cms": "^3.0.0",
+                "craftcms/cms": "^4.0.0-beta.1",
                 "jean85/pretty-package-versions": "^1.5 || ^2.0",
                 "league/csv": "^8.2 || ^9.0",
-                "nystudio107/craft-plugin-vite": "^1.0.0"
+                "nystudio107/craft-plugin-vite": "^4.0.0-beta.1"
             },
             "require-dev": {
                 "codeception/codeception": "^3.0",
@@ -4262,10 +4377,9 @@
             },
             "type": "craft-plugin",
             "extra": {
-                "name": "Retour",
+                "class": "nystudio107\\retour\\Retour",
                 "handle": "retour",
-                "changelogUrl": "https://raw.githubusercontent.com/nystudio107/craft-retour/v3/CHANGELOG.md",
-                "class": "nystudio107\\retour\\Retour"
+                "name": "Retour"
             },
             "autoload": {
                 "psr-4": {
@@ -4292,9 +4406,9 @@
                 "statistics"
             ],
             "support": {
-                "docs": "https://nystudio107.com/plugins/retour/documentation",
+                "docs": "https://nystudio107.com/docs/retour/",
                 "issues": "https://nystudio107.com/plugins/retour/support",
-                "source": "https://github.com/nystudio107/craft-retour/tree/3.1.70"
+                "source": "https://github.com/nystudio107/craft-retour"
             },
             "funding": [
                 {
@@ -4302,39 +4416,39 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-01-17T14:17:41+00:00"
+            "time": "2022-03-18T17:19:23+00:00"
         },
         {
             "name": "nystudio107/craft-seomatic",
-            "version": "3.4.28",
+            "version": "4.0.0-beta.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nystudio107/craft-seomatic.git",
-                "reference": "f77edbc76d29a160415bd819a014945fc300b067"
+                "reference": "4fbfc5be936f4ff70a005f6bcc9b6caca53592e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nystudio107/craft-seomatic/zipball/f77edbc76d29a160415bd819a014945fc300b067",
-                "reference": "f77edbc76d29a160415bd819a014945fc300b067",
+                "url": "https://api.github.com/repos/nystudio107/craft-seomatic/zipball/4fbfc5be936f4ff70a005f6bcc9b6caca53592e3",
+                "reference": "4fbfc5be936f4ff70a005f6bcc9b6caca53592e3",
                 "shasum": ""
             },
             "require": {
-                "craftcms/cms": "^3.1.19",
+                "craftcms/cms": "^4.0.0-alpha",
                 "davechild/textstatistics": "1.0.2",
-                "nystudio107/craft-plugin-manifest": "^1.0.4",
+                "nystudio107/craft-plugin-manifest": "^4.0.0-beta.1",
+                "php": "^8.0.2",
                 "php-science/textrank": "^1.0.3",
                 "sunra/php-simple-html-dom-parser": "^1.5.2"
             },
             "require-dev": {
-                "codeception/codeception": "^3.0",
+                "codeception/codeception": "^4.0",
                 "vlucas/phpdotenv": "^3.0"
             },
             "type": "craft-plugin",
             "extra": {
-                "name": "SEOmatic",
+                "class": "nystudio107\\seomatic\\Seomatic",
                 "handle": "seomatic",
-                "changelogUrl": "https://raw.githubusercontent.com/nystudio107/craft-seomatic/v3/CHANGELOG.md",
-                "class": "nystudio107\\seomatic\\Seomatic"
+                "name": "SEOmatic"
             },
             "autoload": {
                 "psr-4": {
@@ -4367,9 +4481,9 @@
                 "twitter"
             ],
             "support": {
-                "docs": "https://nystudio107.com/plugins/seomatic/documentation",
+                "docs": "https://nystudio107.com/docs/seomatic/",
                 "issues": "https://nystudio107.com/plugins/seomatic/support",
-                "source": "https://github.com/nystudio107/craft-seomatic/tree/3.4.28"
+                "source": "https://github.com/nystudio107/craft-seomatic"
             },
             "funding": [
                 {
@@ -4377,33 +4491,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-22T20:03:14+00:00"
+            "time": "2022-04-08T22:49:14+00:00"
         },
         {
             "name": "nystudio107/craft-transcoder",
-            "version": "1.2.21",
+            "version": "4.0.0-beta.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nystudio107/craft-transcoder.git",
-                "reference": "62c40a9b6050bed8c65097819c8026a9dc7a89ba"
+                "reference": "c6905ee36f0a6aa0186eacff5ae27f4442ffec70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nystudio107/craft-transcoder/zipball/62c40a9b6050bed8c65097819c8026a9dc7a89ba",
-                "reference": "62c40a9b6050bed8c65097819c8026a9dc7a89ba",
+                "url": "https://api.github.com/repos/nystudio107/craft-transcoder/zipball/c6905ee36f0a6aa0186eacff5ae27f4442ffec70",
+                "reference": "c6905ee36f0a6aa0186eacff5ae27f4442ffec70",
                 "shasum": ""
             },
             "require": {
-                "craftcms/cms": "^3.1.0",
+                "craftcms/cms": "^4.0.0-alpha",
                 "mikehaertl/php-shellcommand": "~1.2",
-                "nystudio107/craft-plugin-vite": "^1.0.4"
+                "nystudio107/craft-plugin-vite": "^4.0.0-beta.1"
             },
             "type": "craft-plugin",
             "extra": {
-                "name": "Transcoder",
+                "class": "nystudio107\\transcoder\\Transcoder",
                 "handle": "transcoder",
-                "changelogUrl": "https://raw.githubusercontent.com/nystudio107/craft-transcoder/v1/CHANGELOG.md",
-                "class": "nystudio107\\transcoder\\Transcoder"
+                "name": "Transcoder"
             },
             "autoload": {
                 "psr-4": {
@@ -4435,9 +4548,9 @@
                 "video"
             ],
             "support": {
-                "docs": "https://nystudio107.com/plugins/transcoder/documentation",
+                "docs": "https://nystudio107.com/docs/transcoder",
                 "issues": "https://nystudio107.com/plugins/transcoder/support",
-                "source": "https://github.com/nystudio107/craft-transcoder/tree/1.2.21"
+                "source": "https://github.com/nystudio107/craft-transcoder"
             },
             "funding": [
                 {
@@ -4445,39 +4558,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-01-12T17:58:59+00:00"
+            "time": "2022-04-09T00:41:09+00:00"
         },
         {
             "name": "nystudio107/craft-typogrify",
-            "version": "1.1.19",
+            "version": "4.0.0-beta.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nystudio107/craft-typogrify.git",
-                "reference": "10e7da358c3ff46a8217ed9f714d504597897e76"
+                "reference": "2f91e05f450417a6ce9d801edbfb5478c06424b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nystudio107/craft-typogrify/zipball/10e7da358c3ff46a8217ed9f714d504597897e76",
-                "reference": "10e7da358c3ff46a8217ed9f714d504597897e76",
+                "url": "https://api.github.com/repos/nystudio107/craft-typogrify/zipball/2f91e05f450417a6ce9d801edbfb5478c06424b9",
+                "reference": "2f91e05f450417a6ce9d801edbfb5478c06424b9",
                 "shasum": ""
             },
             "require": {
-                "craftcms/cms": "^3.0.0",
+                "craftcms/cms": "^4.0.0-alpha",
                 "michelf/php-smartypants": "^1.8",
                 "mundschenk-at/php-typography": "^6.0"
             },
             "type": "craft-plugin",
             "extra": {
-                "name": "Typogrify",
+                "class": "nystudio107\\typogrify\\Typogrify",
                 "handle": "typogrify",
-                "schemaVersion": "1.0.0",
-                "hasCpSettings": false,
-                "hasCpSection": false,
-                "changelogUrl": "https://raw.githubusercontent.com/nystudio107/craft-typogrify/v1/CHANGELOG.md",
-                "components": {
-                    "typogrify": "nystudio107\\typogrify\\services\\TypogrifyService"
-                },
-                "class": "nystudio107\\typogrify\\Typogrify"
+                "name": "Typogrify"
             },
             "autoload": {
                 "psr-4": {
@@ -4503,9 +4609,9 @@
                 "typogrify"
             ],
             "support": {
-                "docs": "https://nystudio107.com/plugins/typogrify/documentation",
+                "docs": "https://nystudio107.com/docs/typogrify/",
                 "issues": "https://nystudio107.com/plugins/typogrify/support",
-                "source": "https://github.com/nystudio107/craft-typogrify/tree/1.1.19"
+                "source": "https://github.com/nystudio107/craft-typogrify"
             },
             "funding": [
                 {
@@ -4513,33 +4619,29 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-23T04:16:36+00:00"
+            "time": "2022-03-09T03:51:13+00:00"
         },
         {
             "name": "nystudio107/craft-vite",
-            "version": "1.0.24",
+            "version": "4.0.0-beta.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nystudio107/craft-vite.git",
-                "reference": "09a90f2a0cba9d9efdc3a80ec75831e89c684fc0"
+                "reference": "3cb77e20bd9f7ee8cf421f89f70471c328289288"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nystudio107/craft-vite/zipball/09a90f2a0cba9d9efdc3a80ec75831e89c684fc0",
-                "reference": "09a90f2a0cba9d9efdc3a80ec75831e89c684fc0",
+                "url": "https://api.github.com/repos/nystudio107/craft-vite/zipball/3cb77e20bd9f7ee8cf421f89f70471c328289288",
+                "reference": "3cb77e20bd9f7ee8cf421f89f70471c328289288",
                 "shasum": ""
             },
             "require": {
-                "craftcms/cms": "^3.0.0",
-                "nystudio107/craft-plugin-vite": "^1.0.23"
+                "craftcms/cms": "^4.0.0-alpha",
+                "nystudio107/craft-plugin-vite": "4.0.0-beta.2"
             },
             "type": "craft-plugin",
             "extra": {
-                "changelogUrl": "https://raw.githubusercontent.com/nystudio107/craft-vite/v1/CHANGELOG.md",
                 "class": "nystudio107\\vite\\Vite",
-                "developer": "nystudio107",
-                "developerUrl": "https://nystudio107.com",
-                "documentationUrl": "https://nystudio107.com/docs/vite/",
                 "handle": "vite",
                 "name": "Vite"
             },
@@ -4567,9 +4669,9 @@
                 "vite"
             ],
             "support": {
-                "docs": "https://github.com/nystudio107/craft-vite/blob/master/README.md",
-                "issues": "https://github.com/nystudio107/craft-vite/issues",
-                "source": "https://github.com/nystudio107/craft-vite/tree/1.0.24"
+                "docs": "https://nystudio107.com/docs/vite/",
+                "issues": "https://nystudio107.com/plugins/vite/support",
+                "source": "https://github.com/nystudio107/craft-vite"
             },
             "funding": [
                 {
@@ -4577,35 +4679,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-23T04:02:17+00:00"
+            "time": "2022-03-23T04:06:20+00:00"
         },
         {
             "name": "nystudio107/craft-webperf",
-            "version": "1.0.27",
+            "version": "4.0.0-beta.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nystudio107/craft-webperf.git",
-                "reference": "2288f45b90abeca5aad89237ae1f71508ee735b1"
+                "reference": "426da09e0f6a5bcdd429ce5f73c084510fe9c341"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nystudio107/craft-webperf/zipball/2288f45b90abeca5aad89237ae1f71508ee735b1",
-                "reference": "2288f45b90abeca5aad89237ae1f71508ee735b1",
+                "url": "https://api.github.com/repos/nystudio107/craft-webperf/zipball/426da09e0f6a5bcdd429ce5f73c084510fe9c341",
+                "reference": "426da09e0f6a5bcdd429ce5f73c084510fe9c341",
                 "shasum": ""
             },
             "require": {
-                "craftcms/cms": "^3.0.0",
+                "craftcms/cms": "^4.0.0-alpha",
                 "jaybizzle/crawler-detect": "^1.2.37",
                 "league/csv": "^8.2 || ^9.0",
-                "nystudio107/craft-plugin-vite": "^1.0.0",
+                "nystudio107/craft-plugin-vite": "^4.0.0-beta.1",
                 "whichbrowser/parser": "^2.0.37"
             },
             "type": "craft-plugin",
             "extra": {
-                "name": "Webperf",
+                "class": "nystudio107\\webperf\\Webperf",
                 "handle": "webperf",
-                "changelogUrl": "https://raw.githubusercontent.com/nystudio107/craft-webperf/v1/CHANGELOG.md",
-                "class": "nystudio107\\webperf\\Webperf"
+                "name": "Webperf"
             },
             "autoload": {
                 "psr-4": {
@@ -4631,9 +4732,9 @@
                 "webperf"
             ],
             "support": {
-                "docs": "https://nystudio107.com/plugins/webperf/documentation",
+                "docs": "https://nystudio107.com/docs/webperf",
                 "issues": "https://nystudio107.com/plugins/webperf/support",
-                "source": "https://github.com/nystudio107/craft-webperf/tree/1.0.27"
+                "source": "https://github.com/nystudio107/craft-webperf"
             },
             "funding": [
                 {
@@ -4641,7 +4742,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-01-12T18:10:08+00:00"
+            "time": "2022-03-18T17:24:19+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -5146,20 +5247,20 @@
         },
         {
             "name": "psr/container",
-            "version": "1.1.1",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.0"
+                "php": ">=7.4.0"
             },
             "type": "library",
             "autoload": {
@@ -5188,9 +5289,59 @@
             ],
             "support": {
                 "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/1.1.1"
+                "source": "https://github.com/php-fig/container/tree/1.1.2"
             },
-            "time": "2021-03-05T17:36:06+00:00"
+            "time": "2021-11-05T16:50:12+00:00"
+        },
+        {
+            "name": "psr/event-dispatcher",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/event-dispatcher.git",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\EventDispatcher\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Standard interfaces for event handling.",
+            "keywords": [
+                "events",
+                "psr",
+                "psr-14"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+            },
+            "time": "2019-01-08T18:20:26+00:00"
         },
         {
             "name": "psr/http-client",
@@ -5402,6 +5553,57 @@
             },
             "time": "2021-05-03T11:20:27+00:00"
         },
+        {
+            "name": "psr/simple-cache",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/simple-cache.git",
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865",
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\SimpleCache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for simple caching",
+            "keywords": [
+                "cache",
+                "caching",
+                "psr",
+                "psr-16",
+                "simple-cache"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/simple-cache/tree/3.0.0"
+            },
+            "time": "2021-10-29T13:26:27+00:00"
+        },
         {
             "name": "ralouphie/getallheaders",
             "version": "3.0.3",
@@ -5522,6 +5724,68 @@
             ],
             "time": "2022-02-11T10:27:51+00:00"
         },
+        {
+            "name": "samdark/yii2-psr-log-target",
+            "version": "1.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/samdark/yii2-psr-log-target.git",
+                "reference": "ccb29ecb7140c4eb81c3dfad38f61b21a9c1ed30"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/samdark/yii2-psr-log-target/zipball/ccb29ecb7140c4eb81c3dfad38f61b21a9c1ed30",
+                "reference": "ccb29ecb7140c4eb81c3dfad38f61b21a9c1ed30",
+                "shasum": ""
+            },
+            "require": {
+                "psr/log": "~1.0.2|~1.1.0",
+                "yiisoft/yii2": "~2.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "samdark\\log\\": "src",
+                    "samdark\\log\\tests\\": "tests"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Alexander Makarov",
+                    "email": "sam@rmcreative.ru"
+                }
+            ],
+            "description": "Yii 2 log target which uses PSR-3 compatible logger",
+            "homepage": "https://github.com/samdark/yii2-psr-log-target",
+            "keywords": [
+                "extension",
+                "log",
+                "psr-3",
+                "yii"
+            ],
+            "support": {
+                "issues": "https://github.com/samdark/yii2-psr-log-target/issues",
+                "source": "https://github.com/samdark/yii2-psr-log-target"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/samdark",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/samdark",
+                    "type": "patreon"
+                }
+            ],
+            "time": "2020-07-16T12:34:01+00:00"
+        },
         {
             "name": "seld/cli-prompt",
             "version": "1.0.4",
@@ -5598,14 +5862,362 @@
                 "phpstan/phpstan": "^1.5",
                 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13"
             },
-            "bin": [
-                "bin/jsonlint"
-            ],
+            "bin": [
+                "bin/jsonlint"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "JSON Linter",
+            "keywords": [
+                "json",
+                "linter",
+                "parser",
+                "validator"
+            ],
+            "support": {
+                "issues": "https://github.com/Seldaek/jsonlint/issues",
+                "source": "https://github.com/Seldaek/jsonlint/tree/1.9.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/Seldaek",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-04-01T13:37:23+00:00"
+        },
+        {
+            "name": "seld/phar-utils",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/phar-utils.git",
+                "reference": "9f3452c93ff423469c0d56450431562ca423dcee"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/9f3452c93ff423469c0d56450431562ca423dcee",
+                "reference": "9f3452c93ff423469c0d56450431562ca423dcee",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Seld\\PharUtils\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be"
+                }
+            ],
+            "description": "PHAR file format utilities, for when PHP phars you up",
+            "keywords": [
+                "phar"
+            ],
+            "support": {
+                "issues": "https://github.com/Seldaek/phar-utils/issues",
+                "source": "https://github.com/Seldaek/phar-utils/tree/1.2.0"
+            },
+            "time": "2021-12-10T11:20:11+00:00"
+        },
+        {
+            "name": "sunra/php-simple-html-dom-parser",
+            "version": "v1.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sunra/php-simple-html-dom-parser.git",
+                "reference": "75b9b1cb64502d8f8c04dc11b5906b969af247c6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sunra/php-simple-html-dom-parser/zipball/75b9b1cb64502d8f8c04dc11b5906b969af247c6",
+                "reference": "75b9b1cb64502d8f8c04dc11b5906b969af247c6",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Sunra\\PhpSimple\\HtmlDomParser": "Src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Sunra",
+                    "email": "sunra@yandex.ru",
+                    "homepage": "https://github.com/sunra"
+                },
+                {
+                    "name": "S.C. Chen",
+                    "homepage": "http://sourceforge.net/projects/simplehtmldom/"
+                }
+            ],
+            "description": "Composer adaptation of: A HTML DOM parser written in PHP5+ let you manipulate HTML in a very easy way! Require PHP 5+. Supports invalid HTML. Find tags on an HTML page with selectors just like jQuery. Extract contents from HTML in a single line.",
+            "homepage": "https://github.com/sunra/php-simple-html-dom-parser",
+            "keywords": [
+                "dom",
+                "html",
+                "parser"
+            ],
+            "support": {
+                "issues": "https://github.com/sunra/php-simple-html-dom-parser/issues",
+                "source": "https://github.com/sunra/php-simple-html-dom-parser/tree/master"
+            },
+            "time": "2016-11-22T22:57:47+00:00"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v5.4.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "900275254f0a1a2afff1ab0e11abd5587a10e1d6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/900275254f0a1a2afff1ab0e11abd5587a10e1d6",
+                "reference": "900275254f0a1a2afff1ab0e11abd5587a10e1d6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php73": "^1.9",
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/string": "^5.1|^6.0"
+            },
+            "conflict": {
+                "psr/log": ">=3",
+                "symfony/dependency-injection": "<4.4",
+                "symfony/dotenv": "<5.1",
+                "symfony/event-dispatcher": "<4.4",
+                "symfony/lock": "<4.4",
+                "symfony/process": "<4.4"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0|2.0"
+            },
+            "require-dev": {
+                "psr/log": "^1|^2",
+                "symfony/config": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
+                "symfony/lock": "^4.4|^5.0|^6.0",
+                "symfony/process": "^4.4|^5.0|^6.0",
+                "symfony/var-dumper": "^4.4|^5.0|^6.0"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/lock": "",
+                "symfony/process": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Eases the creation of beautiful and testable command line interfaces",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "cli",
+                "command line",
+                "console",
+                "terminal"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v5.4.7"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-03-31T17:09:19+00:00"
+        },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
+                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.0-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-02T09:55:41+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v6.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "6472ea2dd415e925b90ca82be64b8bc6157f3934"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6472ea2dd415e925b90ca82be64b8bc6157f3934",
+                "reference": "6472ea2dd415e925b90ca82be64b8bc6157f3934",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.2",
+                "symfony/event-dispatcher-contracts": "^2|^3"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<5.4"
+            },
+            "provide": {
+                "psr/event-dispatcher-implementation": "1.0",
+                "symfony/event-dispatcher-implementation": "2.0|3.0"
+            },
+            "require-dev": {
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^5.4|^6.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/error-handler": "^5.4|^6.0",
+                "symfony/expression-language": "^5.4|^6.0",
+                "symfony/http-foundation": "^5.4|^6.0",
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/stopwatch": "^5.4|^6.0"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "",
+                "symfony/http-kernel": ""
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
-                }
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -5613,60 +6225,69 @@
             ],
             "authors": [
                 {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "JSON Linter",
-            "keywords": [
-                "json",
-                "linter",
-                "parser",
-                "validator"
-            ],
+            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
+            "homepage": "https://symfony.com",
             "support": {
-                "issues": "https://github.com/Seldaek/jsonlint/issues",
-                "source": "https://github.com/Seldaek/jsonlint/tree/1.9.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.0.3"
             },
             "funding": [
                 {
-                    "url": "https://github.com/Seldaek",
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
                     "type": "github"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint",
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-01T13:37:23+00:00"
+            "time": "2022-01-02T09:55:41+00:00"
         },
         {
-            "name": "seld/phar-utils",
-            "version": "1.2.0",
+            "name": "symfony/event-dispatcher-contracts",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Seldaek/phar-utils.git",
-                "reference": "9f3452c93ff423469c0d56450431562ca423dcee"
+                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
+                "reference": "7bc61cc2db649b4637d331240c5346dcc7708051"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/9f3452c93ff423469c0d56450431562ca423dcee",
-                "reference": "9f3452c93ff423469c0d56450431562ca423dcee",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7bc61cc2db649b4637d331240c5346dcc7708051",
+                "reference": "7bc61cc2db649b4637d331240c5346dcc7708051",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3"
+                "php": ">=8.0.2",
+                "psr/event-dispatcher": "^1"
+            },
+            "suggest": {
+                "symfony/event-dispatcher-implementation": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-main": "3.0-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Seld\\PharUtils\\": "src/"
+                    "Symfony\\Contracts\\EventDispatcher\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5675,43 +6296,70 @@
             ],
             "authors": [
                 {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "PHAR file format utilities, for when PHP phars you up",
+            "description": "Generic abstractions related to dispatching event",
+            "homepage": "https://symfony.com",
             "keywords": [
-                "phar"
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
             ],
             "support": {
-                "issues": "https://github.com/Seldaek/phar-utils/issues",
-                "source": "https://github.com/Seldaek/phar-utils/tree/1.2.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.1"
             },
-            "time": "2021-12-10T11:20:11+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-02T09:55:41+00:00"
         },
         {
-            "name": "sunra/php-simple-html-dom-parser",
-            "version": "v1.5.2",
+            "name": "symfony/filesystem",
+            "version": "v6.0.7",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sunra/php-simple-html-dom-parser.git",
-                "reference": "75b9b1cb64502d8f8c04dc11b5906b969af247c6"
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "6c9e4c41f2c51dfde3db298594ed9cba55dbf5ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sunra/php-simple-html-dom-parser/zipball/75b9b1cb64502d8f8c04dc11b5906b969af247c6",
-                "reference": "75b9b1cb64502d8f8c04dc11b5906b969af247c6",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/6c9e4c41f2c51dfde3db298594ed9cba55dbf5ff",
+                "reference": "6c9e4c41f2c51dfde3db298594ed9cba55dbf5ff",
                 "shasum": ""
             },
             "require": {
-                "ext-mbstring": "*",
-                "php": ">=5.3.2"
+                "php": ">=8.0.2",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.8"
             },
             "type": "library",
             "autoload": {
-                "psr-0": {
-                    "Sunra\\PhpSimple\\HtmlDomParser": "Src/"
-                }
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -5719,65 +6367,59 @@
             ],
             "authors": [
                 {
-                    "name": "Sunra",
-                    "email": "sunra@yandex.ru",
-                    "homepage": "https://github.com/sunra"
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 },
                 {
-                    "name": "S.C. Chen",
-                    "homepage": "http://sourceforge.net/projects/simplehtmldom/"
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Composer adaptation of: A HTML DOM parser written in PHP5+ let you manipulate HTML in a very easy way! Require PHP 5+. Supports invalid HTML. Find tags on an HTML page with selectors just like jQuery. Extract contents from HTML in a single line.",
-            "homepage": "https://github.com/sunra/php-simple-html-dom-parser",
-            "keywords": [
-                "dom",
-                "html",
-                "parser"
-            ],
+            "description": "Provides basic utilities for the filesystem",
+            "homepage": "https://symfony.com",
             "support": {
-                "issues": "https://github.com/sunra/php-simple-html-dom-parser/issues",
-                "source": "https://github.com/sunra/php-simple-html-dom-parser/tree/master"
+                "source": "https://github.com/symfony/filesystem/tree/v6.0.7"
             },
-            "time": "2016-11-22T22:57:47+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-04-01T12:54:51+00:00"
         },
         {
-            "name": "swiftmailer/swiftmailer",
-            "version": "v6.3.0",
+            "name": "symfony/finder",
+            "version": "v6.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c"
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "8661b74dbabc23223f38c9b99d3f8ade71170430"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c",
-                "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/8661b74dbabc23223f38c9b99d3f8ade71170430",
+                "reference": "8661b74dbabc23223f38c9b99d3f8ade71170430",
                 "shasum": ""
             },
             "require": {
-                "egulias/email-validator": "^2.0|^3.1",
-                "php": ">=7.0.0",
-                "symfony/polyfill-iconv": "^1.0",
-                "symfony/polyfill-intl-idn": "^1.10",
-                "symfony/polyfill-mbstring": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^1.0",
-                "symfony/phpunit-bridge": "^4.4|^5.4"
-            },
-            "suggest": {
-                "ext-intl": "Needed to support internationalized email addresses"
+                "php": ">=8.0.2"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.2-dev"
-                }
-            },
             "autoload": {
-                "files": [
-                    "lib/swift_required.php"
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5785,91 +6427,80 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Chris Corbyn"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Swiftmailer, free feature-rich PHP mailer",
-            "homepage": "https://swiftmailer.symfony.com",
-            "keywords": [
-                "email",
-                "mail",
-                "mailer"
-            ],
+            "description": "Finds files and directories via an intuitive fluent interface",
+            "homepage": "https://symfony.com",
             "support": {
-                "issues": "https://github.com/swiftmailer/swiftmailer/issues",
-                "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.3.0"
+                "source": "https://github.com/symfony/finder/tree/v6.0.3"
             },
             "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
                 {
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/swiftmailer/swiftmailer",
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "abandoned": "symfony/mailer",
-            "time": "2021-10-18T15:26:12+00:00"
+            "time": "2022-01-26T17:23:29+00:00"
         },
         {
-            "name": "symfony/console",
-            "version": "v5.4.7",
+            "name": "symfony/http-client",
+            "version": "v6.0.7",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "900275254f0a1a2afff1ab0e11abd5587a10e1d6"
+                "url": "https://github.com/symfony/http-client.git",
+                "reference": "a7930c47248b9b57e9d0b8da100ffc1e031536dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/900275254f0a1a2afff1ab0e11abd5587a10e1d6",
-                "reference": "900275254f0a1a2afff1ab0e11abd5587a10e1d6",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/a7930c47248b9b57e9d0b8da100ffc1e031536dc",
+                "reference": "a7930c47248b9b57e9d0b8da100ffc1e031536dc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php73": "^1.9",
-                "symfony/polyfill-php80": "^1.16",
-                "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/string": "^5.1|^6.0"
-            },
-            "conflict": {
-                "psr/log": ">=3",
-                "symfony/dependency-injection": "<4.4",
-                "symfony/dotenv": "<5.1",
-                "symfony/event-dispatcher": "<4.4",
-                "symfony/lock": "<4.4",
-                "symfony/process": "<4.4"
+                "php": ">=8.0.2",
+                "psr/log": "^1|^2|^3",
+                "symfony/http-client-contracts": "^3",
+                "symfony/service-contracts": "^1.0|^2|^3"
             },
             "provide": {
-                "psr/log-implementation": "1.0|2.0"
+                "php-http/async-client-implementation": "*",
+                "php-http/client-implementation": "*",
+                "psr/http-client-implementation": "1.0",
+                "symfony/http-client-implementation": "3.0"
             },
             "require-dev": {
-                "psr/log": "^1|^2",
-                "symfony/config": "^4.4|^5.0|^6.0",
-                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-                "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
-                "symfony/lock": "^4.4|^5.0|^6.0",
-                "symfony/process": "^4.4|^5.0|^6.0",
-                "symfony/var-dumper": "^4.4|^5.0|^6.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/lock": "",
-                "symfony/process": ""
+                "amphp/amp": "^2.5",
+                "amphp/http-client": "^4.2.1",
+                "amphp/http-tunnel": "^1.0",
+                "amphp/socket": "^1.1",
+                "guzzlehttp/promises": "^1.4",
+                "nyholm/psr7": "^1.0",
+                "php-http/httplug": "^1.0|^2.0",
+                "psr/http-client": "^1.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/http-kernel": "^5.4|^6.0",
+                "symfony/process": "^5.4|^6.0",
+                "symfony/stopwatch": "^5.4|^6.0"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
+                    "Symfony\\Component\\HttpClient\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -5881,24 +6512,18 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Eases the creation of beautiful and testable command line interfaces",
+            "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
             "homepage": "https://symfony.com",
-            "keywords": [
-                "cli",
-                "command line",
-                "console",
-                "terminal"
-            ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.7"
+                "source": "https://github.com/symfony/http-client/tree/v6.0.7"
             },
             "funding": [
                 {
@@ -5914,29 +6539,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-31T17:09:19+00:00"
+            "time": "2022-04-01T12:27:43+00:00"
         },
         {
-            "name": "symfony/deprecation-contracts",
-            "version": "v2.5.1",
+            "name": "symfony/http-client-contracts",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
+                "url": "https://github.com/symfony/http-client-contracts.git",
+                "reference": "f7525778c712be78ad5b6ca31f47fdcfd404c280"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
-                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/f7525778c712be78ad5b6ca31f47fdcfd404c280",
+                "reference": "f7525778c712be78ad5b6ca31f47fdcfd404c280",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=8.0.2"
+            },
+            "suggest": {
+                "symfony/http-client-implementation": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "3.0-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -5944,9 +6572,9 @@
                 }
             },
             "autoload": {
-                "files": [
-                    "function.php"
-                ]
+                "psr-4": {
+                    "Symfony\\Contracts\\HttpClient\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -5962,10 +6590,18 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "A generic function and convention to trigger deprecation notices",
+            "description": "Generic abstractions related to HTTP clients",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1"
+                "source": "https://github.com/symfony/http-client-contracts/tree/v3.0.1"
             },
             "funding": [
                 {
@@ -5981,32 +6617,42 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2022-03-13T20:10:05+00:00"
         },
         {
-            "name": "symfony/filesystem",
-            "version": "v5.4.7",
+            "name": "symfony/mailer",
+            "version": "v6.0.7",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "3a4442138d80c9f7b600fb297534ac718b61d37f"
+                "url": "https://github.com/symfony/mailer.git",
+                "reference": "f7343f94e7afecca2ad840b078f9d80200e1bd27"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/3a4442138d80c9f7b600fb297534ac718b61d37f",
-                "reference": "3a4442138d80c9f7b600fb297534ac718b61d37f",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/f7343f94e7afecca2ad840b078f9d80200e1bd27",
+                "reference": "f7343f94e7afecca2ad840b078f9d80200e1bd27",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-mbstring": "~1.8",
-                "symfony/polyfill-php80": "^1.16"
+                "egulias/email-validator": "^2.1.10|^3",
+                "php": ">=8.0.2",
+                "psr/event-dispatcher": "^1",
+                "psr/log": "^1|^2|^3",
+                "symfony/event-dispatcher": "^5.4|^6.0",
+                "symfony/mime": "^5.4|^6.0",
+                "symfony/service-contracts": "^1.1|^2|^3"
+            },
+            "conflict": {
+                "symfony/http-kernel": "<5.4"
+            },
+            "require-dev": {
+                "symfony/http-client-contracts": "^1.1|^2|^3",
+                "symfony/messenger": "^5.4|^6.0"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\Filesystem\\": ""
+                    "Symfony\\Component\\Mailer\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -6026,10 +6672,10 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Provides basic utilities for the filesystem",
+            "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v5.4.7"
+                "source": "https://github.com/symfony/mailer/tree/v6.0.7"
             },
             "funding": [
                 {
@@ -6045,31 +6691,45 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-01T12:33:59+00:00"
+            "time": "2022-03-18T16:06:28+00:00"
         },
         {
-            "name": "symfony/finder",
-            "version": "v5.4.3",
+            "name": "symfony/mime",
+            "version": "v6.0.7",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d"
+                "url": "https://github.com/symfony/mime.git",
+                "reference": "74266e396f812a2301536397a6360b6e6913c0d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/231313534dded84c7ecaa79d14bc5da4ccb69b7d",
-                "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/74266e396f812a2301536397a6360b6e6913c0d8",
+                "reference": "74266e396f812a2301536397a6360b6e6913c0d8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.0.2",
+                "symfony/polyfill-intl-idn": "^1.10",
+                "symfony/polyfill-mbstring": "^1.0"
+            },
+            "conflict": {
+                "egulias/email-validator": "~3.0.0",
+                "phpdocumentor/reflection-docblock": "<3.2.2",
+                "phpdocumentor/type-resolver": "<1.4.0",
+                "symfony/mailer": "<5.4"
+            },
+            "require-dev": {
+                "egulias/email-validator": "^2.1.10|^3.1",
+                "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/property-access": "^5.4|^6.0",
+                "symfony/property-info": "^5.4|^6.0",
+                "symfony/serializer": "^5.4|^6.0"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\Finder\\": ""
+                    "Symfony\\Component\\Mime\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -6089,10 +6749,14 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Finds files and directories via an intuitive fluent interface",
+            "description": "Allows manipulating MIME messages",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "mime",
+                "mime-type"
+            ],
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.4.3"
+                "source": "https://github.com/symfony/mime/tree/v6.0.7"
             },
             "funding": [
                 {
@@ -6108,7 +6772,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-26T16:34:36+00:00"
+            "time": "2022-03-13T20:10:05+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -6995,34 +7659,33 @@
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.3",
+            "version": "v6.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10"
+                "reference": "522144f0c4c004c80d56fa47e40e17028e2eefc2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/92043b7d8383e48104e411bc9434b260dbeb5a10",
-                "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10",
+                "url": "https://api.github.com/repos/symfony/string/zipball/522144f0c4c004c80d56fa47e40e17028e2eefc2",
+                "reference": "522144f0c4c004c80d56fa47e40e17028e2eefc2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.0.2",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "~1.15"
+                "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/translation-contracts": ">=3.0"
+                "symfony/translation-contracts": "<2.0"
             },
             "require-dev": {
-                "symfony/error-handler": "^4.4|^5.0|^6.0",
-                "symfony/http-client": "^4.4|^5.0|^6.0",
-                "symfony/translation-contracts": "^1.1|^2",
-                "symfony/var-exporter": "^4.4|^5.0|^6.0"
+                "symfony/error-handler": "^5.4|^6.0",
+                "symfony/http-client": "^5.4|^6.0",
+                "symfony/translation-contracts": "^2.0|^3.0",
+                "symfony/var-exporter": "^5.4|^6.0"
             },
             "type": "library",
             "autoload": {
@@ -7061,7 +7724,96 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.3"
+                "source": "https://github.com/symfony/string/tree/v6.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-02T09:55:41+00:00"
+        },
+        {
+            "name": "symfony/var-dumper",
+            "version": "v5.4.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/var-dumper.git",
+                "reference": "294e9da6e2e0dd404e983daa5aa74253d92c05d0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/294e9da6e2e0dd404e983daa5aa74253d92c05d0",
+                "reference": "294e9da6e2e0dd404e983daa5aa74253d92c05d0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<5.4.3",
+                "symfony/console": "<4.4"
+            },
+            "require-dev": {
+                "ext-iconv": "*",
+                "symfony/console": "^4.4|^5.0|^6.0",
+                "symfony/process": "^4.4|^5.0|^6.0",
+                "symfony/uid": "^5.1|^6.0",
+                "twig/twig": "^2.13|^3.0.4"
+            },
+            "suggest": {
+                "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
+                "ext-intl": "To show region name in time zone dump",
+                "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
+            },
+            "bin": [
+                "Resources/bin/var-dump-server"
+            ],
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Resources/functions/dump.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\VarDumper\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides mechanisms for walking through any arbitrary PHP variable",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "debug",
+                "dump"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/var-dumper/tree/v5.4.6"
             },
             "funding": [
                 {
@@ -7077,7 +7829,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2022-03-02T12:42:23+00:00"
         },
         {
             "name": "symfony/yaml",
@@ -7154,6 +7906,54 @@
             ],
             "time": "2022-01-26T16:32:32+00:00"
         },
+        {
+            "name": "theiconic/name-parser",
+            "version": "v1.2.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theiconic/name-parser.git",
+                "reference": "9a54a713bf5b2e7fd990828147d42de16bf8a253"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theiconic/name-parser/zipball/9a54a713bf5b2e7fd990828147d42de16bf8a253",
+                "reference": "9a54a713bf5b2e7fd990828147d42de16bf8a253",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.1",
+                "php-mock/php-mock-phpunit": "^2.1",
+                "phpunit/phpunit": "^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "TheIconic\\NameParser\\": [
+                        "src/",
+                        "tests/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "The Iconic",
+                    "email": "engineering@theiconic.com.au"
+                }
+            ],
+            "description": "PHP library for parsing a string containing a full name into its parts",
+            "support": {
+                "issues": "https://github.com/theiconic/name-parser/issues",
+                "source": "https://github.com/theiconic/name-parser/tree/v1.2.11"
+            },
+            "time": "2019-11-14T14:08:48+00:00"
+        },
         {
             "name": "true/punycode",
             "version": "v2.1.1",
@@ -7263,23 +8063,22 @@
         },
         {
             "name": "twig/twig",
-            "version": "v2.14.13",
+            "version": "v3.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "66856cd0459df3dc97d32077a98454dc2a0ee75a"
+                "reference": "8442df056c51b706793adf80a9fd363406dd3674"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/66856cd0459df3dc97d32077a98454dc2a0ee75a",
-                "reference": "66856cd0459df3dc97d32077a98454dc2a0ee75a",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/8442df056c51b706793adf80a9fd363406dd3674",
+                "reference": "8442df056c51b706793adf80a9fd363406dd3674",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3",
+                "php": ">=7.2.5",
                 "symfony/polyfill-ctype": "^1.8",
-                "symfony/polyfill-mbstring": "^1.3",
-                "symfony/polyfill-php72": "^1.8"
+                "symfony/polyfill-mbstring": "^1.3"
             },
             "require-dev": {
                 "psr/container": "^1.0",
@@ -7288,13 +8087,10 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.14-dev"
+                    "dev-master": "3.3-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Twig_": "lib/"
-                },
                 "psr-4": {
                     "Twig\\": "src/"
                 }
@@ -7327,7 +8123,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v2.14.13"
+                "source": "https://github.com/twigphp/Twig/tree/v3.3.10"
             },
             "funding": [
                 {
@@ -7339,7 +8135,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-06T06:45:17+00:00"
+            "time": "2022-04-06T06:47:41+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
@@ -8770,46 +9566,36 @@
             "time": "2022-01-11T12:50:32+00:00"
         },
         {
-            "name": "yiisoft/yii2-swiftmailer",
-            "version": "2.1.3",
+            "name": "yiisoft/yii2-symfonymailer",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/yiisoft/yii2-swiftmailer.git",
-                "reference": "7b7ec871b4a63c0abbcd10e1ee3fb5be22f8b340"
+                "url": "https://github.com/yiisoft/yii2-symfonymailer.git",
+                "reference": "77baddfd806005604624ec58e6b55b18f31eeaaf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/7b7ec871b4a63c0abbcd10e1ee3fb5be22f8b340",
-                "reference": "7b7ec871b4a63c0abbcd10e1ee3fb5be22f8b340",
+                "url": "https://api.github.com/repos/yiisoft/yii2-symfonymailer/zipball/77baddfd806005604624ec58e6b55b18f31eeaaf",
+                "reference": "77baddfd806005604624ec58e6b55b18f31eeaaf",
                 "shasum": ""
             },
             "require": {
-                "swiftmailer/swiftmailer": "~6.0",
+                "php": ">=7.4.0",
+                "symfony/mailer": ">=5.4.0",
                 "yiisoft/yii2": ">=2.0.4"
             },
             "require-dev": {
-                "cweagans/composer-patches": "^1.7",
-                "phpunit/phpunit": "4.8.34"
+                "phpunit/phpunit": "9.5.10"
             },
             "type": "yii2-extension",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1.x-dev"
-                },
-                "composer-exit-on-patch-failure": true,
-                "patches": {
-                    "phpunit/phpunit-mock-objects": {
-                        "Fix PHP 7 and 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_mock_objects.patch"
-                    },
-                    "phpunit/phpunit": {
-                        "Fix PHP 7 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php7.patch",
-                        "Fix PHP 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php8.patch"
-                    }
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "yii\\swiftmailer\\": "src"
+                    "yii\\symfonymailer\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -8818,24 +9604,24 @@
             ],
             "authors": [
                 {
-                    "name": "Paul Klimov",
-                    "email": "klimov.paul@gmail.com"
+                    "name": "Kirill Petrov",
+                    "email": "archibeardrinker@gmail.com"
                 }
             ],
-            "description": "The SwiftMailer integration for the Yii framework",
+            "description": "The SymfonyMailer integration for the Yii framework",
             "keywords": [
                 "email",
                 "mail",
                 "mailer",
-                "swift",
-                "swiftmailer",
+                "symfony",
+                "symfonymailer",
                 "yii2"
             ],
             "support": {
                 "forum": "http://www.yiiframework.com/forum/",
                 "irc": "irc://irc.freenode.net/yii",
-                "issues": "https://github.com/yiisoft/yii2-swiftmailer/issues",
-                "source": "https://github.com/yiisoft/yii2-swiftmailer",
+                "issues": "https://github.com/yiisoft/yii2-symfonymailer/issues",
+                "source": "https://github.com/yiisoft/yii2-symfonymailer",
                 "wiki": "http://www.yiiframework.com/wiki/"
             },
             "funding": [
@@ -8848,11 +9634,11 @@
                     "type": "open_collective"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/yiisoft/yii2-swiftmailer",
+                    "url": "https://tidelift.com/funding/github/packagist/yiisoft/yii2-symfonymailer",
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-30T08:48:48+00:00"
+            "time": "2022-02-10T13:42:46+00:00"
         }
     ],
     "packages-dev": [
@@ -9051,95 +9837,6 @@
             },
             "time": "2021-11-30T14:05:36+00:00"
         },
-        {
-            "name": "symfony/var-dumper",
-            "version": "v5.4.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "294e9da6e2e0dd404e983daa5aa74253d92c05d0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/294e9da6e2e0dd404e983daa5aa74253d92c05d0",
-                "reference": "294e9da6e2e0dd404e983daa5aa74253d92c05d0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "^1.16"
-            },
-            "conflict": {
-                "phpunit/phpunit": "<5.4.3",
-                "symfony/console": "<4.4"
-            },
-            "require-dev": {
-                "ext-iconv": "*",
-                "symfony/console": "^4.4|^5.0|^6.0",
-                "symfony/process": "^4.4|^5.0|^6.0",
-                "symfony/uid": "^5.1|^6.0",
-                "twig/twig": "^2.13|^3.0.4"
-            },
-            "suggest": {
-                "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
-                "ext-intl": "To show region name in time zone dump",
-                "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
-            },
-            "bin": [
-                "Resources/bin/var-dump-server"
-            ],
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "Resources/functions/dump.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Component\\VarDumper\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides mechanisms for walking through any arbitrary PHP variable",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "debug",
-                "dump"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v5.4.6"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-03-02T12:42:23+00:00"
-        },
         {
             "name": "yiisoft/yii2-shell",
             "version": "2.0.4",
@@ -9208,13 +9905,26 @@
     ],
     "aliases": [],
     "minimum-stability": "beta",
-    "stability-flags": [],
+    "stability-flags": {
+        "craftcms/cms": 10,
+        "craftcms/aws-s3": 10,
+        "nystudio107/craft-imageoptimize": 10,
+        "nystudio107/craft-fastcgicachebust": 10,
+        "nystudio107/craft-icalendar": 10,
+        "nystudio107/craft-minify": 10,
+        "nystudio107/craft-typogrify": 10,
+        "nystudio107/craft-transcoder": 10,
+        "nystudio107/craft-disqus": 10,
+        "nystudio107/craft-retour": 10,
+        "nystudio107/craft-seomatic": 10,
+        "nystudio107/craft-webperf": 10,
+        "nystudio107/craft-vite": 10
+    },
     "prefer-stable": true,
     "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": [],
-    "platform-overrides": {
-        "php": "7.2.5"
+    "platform": {
+        "php": "^8.0.2"
     },
+    "platform-dev": [],
     "plugin-api-version": "2.1.0"
 }
diff --git a/cms/config/general.php b/cms/config/general.php
index ceb2da08..1e5891af 100644
--- a/cms/config/general.php
+++ b/cms/config/general.php
@@ -49,5 +49,4 @@
     'omitScriptNameInUrls' => true,
     'useEmailAsUsername' => true,
     'usePathInfo' => true,
-    'useProjectConfigFile' => true,
 ];
diff --git a/cms/config/project/entryTypes/about--cc4ea2bd-3bde-4bad-8f72-272fcc3c2a19.yaml b/cms/config/project/entryTypes/about--cc4ea2bd-3bde-4bad-8f72-272fcc3c2a19.yaml
index 7f0fca38..615d5d1f 100644
--- a/cms/config/project/entryTypes/about--cc4ea2bd-3bde-4bad-8f72-272fcc3c2a19.yaml
+++ b/cms/config/project/entryTypes/about--cc4ea2bd-3bde-4bad-8f72-272fcc3c2a19.yaml
@@ -6,7 +6,7 @@ fieldLayouts:
           -
             instructions: null
             label: Title
-            type: craft\fieldlayoutelements\EntryTitleField
+            type: craft\fieldlayoutelements\entries\EntryTitleField
           -
             fieldUid: b5eb01ec-a6ed-4a08-9438-64e7138b08f0 # FAQs
             required: false
diff --git a/cms/config/project/entryTypes/episodes--913ea665-c268-4177-8054-fe76f80101c6.yaml b/cms/config/project/entryTypes/episodes--913ea665-c268-4177-8054-fe76f80101c6.yaml
index 314d95dd..28770e98 100644
--- a/cms/config/project/entryTypes/episodes--913ea665-c268-4177-8054-fe76f80101c6.yaml
+++ b/cms/config/project/entryTypes/episodes--913ea665-c268-4177-8054-fe76f80101c6.yaml
@@ -23,7 +23,7 @@ fieldLayouts:
             step: null
             tip: null
             title: null
-            type: craft\fieldlayoutelements\EntryTitleField
+            type: craft\fieldlayoutelements\entries\EntryTitleField
             warning: null
             width: 100
           -
diff --git a/cms/config/project/entryTypes/genericError--e81379aa-e0c7-45c0-b506-c4ab8fce6bce.yaml b/cms/config/project/entryTypes/genericError--e81379aa-e0c7-45c0-b506-c4ab8fce6bce.yaml
index fb97d89e..779d199f 100644
--- a/cms/config/project/entryTypes/genericError--e81379aa-e0c7-45c0-b506-c4ab8fce6bce.yaml
+++ b/cms/config/project/entryTypes/genericError--e81379aa-e0c7-45c0-b506-c4ab8fce6bce.yaml
@@ -6,7 +6,7 @@ fieldLayouts:
           -
             instructions: null
             label: Title
-            type: craft\fieldlayoutelements\EntryTitleField
+            type: craft\fieldlayoutelements\entries\EntryTitleField
           -
             fieldUid: 18d7721b-780b-4a44-976a-716c3df0bb7a # Error Headline
             required: false
diff --git a/cms/config/project/entryTypes/guests--032dc0eb-27cf-4034-ad36-dc8c274a455e.yaml b/cms/config/project/entryTypes/guests--032dc0eb-27cf-4034-ad36-dc8c274a455e.yaml
index ca8c6245..3dd31422 100644
--- a/cms/config/project/entryTypes/guests--032dc0eb-27cf-4034-ad36-dc8c274a455e.yaml
+++ b/cms/config/project/entryTypes/guests--032dc0eb-27cf-4034-ad36-dc8c274a455e.yaml
@@ -6,7 +6,7 @@ fieldLayouts:
           -
             instructions: null
             label: Title
-            type: craft\fieldlayoutelements\EntryTitleField
+            type: craft\fieldlayoutelements\entries\EntryTitleField
           -
             fieldUid: c05161c0-a294-4d47-8909-1cfc88c2f970 # Profile Company
             required: false
diff --git a/cms/config/project/entryTypes/notFound--78ad1f1e-5dc5-4cff-b19f-43aa4ec02869.yaml b/cms/config/project/entryTypes/notFound--78ad1f1e-5dc5-4cff-b19f-43aa4ec02869.yaml
index 853edcce..4a24a94f 100644
--- a/cms/config/project/entryTypes/notFound--78ad1f1e-5dc5-4cff-b19f-43aa4ec02869.yaml
+++ b/cms/config/project/entryTypes/notFound--78ad1f1e-5dc5-4cff-b19f-43aa4ec02869.yaml
@@ -6,7 +6,7 @@ fieldLayouts:
           -
             instructions: null
             label: null
-            type: craft\fieldlayoutelements\EntryTitleField
+            type: craft\fieldlayoutelements\entries\EntryTitleField
           -
             fieldUid: 18d7721b-780b-4a44-976a-716c3df0bb7a # Error Headline
             required: false
diff --git a/cms/config/project/entryTypes/serviceUnavailable--29da80bf-c705-441b-be33-96df307c84c6.yaml b/cms/config/project/entryTypes/serviceUnavailable--29da80bf-c705-441b-be33-96df307c84c6.yaml
index f4faef02..05d45b69 100644
--- a/cms/config/project/entryTypes/serviceUnavailable--29da80bf-c705-441b-be33-96df307c84c6.yaml
+++ b/cms/config/project/entryTypes/serviceUnavailable--29da80bf-c705-441b-be33-96df307c84c6.yaml
@@ -6,7 +6,7 @@ fieldLayouts:
           -
             instructions: null
             label: Title
-            type: craft\fieldlayoutelements\EntryTitleField
+            type: craft\fieldlayoutelements\entries\EntryTitleField
           -
             fieldUid: 18d7721b-780b-4a44-976a-716c3df0bb7a # Error Headline
             required: false
diff --git a/cms/config/project/entryTypes/siteOffline--a4be3483-f316-4f96-8820-3914ad7b863a.yaml b/cms/config/project/entryTypes/siteOffline--a4be3483-f316-4f96-8820-3914ad7b863a.yaml
index eebb04b4..4fdebfa7 100644
--- a/cms/config/project/entryTypes/siteOffline--a4be3483-f316-4f96-8820-3914ad7b863a.yaml
+++ b/cms/config/project/entryTypes/siteOffline--a4be3483-f316-4f96-8820-3914ad7b863a.yaml
@@ -6,7 +6,7 @@ fieldLayouts:
           -
             instructions: null
             label: Title
-            type: craft\fieldlayoutelements\EntryTitleField
+            type: craft\fieldlayoutelements\entries\EntryTitleField
           -
             fieldUid: 18d7721b-780b-4a44-976a-716c3df0bb7a # Error Headline
             required: false
diff --git a/cms/config/project/project.yaml b/cms/config/project/project.yaml
index 7cbf8188..5780a128 100644
--- a/cms/config/project/project.yaml
+++ b/cms/config/project/project.yaml
@@ -1,8 +1,78 @@
-dateModified: 1647568977
+dateModified: 1649462884
 email:
   fromEmail: andrew@nystudio107.com
   fromName: devMode
   transportType: craft\mail\transportadapters\Sendmail
+fs:
+  devmodeEpisodes:
+    hasUrls: true
+    name: 'Devmode Episodes'
+    settings:
+      autoFocalPoint: ''
+      bucket: $S3_BUCKET
+      bucketSelectionMode: manual
+      cfDistributionId: $CLOUDFRONT_DISTRIBUTION_ID
+      cfPrefix: $CLOUDFRONT_PATH_PREFIX
+      expires: '3 months'
+      keyId: $S3_KEY_ID
+      makeUploadsPublic: ''
+      region: $S3_REGION
+      secret: $S3_SECRET
+      subfolder: episodes
+    type: craft\awss3\Fs
+    url: $CLOUDFRONT_URL
+  devmodeSite:
+    hasUrls: true
+    name: 'Devmode Site'
+    settings:
+      autoFocalPoint: ''
+      bucket: $S3_BUCKET
+      bucketSelectionMode: manual
+      cfDistributionId: CLOUDFRONT_DISTRIBUTION_ID
+      cfPrefix: $CLOUDFRONT_PATH_PREFIX
+      expires: '3 months'
+      keyId: $S3_KEY_ID
+      makeUploadsPublic: ''
+      region: $S3_REGION
+      secret: $S3_SECRET
+      subfolder: site
+    type: craft\awss3\Fs
+    url: $CLOUDFRONT_URL
+  devmodeTranscripts:
+    hasUrls: true
+    name: 'Devmode Transcripts'
+    settings:
+      addSubfolderToRootUrl: '1'
+      autoFocalPoint: ''
+      bucket: $S3_BUCKET
+      bucketSelectionMode: manual
+      cfDistributionId: $CLOUDFRONT_DISTRIBUTION_ID
+      cfPrefix: $CLOUDFRONT_PATH_PREFIX
+      expires: '3 months'
+      keyId: $S3_KEY_ID
+      makeUploadsPublic: ''
+      region: $S3_REGION
+      secret: $S3_SECRET
+      subfolder: transcripts
+    type: craft\awss3\Fs
+    url: $CLOUDFRONT_URL
+  devmodeUsers:
+    hasUrls: true
+    name: 'Devmode Users'
+    settings:
+      autoFocalPoint: ''
+      bucket: $S3_BUCKET
+      bucketSelectionMode: manual
+      cfDistributionId: $CLOUDFRONT_DISTRIBUTION_ID
+      cfPrefix: $CLOUDFRONT_PATH_PREFIX
+      expires: '3 months'
+      keyId: $S3_KEY_ID
+      makeUploadsPublic: ''
+      region: $S3_REGION
+      secret: $S3_SECRET
+      subfolder: users
+    type: craft\awss3\Fs
+    url: $CLOUDFRONT_URL
 graphql:
   publicToken:
     enabled: false
@@ -10,52 +80,73 @@ graphql:
 meta:
   __names__:
     0c790066-43c5-4b67-b6d9-8492fa40cf71: Show # Show
+    1a66bf43-6fcc-4a78-bf36-0f350b930430: 'Episodes Index'
     1be1c156-82fa-4f08-bb63-6d3417da2844: 'Optimized Images' # Optimized Images
     2a4761bd-2461-4db9-96a0-4f52b8cef633: devMode # devMode
     4d90d0e7-b705-4035-b396-2f82ce5bb871: 'Error Image' # Error Image
+    5f70b9e0-f42b-4fdb-bcf6-5e82691d89de: 'Site Offline'
     6def66f0-2a8f-4b88-9435-7f9cc1ccfe9c: 'Show Genre' # Show Genre
     7e338b73-ac10-44cf-892e-04afc0164991: 'Episode Guests' # Episode Guests
     07f04bdf-277d-4010-9fbe-497cd9593324: 'Related Episodes' # Related Episodes
     8c9dd611-b43b-4e22-b076-3f6a6362c93e: 'Episode Reference Links' # Episode Reference Links
     12aa936c-807f-4ec3-81dc-69283a344171: Profile # Profile
     18d7721b-780b-4a44-976a-716c3df0bb7a: 'Error Headline' # Error Headline
+    19dfdfbb-837c-46d5-87bf-e6540df98dc4: Hosts
     19e4e8ba-93c2-4a86-8c57-9b54d46e0981: Site # Site
+    29da80bf-c705-441b-be33-96df307c84c6: '503 Service Unavailable'
     31b8c511-37f9-4d83-956d-5aa215572122: 'Profile URL' # Profile URL
+    032dc0eb-27cf-4034-ad36-dc8c274a455e: Guests
     41fdb4c8-4774-4101-918f-1412190b085b: 'Profile Optimized Images' # Profile Optimized Images
+    52b673e7-3d80-44a4-94f7-43eaafcc9d6f: '404 Not Found'
+    78ad1f1e-5dc5-4cff-b19f-43aa4ec02869: '404 Not Found'
     087ee23d-4f8f-42d4-af12-99fcc2462247: 'Show Info' # Show Info
     88db3e41-57f4-404d-b3ea-762b09c37afe: Errors # Errors
     0090f7a3-1e22-4fb5-9ae0-01de38805601: 'Episode Media' # Episode Media
+    98f56e95-4be6-4238-a110-1f21574fa642: 'Devmode Users'
+    214e4dc6-a454-4df0-a1f5-cd94ecdab53f: Guests
     324e7a11-3346-41e7-a29d-4636ab907e51: 'Episode Number' # Episode Number
     380e3b7e-07de-4d39-b0e5-360f5e87d00d: 'Profile Title' # Profile Title
     406c20cb-9b86-4b0d-9123-1ce57220e2a8: 'Profile Twitter URL' # Profile Twitter URL
     428ec106-b2d1-4d48-a5fa-de192155dff5: 'Show URL' # Show URL
+    486a0853-47b2-4509-97ad-43fe3ec42074: About
     913ea665-c268-4177-8054-fe76f80101c6: Episodes # Episodes
     2405ed1c-fd52-4264-a96a-f6e6fab437b5: 'Show Sub-Title' # Show Sub-Title
+    7540db37-7ec3-4471-9de6-36bde06e949a: 'Devmode Site'
+    9436ac5e-44de-4fe9-be59-fd1f0fc26941: Owners
     34348a98-83b9-4f2d-8e14-0437ec964a15: devMode # devMode
     49649e9a-033b-4ddf-9f3d-26a480502993: About # About
     61953a92-8b34-4678-9bae-fd5a45142f26: 'Episode Tags' # Episode Tags
+    519413e8-a432-4cfe-98c5-5f81e9519f2a: 'Generic Error'
     523395ea-5738-4ca5-a119-f32221ea5ca8: 'Episode Transcript' # Episode Transcript
     8011817c-9518-4a31-9aa8-cad6d4a08b81: 'Episode Summary' # Episode Summary
+    9089688f-6602-4d69-91cd-ec9a94c4bc6f: '503 Service Unavailable'
     9687721c-33b8-4a40-abb7-5c42e07ce274: 'Profile Bio' # Profile Bio
     14605669-4768-4f57-88d6-1f06480a9b80: 'Show iTunes URL' # Show iTunes URL
     86909527-3ec4-4d57-a44c-167649eb86bf: 'Show Description' # Show Description
+    a1eaefb7-b32a-436d-a218-3fc7be02c917: Calendar
+    a4be3483-f316-4f96-8820-3914ad7b863a: 'Site Offline'
     a5cf9c0d-1797-4a60-8c47-bc28c5f01a95: 'Episode Hosts' # Episode Hosts
     a8f2ec1a-a218-451c-a658-e3c600ddb5fa: 'Show Title' # Show Title
+    a9d3a609-1f18-4cb7-afc3-3c103a7e09de: Homepage
     ab0ca0e9-1308-472f-92a5-2ab0cbd84943: 'Show RSS Feed URL' # Show RSS Feed URL
     b5eb01ec-a6ed-4a08-9438-64e7138b08f0: FAQs # FAQs
     bd8ef0d7-f73b-4138-ac52-c14d11dd780e: 'Devmode Transcripts' # Devmode Transcripts
     bda219fa-bace-4d8b-ad3a-08243caaf6ca: 'Show Image' # Show Image
     bfbd2913-36d8-4e54-9f9c-644e793f0ae9: Episodes # Episodes
     c05161c0-a294-4d47-8909-1cfc88c2f970: 'Profile Company' # Profile Company
+    c1f6af30-7375-4feb-92ef-a3ed16ba69b2: Episodes
     ca279869-925f-4960-865c-96cacd2aa942: 'Show Email' # Show Email
+    cc4ea2bd-3bde-4bad-8f72-272fcc3c2a19: About
     d6df6fe7-14f3-42a3-9949-dcee7c8c26d9: 'Profile GitHub URL' # Profile GitHub URL
+    e69c8edb-d562-4367-9a05-91a6fd2c7d99: 'Devmode Episodes'
+    e81379aa-e0c7-45c0-b506-c4ab8fce6bce: 'Generic Error'
     e1087165-5769-428d-bf14-c98e6011cf5e: 'Error Text' # Error Text
     eecc24bf-e253-43b8-b327-632e0dc07fa6: 'Show Technologies Links' # Show Technologies Links
 plugins:
   aws-s3:
     edition: standard
     enabled: true
-    schemaVersion: '1.2'
+    schemaVersion: '2.0'
   disqus:
     enabled: true
     licenseKey: null
@@ -230,5 +321,5 @@ system:
   live: true
   name: devMode.fm
   retryDuration: 60
-  schemaVersion: 3.7.33
+  schemaVersion: 4.0.0.8
   timeZone: America/New_York
diff --git a/cms/config/project/users/groups/hosts--19dfdfbb-837c-46d5-87bf-e6540df98dc4.yaml b/cms/config/project/users/groups/hosts--19dfdfbb-837c-46d5-87bf-e6540df98dc4.yaml
index c6689678..d8bffaf9 100644
--- a/cms/config/project/users/groups/hosts--19dfdfbb-837c-46d5-87bf-e6540df98dc4.yaml
+++ b/cms/config/project/users/groups/hosts--19dfdfbb-837c-46d5-87bf-e6540df98dc4.yaml
@@ -5,12 +5,6 @@ permissions:
   - accessplugin-retour
   - accessplugin-seomatic
   - accesscp
-  - 'publishentries:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
-  - 'publishpeerentries:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
-  - 'editpeerentries:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
-  - 'publishpeerentrydrafts:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
-  - 'editpeerentrydrafts:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
-  - 'editentries:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
   - 'saveassetinvolume:cd231c31-8caf-4b13-995d-2b84f9750c63'
   - 'viewvolume:cd231c31-8caf-4b13-995d-2b84f9750c63'
   - 'saveassetinvolume:ab5dbb6f-b2fe-4712-9237-d47c3a608050'
@@ -50,3 +44,10 @@ permissions:
   - 'seomatic:tracking-scripts:hubspot'
   - 'seomatic:tracking-scripts'
   - 'seomatic:plugin-settings'
+  - 'viewentries:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
+  - 'saveentries:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
+  - 'viewpeerentrydrafts:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
+  - 'savepeerentrydrafts:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
+  - 'viewpeerentries:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
+  - 'savepeerentries:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
+  - 'assignusergroup:19dfdfbb-837c-46d5-87bf-e6540df98dc4'
diff --git a/cms/config/project/users/groups/owners--9436ac5e-44de-4fe9-be59-fd1f0fc26941.yaml b/cms/config/project/users/groups/owners--9436ac5e-44de-4fe9-be59-fd1f0fc26941.yaml
index 7bc9506f..ce9bd6b7 100644
--- a/cms/config/project/users/groups/owners--9436ac5e-44de-4fe9-be59-fd1f0fc26941.yaml
+++ b/cms/config/project/users/groups/owners--9436ac5e-44de-4fe9-be59-fd1f0fc26941.yaml
@@ -1,2 +1,4 @@
 handle: owners
 name: Owners
+permissions:
+  - 'assignusergroup:9436ac5e-44de-4fe9-be59-fd1f0fc26941'
diff --git a/cms/config/project/users/users.yaml b/cms/config/project/users/users.yaml
index 05dcbc3b..6219da5c 100644
--- a/cms/config/project/users/users.yaml
+++ b/cms/config/project/users/users.yaml
@@ -1,4 +1,5 @@
 allowPublicRegistration: false
+deactivateByDefault: false
 defaultGroup: ''
 photoSubpath: ''
 photoVolumeUid: 98f56e95-4be6-4238-a110-1f21574fa642
diff --git a/cms/config/project/volumes/devmodeEpisodes--e69c8edb-d562-4367-9a05-91a6fd2c7d99.yaml b/cms/config/project/volumes/devmodeEpisodes--e69c8edb-d562-4367-9a05-91a6fd2c7d99.yaml
index 145e0690..e3eed6ed 100644
--- a/cms/config/project/volumes/devmodeEpisodes--e69c8edb-d562-4367-9a05-91a6fd2c7d99.yaml
+++ b/cms/config/project/volumes/devmodeEpisodes--e69c8edb-d562-4367-9a05-91a6fd2c7d99.yaml
@@ -1,19 +1,6 @@
+fs: devmodeEpisodes
 handle: devmodeEpisodes
 hasUrls: true
 name: 'Devmode Episodes'
-settings:
-  autoFocalPoint: ''
-  bucket: $S3_BUCKET
-  bucketSelectionMode: manual
-  cfDistributionId: $CLOUDFRONT_DISTRIBUTION_ID
-  cfPrefix: $CLOUDFRONT_PATH_PREFIX
-  expires: '3 months'
-  keyId: $S3_KEY_ID
-  makeUploadsPublic: ''
-  region: $S3_REGION
-  secret: $S3_SECRET
-  storageClass: ''
-  subfolder: episodes
 sortOrder: 4
-type: craft\awss3\Volume
 url: $CLOUDFRONT_URL
diff --git a/cms/config/project/volumes/devmodeSite--7540db37-7ec3-4471-9de6-36bde06e949a.yaml b/cms/config/project/volumes/devmodeSite--7540db37-7ec3-4471-9de6-36bde06e949a.yaml
index 8336eef5..00b3b5bd 100644
--- a/cms/config/project/volumes/devmodeSite--7540db37-7ec3-4471-9de6-36bde06e949a.yaml
+++ b/cms/config/project/volumes/devmodeSite--7540db37-7ec3-4471-9de6-36bde06e949a.yaml
@@ -8,22 +8,9 @@ fieldLayouts:
             sortOrder: 1
         name: Content
         sortOrder: 1
+fs: devmodeSite
 handle: devmodeSite
 hasUrls: true
 name: 'Devmode Site'
-settings:
-  autoFocalPoint: ''
-  bucket: $S3_BUCKET
-  bucketSelectionMode: manual
-  cfDistributionId: CLOUDFRONT_DISTRIBUTION_ID
-  cfPrefix: $CLOUDFRONT_PATH_PREFIX
-  expires: '3 months'
-  keyId: $S3_KEY_ID
-  makeUploadsPublic: ''
-  region: $S3_REGION
-  secret: $S3_SECRET
-  storageClass: ''
-  subfolder: site
 sortOrder: 5
-type: craft\awss3\Volume
 url: $CLOUDFRONT_URL
diff --git a/cms/config/project/volumes/devmodeTranscripts--bd8ef0d7-f73b-4138-ac52-c14d11dd780e.yaml b/cms/config/project/volumes/devmodeTranscripts--bd8ef0d7-f73b-4138-ac52-c14d11dd780e.yaml
index a901e398..896d11ed 100644
--- a/cms/config/project/volumes/devmodeTranscripts--bd8ef0d7-f73b-4138-ac52-c14d11dd780e.yaml
+++ b/cms/config/project/volumes/devmodeTranscripts--bd8ef0d7-f73b-4138-ac52-c14d11dd780e.yaml
@@ -23,30 +23,16 @@ fieldLayouts:
             step: null
             tip: null
             title: null
-            type: craft\fieldlayoutelements\AssetTitleField
+            type: craft\fieldlayoutelements\assets\AssetTitleField
             warning: null
             width: 100
         name: Content
         sortOrder: 1
+fs: devmodeTranscripts
 handle: devmodeTranscripts
 hasUrls: true
 name: 'Devmode Transcripts'
-settings:
-  addSubfolderToRootUrl: '1'
-  autoFocalPoint: ''
-  bucket: $S3_BUCKET
-  bucketSelectionMode: manual
-  cfDistributionId: $CLOUDFRONT_DISTRIBUTION_ID
-  cfPrefix: $CLOUDFRONT_PATH_PREFIX
-  expires: '3 months'
-  keyId: $S3_KEY_ID
-  makeUploadsPublic: ''
-  region: $S3_REGION
-  secret: $S3_SECRET
-  storageClass: ''
-  subfolder: transcripts
 sortOrder: 7
 titleTranslationKeyFormat: null
 titleTranslationMethod: null
-type: craft\awss3\Volume
 url: $CLOUDFRONT_URL
diff --git a/cms/config/project/volumes/devmodeUsers--98f56e95-4be6-4238-a110-1f21574fa642.yaml b/cms/config/project/volumes/devmodeUsers--98f56e95-4be6-4238-a110-1f21574fa642.yaml
index 1d9b7033..9f97a285 100644
--- a/cms/config/project/volumes/devmodeUsers--98f56e95-4be6-4238-a110-1f21574fa642.yaml
+++ b/cms/config/project/volumes/devmodeUsers--98f56e95-4be6-4238-a110-1f21574fa642.yaml
@@ -8,22 +8,9 @@ fieldLayouts:
             sortOrder: 1
         name: Content
         sortOrder: 1
+fs: devmodeUsers
 handle: devmodeUsers
 hasUrls: true
 name: 'Devmode Users'
-settings:
-  autoFocalPoint: ''
-  bucket: $S3_BUCKET
-  bucketSelectionMode: manual
-  cfDistributionId: $CLOUDFRONT_DISTRIBUTION_ID
-  cfPrefix: $CLOUDFRONT_PATH_PREFIX
-  expires: '3 months'
-  keyId: $S3_KEY_ID
-  makeUploadsPublic: ''
-  region: $S3_REGION
-  secret: $S3_SECRET
-  storageClass: ''
-  subfolder: users
 sortOrder: 6
-type: craft\awss3\Volume
 url: $CLOUDFRONT_URL
diff --git a/cms/modules/sitemodule/src/SiteModule.php b/cms/modules/sitemodule/src/SiteModule.php
index 27a53967..74b6db06 100755
--- a/cms/modules/sitemodule/src/SiteModule.php
+++ b/cms/modules/sitemodule/src/SiteModule.php
@@ -10,19 +10,17 @@
 
 namespace modules\sitemodule;
 
+use Craft;
+use craft\events\RegisterTemplateRootsEvent;
+use craft\events\TemplateEvent;
+use craft\i18n\PhpMessageSource;
 use craft\web\twig\variables\CraftVariable;
+use craft\web\View;
 use modules\sitemodule\assetbundles\sitemodule\SiteModuleAsset;
 use modules\sitemodule\services\Calendar;
 use modules\sitemodule\services\RemoteFile;
 use modules\sitemodule\services\Transcript;
 use modules\sitemodule\variables\SiteVariable;
-
-use Craft;
-use craft\events\RegisterTemplateRootsEvent;
-use craft\events\TemplateEvent;
-use craft\i18n\PhpMessageSource;
-use craft\web\View;
-
 use yii\base\Event;
 use yii\base\InvalidConfigException;
 use yii\base\Module;
@@ -44,9 +42,9 @@ class SiteModule extends Module
     // =========================================================================
 
     /**
-     * @var SiteModule
+     * @var ?SiteModule
      */
-    public static $instance;
+    public static ?SiteModule $instance = null;
 
     // Public Methods
     // =========================================================================
@@ -62,7 +60,7 @@ public function __construct($id, $parent = null, array $config = [])
         // Translation category
         $i18n = Craft::$app->getI18n();
         /** @noinspection UnSafeIsSetOverArrayInspection */
-        if (!isset($i18n->translations[$id]) && !isset($i18n->translations[$id.'*'])) {
+        if (!isset($i18n->translations[$id]) && !isset($i18n->translations[$id . '*'])) {
             $i18n->translations[$id] = [
                 'class' => PhpMessageSource::class,
                 'sourceLanguage' => 'en-US',
@@ -74,13 +72,19 @@ public function __construct($id, $parent = null, array $config = [])
 
         // Base template directory
         Event::on(View::class, View::EVENT_REGISTER_CP_TEMPLATE_ROOTS, function (RegisterTemplateRootsEvent $e) {
-            if (is_dir($baseDir = $this->getBasePath().DIRECTORY_SEPARATOR.'templates')) {
+            if (is_dir($baseDir = $this->getBasePath() . DIRECTORY_SEPARATOR . 'templates')) {
                 $e->roots[$this->id] = $baseDir;
             }
         });
 
         // Set this as the global instance of this module class
         static::setInstance($this);
+        // Register our components
+        $config['components'] = [
+            'calendar' => Calendar::class,
+            'remoteFile' => RemoteFile::class,
+            'transcript' => Transcript::class,
+        ];
 
         parent::__construct($id, $parent, $config);
     }
@@ -88,46 +92,31 @@ public function __construct($id, $parent = null, array $config = [])
     /**
      * @inheritdoc
      */
-    public function init()
+    public function init(): void
     {
         parent::init();
         self::$instance = $this;
-
-        // Register our components
-        $this->setComponents([
-            'calendar' => [
-                'class' => Calendar::class,
-            ],
-            'remoteFile' => [
-                'class' => RemoteFile::class,
-            ],
-            'transcript' => [
-                'class' => Transcript::class,
-            ]
-        ]);
-
         // Register our variables
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event) {
+            static function (Event $event) {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('site', SiteVariable::class);
             }
         );
-
         // Register our Asset bundle for CP requests
         if (Craft::$app->getRequest()->getIsCpRequest()) {
             Event::on(
                 View::class,
                 View::EVENT_BEFORE_RENDER_TEMPLATE,
-                function (TemplateEvent $event) {
+                static function (TemplateEvent $event) {
                     try {
                         Craft::$app->getView()->registerAssetBundle(SiteModuleAsset::class);
                     } catch (InvalidConfigException $e) {
                         Craft::error(
-                            'Error registering AssetBundle - '.$e->getMessage(),
+                            'Error registering AssetBundle - ' . $e->getMessage(),
                             __METHOD__
                         );
                     }
diff --git a/cms/modules/sitemodule/src/assetbundles/sitemodule/SiteModuleAsset.php b/cms/modules/sitemodule/src/assetbundles/sitemodule/SiteModuleAsset.php
index 798d8412..e4141c55 100755
--- a/cms/modules/sitemodule/src/assetbundles/sitemodule/SiteModuleAsset.php
+++ b/cms/modules/sitemodule/src/assetbundles/sitemodule/SiteModuleAsset.php
@@ -10,7 +10,6 @@
 
 namespace modules\sitemodule\assetbundles\sitemodule;
 
-use Craft;
 use craft\web\AssetBundle;
 use craft\web\assets\cp\CpAsset;
 
@@ -27,7 +26,7 @@ class SiteModuleAsset extends AssetBundle
     /**
      * @inheritdoc
      */
-    public function init()
+    public function init(): void
     {
         $this->sourcePath = "@modules/sitemodule/assetbundles/sitemodule/dist";
 
@@ -46,3 +45,4 @@ public function init()
         parent::init();
     }
 }
+
diff --git a/cms/modules/sitemodule/src/controllers/SiteController.php b/cms/modules/sitemodule/src/controllers/SiteController.php
index 30d5cdd7..c6053b9c 100644
--- a/cms/modules/sitemodule/src/controllers/SiteController.php
+++ b/cms/modules/sitemodule/src/controllers/SiteController.php
@@ -13,7 +13,6 @@
 use Craft;
 use craft\elements\Entry;
 use craft\web\Controller;
-
 use Stringy\Stringy;
 use yii\web\Response;
 
@@ -27,7 +26,7 @@ class SiteController extends Controller
     // Protected Properties
     // =========================================================================
 
-    protected $allowAnonymous = ['episodes', 'get-csrf'];
+    protected int|bool|array $allowAnonymous = ['episodes', 'get-csrf'];
 
     // Public Methods
     // =========================================================================
@@ -36,44 +35,42 @@ class SiteController extends Controller
      * Handle requests for the performance detail table
      *
      * @param string $sort
-     * @param int    $page
-     * @param int    $per_page
+     * @param int $page
+     * @param int $per_page
      * @param string $filter
      *
      * @return Response
      */
     public function actionEpisodes(
         string $sort = 'postDate|DESC',
-        int $page = 1,
-        int $per_page = 20,
-        $filter = ''
-    ): Response {
+        int    $page = 1,
+        int    $per_page = 20,
+        string $filter = ''
+    ): Response
+    {
         $data = [];
         $sortField = 'postDate';
         $sortType = 'DESC';
         // Figure out the sorting type
         if ($sort !== '') {
-            if (strpos($sort, '|') === false) {
+            if (!str_contains($sort, '|')) {
                 $sortField = $sort;
             } else {
-                list($sortField, $sortType) = explode('|', $sort);
+                [$sortField, $sortType] = explode('|', $sort);
             }
         }
         // Query the db table
         $offset = ($page - 1) * $per_page;
         $query = Entry::find()
             ->section('episodes')
-            ->offset($offset)
-        ;
+            ->offset($offset);
         if ($filter !== '') {
             $query
-                ->search($filter)
-            ;
+                ->search($filter);
         }
         $query
             ->orderBy("{$sortField} {$sortType}")
-            ->limit($per_page)
-        ;
+            ->limit($per_page);
         $episodes = $query->all();
         if ($episodes) {
             $stats = [];
diff --git a/cms/modules/sitemodule/src/helpers/Config.php b/cms/modules/sitemodule/src/helpers/Config.php
index 8717270c..1718f0b0 100644
--- a/cms/modules/sitemodule/src/helpers/Config.php
+++ b/cms/modules/sitemodule/src/helpers/Config.php
@@ -24,13 +24,13 @@ class Config
     // Constants
     // =========================================================================
 
-    const PHP_SUFFIX = '.php';
+    protected const PHP_SUFFIX = '.php';
 
     // Static Methods
     // =========================================================================
 
     /**
-     * Loads a config file from, trying @craft/config first, then the modules's
+     * Loads a config file from, trying @craft/config first, then the module's
      * @modules/sitemodule
      *
      * @param string $fileName
@@ -43,10 +43,10 @@ public static function getConfigFromFile(string $fileName): array
         $currentEnv = Craft::$app->getConfig()->env;
 
         // Try craft/config first
-        $path = Craft::getAlias('@config/'.$fileName, false);
+        $path = Craft::getAlias('@config/' . $fileName, false);
         if ($path === false || !file_exists($path)) {
             // Now try our own internal config
-            $path = Craft::getAlias('@modules/sitemodule/'.$fileName, false);
+            $path = Craft::getAlias('@modules/sitemodule/' . $fileName, false);
             if ($path === false || !file_exists($path)) {
                 return [];
             }
@@ -79,3 +79,4 @@ public static function getConfigFromFile(string $fileName): array
     // Private Methods
     // =========================================================================
 }
+
diff --git a/cms/modules/sitemodule/src/services/Calendar.php b/cms/modules/sitemodule/src/services/Calendar.php
index d0dcce23..685a5f1b 100644
--- a/cms/modules/sitemodule/src/services/Calendar.php
+++ b/cms/modules/sitemodule/src/services/Calendar.php
@@ -22,7 +22,7 @@ class Calendar extends Component
     // Constants
     // =========================================================================
 
-    const SHOW_ICS_FEED_URL = "https://trello.com/calendar/58818099de7afeb3eccf53c3/596c082de8b3646b91fe224c/a33556c5da5218fe3ed14f368b6b77bc.ics";
+    protected const SHOW_ICS_FEED_URL = "https://trello.com/calendar/58818099de7afeb3eccf53c3/596c082de8b3646b91fe224c/a33556c5da5218fe3ed14f368b6b77bc.ics";
 
     // Public Methods
     // =========================================================================
diff --git a/cms/modules/sitemodule/src/services/RemoteFile.php b/cms/modules/sitemodule/src/services/RemoteFile.php
index 71eb6215..ae930ca0 100644
--- a/cms/modules/sitemodule/src/services/RemoteFile.php
+++ b/cms/modules/sitemodule/src/services/RemoteFile.php
@@ -12,6 +12,7 @@
 
 use Craft;
 use craft\base\Component;
+use Throwable;
 
 /**
  * @author    nystudio107
@@ -42,7 +43,7 @@ public function fetch(string $url): ?string
                 $reason = $response->getReasonPhrase();
                 Craft::error("Invalid response from API: ${reason} -- ${url}", __METHOD__);
             }
-        } catch (\Throwable $e) {
+        } catch (Throwable $e) {
             Craft::error($e->getMessage() . " -- ${url}", 'site-module');
         }
 
diff --git a/cms/modules/sitemodule/src/services/Transcript.php b/cms/modules/sitemodule/src/services/Transcript.php
index 581b869b..048cf5c6 100644
--- a/cms/modules/sitemodule/src/services/Transcript.php
+++ b/cms/modules/sitemodule/src/services/Transcript.php
@@ -11,17 +11,16 @@
 namespace modules\sitemodule\services;
 
 use Composer\Semver\Semver;
-use craft\helpers\ArrayHelper;
-use Jean85\PrettyVersions;
-use modules\sitemodule\SiteModule;
-
 use Craft;
 use craft\base\Component;
-
+use Jean85\PrettyVersions;
 use League\Csv\AbstractCsv;
 use League\Csv\Exception;
 use League\Csv\Reader;
 use League\Csv\Statement;
+use League\Csv\UnableToProcessCsv;
+use modules\sitemodule\SiteModule;
+use Throwable;
 
 /**
  * @author    nystudio107
@@ -33,7 +32,7 @@ class Transcript extends Component
     // Constants
     // =========================================================================
 
-    const LEAGUE_CSV_PACKAGE = 'league/csv';
+    protected const LEAGUE_CSV_PACKAGE = 'league/csv';
 
     // Public Methods
     // =========================================================================
@@ -43,6 +42,7 @@ class Transcript extends Component
      *
      * @param string $url
      * @return array|null
+     * @throws UnableToProcessCsv
      */
     public function fetch(string $url): ?array
     {
@@ -51,6 +51,7 @@ public function fetch(string $url): ?array
         $remoteFile = SiteModule::$instance->remoteFile;
         $transcriptContents = $remoteFile->fetch($url);
         if ($transcriptContents) {
+            $csv = null;
             // If your CSV document was created or is read on a Macintosh computer,
             // add the following lines before using the library to help PHP detect line ending in Mac OS X
             if (!ini_get('auto_detect_line_endings')) {
@@ -64,7 +65,7 @@ public function fetch(string $url): ?array
                 Craft::error($e, __METHOD__);
             }
             // If we have headers, then we have a file, so parse it
-            if ($headers !== null) {
+            if ($csv !== null && $headers !== null) {
                 switch ($this->getLeagueCsvVersion()) {
                     case 8:
                         $result = $this->importCsvApi8($csv);
@@ -129,7 +130,7 @@ protected function getLeagueCsvVersion(): int
         try {
             $pv = PrettyVersions::getVersion(self::LEAGUE_CSV_PACKAGE);
             $installedVersion = $pv->getPrettyVersion();
-        } catch (\Throwable $e) {
+        } catch (Throwable $e) {
             Craft::error($e, __METHOD__);
         }
         if ($installedVersion) {
diff --git a/cms/modules/sitemodule/src/translations/en/site-module.php b/cms/modules/sitemodule/src/translations/en/site-module.php
index 21050184..cbd41558 100755
--- a/cms/modules/sitemodule/src/translations/en/site-module.php
+++ b/cms/modules/sitemodule/src/translations/en/site-module.php
@@ -14,5 +14,5 @@
  * @since     1.0.0
  */
 return [
-    'Site plugin loaded' => 'Site plugin loaded',
+    '{name} module loaded' => '{name} module loaded',
 ];
diff --git a/cms/modules/sitemodule/src/variables/SiteVariable.php b/cms/modules/sitemodule/src/variables/SiteVariable.php
index a28ef946..bc970f61 100644
--- a/cms/modules/sitemodule/src/variables/SiteVariable.php
+++ b/cms/modules/sitemodule/src/variables/SiteVariable.php
@@ -10,12 +10,10 @@
 
 namespace modules\sitemodule\variables;
 
-use Craft;
 use craft\helpers\Json;
-
-use yii\base\Exception;
-
+use League\Csv\UnableToProcessCsv;
 use modules\sitemodule\SiteModule;
+use function is_string;
 
 /**
  * @author    nystudio107
@@ -32,7 +30,7 @@ class SiteVariable
      *
      * @return mixed|null
      */
-    public function webmentions(string $url)
+    public function webmentions(string $url): mixed
     {
         $remoteFile = SiteModule::$instance->remoteFile;
         $result = $remoteFile->fetch($url);
@@ -40,7 +38,7 @@ public function webmentions(string $url)
             $result = Json::decodeIfJson($result);
         }
         // Return null if the JSON decode fails
-        if (\is_string($result)) {
+        if (is_string($result)) {
             $result = null;
         }
 
@@ -52,12 +50,11 @@ public function webmentions(string $url)
      *
      * @param string $url
      * @return array|null
+     * @throws UnableToProcessCsv
      */
     public function getTranscript(string $url): ?array
     {
-        $transcript = SiteModule::$instance->transcript;
-
-        return $transcript->fetch($url);
+        return SiteModule::$instance->transcript->fetch($url);
     }
 
     /**
@@ -67,8 +64,6 @@ public function getTranscript(string $url): ?array
      */
     public function getCalendarFeedUrl(): string
     {
-        $calendar = SiteModule::$instance->calendar;
-
-        return $calendar->getCalendarFeedUrl();
+        return SiteModule::$instance->calendar->getCalendarFeedUrl();
     }
 }
diff --git a/cms/templates/_layouts/global-variables.twig b/cms/templates/_layouts/global-variables.twig
index 8c26a74c..4700abcb 100644
--- a/cms/templates/_layouts/global-variables.twig
+++ b/cms/templates/_layouts/global-variables.twig
@@ -8,7 +8,7 @@
 │                                  htmlPage                                   │
 └─────────────────────────────────────────────────────────────────────────────┘
 #}
-{% spaceless %}
+{% apply spaceless %}
 
     {# -- Prefetch & preconnect headers and links -- #}
     {% set prefetchUrls = [
@@ -28,4 +28,4 @@
     {% block htmlPage %}
     {% endblock %}
 
-{% endspaceless %}
+{% endapply %}
diff --git a/cms/templates/_partials/amp-info-footer.twig b/cms/templates/_partials/amp-info-footer.twig
index e745d6f1..3b54fefd 100755
--- a/cms/templates/_partials/amp-info-footer.twig
+++ b/cms/templates/_partials/amp-info-footer.twig
@@ -1,15 +1,20 @@
-{% spaceless %}
+{% apply spaceless %}
     {% set hosts = craft.users.group("owners").all() %}
-{% endspaceless %}
+{% endapply %}
 <footer>
     <div class="bg-repeat header-background relative footer-background">
-        <div class="w-full md:w-auto bg-devmode-yellow text-devmode-pink inline-block py-4 px-8 absolute bottom-0 left-0">
+        <div
+            class="w-full md:w-auto bg-devmode-yellow text-devmode-pink inline-block py-4 px-8 absolute bottom-0 left-0">
             <div class="inline text-devmode-pink font-mono italic text-sm align-middle">
-                // Copyright &copy;{{ now |date("Y") }} {% for host in hosts %}{{ host.fullName }}{% if not loop.last %}, {% endif %}{% endfor %}
-                <br />
-                // Site by<a class="navbar-link font-mono text-sm" href="https://nystudio107.com/" target="_blank" rel="noopener">nystudio107.com</a>designed by<a class="navbar-link font-mono text-sm" href="https://codemdd.io/" target="_blank" rel="noopener">codemdd.io</a></span>
-                <br />
-                <br />
+                // Copyright
+                &copy;{{ now |date("Y") }} {% for host in hosts %}{{ host.fullName }}{% if not loop.last %}, {% endif %}{% endfor %}
+                <br/>
+                // Site by<a class="navbar-link font-mono text-sm" href="https://nystudio107.com/" target="_blank"
+                             rel="noopener">nystudio107.com</a>designed by<a class="navbar-link font-mono text-sm"
+                                                                             href="https://codemdd.io/" target="_blank"
+                                                                             rel="noopener">codemdd.io</a></span>
+                <br/>
+                <br/>
                 {% verbatim %}
                     <span class="whitespace-no-wrap not-italic">{{ footer.privacyPolicy }}</span> <span class="whitespace-no-wrap not-italic">{{ footer.termsOfService }}</span>
                 {% endverbatim %}
diff --git a/cms/templates/_partials/info-footer.twig b/cms/templates/_partials/info-footer.twig
index fcd51130..1186af7e 100755
--- a/cms/templates/_partials/info-footer.twig
+++ b/cms/templates/_partials/info-footer.twig
@@ -1,17 +1,23 @@
 {% set backgroundUrl = "#{baseUrl}site/devmode-fm-dark-bg.svg" %}
 {% from "_partials/macros.twig" import displayCodeLines %}
-{% spaceless %}
+{% apply spaceless %}
     {% set hosts = craft.users.group("owners").all() %}
-{% endspaceless %}
+{% endapply %}
 <footer>
-    <div class="lazyload bg-repeat header-background relative" style="min-height: 18rem; background-image: url('{{ backgroundUrl }}')">
-        <div class="w-full md:w-auto bg-devmode-yellow text-devmode-pink inline-block py-4 px-8 absolute bottom-0 left-0">
+    <div class="lazyload bg-repeat header-background relative"
+         style="min-height: 18rem; background-image: url('{{ backgroundUrl }}')">
+        <div
+            class="w-full md:w-auto bg-devmode-yellow text-devmode-pink inline-block py-4 px-8 absolute bottom-0 left-0">
             <div class="inline text-devmode-pink font-mono italic text-sm align-middle">
-                // Copyright &copy;{{ now |date("Y") }} {% for host in hosts %}{{ host.fullName }}{% if not loop.last %}, {% endif %}{% endfor %}
-                <br />
-                // Site by<a class="navbar-link font-mono text-sm" href="https://nystudio107.com/" target="_blank" rel="noopener">nystudio107.com</a>designed by<a class="navbar-link font-mono text-sm" href="https://codemdd.io/" target="_blank" rel="noopener">codemdd.io</a></span>
-                <br />
-                <br />
+                // Copyright
+                &copy;{{ now |date("Y") }} {% for host in hosts %}{{ host.fullName }}{% if not loop.last %}, {% endif %}{% endfor %}
+                <br/>
+                // Site by<a class="navbar-link font-mono text-sm" href="https://nystudio107.com/" target="_blank"
+                             rel="noopener">nystudio107.com</a>designed by<a class="navbar-link font-mono text-sm"
+                                                                             href="https://codemdd.io/" target="_blank"
+                                                                             rel="noopener">codemdd.io</a></span>
+                <br/>
+                <br/>
                 {% verbatim %}
                     <span class="whitespace-no-wrap not-italic">{{ footer.privacyPolicy }}</span> <span class="whitespace-no-wrap not-italic">{{ footer.termsOfService }}</span>
                 {% endverbatim %}
diff --git a/cms/templates/feed.json b/cms/templates/feed.json
index 6157220d..2d4a8e6a 100644
--- a/cms/templates/feed.json
+++ b/cms/templates/feed.json
@@ -18,7 +18,7 @@
         "avatar": "{{ hostPhoto.getUrl() }}"
     },
     "items": [
-        {% spaceless %}
+        {% apply spaceless %}
         {% for episode in craft.entries.section("episodes").all() %}
             {% set summaryText = stringy(episode.episodeSummary).lines()[0] |truncateOnWord(300) |typogrifyFeed %}
             {% set transAudioUrl = craft.transcoder.getAudioUrl(episode.episodeMedia.one(), {
@@ -38,15 +38,15 @@
                 "id": "{{ url(episode.episodeNumber) }}",
                 "url": "{{ episode.url }}",
                 "title": "{{ episode.title }}",
-                "content_html": {% filter json_encode | raw %}{% spaceless %}<p>{{ episode.episodeSummary | typogrifyFeed | nl2br  }}</p>
+                "content_html": {% filter json_encode | raw %}{% apply spaceless %}<p>{{ episode.episodeSummary | typogrifyFeed | nl2br  }}</p>
                 <ul>
                 {% for link in episode.episodeReferenceLinks %}
                 <li>
                 <a href='{{ link.linkUrl }}' >{{ link.linkName }}</a>
                 </li>
                 {% endfor %}
-                </ul>{% endspaceless %}{% endfilter %},
-                "content_text": {% filter json_encode | raw %}{% spaceless %}{{ episode.episodeSummary | striptags | typogrifyFeed | nl2br }}{% endspaceless %}{% endfilter %},
+                </ul>{% endapply %}{% endfilter %},
+                "content_text": {% filter json_encode | raw %}{% apply spaceless %}{{ episode.episodeSummary | striptags | typogrifyFeed | nl2br }}{% endapply %}{% endfilter %},
                 "summary": "{{ summaryText }}",
                 "image": "{{ showInfo.showImage.one().getUrl() }}",
                 "date_published": "{{ episode.postDate | atom }}",
@@ -61,6 +61,6 @@
                     ]
                 }{% if not loop.last %},{% endif %}
         {% endfor %}
-        {% endspaceless %}
+        {% endapply %}
     ]
 }