Merge branch 'master' into puppeteer

3613837a · nanahira · 98682db4 · 6c21f352 · 3613837a · 3613837a
Commit 3613837a authored Jan 01, 2023 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 196 additions and 74 deletions

package-lock.json package-lock.json +194 -71

package.json package.json +2 -3

No files found.
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,9 +9,14 @@
      "version": "7.5.2",
      "license": "MIT",
      "dependencies": {
+<<<<<<< HEAD
        "@koishijs/cli": "^4.10.10",
        "@koishijs/loader": "^1.0.1",
        "koishi": "^4.10.10",
+=======
+        "@koishijs/loader": "^2.5.0",
+        "koishi": "^4.11.0",
+>>>>>>> master
        "load-json-file": "^6.2.0",
        "ws": "^8.2.3",
        "yaml": "^1.10.2"
@@ -187,6 +192,7 @@
        "node": ">= 8.0.0"
      }
    },
+<<<<<<< HEAD
    "node_modules/@koishijs/cli": {
      "version": "4.10.10",
      "resolved": "https://registry.npmjs.org/@koishijs/cli/-/cli-4.10.10.tgz",
@@ -212,12 +218,32 @@
      "version": "2.4.3",
      "resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-2.4.3.tgz",
      "integrity": "sha512-vk/W8TK2/AgKuvEmP6C90+V4vn51u5A3zwJMRKaPi+Sm6xVMRCtGqvUkIi1xaX00hK9EhQKEi18UbRRLKGXhWA==",
+=======
+    "node_modules/@koishijs/core": {
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.11.0.tgz",
+      "integrity": "sha512-urQGWpqifyFAqJuhfkbZVnO+OdFw/p+PZcMEelfrFi6iaKCLVXVlIO4zK4yEu+lHTwQiYwBszqu5NeoE9Z2kuA==",
+      "dependencies": {
+        "@koishijs/utils": "^6.4.0",
+        "@minatojs/core": "^2.1.0",
+        "@satorijs/core": "^1.5.2",
+        "cordis": "^2.6.0",
+        "cosmokit": "^1.4.0",
+        "fastest-levenshtein": "^1.0.16"
+      }
+    },
+    "node_modules/@koishijs/loader": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-2.5.0.tgz",
+      "integrity": "sha512-8StBIK7+/sDr65d+MEm8htXblVCrIZORXcEO/O7Wupn0eMyktm7GI0kL7C7uLhHT5Yoiby36T5LeNbaKWeKWlg==",
+>>>>>>> master
      "dependencies": {
        "dotenv": "^16.0.3",
        "js-yaml": "^4.1.0",
        "ns-require": "^1.1.4"
      },
      "peerDependencies": {
+<<<<<<< HEAD
        "koishi": "^4.10.10"
      }
    },
@@ -256,6 +282,9 @@
      "integrity": "sha512-cuKYfsVY1Ok6sxDxvWP7ZWS0sUshKiUkno3TCRy/GX8EbB2NUYkTG9zbR7b1Sd1iQq9sh7am3qRwq1Bk/cyF/Q==",
      "dependencies": {
        "js-yaml": "^4.1.0"
+=======
+        "@koishijs/core": "^4.11.0"
+>>>>>>> master
      }
    },
    "node_modules/@koishijs/loader/node_modules/argparse": {
@@ -275,22 +304,22 @@
      }
    },
    "node_modules/@koishijs/utils": {
-      "version": "6.3.4",
-      "resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-6.3.4.tgz",
-      "integrity": "sha512-P8hQOTVYsk5rCkBcYbIKKKBm58etGlY/Q3xOuMEyz6BlTe0V8A6lFv56nInuPIaTOf4XprTceZBE6Oe3lC8RuQ==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-6.4.0.tgz",
+      "integrity": "sha512-GMIBnr4W6JZST5hB8u1sVH3+MH7ZcGIUy3IJU538Z4j/JbCoRnydNnCKggs7tB1JFHqq/7eHAsks/2WrfA/1ng==",
      "dependencies": {
-        "cosmokit": "^1.3.6",
+        "cosmokit": "^1.4.0",
        "inaba": "^1.1.1",
-        "reggol": "^1.3.3",
+        "reggol": "^1.3.4",
        "schemastery": "^3.6.1"
      }
    },
    "node_modules/@minatojs/core": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@minatojs/core/-/core-2.0.3.tgz",
