diff --git a/build/build.js b/build/build.js index 0b2c44b3d..ad263e3d5 100644 --- a/build/build.js +++ b/build/build.js @@ -64,10 +64,6 @@ fs.writeFileSync(path.resolve(process.cwd(), 'tsconfig.json'), JSON.stringify(co if (argv.watch) { child.execSync('./node_modules/.bin/tsc -b --watch', { stdio: 'inherit' }); } else { - let result; - try { - result = child.execSync('./node_modules/.bin/tsc -b', { stdio: 'inherit' }); - } catch (e) { - result = child.execSync('./node_modules/.bin/tsc -b', { stdio: 'inherit' }); - } + child.execSync('cd packages/hydrooj && yarn build', { stdio: 'inherit' }); + child.execSync('./node_modules/.bin/tsc -b', { stdio: 'inherit' }); } \ No newline at end of file diff --git a/package.json b/package.json index dcb946c74..994263c84 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "jest": "node build/jest", "debug": "node --async-stack-traces --trace-deprecation --enable-source-maps build/start --debug", "start": "node build/start", - "clean": "zsh -c \"rm -r tsconfig.build.tsbuildinfo ./packages/*/tsconfig.tsbuildinfo ./packages/*/dist ./.coverage\"" + "clean": "zsh -c \"rm -rf tsconfig.build.tsbuildinfo ./packages/*/tsconfig.tsbuildinfo ./packages/*/dist ./.coverage\"" }, "version": "1.0.0", "license": "AGPL-3.0-only", @@ -41,4 +41,4 @@ "fs-extra": "^9.0.1", "yargs": "^16.0.3" } -} +} \ No newline at end of file diff --git a/packages/hydrooj/src/interface.ts b/packages/hydrooj/src/interface.ts index 002a36ef8..c42c8271c 100644 --- a/packages/hydrooj/src/interface.ts +++ b/packages/hydrooj/src/interface.ts @@ -76,8 +76,8 @@ export interface User extends Dictionary { role: string, regip: () => string, loginip: () => string, - hasPerm: (perm: bigint) => boolean, - hasPriv: (priv: number) => boolean, + hasPerm: (...perm: bigint[]) => boolean, + hasPriv: (...priv: number[]) => boolean, checkPassword: (password: string) => void, }