From 7a9dc953777e0f20fbbc3ce70c5606509544fc0e Mon Sep 17 00:00:00 2001 From: undefined Date: Fri, 4 Jun 2021 19:48:04 +0800 Subject: [PATCH] core: hack for broken package @types/express-serve-static-core --- build/hack.js | 3 +++ package.json | 15 ++++++++------- packages/center/package.json | 2 +- packages/hydrooj/package.json | 5 +++-- packages/migrate-vijos/package.json | 2 +- packages/ui-default/package.json | 8 ++++---- packages/utils/package.json | 2 +- 7 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 build/hack.js diff --git a/build/hack.js b/build/hack.js new file mode 100644 index 00000000..76033fd3 --- /dev/null +++ b/build/hack.js @@ -0,0 +1,3 @@ +const fs = require('fs-extra'); + +fs.removeSync('node_modules/@types/express/node_modules'); diff --git a/package.json b/package.json index 54dfb3d5..77dbd561 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "debug": "node --async-stack-traces --trace-deprecation --enable-source-maps node_modules/hydrooj/bin/hydrooj --debug --template", "start:all": "node build/start", "start": "node_modules/.bin/hydrooj", + "postinstall": "node build/hack", "clean": "zsh -c \"rm -rf tsconfig.build.tsbuildinfo ./packages/*/tsconfig.tsbuildinfo ./packages/*/dist ./.coverage\"" }, "version": "1.0.0", @@ -30,26 +31,26 @@ "@shelf/jest-mongodb": "^1.2.5", "@types/cross-spawn": "^6.0.2", "@types/jest": "^26.0.23", - "@types/node": "^15.6.1", + "@types/node": "^15.12.0", "@types/semver": "^7.3.6", - "@typescript-eslint/eslint-plugin": "^4.25.0", - "@typescript-eslint/parser": "^4.25.0", + "@typescript-eslint/eslint-plugin": "^4.26.0", + "@typescript-eslint/parser": "^4.26.0", "cac": "^6.7.3", "cross-env": "^7.0.3", "cross-spawn": "^7.0.3", "eslint": "^7.27.0", "eslint-config-airbnb-typescript": "^12.3.1", "eslint-import-resolver-typescript": "^2.4.0", - "eslint-plugin-import": "^2.23.3", + "eslint-plugin-import": "^2.23.4", "fs-extra": "^10.0.0", "globby": "^11.0.3", - "jest": "^27.0.1", + "jest": "^27.0.4", "latest-version": "^5.1.0", "mongodb": "^3.6.9", - "nmls": "^3.0.0", + "nmls": "^3.0.1", "ora": "^5.4.0", "semver": "^7.3.5", - "ts-jest": "^27.0.1", + "ts-jest": "^27.0.2", "typedoc": "^0.20.36", "typescript": "4.2.4" } diff --git a/packages/center/package.json b/packages/center/package.json index 2efc71b0..fcef6fb4 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.6.1" + "@types/node": "^15.12.0" }, "peerDependencies": { "hydrooj": "*" diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 47a9eeba..9d7fa16e 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -40,16 +40,17 @@ }, "devDependencies": { "@types/adm-zip": "^0.4.34", + "@types/express-serve-static-core": "^4.17.21", "@types/fs-extra": "^9.0.11", "@types/js-yaml": "^4.0.1", - "@types/koa": "^2.13.2", + "@types/koa": "^2.13.3", "@types/koa-compress": "^4.0.1", "@types/koa-router": "^7.4.2", "@types/koa-static-cache": "^5.1.0", "@types/lodash": "^4.14.170", "@types/lru-cache": "^5.1.0", "@types/minio": "^7.0.7", - "@types/mongodb": "^3.6.16", + "@types/mongodb": "^3.6.17", "@types/nodemailer": "^6.4.2", "@types/serialize-javascript": "^5.0.0", "@types/sockjs": "^0.3.32", diff --git a/packages/migrate-vijos/package.json b/packages/migrate-vijos/package.json index 288727a9..23edd7ef 100644 --- a/packages/migrate-vijos/package.json +++ b/packages/migrate-vijos/package.json @@ -7,7 +7,7 @@ "preferUnplugged": true, "license": "SEE LICENSE IN LICENSE", "devDependencies": { - "@types/mongodb": "^3.6.16" + "@types/mongodb": "^3.6.17" }, "dependencies": { "mongodb": "^3.6.9" diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 86e0790d..ed715f67 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -9,7 +9,7 @@ "devDependencies": { "@babel/cli": "^7.14.3", "@babel/core": "^7.14.3", - "@babel/eslint-parser": "7.14.3", + "@babel/eslint-parser": "7.14.4", "@babel/plugin-proposal-class-properties": "^7.13.0", "@babel/plugin-proposal-export-namespace-from": "^7.14.2", "@babel/plugin-proposal-function-sent": "^7.12.13", @@ -19,7 +19,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-transform-runtime": "^7.14.3", - "@babel/preset-env": "^7.14.2", + "@babel/preset-env": "^7.14.4", "@babel/preset-react": "^7.13.13", "@babel/register": "^7.13.16", "@babel/runtime-corejs3": "^7.14.0", @@ -45,9 +45,9 @@ "eslint-config-airbnb": "^18.2.1", "eslint-import-resolver-webpack": "^0.13.1", "eslint-plugin-babel": "^5.3.1", - "eslint-plugin-import": "^2.23.3", + "eslint-plugin-import": "^2.23.4", "eslint-plugin-jsx-a11y": "^6.4.1", - "eslint-plugin-react": "^7.23.2", + "eslint-plugin-react": "^7.24.0", "fancy-log": "^1.3.3", "file-loader": "^6.2.0", "friendly-errors-webpack-plugin": "^1.7.0", diff --git a/packages/utils/package.json b/packages/utils/package.json index 492aa939..7cf3a5e9 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.6.1", + "@types/node": "^15.12.0", "moment-timezone": "^0.5.33" } }