-      "integrity": "sha512-VZo1sDl9jLcejMyEfd/A+yZt/qre3vB+woSIZmWCm78zBR+CkFPk56y5EAMnu0cW9kgtq0p/KHa2VUVXyN71Bw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@minatojs/core/-/core-2.1.0.tgz",
+      "integrity": "sha512-buMhprBZoMmH5vcy98YDKyBSDrt/C6VSNgbPKILPEJf0jikVmURHniqV1zZ+KL7M1jbOIHcyJE5w3+cMe4ifLQ==",
      "dependencies": {
-        "cosmokit": "^1.3.4"
+        "cosmokit": "^1.4.0"
      }
    },
    "node_modules/@nodelib/fs.scandir": {
@@ -329,38 +358,62 @@
      }
    },
    "node_modules/@satorijs/core": {
+<<<<<<< HEAD
      "version": "1.4.11",
      "resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.4.11.tgz",
      "integrity": "sha512-8EsVA5esShEqYMwwXipGwx7obwVb3Lc0NwBmjZWNj2++WYKYg+jQ0Iatgd2jcJhNX2H9ziqnwu05aHtWo+mSsA==",
      "dependencies": {
        "@satorijs/element": "^2.2.2",
+=======
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.5.2.tgz",
+      "integrity": "sha512-5hnqwI6mSpDyzSHHIaaJBCwoiDjvDDBeD81rIwYW4JDKEKBOGWgVqNi4g+ru2s8gyR+M8cTvH71a1B2iOQiQTQ==",
+      "dependencies": {
+        "@satorijs/element": "^2.3.1",
+>>>>>>> master
        "cordis": "^2.6.0",
-        "cordis-axios": "^2.1.6",
-        "cosmokit": "^1.3.6",
-        "reggol": "^1.3.3",
+        "cordis-axios": "^2.2.0",
+        "cosmokit": "^1.4.0",
+        "reggol": "^1.3.4",
        "schemastery": "^3.6.1",
        "ws": "^8.11.0"
      }
    },
    "node_modules/@satorijs/element": {
+<<<<<<< HEAD
      "version": "2.2.2",
      "resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.2.2.tgz",
      "integrity": "sha512-t6K0weO+GwqHhP/C9GTchck0jDk8c63kiAr9hHEVQX3nx/+fjGquTDGzBc4WzOVc105wePWRvV1UtvRaa0I9FQ==",
+=======
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.3.1.tgz",
+      "integrity": "sha512-p1hQVy56nfJ2dw1noEHkV7hKpC9yqe5u3Vla+CSPqXU12uB4zqv96rjT9n4WulNGl8XTzqWxp8q8KWqhSI8JFA==",
+>>>>>>> master
      "dependencies": {
-        "cosmokit": "^1.3.6"
+        "cosmokit": "^1.4.0"
      }
    },
    "node_modules/@satorijs/satori": {
+<<<<<<< HEAD
      "version": "1.4.11",
      "resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.4.11.tgz",
      "integrity": "sha512-nQHch/Ya1ClsNO9anJYfNnpiMFHCc1ihxdWuVKKpGOXRxuGMOtnbkB/Qa+NuBT+887E2NsFfTBoFgt8vuExxew==",
      "dependencies": {
        "@koa/router": "^10.1.1",
        "@satorijs/core": "1.4.11",
+=======
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.5.2.tgz",
+      "integrity": "sha512-e5l1NH9VVU8+4CeyKUWtr0mZ0E8WutvUzzqSuA5NCYkMMJ8A8xjqlHDOZtoEjtbp/AF9vnYVGHZC25DJw0zhig==",
+      "dependencies": {
+        "@koa/router": "^10.1.1",
+        "@satorijs/core": "1.5.2",
+>>>>>>> master
        "@types/koa": "*",
        "@types/koa__router": "*",
        "@types/ws": "^8.5.3",
        "agent-base": "^6.0.2",
+        "file-type": "^16.5.4",
        "http-proxy-agent": "^5.0.0",
        "https-proxy-agent": "^5.0.1",
        "koa": "^2.14.1",
@@ -441,9 +494,9 @@
      }
    },
    "node_modules/@types/express-serve-static-core": {
-      "version": "4.17.31",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
-      "integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
+      "version": "4.17.32",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz",
+      "integrity": "sha512-aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA==",
      "dependencies": {
        "@types/node": "*",
        "@types/qs": "*",
@@ -532,9 +585,9 @@
      }
    },
    "node_modules/@types/ws": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-      "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz",
+      "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==",
      "dependencies": {
        "@types/node": "*"
      }
@@ -808,9 +861,9 @@
      }
    },
    "node_modules/anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
      "dependencies": {
        "normalize-path": "^3.0.0",
        "picomatch": "^2.0.4"
@@ -1095,13 +1148,12 @@
      }
    },
    "node_modules/cordis-axios": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/cordis-axios/-/cordis-axios-2.1.6.tgz",
