From 856f586d65a81931d38bcbc0f3db5a865a09cab0 Mon Sep 17 00:00:00 2001 From: undefined Date: Wed, 2 Oct 2024 13:00:43 +0800 Subject: [PATCH] core: remove handler, lib, model, script --- packages/hydrooj/src/entry/common.ts | 11 ++++++----- packages/ui-default/lib.js | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 packages/ui-default/lib.js diff --git a/packages/hydrooj/src/entry/common.ts b/packages/hydrooj/src/entry/common.ts index bcd61d899..e58efab9f 100644 --- a/packages/hydrooj/src/entry/common.ts +++ b/packages/hydrooj/src/entry/common.ts @@ -34,12 +34,13 @@ function locateFile(basePath: string, filenames: string[]) { } type LoadTask = 'handler' | 'model' | 'addon' | 'lib' | 'script' | 'service'; -const getLoader = (type: LoadTask, filename: string) => async function loader(pending: string[], fail: string[], ctx: Context) { +const getLoader = (type: LoadTask, filename: string, dontLoad = false) => async function loader(pending: string[], fail: string[], ctx: Context) { for (const i of pending) { const p = locateFile(i, [`${filename}.ts`, `${filename}.js`]); if (p && !fail.includes(i)) { const name = type.replace(/^(.)/, (t) => t.toUpperCase()); try { + if (dontLoad) throw new Error(`deprecated ${name} in %s will not be load: ${i}`); const m = unwrapExports(require(p)); if (m.apply) ctx.loader.reloadPlugin(ctx, p, {}); else logger.info(`${name} init: %s`, i); @@ -56,11 +57,11 @@ const getLoader = (type: LoadTask, filename: string) => async function loader(pe } }; -export const handler = getLoader('handler', 'handler'); +export const handler = getLoader('handler', 'handler', true); export const addon = getLoader('addon', 'index'); -export const model = getLoader('model', 'model'); -export const lib = getLoader('lib', 'lib'); -export const script = getLoader('script', 'script'); +export const model = getLoader('model', 'model', true); +export const lib = getLoader('lib', 'lib', true); +export const script = getLoader('script', 'script', true); export const service = getLoader('service', 'service'); export async function builtinModel(ctx: Context) { diff --git a/packages/ui-default/lib.js b/packages/ui-default/lib.js deleted file mode 100644 index 1a7096ca7..000000000 --- a/packages/ui-default/lib.js +++ /dev/null @@ -1 +0,0 @@ -require('./backendlib/template');