From 9219bbfc24de2a1cba0d95d56737f0a4128b3169 Mon Sep 17 00:00:00 2001 From: undefined Date: Tue, 22 Nov 2022 19:13:45 +0800 Subject: [PATCH] core: update cordis to 2.6.0 --- package.json | 4 ++-- packages/hydrooj/package.json | 12 ++++++------ packages/hydrooj/src/context.ts | 6 +++--- packages/hydrooj/src/service/watcher.ts | 8 ++++---- packages/ui-default/package.json | 4 ++-- packages/utils/package.json | 2 +- packages/vjudge/package.json | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index f7b3b243c..df948e23a 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,8 @@ "@types/node": "^18.11.9", "@types/semver": "^7.3.13", "@types/supertest": "^2.0.12", - "@typescript-eslint/eslint-plugin": "^5.43.0", - "@typescript-eslint/parser": "^5.43.0", + "@typescript-eslint/eslint-plugin": "^5.44.0", + "@typescript-eslint/parser": "^5.44.0", "autocannon": "^7.10.0", "cac": "^6.7.14", "cross-env": "^7.0.3", diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 8cca9003b..3d0b96761 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -12,16 +12,16 @@ }, "preferUnplugged": true, "dependencies": { - "@aws-sdk/client-s3": "^3.212.0", - "@aws-sdk/lib-storage": "^3.212.0", - "@aws-sdk/middleware-endpoint": "^3.212.0", - "@aws-sdk/s3-presigned-post": "^3.212.0", - "@aws-sdk/s3-request-presigner": "^3.212.0", + "@aws-sdk/client-s3": "^3.215.0", + "@aws-sdk/lib-storage": "^3.215.0", + "@aws-sdk/middleware-endpoint": "^3.215.0", + "@aws-sdk/s3-presigned-post": "^3.215.0", + "@aws-sdk/s3-request-presigner": "^3.215.0", "@graphql-tools/schema": "^9.0.10", "@hydrooj/utils": "workspace:*", "adm-zip": "0.5.5", "cac": "^6.7.14", - "cordis": "^2.5.0", + "cordis": "^2.6.0", "detect-browser": "^5.3.0", "emoji-regex": "^10.2.1", "emojis-list": "2.1.0", diff --git a/packages/hydrooj/src/context.ts b/packages/hydrooj/src/context.ts index f6995989a..ae38c2c69 100644 --- a/packages/hydrooj/src/context.ts +++ b/packages/hydrooj/src/context.ts @@ -45,9 +45,9 @@ export namespace Context { export interface Config extends cordis.Context.Config { } } -export type Runtime = cordis.Runtime; -export type State = cordis.State; -export type Fork = cordis.Fork; +export type MainScope = cordis.MainScope; +export type EffectScope = cordis.EffectScope; +export type ForkScope = cordis.ForkScope; export type Plugin = cordis.Plugin; export const Service = cordis.Service; export namespace Plugin { diff --git a/packages/hydrooj/src/service/watcher.ts b/packages/hydrooj/src/service/watcher.ts index 2c268e150..a139df596 100644 --- a/packages/hydrooj/src/service/watcher.ts +++ b/packages/hydrooj/src/service/watcher.ts @@ -4,7 +4,7 @@ import { relative, resolve } from 'path'; import { FSWatcher, watch } from 'chokidar'; import { debounce } from 'lodash'; -import { Context, Runtime, Service } from '../context'; +import { Context, MainScope, Service } from '../context'; import { Logger } from '../logger'; import { unwrapExports } from '../utils'; @@ -142,10 +142,10 @@ export default class Watcher extends Service { this.analyzeChanges(); /** plugins pending classification */ - const pending = new Map(); + const pending = new Map(); /** plugins that should be reloaded */ - const reloads = new Map(); + const reloads = new Map(); // we assume that plugin entry files are "atomic" // that is, reloading them will not cause any other reloads @@ -172,7 +172,7 @@ export default class Watcher extends Service { // prepare for reload let isMarked = false; - const visited = new Set(); + const visited = new Set(); const queued = [runtime]; while (queued.length) { const runtime = queued.shift(); diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 339e6dfcb..372547f99 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -31,8 +31,8 @@ "@types/qrcode": "^1.5.0", "@types/react-dom": "^18.0.9", "@types/redux-logger": "^3.0.9", - "@types/serviceworker": "^0.0.56", - "@types/sharedworker": "^0.0.85", + "@types/serviceworker": "^0.0.57", + "@types/sharedworker": "^0.0.86", "@types/webpack-env": "^1.18.0", "@vscode/codicons": "^0.0.32", "autoprefixer": "^10.4.13", diff --git a/packages/utils/package.json b/packages/utils/package.json index dffba9087..9dbfb6fcb 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -16,7 +16,7 @@ "mongodb": "^3.7.3", "reggol": "^1.3.1", "source-map-support": "^0.5.21", - "systeminformation": "^5.13.5" + "systeminformation": "^5.14.4" }, "devDependencies": { "@types/fs-extra": "^9.0.13", diff --git a/packages/vjudge/package.json b/packages/vjudge/package.json index b3a0eb0dd..5903cc06d 100644 --- a/packages/vjudge/package.json +++ b/packages/vjudge/package.json @@ -10,7 +10,7 @@ "dependencies": { "@hydrooj/utils": "workspace:*", "chrome-finder": "^1.0.7", - "jsdom": "^20.0.2", + "jsdom": "^20.0.3", "puppeteer-core": "^15.5.0", "puppeteer-extra": "3.3.0", "puppeteer-extra-plugin-portal": "3.1.0",