修复tsconfig

build/start.ts

@@ -5,6 +5,7 @@ import cluster from 'cluster';
 import fs from 'fs-extra';
 import { filter } from 'lodash';
 import { argv } from 'yargs';
+// @ts-ignore
 import * as hydro from 'hydrooj';
 
 if (!cluster.isMaster) {

package.json

@@ -7,7 +7,7 @@
     "scripts": {
         "build": "tsc -b",
         "build:watch": "tsc -b --watch",
-        "lint": "eslint packages/**/*.ts --fix",
+        "lint": "eslint packages --ext ts --fix",
         "pub": "node build/publish",
         "jest": "node build/jest",
         "start": "node_modules/.bin/hydrooj"
@@ -36,4 +36,4 @@
         "fs-extra": "^9.0.1",
         "yargs": "^15.4.1"
     }
-}
+}

packages/geoip/lib.ts

@@ -1,3 +1,4 @@
+import 'hydrooj';
 import fs from 'fs';
 import path from 'path';
 import { Reader } from 'maxmind';

packages/geoip/package.json

@@ -1,14 +1,12 @@
 {
-  "name": "@hydrooj/geoip",
-  "version": "1.1.6",
-  "main": "package.json",
-  "repository": "git@github.com:hydro-dev/Hydro.git",
-  "author": "undefined <masnn0@outlook.com>",
-  "license": "MIT",
-  "dependencies": {
-    "maxmind": "^4.1.3"
-  },
-  "peerDependencies": {
-    "hydrooj": "^2.12.0"
-  }
+    "name": "@hydrooj/geoip",
+    "version": "1.1.6",
+    "main": "package.json",
+    "repository": "git@github.com:hydro-dev/Hydro.git",
+    "author": "undefined <masnn0@outlook.com>",
+    "license": "MIT",
+    "dependencies": {
+        "hydrooj": "^2.12.0",
+        "maxmind": "^4.1.3"
+    }
 }

packages/geoip/tsconfig.json

@@ -2,13 +2,18 @@
     "compilerOptions": {
         "target": "es2019",
         "module": "commonjs",
-        "composite": true,
-        "incremental": true,
         "esModuleInterop": true,
         "moduleResolution": "node",
         "declaration": true,
         "sourceMap": true,
+        "composite": true,
         "strictBindCallApply": true,
         "experimentalDecorators": true,
+        "outDir": ".",
+        "rootDir": "."
     },
+    "include": [
+        "*.ts"
+    ],
+    "exclude": []
 }

packages/hydrooj/package.json

@@ -3,6 +3,7 @@
     "version": "2.12.3",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
+    "typings": "dist/loader.d.ts",
     "repository": "https://github.com/hydro-dev/Hydro.git",
     "author": "masnn",
     "license": "GPL-3.0-only",

packages/hydrooj/src/check.ts

@@ -1,7 +1,6 @@
 // TODO check more
 
 import os from 'os';
-import superagent from 'superagent';
 import { Dictionary } from 'lodash';
 import * as system from './model/system';
 import * as db from './service/db';

packages/hydrooj/tsconfig.json

@@ -1,14 +1,22 @@
 {
-    "extends": "../../tsconfig.base",
     "compilerOptions": {
+        "target": "es2019",
+        "module": "commonjs",
+        "esModuleInterop": true,
+        "moduleResolution": "node",
+        "declaration": true,
+        "sourceMap": true,
+        "composite": true,
+        "strictBindCallApply": true,
+        "experimentalDecorators": true,
         "outDir": "dist",
-        "rootDir": "src",
+        "rootDir": "src"
     },
     "include": [
-        "src",
+        "src"
     ],
     "exclude": [
-        "dist",
-        "bin"
+        "bin",
+        "dist"
     ]
 }

packages/login-with-github/package.json

@@ -11,14 +11,11 @@
     },
     "devDependencies": {
         "@types/superagent": "^4.1.8",
-        "@types/superagent-proxy": "^2.0.0",
-        "hydrooj": "2.12.1"
-    },
-    "peerDependencies": {
-        "hydrooj": "^2.12.1"
+        "@types/superagent-proxy": "^2.0.0"
     },
     "dependencies": {
+        "hydrooj": "^2.12.1",
         "superagent": "^5.3.1",
         "superagent-proxy": "^2.0.0"
     }
-}
+}

packages/login-with-github/tsconfig.json

