From 1b5f8a549397bfeec171a19ce455327ede0931d6 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Thu, 8 Jun 2023 00:18:10 +0800
Subject: [PATCH] ci: fix build [skip-cache]

---
 package.json                                            | 5 +++--
 packages/hydrooj/package.json                           | 4 ++--
 packages/hydrooj/src/entry/setup.ts                     | 2 +-
 packages/hydrooj/src/service/server.ts                  | 2 ++
 packages/ui-default/components/monaco/languages/yaml.ts | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 1f2e019ab..52e68f45e 100644
--- a/package.json
+++ b/package.json
@@ -68,8 +68,8 @@
         "stylus-loader": "^7.1.2",
         "supertest": "^6.3.3",
         "ts-loader": "^9.4.3",
-        "typescript": "^5.1.3",
-        "webpack": "^5.85.1",
+        "typescript": "5.0.2",
+        "webpack": "^5.86.0",
         "webpack-bundle-analyzer": "^4.9.0",
         "webpack-dev-server": "^4.15.0",
         "webpack-manifest-plugin": "^5.0.0",
@@ -78,6 +78,7 @@
     },
     "resolutions": {
         "@types/node": "18.16.1",
+        "@types/react": "18.2.8",
         "prettier": "npm:not-installable-package@1.0.0"
     }
 }
diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index 2a8cb71b6..9178a396c 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -28,7 +28,7 @@
         "emojis-list": "2.1.0",
         "fs-extra": "^11.1.1",
         "graphql": "^16.6.0",
-        "graphql-scalars": "1.22.1",
+        "graphql-scalars": "^1.22.2",
         "js-yaml": "^4.1.0",
         "koa": "^2.14.2",
         "koa-body": "^6.0.1",
@@ -60,7 +60,7 @@
         "@types/adm-zip": "^0.4.34",
         "@types/fs-extra": "^11.0.1",
         "@types/js-yaml": "^4.0.5",
-        "@types/koa": "2.13.5",
+        "@types/koa": "^2.13.6",
         "@types/koa-compress": "^4.0.3",
         "@types/koa-router": "^7.4.4",
         "@types/koa-static-cache": "^5.1.1",
diff --git a/packages/hydrooj/src/entry/setup.ts b/packages/hydrooj/src/entry/setup.ts
index d20a6df9b..f777f4614 100644
--- a/packages/hydrooj/src/entry/setup.ts
+++ b/packages/hydrooj/src/entry/setup.ts
@@ -80,7 +80,7 @@ async function get(ctx: Context) {
 async function post(ctx: Context) {
     const {
         host, port, name, username, password,
-    } = ctx.request.body;
+    } = (ctx.request as any).body;
     let mongourl = 'mongodb://';
     if (username) mongourl += `${username}:${password}@`;
     mongourl += `${host}:${port}/${name}`;
diff --git a/packages/hydrooj/src/service/server.ts b/packages/hydrooj/src/service/server.ts
index 242948dd0..45000e906 100644
--- a/packages/hydrooj/src/service/server.ts
+++ b/packages/hydrooj/src/service/server.ts
@@ -2,6 +2,7 @@ import http from 'http';
 import { tmpdir } from 'os';
 import { join, resolve } from 'path';
 import cac from 'cac';
+import type { Files } from 'formidable';
 import fs from 'fs-extra';
 import Koa from 'koa';
 import Body from 'koa-body';
@@ -83,6 +84,7 @@ interface HydroContext {
 export interface KoaContext extends Koa.Context {
     HydroContext: HydroContext;
     handler: any;
+    request: Koa.Request & { body: any, files: Files };
     session: Record<string, any>;
     render: (name: string, args: any) => Promise<void>;
     renderHTML: (name: string, args: any) => Promise<string>;
diff --git a/packages/ui-default/components/monaco/languages/yaml.ts b/packages/ui-default/components/monaco/languages/yaml.ts
index 931123f9a..b73bc9fbd 100644
--- a/packages/ui-default/components/monaco/languages/yaml.ts
+++ b/packages/ui-default/components/monaco/languages/yaml.ts
@@ -11,7 +11,7 @@ setDiagnosticsOptions({
     {
       uri: 'https://hydro.js.org/schema/problemConfig.json',
       fileMatch: ['hydro://problem/file/config.yaml'],
-      schema: problemConfigSchema,
+      schema: problemConfigSchema as any,
     },
     {
       uri: new URL('/manage/config/schema.json', window.location.href).toString(),