diff --git a/packages/center/package.json b/packages/center/package.json index 9e088665a..ca73a0bf2 100644 --- a/packages/center/package.json +++ b/packages/center/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/center", - "version": "0.0.4", + "version": "0.1.0", "main": "package.json", "repository": "https://github.com/hydro-dev/Hydro.git", "author": "undefined ", diff --git a/packages/easy-locale/package.json b/packages/easy-locale/package.json index 01a6491d1..250fd579f 100644 --- a/packages/easy-locale/package.json +++ b/packages/easy-locale/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/easy-locale", - "version": "1.0.0", + "version": "1.1.0", "main": "package.json", "repository": "https://github.com/hydro-dev/Hydro", "author": "undefined ", diff --git a/packages/fps-importer/package.json b/packages/fps-importer/package.json index 5d7572fb0..56187cdee 100644 --- a/packages/fps-importer/package.json +++ b/packages/fps-importer/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/fps-importer", - "version": "1.2.2", + "version": "1.3.0", "description": "Import FPS problems", "main": "package.json", "repository": "https://github.com/hydro-dev/Hydro.git", diff --git a/packages/geoip/package.json b/packages/geoip/package.json index ca98e942a..a1c071de1 100644 --- a/packages/geoip/package.json +++ b/packages/geoip/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/geoip", - "version": "1.1.18", + "version": "1.2.0", "main": "package.json", "repository": "git@github.com:hydro-dev/Hydro.git", "author": "undefined ", diff --git a/packages/hydrojudge/package.json b/packages/hydrojudge/package.json index e49e22fc0..51f046b15 100644 --- a/packages/hydrojudge/package.json +++ b/packages/hydrojudge/package.json @@ -1,7 +1,7 @@ { "name": "@hydrooj/hydrojudge", "bin": "bin/hydrojudge.js", - "version": "2.8.19", + "version": "2.9.0", "main": "package.json", "author": "undefined ", "repository": "https://github.com/hydro-dev/Hydro.git", diff --git a/packages/hydrooj/TODO b/packages/hydrooj/TODO index c1643e1e8..934016f77 100644 --- a/packages/hydrooj/TODO +++ b/packages/hydrooj/TODO @@ -1,17 +1,12 @@ @requireCsrfToken 举报功能 SETTINGS_PRIVACY.allowRegisteredUsers -model.setting.ui.name pdoc.secretConfig? message.markAsRead 检查多余的索引 +hack -评测队列优先级系统 讨论浏览数量显示 -解离mail模块 -存储系统抽象化 extend problem settings -将系统设置存于本地而非数据库 添加nav排序功能 自动拓扑组件加载顺序？ add declarations to psdoc \ No newline at end of file diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 77b25c64d..17f698b2b 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.29.46", + "version": "2.30.0", "bin": "bin/hydrooj.js", "main": "src/loader", "module": "src/loader", diff --git a/packages/hydrooj/src/entry/common.ts b/packages/hydrooj/src/entry/common.ts index 5587daa07..323e8baf4 100644 --- a/packages/hydrooj/src/entry/common.ts +++ b/packages/hydrooj/src/entry/common.ts @@ -134,6 +134,7 @@ export async function template(pending: string[], fail: string[]) { try { const files = getFiles(p); for (const file of files) { + if (file.endsWith('.tsx')) global.Hydro.ui.template[file] = eval('require')(path.resolve(p, file)); global.Hydro.ui.template[file] = await fs.readFile(path.resolve(p, file), 'utf-8'); } logger.info('Template init: %s', i); diff --git a/packages/import-qduoj/package.json b/packages/import-qduoj/package.json index d6482c8a1..e98887ada 100644 --- a/packages/import-qduoj/package.json +++ b/packages/import-qduoj/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/import-qduoj", - "version": "1.2.0", + "version": "1.3.0", "description": "Import QDUOJ problem export", "main": "package.json", "repository": "https://github.com/hydro-dev/Hydro.git", diff --git a/packages/login-with-github/package.json b/packages/login-with-github/package.json index a459e8bf0..cc12df955 100644 --- a/packages/login-with-github/package.json +++ b/packages/login-with-github/package.json @@ -1,20 +1,16 @@ { "name": "@hydrooj/login-with-github", - "version": "0.0.9", + "version": "0.1.0", "main": "package.json", "repository": "git@github.com:hydro-dev/Hydro.git", "author": "undefined ", "license": "AGPL-3.0-or-later", "preferUnplugged": true, - "scripts": { - "lint": "eslint lib.ts --fix", - "build": "tsc" - }, "devDependencies": { "@types/superagent": "^4.1.12" }, "peerDependencies": { - "hydrooj": "^2.15.0" + "hydrooj": "workspace:*" }, "dependencies": { "superagent": "^6.1.0" diff --git a/packages/login-with-google/package.json b/packages/login-with-google/package.json index 37e7a5b4c..f357e570d 100644 --- a/packages/login-with-google/package.json +++ b/packages/login-with-google/package.json @@ -1,20 +1,16 @@ { "name": "@hydrooj/login-with-google", - "version": "0.0.10", + "version": "0.1.0", "main": "package.json", "repository": "git@github.com:hydro-dev/Hydro.git", "author": "undefined ", "license": "AGPL-3.0-or-later", "preferUnplugged": true, - "scripts": { - "lint": "eslint lib.ts --fix", - "build": "tsc" - }, "devDependencies": { "@types/superagent": "^4.1.12" }, "peerDependencies": { - "hydrooj": "^2.15.0" + "hydrooj": "workspace:*" }, "dependencies": { "superagent": "^6.1.0" diff --git a/packages/login-with-osu/package.json b/packages/login-with-osu/package.json index daa146fed..80894cf7b 100644 --- a/packages/login-with-osu/package.json +++ b/packages/login-with-osu/package.json @@ -1,20 +1,16 @@ { "name": "@hydrooj/login-with-osu", - "version": "0.0.8", + "version": "0.1.0", "main": "package.json", "repository": "git@github.com:hydro-dev/Hydro.git", "author": "undefined ", "license": "AGPL-3.0-or-later", "preferUnplugged": true, - "scripts": { - "lint": "eslint lib.ts --fix", - "build": "tsc" - }, "devDependencies": { "@types/superagent": "^4.1.12" }, "peerDependencies": { - "hydrooj": "^2.15.0" + "hydrooj": "workspace:*" }, "dependencies": { "superagent": "^6.1.0" diff --git a/packages/login-with-qq/package.json b/packages/login-with-qq/package.json index 84507cd3e..8b1d47694 100644 --- a/packages/login-with-qq/package.json +++ b/packages/login-with-qq/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/login-with-qq", - "version": "0.0.5", + "version": "0.1.0", "main": "package.json", "repository": "git@github.com:hydro-dev/Hydro.git", "author": "undefined ", diff --git a/packages/migrate-vijos/package.json b/packages/migrate-vijos/package.json index 88f8f2ebf..14fa8fe90 100644 --- a/packages/migrate-vijos/package.json +++ b/packages/migrate-vijos/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/migrate-vijos", - "version": "1.4.3", + "version": "1.5.0", "main": "package.json", "repository": "git@github.com:hydro-dev/Hydro.git", "author": "undefined ", diff --git a/packages/onlyoffice/package.json b/packages/onlyoffice/package.json index 21e864715..841070c42 100644 --- a/packages/onlyoffice/package.json +++ b/packages/onlyoffice/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/onlyoffice", - "version": "1.0.3", + "version": "1.1.0", "main": "package.json", "repository": "git@github.com:hydro-dev/Hydro.git", "author": "undefined ", diff --git a/packages/recaptcha/package.json b/packages/recaptcha/package.json index 71983c452..38f2624d4 100644 --- a/packages/recaptcha/package.json +++ b/packages/recaptcha/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/recaptcha", - "version": "1.0.3", + "version": "1.1.0", "description": "Google reCAPTCHA", "main": "package.json", "repository": "https://github.com/hydro-dev/Hydro.git", diff --git a/packages/sonic/package.json b/packages/sonic/package.json index 765d5731a..c9c490645 100644 --- a/packages/sonic/package.json +++ b/packages/sonic/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/sonic", - "version": "1.0.4", + "version": "1.1.0", "description": "Sonic search service", "main": "service.js", "typings": "service.d.ts", diff --git a/packages/ui-default/jsconfig.json b/packages/ui-default/jsconfig.json index 83a9416eb..b9472621d 100644 --- a/packages/ui-default/jsconfig.json +++ b/packages/ui-default/jsconfig.json @@ -3,6 +3,7 @@ "./public", ], "compilerOptions": { + "jsx": "react", "allowSyntheticDefaultImports": true, "target": "ES6", "baseUrl": ".", diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 38f7c465e..0baa453bc 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.13.13", + "version": "4.14.0", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/pages/a.page.js b/packages/ui-default/pages/a.page.js deleted file mode 100644 index 6f860387c..000000000 --- a/packages/ui-default/pages/a.page.js +++ /dev/null @@ -1,22 +0,0 @@ -(() => { - const { NamedPage } = window.Hydro; - const { $ } = window.node_modules; - const { request, i18n, tpl } = window.Hydro.utils; - const { ConfirmDialog } = window.Hydro.components; - - const page = new NamedPage('course_detail', async () => { - $(document).on('click', '[name="course_buy"]', async (ev) => { - const message = '购买课程'; - const action = await new ConfirmDialog({ - $body: tpl` -
-

${i18n(message)}

-
`, - }).open(); - if (action !== 'yes') return; - window.open(`/course/buy/${UiContext.cdoc._id}`, '_blank'); - }); - }); - - window.Hydro.extraPages.push(page); -})(); diff --git a/packages/utils/package.json b/packages/utils/package.json index 16538bdbd..b4c6302e1 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/utils", - "version": "1.0.26", + "version": "1.1.0", "description": "hydrooj utils", "main": "package.json", "repository": "https://github.com/hydro-dev/Hydro.git", diff --git a/packages/vjudge/package.json b/packages/vjudge/package.json index c88d0488e..50a3c8721 100644 --- a/packages/vjudge/package.json +++ b/packages/vjudge/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/vjudge", - "version": "1.1.1", + "version": "1.2.0", "description": "Submit problems to remote oj", "main": "package.json", "repository": "https://github.com/hydro-dev/Hydro.git",