@@ -1,8 +1,16 @@
 {
-    "extends": "../../tsconfig.base",
     "compilerOptions": {
+        "target": "es2019",
+        "module": "commonjs",
+        "esModuleInterop": true,
+        "moduleResolution": "node",
+        "declaration": true,
+        "sourceMap": true,
+        "composite": true,
+        "strictBindCallApply": true,
+        "experimentalDecorators": true,
         "outDir": ".",
-        "rootDir": ".",
+        "rootDir": "."
     },
     "include": [
         "*.ts"

packages/login-with-google/lib.ts

@@ -21,7 +21,7 @@ async function callback({
     const { UserFacingError } = global.Hydro.error;
     if (error) throw new UserFacingError(error);
     const [
-        [appid, secret, url, proxy],
+        [appid, secret, url, proxyUrl],
         s,
     ] = await Promise.all([
         system.getMany([
@@ -30,7 +30,7 @@ async function callback({
         token.get(state, token.TYPE_OAUTH),
     ]);
     const res = await superagent.post('https://oauth2.googleapis.com/token')
-        .proxy(proxy)
+        .proxy(proxyUrl)
         .send({
             client_id: appid,
             client_secret: secret,

packages/login-with-google/package.json

@@ -11,14 +11,11 @@
     },
     "devDependencies": {
         "@types/superagent": "^4.1.8",
-        "@types/superagent-proxy": "^2.0.0",
-        "hydrooj": "2.12.1"
-    },
-    "peerDependencies": {
-        "hydrooj": "^2.12.1"
+        "@types/superagent-proxy": "^2.0.0"
     },
     "dependencies": {
+        "hydrooj": "^2.12.1",
         "superagent": "^5.3.1",
         "superagent-proxy": "^2.0.0"
     }
-}
+}

packages/login-with-google/tsconfig.json

@@ -1,8 +1,16 @@
 {
-    "extends": "../../tsconfig.base",
     "compilerOptions": {
+        "target": "es2019",
+        "module": "commonjs",
+        "esModuleInterop": true,
+        "moduleResolution": "node",
+        "declaration": true,
+        "sourceMap": true,
+        "composite": true,
+        "strictBindCallApply": true,
+        "experimentalDecorators": true,
         "outDir": ".",
-        "rootDir": ".",
+        "rootDir": "."
     },
     "include": [
         "*.ts"

packages/migrate-vijos/package.json

@@ -11,13 +11,10 @@
     },
     "devDependencies": {
         "@types/js-yaml": "^3.12.5",
-        "@types/mongodb": "^3.5.25",
-        "hydrooj": "2.11.5"
-    },
-    "peerDependencies": {
-        "hydrooj": "^2.11.3"
+        "@types/mongodb": "^3.5.25"
     },
     "dependencies": {
+        "hydrooj": "^2.12.3",
         "js-yaml": "^3.14.0",
         "mongodb": "^3.6.0"
     }

packages/migrate-vijos/tsconfig.json

@@ -1,6 +1,14 @@
 {
-    "extends": "../../tsconfig.base",
     "compilerOptions": {
+        "target": "es2019",
+        "module": "commonjs",
+        "esModuleInterop": true,
+        "moduleResolution": "node",
+        "declaration": true,
+        "sourceMap": true,
+        "composite": true,
+        "strictBindCallApply": true,
+        "experimentalDecorators": true,
         "outDir": ".",
         "rootDir": "."
     },

tsconfig.build.json

@@ -1,13 +0,0 @@
-{
-    "extends": "./tsconfig.base",
-    "compilerOptions": {
-        "outDir": "build",
-        "rootDir": "build",
-    },
-    "include": [
-        "build"
-    ],
-    "exclude": [
-        "packages"
-    ]
-}

tsconfig.json

@@ -2,16 +2,20 @@
     "compilerOptions": {
         "target": "es2019",
         "module": "commonjs",
-        "composite": true,
+        "esModuleInterop": true,
         "moduleResolution": "node",
+        "declaration": true,
+        "sourceMap": true,
+        "composite": true,
+        "strictBindCallApply": true,
         "experimentalDecorators": true,
-        "esModuleInterop": true
     },
     "references": [
-        { "path": "./tsconfig.build.json" },
-        { "path": "./packages/hydrooj" },
-        { "path": "./packages/login-with-github" },
-        { "path": "./packages/login-with-google" },
-        { "path": "./packages/migrate-vijos" },
+        { "path": "packages/hydrooj" },
+        { "path": "packages/geoip" },
+        { "path": "packages/login-with-github" },
+        { "path": "packages/login-with-google" },
+        { "path": "packages/migrate-vijos" },
     ],
+    "files": [],
 }