From 2cc2c88b8acb409d0858d801417e5d654bbf731e Mon Sep 17 00:00:00 2001 From: undefined Date: Wed, 9 Jun 2021 01:38:53 +0800 Subject: [PATCH] =?UTF-8?q?core:=20=E6=AF=94=E8=B5=9B=E6=97=B6=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E9=9A=90=E8=97=8F=E9=A2=98=E7=9B=AE=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 12 ++++++------ packages/center/package.json | 2 +- packages/hydrooj/bin/hydrooj.js | 9 ++++++++- packages/hydrooj/package.json | 2 +- packages/hydrooj/src/handler/contest.ts | 2 ++ packages/ui-default/package.json | 4 ++-- packages/utils/package.json | 2 +- 7 files changed, 21 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 77dbd561..df2fb7fe 100644 --- a/package.json +++ b/package.json @@ -31,14 +31,14 @@ "@shelf/jest-mongodb": "^1.2.5", "@types/cross-spawn": "^6.0.2", "@types/jest": "^26.0.23", - "@types/node": "^15.12.0", + "@types/node": "^15.12.2", "@types/semver": "^7.3.6", - "@typescript-eslint/eslint-plugin": "^4.26.0", - "@typescript-eslint/parser": "^4.26.0", + "@typescript-eslint/eslint-plugin": "^4.26.1", + "@typescript-eslint/parser": "^4.26.1", "cac": "^6.7.3", "cross-env": "^7.0.3", "cross-spawn": "^7.0.3", - "eslint": "^7.27.0", + "eslint": "^7.28.0", "eslint-config-airbnb-typescript": "^12.3.1", "eslint-import-resolver-typescript": "^2.4.0", "eslint-plugin-import": "^2.23.4", @@ -48,9 +48,9 @@ "latest-version": "^5.1.0", "mongodb": "^3.6.9", "nmls": "^3.0.1", - "ora": "^5.4.0", + "ora": "^5.4.1", "semver": "^7.3.5", - "ts-jest": "^27.0.2", + "ts-jest": "^27.0.3", "typedoc": "^0.20.36", "typescript": "4.2.4" } diff --git a/packages/center/package.json b/packages/center/package.json index fcef6fb4..199576e9 100644 --- a/packages/center/package.json +++ b/packages/center/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "@types/js-yaml": "^4.0.1", - "@types/node": "^15.12.0" + "@types/node": "^15.12.2" }, "peerDependencies": { "hydrooj": "*" diff --git a/packages/hydrooj/bin/hydrooj.js b/packages/hydrooj/bin/hydrooj.js index a2b3b591..ad784f4d 100755 --- a/packages/hydrooj/bin/hydrooj.js +++ b/packages/hydrooj/bin/hydrooj.js @@ -48,7 +48,14 @@ if (!cluster.isMaster) { const arg1 = argv.args[1]; const arg2 = argv.args[2]; if (operation === 'addon') { - if (arg1 === 'add') addons.push(arg2); + if (arg1 === 'create') { + fs.mkdirSync('/root/addon'); + child.execSync('yarn init -y', { cwd: '/root/addon' }); + fs.mkdirSync('/root/addon/templates'); + fs.mkdirSync('/root/addon/locales'); + fs.mkdirSync('/root/addon/public'); + addons.push('/root/addon'); + } else if (arg1 === 'add') addons.push(arg2); else if (arg1 === 'remove') { for (let i = 0; i < addons.length; i++) { if (addons[i] === arg2) { diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index b61e2c99..72120693 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.28.24", + "version": "2.28.25", "bin": "bin/hydrooj.js", "main": "dist/loader.js", "typings": "dist/loader.d.ts", diff --git a/packages/hydrooj/src/handler/contest.ts b/packages/hydrooj/src/handler/contest.ts index fb0ba578..6a9dffba 100644 --- a/packages/hydrooj/src/handler/contest.ts +++ b/packages/hydrooj/src/handler/contest.ts @@ -76,6 +76,7 @@ export class ContestDetailHandler extends Handler { ]; const index = tdoc.pids.map((i) => i.toString()); for (const key in pdict) { + pdict[key].tag.length = 0; const i = (index.indexOf(key) + 10).toString(36).toUpperCase(); if (i !== '9') pdict[key].pid = i; } @@ -265,6 +266,7 @@ export class ContestProblemHandler extends Handler { ]); if (!this.pdoc) throw new ProblemNotFoundError(domainId, pid); this.pdoc.pid = _pid; + this.pdoc.tag.length = 0; // @ts-ignore if (this.pdoc.domainId !== domainId) this.pdoc.docId = `${this.pdoc.domainId}:${this.pdoc.docId}`; this.attended = this.tsdoc && this.tsdoc.attend === 1; diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 022fa2e1..0975698a 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -39,9 +39,9 @@ "copy-webpack-plugin": "^6.4.1", "css-loader": "^4.3.0", "diff-dom": "^4.2.2", - "echarts": "^5.1.1", + "echarts": "^5.1.2", "emojify.js": "^1.1.0", - "eslint": "^7.27.0", + "eslint": "^7.28.0", "eslint-config-airbnb": "^18.2.1", "eslint-import-resolver-webpack": "^0.13.1", "eslint-plugin-babel": "^5.3.1", diff --git a/packages/utils/package.json b/packages/utils/package.json index 7cf3a5e9..78eb150e 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -16,7 +16,7 @@ }, "devDependencies": { "@types/fs-extra": "^9.0.11", - "@types/node": "^15.12.0", + "@types/node": "^15.12.2", "moment-timezone": "^0.5.33" } }