ui: upgrade to blueprintjs6

undefined-moe · undefined-moe · commit a9215698f900 · 2025-06-30T16:38:13.000+08:00
diff --git a/framework/eslint-config/base.mjs b/framework/eslint-config/base.mjs
@@ -92,7 +92,8 @@ export default defineConfig([
             'default-param-last': 'off',
 
             'func-call-spacing': 'off',
-            '@stylistic/func-call-spacing': ['error', 'never'],
+            'function-call-spacing': 'off',
+            '@stylistic/function-call-spacing': ['error', 'never'],
             indent: 'off',
 
             '@stylistic/indent': ['warn', 4, {
diff --git a/framework/eslint-config/package.json b/framework/eslint-config/package.json
@@ -5,11 +5,11 @@
     "main": "base.mjs",
     "dependencies": {
         "@eslint-react/eslint-plugin": "^1.52.2",
-        "@eslint/compat": "^1.3.0",
+        "@eslint/compat": "^1.3.1",
         "@eslint/eslintrc": "^3.3.1",
-        "@stylistic/eslint-plugin": "^4.4.1",
-        "@typescript-eslint/eslint-plugin": "^8.34.1",
-        "@typescript-eslint/parser": "^8.34.1",
+        "@stylistic/eslint-plugin": "^5.1.0",
+        "@typescript-eslint/eslint-plugin": "^8.35.0",
+        "@typescript-eslint/parser": "^8.35.0",
         "eslint-config-airbnb": "^19.0.4",
         "eslint-plugin-de-morgan": "^1.3.0",
         "eslint-plugin-github": "^6.0.0",
diff --git a/framework/framework/package.json b/framework/framework/package.json
@@ -19,7 +19,7 @@
         "saslprep": "^1.0.3",
         "schemastery": "^3.16.1",
         "shorty.js": "^1.0.1",
-        "ws": "^8.18.2"
+        "ws": "^8.18.3"
     },
     "devDependencies": {
         "@types/fs-extra": "^11.0.4",
diff --git a/package.json b/package.json
@@ -43,8 +43,8 @@
         "cross-env": "^7.0.3",
         "cross-spawn": "^7.0.6",
         "esbuild": "0.25.2",
-        "eslint": "^9.29.0",
-        "eslint-import-resolver-typescript": "^4.4.3",
+        "eslint": "^9.30.0",
+        "eslint-import-resolver-typescript": "^4.4.4",
         "eslint-import-resolver-webpack": "^0.13.10",
         "fs-extra": "^11.3.0",
         "globals": "^16.2.0",
@@ -53,7 +53,7 @@
         "mongodb-memory-server": "10.1.4",
         "nyc": "^17.1.0",
         "ora": "^8.2.0",
-        "oxlint": "^1.3.0",
+        "oxlint": "^1.4.0",
         "package-json": "^10.0.1",
         "semver": "^7.7.2",
         "simple-git": "^3.28.0",
diff --git a/packages/components/frontend/autocomplete/autocomplete.scss b/packages/components/frontend/autocomplete/autocomplete.scss
@@ -76,7 +76,7 @@
     text-overflow: ellipsis;
   }
 
-  &>span.bp5-icon>svg {
+  &>span.bp6-icon>svg {
     font-size: 12px;
     cursor: pointer;
     padding: 4px;
@@ -104,15 +104,15 @@
       flex-grow: 1;
     }
 
-    &>span.bp5-icon>svg {
+    &>span.bp6-icon>svg {
       color: transparent;
     }
 
     &[aria-selected='true'] {
       background-color: #fafafa;
       font-weight: 600;
 
-      &>span.bp5-icon>svg {
+      &>span.bp6-icon>svg {
         color: #1890ff;
       }
     }
@@ -121,7 +121,7 @@
       background-color: #e6f7ff;
       cursor: pointer;
 
-      &>span.bp5-icon>svg {
+      &>span.bp6-icon>svg {
         color: currentColor;
       }
     }
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -19,7 +19,7 @@
     "devDependencies": {
         "@types/diff": "^8.0.0",
         "@types/js-yaml": "^4.0.9",
-        "@types/lodash": "^4.17.18",
+        "@types/lodash": "^4.17.19",
         "sass": "^1.89.2"
     },
     "peerDependencies": {
diff --git a/packages/hydrojudge/package.json b/packages/hydrojudge/package.json
@@ -15,7 +15,7 @@
         "semver": "^7.7.2",
         "shell-quote": "^1.8.3",
         "superagent": "^10.2.1",
-        "ws": "^8.18.2"
+        "ws": "^8.18.3"
     },
     "preferUnplugged": true,
     "license": "AGPL-3.0-or-later",
diff --git a/packages/hydrojudge/src/judge/interactive.ts b/packages/hydrojudge/src/judge/interactive.ts
@@ -48,7 +48,7 @@ function judgeCase(c: NormalizedCase) {
             if (code < 32 && signalled) message = signals[code];
             else message = { message: 'Your program returned {0}.', params: [code] };
         } else {
-            const result = parse(resInteractor.stderr, c.score);
+            const result = parse(resInteractor.stderr, c.score, ctx.config.detail);
             status = result.status;
             score = result.score;
             message = result.message;
diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
@@ -41,7 +41,7 @@
         "mongodb": "^6.17.0",
         "mongodb-uri": "^0.9.7",
         "nanoid": "^5.1.5",
-        "nodemailer": "^7.0.3",
+        "nodemailer": "^7.0.4",
         "notp": "^2.0.3",
         "p-queue": "^8.1.0",
         "sanitize-filename": "^1.6.3",
@@ -52,16 +52,16 @@
         "superagent": "^10.2.1",
         "tar": "6.2.1",
         "thirty-two": "^1.0.2",
-        "ua-parser-js": "^2.0.3"
+        "ua-parser-js": "^2.0.4"
     },
     "devDependencies": {
         "@types/adm-zip": "^0.5.7",
         "@types/babel__code-frame": "^7.0.6",
         "@types/fs-extra": "^11.0.4",
         "@types/js-yaml": "^4.0.9",
         "@types/koa-static-cache": "^5.1.4",
-        "@types/lodash": "^4.17.18",
-        "@types/mime-types": "^2.1.4",
+        "@types/lodash": "^4.17.19",
+        "@types/mime-types": "^3.0.1",
         "@types/mongodb-uri": "^0.9.4",
         "@types/nodemailer": "^6.4.17",
         "@types/notp": "^2.0.5",
diff --git a/packages/ui-default/components/problemconfig/ProblemConfigTree.tsx b/packages/ui-default/components/problemconfig/ProblemConfigTree.tsx
@@ -127,7 +127,7 @@ export function SubtaskConfigTree() {
     <div className={Classes.TREE}>
       <ul className={`${Classes.TREE_NODE_LIST} ${Classes.TREE_ROOT}`}>
         <li className={Classes.TREE_NODE} onClick={autoConfigure}>
-          <div className={`${Classes.TREE_NODE_CONTENT} bp5-tree-node-content-0`}>
+          <div className={`${Classes.TREE_NODE_CONTENT} ${Classes.TREE_NODE_CONTENT}-0`}>
             <Icon icon="clean" />&nbsp;
             <span className={Classes.TREE_NODE_LABEL}>{i18n('Auto configure')}</span>
           </div>
@@ -138,7 +138,7 @@ export function SubtaskConfigTree() {
           className={Classes.TREE_NODE}
           onClick={() => dispatch({ type: 'problemconfig/addSubtask' })}
         >
-          <div className={`${Classes.TREE_NODE_CONTENT} bp5-tree-node-content-0`}>
+          <div className={`${Classes.TREE_NODE_CONTENT} ${Classes.TREE_NODE_CONTENT}-0`}>
             <Icon icon="folder-new" />&nbsp;
             <span className={Classes.TREE_NODE_LABEL}>{i18n('Add new subtask')}</span>
           </div>
diff --git a/packages/ui-default/components/problemconfig/ProblemType.tsx b/packages/ui-default/components/problemconfig/ProblemType.tsx
@@ -35,7 +35,7 @@ export default function ProblemType() {
           renderActiveTabPanelOnly
         >
           <span className={Classes.TAB}>{i18n('Problem Type')}</span>
-          <Tabs.Expander />
+          <TabsExpander />
           <Tab
             id="default"
             title={i18n('problem_type.default')}
diff --git a/packages/ui-default/components/problemconfig/tree/AddTestcase.tsx b/packages/ui-default/components/problemconfig/tree/AddTestcase.tsx
@@ -84,7 +84,7 @@ export function AddTestcase() {
 
   return (<>
     <li className={Classes.TREE_NODE} onClick={auto}>
-      <div className="bp5-tree-node-content bp5-tree-node-content-0">
+      <div className={`${Classes.TREE_NODE_CONTENT} ${Classes.TREE_NODE_CONTENT}-0`}>
         <Icon icon="clean" />&nbsp;
         <span className={Classes.TREE_NODE_LABEL}>{i18n('Auto detect')}</span>
       </div>
@@ -99,7 +99,7 @@ export function AddTestcase() {
         setOpen(true);
       }}
     >
-      <div className="bp5-tree-node-content bp5-tree-node-content-0">
+      <div className={`${Classes.TREE_NODE_CONTENT} ${Classes.TREE_NODE_CONTENT}-0`}>
         <Icon icon="clean" />&nbsp;
         <span className={Classes.TREE_NODE_LABEL}>{i18n('Add testcase')}</span>
       </div>
diff --git a/packages/ui-default/components/problemconfig/tree/SubtaskSettings.tsx b/packages/ui-default/components/problemconfig/tree/SubtaskSettings.tsx
@@ -1,7 +1,7 @@
 import { CustomSelectAutoComplete } from '@hydrooj/components';
 import { parseMemoryMB, parseTimeMS } from '@hydrooj/utils/lib/common';
 import {
-  Button, ControlGroup,
+  Button, Classes, ControlGroup,
   Dialog, DialogBody, DialogFooter,
   Icon, InputGroup, Tag,
 } from '@blueprintjs/core';
@@ -101,35 +101,35 @@ export function SubtaskSettings(props: SubtaskSettingsProps) {
       </DialogBody>
       <DialogFooter actions={<Button className="primary rounded button" onClick={onConfirm} intent="primary" text="Save" />} />
     </Dialog>
-    <li className="bp5-tree-node" onClick={() => setOpen(true)}>
-      <div className="bp5-tree-node-content">
-        <span className="bp5-tree-node-caret-none bp5-icon-standard"></span>
+    <li className={Classes.TREE_NODE} onClick={() => setOpen(true)}>
+      <div className={Classes.TREE_NODE_CONTENT}>
+        <span className={`${Classes.TREE_NODE_CARET_NONE} ${Classes.ICON_STANDARD}`}></span>
         <Icon icon="time" />
         &nbsp;&nbsp;
-        <span className={`bp5-tree-node-label${time ? '' : ' text-gray'}`}>{time || props.time || '1s'}</span>
+        <span className={`${Classes.TREE_NODE_LABEL}${time ? '' : ' text-gray'}`}>{time || props.time || '1s'}</span>
         <Icon icon="comparison" />
         &nbsp;&nbsp;
-        <span className={`bp5-tree-node-label${memory ? '' : ' text-gray'}`}>{memory || props.memory || '256m'}</span>
+        <span className={`${Classes.TREE_NODE_LABEL}${memory ? '' : ' text-gray'}`}>{memory || props.memory || '256m'}</span>
         <Icon icon="star" />
         {' '}
-        <span className="bp5-tree-node-secondary-label">{score || 0}</span>
+        <span className={Classes.TREE_NODE_SECONDARY_LABEL}>{score || 0}</span>
       </div>
     </li>
-    <li className="bp5-tree-node" onClick={() => setDepsOpen(true)}>
-      <div className="bp5-tree-node-content">
-        <span className="bp5-tree-node-caret-none bp5-icon-standard"></span>
+    <li className={Classes.TREE_NODE} onClick={() => setDepsOpen(true)}>
+      <div className={Classes.TREE_NODE_CONTENT}>
+        <span className={`${Classes.TREE_NODE_CARET_NONE} ${Classes.ICON_STANDARD}`}></span>
         <Icon icon="diagram-tree" />
         &nbsp;&nbsp;
-        <span className="bp5-tree-node-label">{i18n('Dependencies')}: {deps.length ? deps.join(', ') : i18n('(None)')}</span>
+        <span className={Classes.TREE_NODE_LABEL}>{i18n('Dependencies')}: {deps.length ? deps.join(', ') : i18n('(None)')}</span>
       </div>
     </li>
-    <li className="bp5-tree-node">
-      <div className="bp5-tree-node-content">
-        <span className="bp5-tree-node-caret-none bp5-icon-standard"></span>
+    <li className={Classes.TREE_NODE}>
+      <div className={Classes.TREE_NODE_CONTENT}>
+        <span className={`${Classes.TREE_NODE_CARET_NONE} ${Classes.ICON_STANDARD}`}></span>
         <Icon icon="asterisk" />
         &nbsp;&nbsp;
-        <span className="bp5-tree-node-label">{i18n('Scoring method')}</span>
-        <span className="bp5-tree-node-secondary-label">
+        <span className={Classes.TREE_NODE_LABEL}>{i18n('Scoring method')}</span>
+        <span className={Classes.TREE_NODE_SECONDARY_LABEL}>
           <select className="compact select" value={ctype} onChange={(e) => setType(e.target.value)}>
             <option value="min">Min</option>
             <option value="max">Max</option>
@@ -184,14 +184,14 @@ export function GlobalSettings() {
       </DialogBody>
       <DialogFooter actions={<Button className="primary rounded button" onClick={onConfirm} intent="primary" text="Save" />} />
     </Dialog>
-    <li className="bp5-tree-node" onClick={() => setOpen(true)}>
-      <div className="bp5-tree-node-content">
+    <li className="bp6-tree-node" onClick={() => setOpen(true)}>
+      <div className="bp6-tree-node-content">
         <Icon icon="time" />
         &nbsp;&nbsp;
-        <span className={`bp5-tree-node-label${time ? '' : ' text-gray'}`}>{time || '1s'}</span>
+        <span className={`bp6-tree-node-label${time ? '' : ' text-gray'}`}>{time || '1s'}</span>
         <Icon icon="comparison" />
         {' '}
-        <span className={`bp5-tree-node-secondary-label${memory ? '' : ' text-gray'}`}>{memory || '256MB'}</span>
+        <span className={`bp6-tree-node-secondary-label${memory ? '' : ' text-gray'}`}>{memory || '256MB'}</span>
       </div>
     </li>
   </>);
diff --git a/packages/ui-default/components/upload.tsx b/packages/ui-default/components/upload.tsx
@@ -1,7 +1,9 @@
+import { Classes } from '@blueprintjs/core';
+import $ from 'jquery';
 import { Dialog } from 'vj/components/dialog/index';
 import Notification from 'vj/components/notification';
 import {
-  delay, i18n, pjax, request,
+  delay, i18n, pjax, request, tpl,
 } from 'vj/utils';
 
 function onBeforeUnload(e) {
@@ -17,15 +19,20 @@ interface UploadOptions {
 }
 export default async function uploadFiles(endpoint = '', files: File[] | FileList = [], options: UploadOptions = {}) {
   const dialog = new Dialog({
-    $body: `
-      <div class="file-label" style="text-align: center; margin-bottom: 5px; color: gray; font-size: small;"></div>
-      <div class="bp5-progress-bar bp5-intent-primary bp5-no-stripes">
-        <div class="file-progress bp5-progress-meter" style="width: 0"></div>
+    $body: $(tpl(<>
+      <div className="file-label" style={{
+        textAlign: 'center', marginBottom: '5px', color: 'gray', fontSize: 'small',
+      }}></div>
+      <div className={`${Classes.PROGRESS_BAR} ${Classes.INTENT_PRIMARY} bp5-no-stripes`}>
+        <div className={`file-progress ${Classes.PROGRESS_METER}`} style={{ width: 0 }}></div>
       </div>
-      <div class="upload-label" style="text-align: center; margin: 5px 0; color: gray; font-size: small;"></div>
-      <div class="bp5-progress-bar bp5-intent-primary bp5-no-stripes">
-        <div class="upload-progress bp5-progress-meter" style="width: 0"></div>
-      </div>`,
+      <div className="upload-label" style={{
+        textAlign: 'center', margin: '5px 0', color: 'gray', fontSize: 'small',
+      }}></div>
+      <div className={`${Classes.PROGRESS_BAR} ${Classes.INTENT_PRIMARY} bp5-no-stripes`}>
+        <div className={`upload-progress ${Classes.PROGRESS_METER}`} style={{ width: 0 }}></div>
+      </div>
+    </>)),
   });
   try {
     Notification.info(i18n('Uploading files...'));
@@ -47,8 +54,8 @@ export default async function uploadFiles(endpoint = '', files: File[] | FileLis
         xhr() {
           const xhr = new XMLHttpRequest();
           xhr.upload.addEventListener('loadstart', () => {
-            $fileLabel.text(`[${+i + 1}/${files.length}] ${file.name}`);
-            $fileProgress.width(`${Math.round((+i + 1) / files.length * 100)}%`);
+            $fileLabel.text(`[${+i + 1}/${files.length}] ${file.name} `);
+            $fileProgress.width(`${Math.round((+i + 1) / files.length * 100)}% `);
             $uploadLabel.text(i18n('Uploading... ({0}%)', 0));
             $uploadProgress.width(0);
           });
@@ -57,7 +64,7 @@ export default async function uploadFiles(endpoint = '', files: File[] | FileLis
               const percentComplete = Math.round((e.loaded / e.total) * 100);
               if (percentComplete === 100) $uploadLabel.text(i18n('Processing...'));
               else $uploadLabel.text(i18n('Uploading... ({0}%)', percentComplete));
-              $uploadProgress.width(`${percentComplete}%`);
+              $uploadProgress.width(`${percentComplete}% `);
             }
           }, false);
           return xhr;
@@ -69,9 +76,9 @@ export default async function uploadFiles(endpoint = '', files: File[] | FileLis
     Notification.success(i18n('File uploaded successfully.'));
     if (options.pjax) {
       let params = '';
-      if (options.type) params += `?d=${options.type}`;
-      if (options.sidebar) params += `${params ? '&' : '?'}sidebar=true`;
-      await pjax.request({ push: false, url: `${endpoint}${params || ''}` });
+      if (options.type) params += `? d = ${options.type} `;
+      if (options.sidebar) params += `${params ? '&' : '?'} sidebar = true`;
+      await pjax.request({ push: false, url: `${endpoint}${params || ''} ` });
     }
   } catch (e) {
     console.error(e);
diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
@@ -11,7 +11,7 @@
     "cli": false
   },
   "devDependencies": {
-    "@blueprintjs/core": "^5.19.0",
+    "@blueprintjs/core": "^6.0.0",
     "@fontsource/dm-mono": "^5.2.6",
     "@fontsource/fira-code": "^5.2.6",
     "@fontsource/inconsolata": "^5.2.6",
@@ -21,7 +21,7 @@
     "@fontsource/source-code-pro": "^5.2.6",
     "@fontsource/ubuntu-mono": "^5.2.6",
     "@hydrooj/utils": "workspace:^",
-    "@sentry/browser": "^9.30.0",
+    "@sentry/browser": "^9.33.0",
     "@sentry/webpack-plugin": "^3.5.0",
     "@simplewebauthn/browser": "13.1.0",
     "@svgr/webpack": "^8.1.0",
diff --git a/packages/ui-default/pages/problem_config.page.styl b/packages/ui-default/pages/problem_config.page.styl
diff --git a/packages/ui-default/templates/contest_detail.html b/packages/ui-default/templates/contest_detail.html
diff --git a/packages/ui-default/templates/problem_detail.html b/packages/ui-default/templates/problem_detail.html
diff --git a/packages/ui-default/theme/dark.styl b/packages/ui-default/theme/dark.styl
diff --git a/packages/ui-next/package.json b/packages/ui-next/package.json
diff --git a/packages/utils/package.json b/packages/utils/package.json

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@`
`76`	`76`	`text-overflow: ellipsis;`
`77`	`77`	`}`
`78`	`78`
`79`		`- &>span.bp5-icon>svg {`
	`79`	`+ &>span.bp6-icon>svg {`
`80`	`80`	`font-size: 12px;`
`81`	`81`	`cursor: pointer;`
`82`	`82`	`padding: 4px;`
`@@ -104,15 +104,15 @@`
`104`	`104`	`flex-grow: 1;`
`105`	`105`	`}`
`106`	`106`
`107`		`- &>span.bp5-icon>svg {`
	`107`	`+ &>span.bp6-icon>svg {`
`108`	`108`	`color: transparent;`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`&[aria-selected='true'] {`
`112`	`112`	`background-color: #fafafa;`
`113`	`113`	`font-weight: 600;`
`114`	`114`
`115`		`- &>span.bp5-icon>svg {`
	`115`	`+ &>span.bp6-icon>svg {`
`116`	`116`	`color: #1890ff;`
`117`	`117`	`}`
`118`	`118`	`}`
`@@ -121,7 +121,7 @@`
`121`	`121`	`background-color: #e6f7ff;`
`122`	`122`	`cursor: pointer;`
`123`	`123`
`124`		`- &>span.bp5-icon>svg {`
	`124`	`+ &>span.bp6-icon>svg {`
`125`	`125`	`color: currentColor;`
`126`	`126`	`}`
`127`	`127`	`}`