-      "integrity": "sha512-GaJq5zoh4XRAFHEOyCLyU7kIcRrV7hqDVEh5kF4t047TmROAUaLukPKSMeMVMNohpKW4Vz+tj2FGEqMx5NuBQg==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cordis-axios/-/cordis-axios-2.2.0.tgz",
+      "integrity": "sha512-gpFyu+nZoTSiPD1H8LsUxq2H7rtLFnm8UL5jOtwaTor20EmyVXiaSRV8Cc0yIcnobqmMmcY3VYVcXTir++DLtQ==",
      "dependencies": {
        "axios": "~1.1.3",
-        "cosmokit": "^1.3.4",
-        "file-type": "^16.5.4",
+        "cosmokit": "^1.4.0",
        "mime-db": "^1.52.0",
        "schemastery": "^3.6.1"
      },
@@ -1113,9 +1165,9 @@
      }
    },
    "node_modules/cosmokit": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/cosmokit/-/cosmokit-1.3.6.tgz",
-      "integrity": "sha512-buZvC7fuqBbSimJfkaaTJmlelpgj56L7VybjNkCy5UVvShMVQHi/bTZcuBfYLBwpuebSfvDZPwwHS5IfcoAnxg=="
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/cosmokit/-/cosmokit-1.4.0.tgz",
+      "integrity": "sha512-9Y5epwkPxnWDSjweuWoFATY8GKg9N1/r/3wL32Cjs7FIvo0S9syyY39xmNKq7+SZjbw+9bZUSbeQSbJaqufV3Q=="
    },
    "node_modules/cross-spawn": {
      "version": "7.0.3",
@@ -2176,6 +2228,7 @@
      }
    },
    "node_modules/koishi": {
+<<<<<<< HEAD
      "version": "4.10.10",
      "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.10.10.tgz",
      "integrity": "sha512-92VxR/7AL8l2eyd0MOWi5Nc/nLe2lX9ftglsMkqHvvImFkQma+2kSuexuxVLjcDmkAL6LWI27VxyuUH35jl5PQ==",
@@ -2185,6 +2238,24 @@
        "@satorijs/satori": "^1.4.11",
        "file-type": "^16.5.4",
        "ns-require": "^1.1.4"
+=======
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.11.0.tgz",
+      "integrity": "sha512-1XGqZRRZxkUn3a0RYY8/hQ2B5/8T7eWyH8C93VYLiLKpYoPZleh47mx4rpd/fI1zBBQC3VEym0m8ApfEqwGIkg==",
+      "dependencies": {
+        "@koishijs/core": "^4.11.0",
+        "@koishijs/loader": "^2.5.0",
+        "@koishijs/utils": "^6.4.0",
+        "@satorijs/satori": "^1.5.2",
+        "cac": "^6.7.14",
+        "chokidar": "^3.5.3",
+        "kleur": "^4.1.5",
+        "ns-require": "^1.1.4",
+        "throttle-debounce": "^3.0.1"
+      },
+      "bin": {
+        "koishi": "lib/cli/index.js"
+>>>>>>> master
      },
      "engines": {
        "node": ">=12.0.0"
@@ -2684,9 +2755,9 @@
      }
    },
    "node_modules/reggol": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/reggol/-/reggol-1.3.3.tgz",
