Hydro v5

.gitattributes

@@ -0,0 +1,12 @@
+*.js text eol=lf
+*.jsx text eol=lf
+*.ts text eol=lf
+*.tsx text eol=lf
+*.json text eol=lf
+*.yaml text eol=lf
+*.yml text eol=lf
+*.md text eol=lf
+*.css text eol=lf
+*.scss text eol=lf
+*.less text eol=lf
+*.html text eol=lf

.github/workflows/build.yml

@@ -63,7 +63,7 @@ jobs:
         if [[ ${{ steps.ui-changed-files.outputs.any_changed }} == true ]] || [[ $(npm info @hydrooj/ui-default version) != $(node -e 'console.log(require("./packages/ui-default/package.json").version)') ]]
         then
           yarn build:ui:iconfont
-          parallel --tty -j+0 yarn ::: lint:ci lint:ui:ci build build:ui:production:webpack test
+          parallel --tty -j+0 yarn ::: lint:ci build build:ui:production:webpack test
         else
           parallel --tty -j+0 yarn ::: lint:ci build test
         fi

.gitignore

@@ -30,6 +30,7 @@ yarn.lock
 pnpm-lock.yaml
 tsconfig.json
 tsconfig.*.json
+.oxlintrc.json
 
 # Project Rules
 ## Core

.yarnrc.yml

@@ -1,10 +1,13 @@
+enableTelemetry: false
+
 nodeLinker: node-modules
 
 npmPublishAccess: public
 
-yarnPath: .yarn/releases/yarn-4.0.2.cjs
-
 preferInteractive: true
+
 preferReuse: true
+
 tsEnableAutoTypes: true
-enableTelemetry: false
+
+yarnPath: .yarn/releases/yarn-4.7.0.cjs

README.md

@@ -113,7 +113,6 @@ Hydro 用户群：1085853538
 
 ## Unreleased
 
-- judge: breaking: 不再支持在 checker 等的编译阶段读取选手代码
 - judge: 添加 checker 编译缓存
 - ui: 优化题目详情页面 OGP 信息
 - core&ui: 升级 simplewebauthn
@@ -122,7 +121,32 @@ Hydro 用户群：1085853538
 - core: 基于相对时间计算一血而非绝对时间
 - ui&judge: 添加栈空间回显
 - install: 在树莓派中自动启用 cgroup.memory
+- install: 添加 shm 空间大小警告
+- core: 升级到 cordis@4
+- framework: 支持同时启用多个 renderer
+- core: 分离 HMR 和 Watcher 组件
+- core: i18n: 添加 interface 选项
+- judge: 添加 kattis checker 支持
+- migrate: 修复 hustoj 自动运行
+- core: Settings: 支持使用 Schemastery
+- ui: 更新系统设置页面样式
+- import-qduoj: 修复 spj=null
+- core: 修复文件复制
+- core: 支持存储并显示提交记录重测历史
+- core: 新的加域逻辑
+- ui: UserSelect.Multi: 支持批量粘贴用户名
+
+### Breaking API Changes
+
 - vjudge: 使用 vjudge.mount 表替代 domain.mount
+- judge: breaking: 不再支持在 checker 等的编译阶段读取选手代码
+- core: 强制要求使用 inject 声明插件依赖
+- core: 移除旧版本 bus 调用
+- core: 移除 global.Hydro.service
+- core: 移除 global.Hydro.ui.template
+- core: 移除 global.Hydro.lib
+- core: 移除 String.prototype.translate (使用 app.i18n.translate)
+- core: 升级至 Mongo Driver 6
 
 ## Hydro 4.19.0 / UI 4.57.0
 

build/prepare.js

