From b9e6316a82beeb97e576fea5b1c5d01417d06edc Mon Sep 17 00:00:00 2001 From: undefined Date: Mon, 22 Aug 2022 03:42:22 +0800 Subject: [PATCH] install: remove outdated script --- build/publish.js | 3 -- build/start.js | 2 - build/utils.js | 2 - install/centos-7.sh | 90 -------------------------------- install/ubuntu-1604.sh | 85 ------------------------------ install/ubuntu-1804.sh | 85 ------------------------------ package.json | 10 ++-- packages/hydrojudge/package.json | 2 +- packages/ui-default/package.json | 6 +-- packages/utils/package.json | 2 +- packages/vjudge/package.json | 2 +- 11 files changed, 11 insertions(+), 278 deletions(-) delete mode 100644 install/centos-7.sh delete mode 100644 install/ubuntu-1604.sh delete mode 100644 install/ubuntu-1804.sh diff --git a/build/publish.js b/build/publish.js index fd863d20..85d32e67 100644 --- a/build/publish.js +++ b/build/publish.js @@ -1,6 +1,3 @@ -/* eslint-disable no-console */ -/* eslint-disable import/no-extraneous-dependencies */ -/* eslint-disable consistent-return */ /* eslint-disable no-await-in-loop */ /* eslint-disable import/no-dynamic-require */ require('@hydrooj/utils/lib/register'); diff --git a/build/start.js b/build/start.js index 7fe67bb2..32e3675a 100644 --- a/build/start.js +++ b/build/start.js @@ -1,5 +1,3 @@ -/* eslint-disable no-console */ -/* eslint-disable import/no-extraneous-dependencies */ const os = require('os'); const path = require('path'); const fs = require('fs-extra'); diff --git a/build/utils.js b/build/utils.js index ab8f6cd0..ed8afce7 100644 --- a/build/utils.js +++ b/build/utils.js @@ -1,5 +1,3 @@ -/* eslint-disable no-console */ -/* eslint-disable import/no-extraneous-dependencies */ const globby = require('globby'); const spawn = require('cross-spawn'); diff --git a/install/centos-7.sh b/install/centos-7.sh deleted file mode 100644 index cd09bcb4..00000000 --- a/install/centos-7.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -echo "Running Hydro Installer for centos 7" -echo "CENTOS IS NOT RECOMMENDED TO USE." -echo "PLEASE USE UBUNTU INSTEAD." -echo "THIS SCRIPT MAY NOT WORK PROPERLY." -echo "Will continue installation in 10 secs, press Ctrl-C to exit" -echo "非常不推荐使用CentOS！" -echo "请切换到 ubuntu 操作系统！" -echo "此脚本可能无法正常工作" -echo "使用 Ctrl-C 退出该脚本。" -sleep 10 -db_password=$(cat /dev/urandom | head -n 10 | md5sum | head -c 20) -MINIO_ACCESS_KEY=$(cat /dev/urandom | head -n 10 | md5sum | head -c 20) -MINIO_SECRET_KEY=$(cat /dev/urandom | head -n 10 | md5sum | head -c 20) - -# Basic -yum install wget -mkdir -p /etc/yum.repos.d -echo "[mongodb-org-4.4] -name=MongoDB Repository -baseurl=https://repo.mongodb.org/yum/redhat/7/mongodb-org/4.4/x86_64/ -gpgcheck=1 -enabled=1 -gpgkey=https://www.mongodb.org/static/pgp/server-4.4.asc" >/etc/yum.repos.d/mongodb-org-4.4.repo -echo "yum install -y mongodb-org" -yum install -y mongodb-org -mkdir -p /var/lib/mongo -mkdir -p /var/log/mongodb -mkdir -p /data/db -chown -R mongod:mongod /var/lib/mongo /var/log/mongodb /data/db -echo user.max_user_namespaces=10000 >> /etc/sysctl.d/98-userns.conf -sysctl -p - -# Install NodeJS -echo "Installing NodeJS" -curl -o- https://cdn.jsdelivr.net/gh/nvm-sh/nvm@v0.36.0/install.sh | sed 's/raw.githubusercontent.com\/nvm-sh\/nvm\//cdn.jsdelivr.net\/gh\/nvm-sh\/nvm@/g' | sed 's/github.com\/nvm-sh\/nvm.git/gitee.com\/imirror\/nvm/g' | bash -export NVM_DIR=/root/.nvm -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" -nvm install 14 -nvm use 14 -npm i yarn -g -echo "Installing pm2" -yarn global add pm2 - -# Install MongoDB -echo "Installing MongoDB" -echo "db.createUser({ - user: 'hydro', - pwd: '$db_password', - roles: [ - { role: 'readWrite', db: 'hydro' } - ] -})" >/tmp/createUser.js -echo "pm2 start mongod" -pm2 start mongod >/dev/null -sleep 2 -mongo 127.0.0.1:27017/hydro /tmp/createUser.js -rm /tmp/createUser.js -echo "pm2 stop mongod" -pm2 stop mongod >/dev/null -pm2 del mongod >/dev/null -echo 'pm2 start "mongod --auth"' -pm2 start "mongod --auth" - -# Install MinIO -echo 'Installing MinIO' -wget http://dl.minio.org.cn/server/minio/release/linux-amd64/minio -chmod +x minio -mkdir -p /data/file -pm2 start "./minio server /data/file" --name minio - -# Install HydroOJ -# TODO: install basic addons? -echo "Installing Hydro" -yarn global add hydrooj @hydrooj/ui-default @hydrooj/hydrojudge -wget https://s3.undefined.moe/file/executor-amd64 -O /usr/bin/sandbox_ -chmod +x /usr/bin/sandbox_ -pm2 start "/usr/bin/sandbox_" -mkdir ~/.hydro -echo "{\"host\":\"127.0.0.1\",\"port\":\"27017\",\"name\":\"hydro\",\"username\":\"hydro\",\"password\":\"$db_password\"}" >~/.hydro/config.json -echo '["@hydrooj/ui-default","@hydrooj/hydrojudge"]' >~/.hydro/addon.json -pm2 start hydrooj - -# Done -echo "Done" -echo "Database username: hydro" -echo "Database password: $db_password" -echo "MINIO_ACCESS_KEY=$MINIO_ACCESS_KEY -MINIO_SECRET_KEY=$MINIO_SECRET_KEY" >~/.hydro/env diff --git a/install/ubuntu-1604.sh b/install/ubuntu-1604.sh deleted file mode 100644 index ca51e429..00000000 --- a/install/ubuntu-1604.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash -name=xenial -echo "Running Hydro Installer for ubuntu 16.04" -echo "此脚本已不再维护，推荐使用新版安装工具：" -echo "LANG=zh bash <(curl https://hydro.ac/install.sh)" -echo "详情请参阅文档 -> https://hydro.js.org" -echo "使用 Ctrl-C 退出该脚本，或是等待十秒后继续。" -echo "Will continue installation in 10 secs, press Ctrl-C to exit" -sleep 10 -MINIO_ACCESS_KEY=$(cat /dev/urandom | head -n 10 | md5sum | head -c 20) -MINIO_SECRET_KEY=$(cat /dev/urandom | head -n 10 | md5sum | head -c 20) - -# Basic -echo "apt-get update" -apt-get -qq update -echo "apt-get install curl wget gnupg -y" -apt-get install -y curl wget gnupg >/dev/null -wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add - -echo "deb [ arch=amd64 ] https://mirrors.tuna.tsinghua.edu.cn/mongodb/apt/ubuntu $name/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list -echo "apt-get update" -apt-get -qq update -mkdir -p /data/db /data/file - -# Install NodeJS -echo "Installing NodeJS" -curl -o- https://cdn.jsdelivr.net/gh/nvm-sh/nvm@v0.36.0/install.sh | sed 's/raw.githubusercontent.com\/nvm-sh\/nvm\//cdn.jsdelivr.net\/gh\/nvm-sh\/nvm@/g' | sed 's/github.com\/nvm-sh\/nvm.git/gitee.com\/imirror\/nvm/g' | bash -export NVM_DIR=/root/.nvm -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" -NVM_NODEJS_ORG_MIRROR=https://mirrors.tuna.tsinghua.edu.cn/nodejs-release nvm install 14 -nvm use 14 -npm i yarn -g -echo "Installing pm2" -yarn global add pm2 - -# Install MongoDB -echo "Installing MongoDB" -db_password=$(cat /dev/urandom | head -n 10 | md5sum | head -c 20) -apt-get -qq install -y mongodb-org -echo "db.createUser({ - user: 'hydro', - pwd: '$db_password', - roles: [ - { role: 'readWrite', db: 'hydro' } - ] -})" >/tmp/createUser.js -echo "pm2 start mongod" -pm2 start mongod >/dev/null -sleep 2 -mongo 127.0.0.1:27017/hydro /tmp/createUser.js -rm /tmp/createUser.js -echo "pm2 stop mongod" -pm2 stop mongod >/dev/null -pm2 del mongod >/dev/null -echo 'Starting mongodb' -pm2 start "mongod --auth --bind_ip 0.0.0.0" --name mongodb - -# Install MinIO -wget http://dl.minio.org.cn/server/minio/release/linux-amd64/minio -chmod +x minio -pm2 start "MINIO_ACCESS_KEY=$MINIO_ACCESS_KEY MINIO_SECRET_KEY=$MINIO_SECRET_KEY ./minio server /data/file" --name minio - -# Install Compiler -echo 'Installing g++' -apt-get install -y g++ >/dev/null - -# Install HydroOJ -echo "Installing Hydro" -yarn global add hydrooj @hydrooj/ui-default @hydrooj/hydrojudge -wget https://s3.undefined.moe/file/executor-amd64 -O /usr/bin/sandbox -chmod +x /usr/bin/sandbox -pm2 start sandbox -mkdir ~/.hydro -echo "{\"host\":\"127.0.0.1\",\"port\":\"27017\",\"name\":\"hydro\",\"username\":\"hydro\",\"password\":\"$db_password\"}" >~/.hydro/config.json -echo '["@hydrooj/ui-default","@hydrooj/hydrojudge"]' >~/.hydro/addon.json -pm2 start hydrooj - -pm2 startup -pm2 save - -# Done -echo "Done" -echo "Database username: hydro" -echo "Database password: $db_password" -echo "MINIO_ACCESS_KEY=$MINIO_ACCESS_KEY -MINIO_SECRET_KEY=$MINIO_SECRET_KEY" >~/.hydro/env diff --git a/install/ubuntu-1804.sh b/install/ubuntu-1804.sh deleted file mode 100644 index a52d2c74..00000000 --- a/install/ubuntu-1804.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash -name=bionic -echo "Running Hydro Installer for ubuntu 18.04" -echo "此脚本已不再维护，推荐使用新版安装工具：" -echo "LANG=zh bash <(curl https://hydro.ac/install.sh)" -echo "详情请参阅文档 -> https://hydro.js.org" -echo "使用 Ctrl-C 退出该脚本，或是等待十秒后继续。" -echo "Will continue installation in 10 secs, press Ctrl-C to exit" -sleep 10 -MINIO_ACCESS_KEY=$(cat /dev/urandom | head -n 10 | md5sum | head -c 20) -MINIO_SECRET_KEY=$(cat /dev/urandom | head -n 10 | md5sum | head -c 20) - -# Basic -echo "apt-get update" -apt-get -qq update -echo "apt-get install curl wget gnupg -y" -apt-get install -y curl wget gnupg >/dev/null -wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add - -echo "deb [ arch=amd64 ] https://mirrors.tuna.tsinghua.edu.cn/mongodb/apt/ubuntu $name/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list -echo "apt-get update" -apt-get -qq update -mkdir -p /data/db /data/file - -# Install NodeJS -echo "Installing NodeJS" -curl -o- https://cdn.jsdelivr.net/gh/nvm-sh/nvm@v0.36.0/install.sh | sed 's/raw.githubusercontent.com\/nvm-sh\/nvm\//cdn.jsdelivr.net\/gh\/nvm-sh\/nvm@/g' | sed 's/github.com\/nvm-sh\/nvm.git/gitee.com\/imirror\/nvm/g' | bash -export NVM_DIR=/root/.nvm -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" -NVM_NODEJS_ORG_MIRROR=https://mirrors.tuna.tsinghua.edu.cn/nodejs-release nvm install 14 -nvm use 14 -npm i yarn -g -echo "Installing pm2" -yarn global add pm2 - -# Install MongoDB -echo "Installing MongoDB" -db_password=$(cat /dev/urandom | head -n 10 | md5sum | head -c 20) -apt-get -qq install -y mongodb-org -echo "db.createUser({ - user: 'hydro', - pwd: '$db_password', - roles: [ - { role: 'readWrite', db: 'hydro' } - ] -})" >/tmp/createUser.js -echo "pm2 start mongod" -pm2 start mongod >/dev/null -sleep 2 -mongo 127.0.0.1:27017/hydro /tmp/createUser.js -rm /tmp/createUser.js -echo "pm2 stop mongod" -pm2 stop mongod >/dev/null -pm2 del mongod >/dev/null -echo 'Starting mongodb' -pm2 start "mongod --auth --bind_ip 0.0.0.0" --name mongodb - -# Install MinIO -wget http://dl.minio.org.cn/server/minio/release/linux-amd64/minio -chmod +x minio -pm2 start "MINIO_ACCESS_KEY=$MINIO_ACCESS_KEY MINIO_SECRET_KEY=$MINIO_SECRET_KEY ./minio server /data/file" --name minio - -# Install Compiler -echo 'Installing g++' -apt-get install -y g++ >/dev/null - -# Install HydroOJ -echo "Installing Hydro" -yarn global add hydrooj @hydrooj/ui-default @hydrooj/hydrojudge -wget https://s3.undefined.moe/file/executor-amd64 -O /usr/bin/sandbox -chmod +x /usr/bin/sandbox -pm2 start sandbox -mkdir ~/.hydro -echo "{\"host\":\"127.0.0.1\",\"port\":\"27017\",\"name\":\"hydro\",\"username\":\"hydro\",\"password\":\"$db_password\"}" >~/.hydro/config.json -echo '["@hydrooj/ui-default","@hydrooj/hydrojudge"]' >~/.hydro/addon.json -pm2 start hydrooj - -pm2 startup -pm2 save - -# Done -echo "Done" -echo "Database username: hydro" -echo "Database password: $db_password" -echo "MINIO_ACCESS_KEY=$MINIO_ACCESS_KEY -MINIO_SECRET_KEY=$MINIO_SECRET_KEY" >~/.hydro/env diff --git a/package.json b/package.json index 37ef4543..c52597ea 100644 --- a/package.json +++ b/package.json @@ -33,20 +33,20 @@ "@types/autocannon": "^7.6.1", "@types/cross-spawn": "^6.0.2", "@types/mocha": "^9.1.1", - "@types/node": "^18.7.3", + "@types/node": "^18.7.8", "@types/semver": "^7.3.12", "@types/supertest": "^2.0.12", - "@typescript-eslint/eslint-plugin": "^5.33.0", - "@typescript-eslint/parser": "^5.33.0", + "@typescript-eslint/eslint-plugin": "^5.33.1", + "@typescript-eslint/parser": "^5.33.1", "autocannon": "^7.9.0", "cac": "^6.7.12", "cross-env": "^7.0.3", "cross-spawn": "^7.0.3", "esbuild": "0.15.2", - "eslint": "^8.21.0", + "eslint": "^8.22.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb-typescript": "^17.0.0", - "eslint-import-resolver-typescript": "^3.4.1", + "eslint-import-resolver-typescript": "^3.4.2", "eslint-import-resolver-webpack": "^0.13.2", "eslint-plugin-import": "2.26.0", "eslint-plugin-jsx-a11y": "^6.6.1", diff --git a/packages/hydrojudge/package.json b/packages/hydrojudge/package.json index b8e7a6ef..d1648025 100644 --- a/packages/hydrojudge/package.json +++ b/packages/hydrojudge/package.json @@ -22,7 +22,7 @@ "devDependencies": { "@types/fs-extra": "^9.0.13", "@types/js-yaml": "^4.0.5", - "@types/lodash": "^4.14.182", + "@types/lodash": "^4.14.184", "@types/shell-quote": "^1.7.1", "@types/ws": "^8.5.3" } diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index af282e40..ac0ecac8 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -27,7 +27,7 @@ "@types/katex": "^0.14.0", "@types/markdown-it": "^12.2.3", "@types/pickadate": "^3.5.32", - "@types/qrcode": "^1.4.2", + "@types/qrcode": "^1.5.0", "@types/react-dom": "^18.0.6", "@types/redux-logger": "^3.0.9", "@vscode/codicons": "^0.0.32", @@ -106,7 +106,7 @@ "vinyl-buffer": "^1.0.1", "web-streams-polyfill": "^3.2.1", "webpack": "^5.74.0", - "webpack-bundle-analyzer": "^4.5.0", + "webpack-bundle-analyzer": "^4.6.0", "webpack-dev-server": "^4.10.0", "webpackbar": "^5.0.2" }, @@ -130,6 +130,6 @@ "nunjucks": "^3.2.3", "p-queue": "^7.3.0", "streamsaver": "^2.0.6", - "xss": "^1.0.13" + "xss": "^1.0.14" } } diff --git a/packages/utils/package.json b/packages/utils/package.json index b0d8b85b..c0bbc467 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -15,7 +15,7 @@ "moment-timezone": "^0.5.34", "mongodb": "^3.7.3", "source-map-support": "^0.5.21", - "systeminformation": "^5.12.5" + "systeminformation": "^5.12.6" }, "devDependencies": { "@types/fs-extra": "^9.0.13", diff --git a/packages/vjudge/package.json b/packages/vjudge/package.json index b7220bdb..eaef7462 100644 --- a/packages/vjudge/package.json +++ b/packages/vjudge/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "@types/jsdom": "^20.0.0", - "@types/lodash": "^4.14.182", + "@types/lodash": "^4.14.184", "@types/superagent": "^4.1.15", "@types/superagent-proxy": "^3.0.0" }