-      "integrity": "sha512-AmFo4aBBLwd1IosfkQ9cnWJF+RDXjrfmY2pFeRXSLlvi1UoqMYLsltR/514R8Dr/ZfAYdcD75V/vFDK60hgyOQ==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/reggol/-/reggol-1.3.4.tgz",
+      "integrity": "sha512-E/sL4WovP0kR5EHQx3YF4ZDsI5D5baTROXaELCN1mOCB8tEOVOR3PHr807yVcGit2BfmXMSW5KyRaUAV5K8Vzw==",
      "dependencies": {
        "cosmokit": "^1.3.6",
        "object-inspect": "^1.12.2",
@@ -3419,6 +3490,7 @@
        "path-to-regexp": "^6.1.0"
      }
    },
+<<<<<<< HEAD
    "@koishijs/cli": {
      "version": "4.10.10",
      "resolved": "https://registry.npmjs.org/@koishijs/cli/-/cli-4.10.10.tgz",
@@ -3464,17 +3536,29 @@
        "@koishijs/utils": "^6.3.4",
        "@minatojs/core": "^2.0.3",
        "@satorijs/core": "^1.4.11",
+=======
+    "@koishijs/core": {
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.11.0.tgz",
+      "integrity": "sha512-urQGWpqifyFAqJuhfkbZVnO+OdFw/p+PZcMEelfrFi6iaKCLVXVlIO4zK4yEu+lHTwQiYwBszqu5NeoE9Z2kuA==",
+      "requires": {
+        "@koishijs/utils": "^6.4.0",
+        "@minatojs/core": "^2.1.0",
+        "@satorijs/core": "^1.5.2",
+>>>>>>> master
        "cordis": "^2.6.0",
-        "cosmokit": "^1.3.6",
+        "cosmokit": "^1.4.0",
        "fastest-levenshtein": "^1.0.16"
      }
    },
    "@koishijs/loader": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-1.0.1.tgz",
-      "integrity": "sha512-cuKYfsVY1Ok6sxDxvWP7ZWS0sUshKiUkno3TCRy/GX8EbB2NUYkTG9zbR7b1Sd1iQq9sh7am3qRwq1Bk/cyF/Q==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-2.5.0.tgz",
+      "integrity": "sha512-8StBIK7+/sDr65d+MEm8htXblVCrIZORXcEO/O7Wupn0eMyktm7GI0kL7C7uLhHT5Yoiby36T5LeNbaKWeKWlg==",
      "requires": {
-        "js-yaml": "^4.1.0"
+        "dotenv": "^16.0.3",
+        "js-yaml": "^4.1.0",
+        "ns-require": "^1.1.4"
      },
      "dependencies": {
        "argparse": {
@@ -3493,22 +3577,22 @@
      }
    },
    "@koishijs/utils": {
-      "version": "6.3.4",
-      "resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-6.3.4.tgz",
-      "integrity": "sha512-P8hQOTVYsk5rCkBcYbIKKKBm58etGlY/Q3xOuMEyz6BlTe0V8A6lFv56nInuPIaTOf4XprTceZBE6Oe3lC8RuQ==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-6.4.0.tgz",
+      "integrity": "sha512-GMIBnr4W6JZST5hB8u1sVH3+MH7ZcGIUy3IJU538Z4j/JbCoRnydNnCKggs7tB1JFHqq/7eHAsks/2WrfA/1ng==",
      "requires": {
-        "cosmokit": "^1.3.6",
+        "cosmokit": "^1.4.0",
        "inaba": "^1.1.1",
-        "reggol": "^1.3.3",
+        "reggol": "^1.3.4",
        "schemastery": "^3.6.1"
      }
    },
    "@minatojs/core": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@minatojs/core/-/core-2.0.3.tgz",
-      "integrity": "sha512-VZo1sDl9jLcejMyEfd/A+yZt/qre3vB+woSIZmWCm78zBR+CkFPk56y5EAMnu0cW9kgtq0p/KHa2VUVXyN71Bw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@minatojs/core/-/core-2.1.0.tgz",
+      "integrity": "sha512-buMhprBZoMmH5vcy98YDKyBSDrt/C6VSNgbPKILPEJf0jikVmURHniqV1zZ+KL7M1jbOIHcyJE5w3+cMe4ifLQ==",
      "requires": {
-        "cosmokit": "^1.3.4"
+        "cosmokit": "^1.4.0"
      }
    },
    "@nodelib/fs.scandir": {
@@ -3538,38 +3622,62 @@
      }
    },
    "@satorijs/core": {
+<<<<<<< HEAD
      "version": "1.4.11",
      "resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.4.11.tgz",
      "integrity": "sha512-8EsVA5esShEqYMwwXipGwx7obwVb3Lc0NwBmjZWNj2++WYKYg+jQ0Iatgd2jcJhNX2H9ziqnwu05aHtWo+mSsA==",
      "requires": {
        "@satorijs/element": "^2.2.2",
+=======
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.5.2.tgz",
+      "integrity": "sha512-5hnqwI6mSpDyzSHHIaaJBCwoiDjvDDBeD81rIwYW4JDKEKBOGWgVqNi4g+ru2s8gyR+M8cTvH71a1B2iOQiQTQ==",
+      "requires": {
+        "@satorijs/element": "^2.3.1",
+>>>>>>> master
        "cordis": "^2.6.0",
-        "cordis-axios": "^2.1.6",
-        "cosmokit": "^1.3.6",
-        "reggol": "^1.3.3",
+        "cordis-axios": "^2.2.0",
+        "cosmokit": "^1.4.0",
+        "reggol": "^1.3.4",
        "schemastery": "^3.6.1",
        "ws": "^8.11.0"
      }
    },
    "@satorijs/element": {
+<<<<<<< HEAD
      "version": "2.2.2",
      "resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.2.2.tgz",
      "integrity": "sha512-t6K0weO+GwqHhP/C9GTchck0jDk8c63kiAr9hHEVQX3nx/+fjGquTDGzBc4WzOVc105wePWRvV1UtvRaa0I9FQ==",
+=======
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.3.1.tgz",
+      "integrity": "sha512-p1hQVy56nfJ2dw1noEHkV7hKpC9yqe5u3Vla+CSPqXU12uB4zqv96rjT9n4WulNGl8XTzqWxp8q8KWqhSI8JFA==",
+>>>>>>> master
      "requires": {
-        "cosmokit": "^1.3.6"
+        "cosmokit": "^1.4.0"
      }
    },
    "@satorijs/satori": {
+<<<<<<< HEAD
      "version": "1.4.11",
      "resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.4.11.tgz",
      "integrity": "sha512-nQHch/Ya1ClsNO9anJYfNnpiMFHCc1ihxdWuVKKpGOXRxuGMOtnbkB/Qa+NuBT+887E2NsFfTBoFgt8vuExxew==",
      "requires": {
        "@koa/router": "^10.1.1",
        "@satorijs/core": "1.4.11",
+=======
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.5.2.tgz",
+      "integrity": "sha512-e5l1NH9VVU8+4CeyKUWtr0mZ0E8WutvUzzqSuA5NCYkMMJ8A8xjqlHDOZtoEjtbp/AF9vnYVGHZC25DJw0zhig==",
+      "requires": {
+        "@koa/router": "^10.1.1",
+        "@satorijs/core": "1.5.2",
+>>>>>>> master
        "@types/koa": "*",
        "@types/koa__router": "*",
        "@types/ws": "^8.5.3",
        "agent-base": "^6.0.2",
+        "file-type": "^16.5.4",
        "http-proxy-agent": "^5.0.0",
        "https-proxy-agent": "^5.0.1",
        "koa": "^2.14.1",
@@ -3644,9 +3752,9 @@
      }
    },
    "@types/express-serve-static-core": {
-      "version": "4.17.31",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
-      "integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
+      "version": "4.17.32",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz",
+      "integrity": "sha512-aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA==",
      "requires": {
        "@types/node": "*",
        "@types/qs": "*",
@@ -3735,9 +3843,9 @@
      }
    },
    "@types/ws": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-      "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz",
+      "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==",
      "requires": {
        "@types/node": "*"
      }
@@ -3900,9 +4008,9 @@
      }
    },
    "anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
      "requires": {
        "normalize-path": "^3.0.0",
        "picomatch": "^2.0.4"
@@ -4120,21 +4228,20 @@
      }
    },
    "cordis-axios": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/cordis-axios/-/cordis-axios-2.1.6.tgz",