@@ -15,10 +15,11 @@ const withoutTypes = (data) => ({
 
 /** @type {import('typescript/lib/typescript').CompilerOptions} */
 const compilerOptionsBase = {
-    target: 'es2020',
-    module: 'commonjs',
+    target: 'es2022',
+    lib: ['es2022'],
+    module: 'preserve',
     esModuleInterop: true,
-    moduleResolution: 'node',
+    moduleResolution: 'bundler',
     jsx: 'react',
     sourceMap: false,
     composite: true,
@@ -33,6 +34,7 @@ const config = {
     compilerOptions: compilerOptionsBase,
     references: [
         { path: 'tsconfig.ui.json' },
+        { path: 'tsconfig.ui-next.json' },
         { path: 'plugins/tsconfig.json' },
     ],
     files: [],
@@ -73,11 +75,16 @@ for (const name of ['plugins', 'modules']) {
 const modules = [
     'packages/hydrooj',
     ...['packages', 'framework'].flatMap((i) => fs.readdirSync(path.resolve(process.cwd(), i)).map((j) => `${i}/${j}`)),
-].filter((i) => !i.includes('/.') && !i.includes('ui-default')).filter((i) => fs.statSync(path.resolve(process.cwd(), i)).isDirectory());
+].filter((i) => !['/.', 'ui-default', 'ui-next'].some((t) => i.includes(t))).filter((i) => fs.statSync(path.resolve(process.cwd(), i)).isDirectory());
 
 const UIConfig = {
     exclude: [
         'packages/ui-default/public',
+        'packages/ui-default/index.ts',
+        'packages/ui-default/backendlib/builder.ts',
+        'packages/ui-default/backendlib/misc.ts',
+        'packages/ui-default/backendlib/template.ts',
+        'packages/ui-default/backendlib/markdown.js',
         '**/node_modules',
     ],
     include: ['ts', 'tsx', 'vue', 'json']
@@ -90,15 +97,75 @@ const UIConfig = {
         skipLibCheck: true,
         allowSyntheticDefaultImports: true,
         baseUrl: '.',
+        jsx: 'react-jsx',
         outDir: path.join(baseOutDir, 'ui'),
+
+        useDefineForClassFields: true,
+        lib: ['es2022', 'DOM', 'DOM.Iterable'],
+
+        /* Bundler mode */
+        moduleResolution: 'bundler',
+        moduleDetection: 'force',
+        noEmit: true,
+
+        /* Linting */
+        noFallthroughCasesInSwitch: true,
+        noUncheckedSideEffectImports: true,
+
+        paths: {
+            'vj/*': [
+                './packages/ui-default/*',
+            ],
+        },
+    },
+};
+
+const UINextConfig = {
+    exclude: [
+        '**/node_modules',
+    ],
+    include: ['ts', 'tsx', 'vue', 'json'].map((ext) => `packages/ui-next/src/**/*.${ext}`),
+    compilerOptions: {
+        ...compilerOptionsBase,
+        module: 'ESNext',
+        skipLibCheck: true,
+        allowSyntheticDefaultImports: true,
+        baseUrl: '.',
+        jsx: 'react-jsx',
+        outDir: path.join(baseOutDir, 'ui-next'),
+
+        strict: true,
+        noImplicitAny: false,
+
+        useDefineForClassFields: true,
+        lib: ['es2022', 'DOM', 'DOM.Iterable'],
+
+        /* Bundler mode */
+        moduleResolution: 'bundler',
+        moduleDetection: 'force',
+        noEmit: true,
+
+        /* Linting */
+        noFallthroughCasesInSwitch: true,
+        noUncheckedSideEffectImports: true,
+
         paths: {
+            '@/*': [
+                './packages/ui-next/src/*',
+            ],
             'vj/*': [
                 './packages/ui-default/*',
             ],
         },
     },
 };
 
+const tryUpdate = (location, content) => {
+    const current = fs.existsSync(location) ? fs.readFileSync(location, 'utf-8') : '';
+    const expected = typeof content === 'string' ? content : JSON.stringify(content, null, 2);
+    if (expected !== current) fs.writeFileSync(location, expected);
+};
+
 const nm = path.resolve(__dirname, '../node_modules');
 fs.ensureDirSync(path.join(nm, '@hydrooj'));
 try {
@@ -119,40 +186,40 @@ const pluginsConfig = {
         rootDir: '.',
         baseUrl: '.',
         outDir: path.join(baseOutDir, 'plugins'),
+        skipLibCheck: true,
         paths: {
             'vj/*': [
                 '../packages/ui-default/*',
             ],
         },
     },
 };
-fs.writeFileSync(path.resolve(process.cwd(), 'plugins', 'tsconfig.json'), JSON.stringify(pluginsConfig));
+tryUpdate(path.resolve(process.cwd(), 'plugins', 'tsconfig.json'), pluginsConfig);
 
-for (const package of modules) {
-    const basedir = path.resolve(process.cwd(), package);
+for (const pkg of modules) {
+    const basedir = path.resolve(process.cwd(), pkg);
     const files = fs.readdirSync(basedir);
     try {
         // eslint-disable-next-line import/no-dynamic-require
         const name = require(path.join(basedir, 'package.json')).name;
         fs.symlinkSync(basedir, path.join(nm, name), 'dir');
     } catch (e) { }
-    if (!files.includes('src') && !files.filter((i) => i.endsWith('.ts')).length && package !== 'packages/utils') continue;
-    config.references.push({ path: package });
-    const origConfig = (files.includes('src') ? configSrc : configFlat)(package);
-    const expectedConfig = JSON.stringify(package.startsWith('modules/') ? withoutTypes(origConfig) : origConfig);
-    const configPath = path.resolve(basedir, 'tsconfig.json');
-    const currentConfig = fs.existsSync(configPath) ? fs.readFileSync(configPath, 'utf-8') : '';
-    if (expectedConfig !== currentConfig) fs.writeFileSync(configPath, expectedConfig);
+    if (!files.includes('src') && !files.filter((i) => i.endsWith('.ts')).length && pkg !== 'packages/utils') continue;
+    config.references.push({ path: pkg });
+    const origConfig = (files.includes('src') ? configSrc : configFlat)(pkg);
+    const expectedConfig = JSON.stringify(pkg.startsWith('modules/') ? withoutTypes(origConfig) : origConfig);
+    tryUpdate(path.resolve(basedir, 'tsconfig.json'), expectedConfig);
     if (!files.includes('src')) continue;
     // Create mapping entry
     for (const file of fs.readdirSync(path.resolve(basedir, 'src'))) {
         if (!fs.statSync(path.resolve(basedir, 'src', file)).isFile()) continue;
         const name = file.split('.')[0];
         const filePath = path.resolve(basedir, `${name}.js`);
         if (name === 'index' && !fs.existsSync(filePath)) {
-            fs.writeFileSync(filePath, 'module.exports = require("./src/index");\n');
+            tryUpdate(filePath, "module.exports = require('./src/index');\n");
         }
     }
 }
-fs.writeFileSync(path.resolve(process.cwd(), 'tsconfig.ui.json'), JSON.stringify(UIConfig));
-fs.writeFileSync(path.resolve(process.cwd(), 'tsconfig.json'), JSON.stringify(config));
+tryUpdate(path.resolve(process.cwd(), 'tsconfig.ui.json'), UIConfig);
+tryUpdate(path.resolve(process.cwd(), 'tsconfig.ui-next.json'), UINextConfig);
+tryUpdate(path.resolve(process.cwd(), 'tsconfig.json'), config);

build/publish.ts

@@ -4,14 +4,14 @@ import { writeFileSync } from 'fs';
 import path from 'path';
 import ora from 'ora';
 import packageJson from 'package-json';
-import { gt } from 'semver';
+import { gt, prerelease } from 'semver';
 import { getWorkspaces, spawnAsync } from './utils';
 
 const {
     CI, GITHUB_EVENT_NAME, GITHUB_REF,
 } = process.env;
 
-const tag = GITHUB_REF === 'refs/heads/master' ? 'latest' : GITHUB_REF === 'refs/heads/develop' ? 'dev' : undefined;
+const tag = GITHUB_REF === 'refs/heads/master' ? 'latest' : GITHUB_REF === 'refs/heads/next' ? 'dev' : undefined;
 
 if (CI && (!tag || GITHUB_EVENT_NAME !== 'push')) {
     console.log('publish skipped.');
@@ -33,6 +33,14 @@ if (CI && (!tag || GITHUB_EVENT_NAME !== 'push')) {
         let meta;
         try {
             meta = require(`../${name}/package.json`);
+            if (tag === 'dev') {
+                try {
+                    const result = await packageJson(meta.name, { version: meta.version });
+                    if (result?.version === meta.version) return progress++; // no change on dev version
+                } catch (e) {
+                    // expected
+                }
+            } else if (prerelease(meta.version)) return progress++; // Refuse to publish prerelease as 'latest' tag
             if (!meta.private && /^[0-9.]+$/.test(meta.version)) {
                 try {
                     const { version } = await packageJson(meta.name, { version: tag });
@@ -41,21 +49,28 @@ if (CI && (!tag || GITHUB_EVENT_NAME !== 'push')) {
                     if (e.name === 'VersionNotFoundError') bumpMap[name] = meta.version;
                     else throw e;
                 }
+            } else {
+                // x.x.x-alpha.x
+                bumpMap[name] = meta.version;
             }
         } catch (e) {
             console.error(e);
         }
         spinner.text = `Loading workspaces (${++progress}/${folders.length})`;
+        return progress;
     }));
     spinner.succeed();
 
     if (Object.keys(bumpMap).length) {
         for (const name in bumpMap) {
             console.log(`publishing ${name}@${bumpMap[name]} ...`);
             if (tag === 'dev') {
-                const pkg = require(`${name}/package.json`);
-                pkg.version += '-dev';
-                writeFileSync(path.resolve(`${name}/package.json`), JSON.stringify(pkg));
+                const location = require.resolve(`../${name}/package.json`);
+                const pkg = require(location);
+                if (!prerelease(pkg.version)) {
+                    pkg.version += '-dev';
+                    writeFileSync(location, JSON.stringify(pkg));
+                }
             }
             await spawnAsync(
                 `yarn npm publish --access public --tag ${tag}`,