diff --git a/.eslintignore b/.eslintignore index c490c346..b5419494 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,4 +1,3 @@ dist *.d.ts -*.js node_modules diff --git a/.eslintrc.yaml b/.eslintrc.yaml index 03ccdd0f..7a862735 100644 --- a/.eslintrc.yaml +++ b/.eslintrc.yaml @@ -54,6 +54,8 @@ settings: import/parsers: '@typescript-eslint/parser': - .ts + - .js + - .jsx import/resolver: typescript: alwaysTryTypes: true diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index bf5d82ce..d13070b4 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.21.3", + "version": "2.21.4", "bin": "bin/hydrooj.js", "main": "dist/loader.js", "typings": "dist/loader.d.ts", diff --git a/packages/hydrooj/src/entry/master.ts b/packages/hydrooj/src/entry/master.ts index d38a0841..95a50566 100644 --- a/packages/hydrooj/src/entry/master.ts +++ b/packages/hydrooj/src/entry/master.ts @@ -71,7 +71,7 @@ export async function load(call: Entry) { const scripts = require('../upgrade'); let dbVer = (await modelSystem.get('db.ver')) ?? 0; const isFresh = !dbVer; - const expected = scripts.length; + const expected = scripts.default.length; while (dbVer < expected) { logger.info('Upgrading database: from %d to %d', dbVer, expected); if (isFresh) { diff --git a/packages/ui-default/.eslintrc.js b/packages/ui-default/.eslintrc.js index e5812386..c542fe1b 100644 --- a/packages/ui-default/.eslintrc.js +++ b/packages/ui-default/.eslintrc.js @@ -22,7 +22,7 @@ module.exports = { legacyDecorators: true, }, babelOptions: { - configFile: './babel.config.js', + configFile: `${__dirname}/babel.config.js`, }, }, settings: {