-      "integrity": "sha512-GaJq5zoh4XRAFHEOyCLyU7kIcRrV7hqDVEh5kF4t047TmROAUaLukPKSMeMVMNohpKW4Vz+tj2FGEqMx5NuBQg==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cordis-axios/-/cordis-axios-2.2.0.tgz",
+      "integrity": "sha512-gpFyu+nZoTSiPD1H8LsUxq2H7rtLFnm8UL5jOtwaTor20EmyVXiaSRV8Cc0yIcnobqmMmcY3VYVcXTir++DLtQ==",
      "requires": {
        "axios": "~1.1.3",
-        "cosmokit": "^1.3.4",
-        "file-type": "^16.5.4",
+        "cosmokit": "^1.4.0",
        "mime-db": "^1.52.0",
        "schemastery": "^3.6.1"
      }
    },
    "cosmokit": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/cosmokit/-/cosmokit-1.3.6.tgz",
-      "integrity": "sha512-buZvC7fuqBbSimJfkaaTJmlelpgj56L7VybjNkCy5UVvShMVQHi/bTZcuBfYLBwpuebSfvDZPwwHS5IfcoAnxg=="
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/cosmokit/-/cosmokit-1.4.0.tgz",
+      "integrity": "sha512-9Y5epwkPxnWDSjweuWoFATY8GKg9N1/r/3wL32Cjs7FIvo0S9syyY39xmNKq7+SZjbw+9bZUSbeQSbJaqufV3Q=="
    },
    "cross-spawn": {
      "version": "7.0.3",
@@ -4914,6 +5021,7 @@
      }
    },
    "koishi": {
+<<<<<<< HEAD
      "version": "4.10.10",
      "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.10.10.tgz",
      "integrity": "sha512-92VxR/7AL8l2eyd0MOWi5Nc/nLe2lX9ftglsMkqHvvImFkQma+2kSuexuxVLjcDmkAL6LWI27VxyuUH35jl5PQ==",
@@ -4923,6 +5031,21 @@
        "@satorijs/satori": "^1.4.11",
        "file-type": "^16.5.4",
        "ns-require": "^1.1.4"
+=======
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.11.0.tgz",
+      "integrity": "sha512-1XGqZRRZxkUn3a0RYY8/hQ2B5/8T7eWyH8C93VYLiLKpYoPZleh47mx4rpd/fI1zBBQC3VEym0m8ApfEqwGIkg==",
+      "requires": {
+        "@koishijs/core": "^4.11.0",
+        "@koishijs/loader": "^2.5.0",
+        "@koishijs/utils": "^6.4.0",
+        "@satorijs/satori": "^1.5.2",
+        "cac": "^6.7.14",
+        "chokidar": "^3.5.3",
+        "kleur": "^4.1.5",
+        "ns-require": "^1.1.4",
+        "throttle-debounce": "^3.0.1"
+>>>>>>> master
      }
    },
    "levn": {
@@ -5272,9 +5395,9 @@
      "dev": true
    },
    "reggol": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/reggol/-/reggol-1.3.3.tgz",
-      "integrity": "sha512-AmFo4aBBLwd1IosfkQ9cnWJF+RDXjrfmY2pFeRXSLlvi1UoqMYLsltR/514R8Dr/ZfAYdcD75V/vFDK60hgyOQ==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/reggol/-/reggol-1.3.4.tgz",
+      "integrity": "sha512-E/sL4WovP0kR5EHQx3YF4ZDsI5D5baTROXaELCN1mOCB8tEOVOR3PHr807yVcGit2BfmXMSW5KyRaUAV5K8Vzw==",
      "requires": {
        "cosmokit": "^1.3.6",
        "object-inspect": "^1.12.2",

--- a/package.json
+++ b/package.json
@@ -36,9 +36,8 @@
    "typescript": "^4.8.2"
  },
  "dependencies": {
-    "@koishijs/cli": "^4.10.10",
-    "@koishijs/loader": "^1.0.1",
-    "koishi": "^4.10.10",
+    "@koishijs/loader": "^2.5.0",
+    "koishi": "^4.11.0",
    "load-json-file": "^6.2.0",
    "ws": "^8.2.3",
    "yaml": "^1.10.2"