mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-08-20 18:11:00 +00:00
92fb94d856
* chore(frontend,docs): move to TypeScript 7 and replace ESLint with oxlint
TypeScript 7 is the native Go port and ships no programmatic compiler
API, so typescript-eslint cannot run at all: it peer-pins
typescript >=4.8.4 <6.1.0 (canary too) and hard-crashes with
"typescript-eslint does not support TS 7.0". Upstream support is
tracked in typescript-eslint#10940 and targets TS >=7.1.
Rather than wait, or carry Microsoft's side-by-side alias (which keeps
a second TS 6 install alive purely to feed the linter), both projects
move to oxlint, which never depended on the TypeScript API.
Typecheck drops from ~9.7s to ~2.2s and 167 packages leave frontend/.
oxlint has no no-restricted-syntax, so the #6121/#6127 cleared-
InputNumber guard is reimplemented as a JS plugin in
frontend/tools/oxlint/. It was verified to still fire in
pages/settings/** and pages/xray/** and to stay exempt in *Modal.tsx.
The type-aware @deprecated sweep survives too, as
`npm run lint:deprecated`: oxlint's type-aware mode runs on
oxlint-tsgolint, which drives the TS 7 typescript-go checker, so the
TS 7 move is what makes it possible.
Behaviour is preserved rather than tightened. jsx-a11y/prefer-tag-over-role
is off in both configs because it was never part of the recommended sets
ESLint actually ran, and oxlint honours the existing eslint-disable
comments, so no source churn was needed.
Two real fixes fell out of the stricter linting:
- outbound-link-parser.test.ts used `out?.streamSettings` behind an `as`
cast, which hid the optional chain from ESLint and would throw on a
null parse; the rest of the file already used `out!`.
- InputAddon's conditional role/tabIndex/onKeyDown is genuinely
accessible but oxlint cannot evaluate it, so it gets a scoped disable.
* chore(docs): replace Prettier with oxfmt
oxfmt is the oxc project's Prettier-compatible formatter, so this pairs
with the oxlint move and drops the last JS-based tool from the docs
toolchain.
The swap is behaviour-preserving. Running Prettier and oxfmt over the
same files, with the existing .prettierrc.json settings migrated via
`oxfmt --migrate=prettier`, produces byte-identical output on every
file. (Comparing them outside the project directory is misleading:
Prettier silently falls back to its defaults when it cannot find its
config, which looks like a mismatch but is not one.)
The 18 files reformatted here were already failing `pnpm format:check`
before this change — Prettier wanted the exact same edits. The check is
not part of docs-ci.yml, which is why the drift went unnoticed.
.prettierignore becomes ignorePatterns in .oxfmtrc.json, keeping the
deliberate MDX exclusion: reflowing MDX prose merges headings into
paragraphs and collapses lists inside Steps/Callout components. Both
that and the generated fumadocs-openapi reference output were verified
untouched.
oxfmt is pinned to 0.63.0 rather than latest. pnpm 11's built-in
minimumReleaseAge policy rejects same-day releases, and 0.64.0 would
have made pnpm silently append 20 waiver lines to pnpm-workspace.yaml.
* style(frontend): adopt oxfmt and format src
frontend/ has never had a formatter, so this reformats 344 of 497 files
in src/. The change is purely whitespace, quoting and line wrapping —
no logic is touched. It is kept in its own commit so it does not bury
the TypeScript 7 / oxlint migration or the git blame for the code
itself.
Settings match docs/ and the code as it was already written: single
quotes, semicolons, trailing commas, 2-space indent, 100 columns. That
was measured rather than assumed — src/ was already uniformly
single-quoted and 2-space indented, with p90 line length at 75.
Formatting is scoped to src/ (mirroring `oxlint src`) and
.oxfmtrc.json ignores src/generated. Both matter: `make gen-check`
compares src/generated and public/openapi.json, and
`make msw-worker-check` byte-compares public/mockServiceWorker.js
against the installed MSW runtime, so reformatting any of them breaks
the gate.
Reflowing also moves `eslint-disable-next-line` comments off the line
they guard, which broke two suppressions that had been silently
correct before:
- clone-inbound-modal.test.tsx: the object literal became multi-line,
leaving `} as any;` four lines below its no-explicit-any disable.
- ClientsPage.tsx: the useMemo dependency array moved onto its own
line, out from under its exhaustive-deps disable.
Both comments were relocated onto the line they actually guard, and
verified to still suppress by removing them and watching the errors
return.
* ci: enforce formatting in CI and make verify
Adding oxfmt in the previous two commits gave both projects a formatter
but nothing that checks it, which is how docs/ had already drifted to 18
unformatted files: docs-ci.yml runs typecheck, lint, test and build, but
never format:check, so Prettier's complaints were only ever visible to
whoever ran it by hand.
Wire `format:check` into the frontend job in ci.yml and the docs job in
docs-ci.yml, and add a `format-check` target to `make verify` so the
local gate keeps mirroring CI as the Makefile header promises.
Verified the step actually bites rather than passing vacuously: adding
a badly formatted line to a source file in each project makes both
`make format-check` and `pnpm format:check` fail, and reverting it makes
them pass again.
No workflow referenced ESLint or Prettier by name — they all invoke the
package scripts — so the tooling swap needed no other CI changes.
* ci: trigger CI on Makefile changes
The path filters listed **.go, go.mod, go.sum, frontend/**, .nvmrc and
ci.yml itself, but not the Makefile — so a change to the canonical task
runner that ci.yml is meant to mirror could land without any job
running. The previous commit, which edits both, only triggers because
it happens to touch ci.yml too.
* fix(frontend): replace deprecated Ant Design 6 APIs in the geo components
`npm run lint:deprecated` reported five uses of props Ant Design 6 has
deprecated. All five are gone, and the matching runtime warnings no
longer appear in the test output.
Tag `bordered={false}` becomes `variant="filled"` and Space `direction`
becomes `orientation`; both are the one-to-one replacements named in
antd's own deprecation messages, and `direction`/`orientation` share the
same Orientation type.
Input `addonAfter` is the one that is not a rename. It becomes a
`Space.Compact block` wrapping the Input and the browse Button, which is
antd's documented migration. `block` keeps the field filling its form
row as the addon did. Note this is a deliberate visual change: the
button used to be a borderless `type="text"` icon sitting inside the
addon's grey box, and is now a regular button whose border joins the
input. The tooltip, aria-label, ref, id and onBlur wiring are unchanged,
so the react-hook-form binding in RuleFormModal and the existing tests
still address it the same way.
Only these five were deprecated. The other `bordered` props in the tree
sit on QRCode, Table, Descriptions and Alert, where the prop is not
deprecated, and these were the only two Space `direction` uses in the
codebase.
* fix(frontend): restore lint rules lost in the oxlint migration, and test the guard
Addresses the review on #6262.
The frontend config re-enabled only no-explicit-any and no-unused-vars
and left the rest of tseslint's recommended set to oxlint's correctness
category. It does not cover all of it. Confirmed by linting one probe
file against both configs: docs/ (which enumerates the rules) reports
all nine, frontend/ reported four. So ban-ts-comment,
no-empty-object-type, no-namespace, no-require-imports and
no-unsafe-function-type had silently stopped being enforced — a `//
@ts-ignore` or a `namespace` block would have landed unflagged. The ten
rules are now mirrored from docs/.oxlintrc.json, and src/ still passes.
The #6121/#6127 guard was 57 lines of hand-written AST walking with no
test. It now has one: fixtures for the three banned shapes plus an
onNumber()-wrapped control, asserting the rule fires three times and
that .oxlintrc.json still wires it to the right paths. Verified it fails
for the right reason by making walk() enumerate nothing, which is the
silent-death mode the review described — the traversal depends on
Object.keys() seeing AST children as own enumerable properties.
The fixtures deliberately violate the rule, so their oxlint config is
named guard.oxlintrc.json rather than .oxlintrc.json: oxlint discovers
nested configs by directory, which would otherwise turn the fixtures
into three lint errors. The test passes it explicitly with -c.
Also from the review:
- lint and format now cover tools/ as well as src/, so the one piece of
hand-written lint logic in the repo is no longer the least covered
file in it.
- lint-staged runs oxfmt before oxlint --fix. Formatting became a hard
CI gate in this PR while the hook only ran the linter, so a commit
could pass the hook and fail CI on formatting alone.
- .oxfmtrc.json ignores public/, so the artefacts that make gen-check
and make msw-worker-check byte-compare stay safe even if oxfmt is
invoked without a path argument.
- The MDX and generated-reference rationales that .prettierignore
carried are back as comments in docs/.oxfmtrc.json — oxlint and oxfmt
both accept JSONC, so relocating them was unnecessary.
Not applied: the review also suggested restoring ../internal/web/dist to
the ignore lists. Both tools reject `..` patterns outright ("patterns
are resolved within the config file's directory"), and being outside
frontend/ it is unreachable anyway.
238 lines
9.9 KiB
TypeScript
238 lines
9.9 KiB
TypeScript
import type { Locale } from './i18n';
|
||
|
||
// UI strings for the marketing chrome (landing page hero/features/footer + the
|
||
// shared navbar labels). The docs *pages* are translated as MDX under
|
||
// content/docs/{locale}; this covers the React-rendered home page and nav that
|
||
// can't live in MDX. English is the source; fa/ru/zh fall back to en.
|
||
//
|
||
// Convention matches the docs: translate prose only — product/protocol names
|
||
// (3x-ui, Xray, VLESS, REALITY, x25519, Docker, REST API, …) stay in Latin.
|
||
export interface SiteMessages {
|
||
tagline: string;
|
||
getStarted: string;
|
||
viewOnGitHub: string;
|
||
documentation: string;
|
||
donate: string;
|
||
docs: string;
|
||
stars: string;
|
||
forks: string;
|
||
latest: string;
|
||
copyCommand: string;
|
||
copied: string;
|
||
featuresHeading: string;
|
||
featuresSubtitle: string;
|
||
// Order matches the icon list in components/home/features.tsx.
|
||
features: { title: string; description: string }[];
|
||
// Footer license line: `{app} — {before}<a>GPL-3.0</a>{after}` (spacing baked in).
|
||
licenseBefore: string;
|
||
licenseAfter: string;
|
||
}
|
||
|
||
const en: SiteMessages = {
|
||
tagline: 'Advanced web panel for managing Xray-core servers',
|
||
getStarted: 'Get started',
|
||
viewOnGitHub: 'View on GitHub',
|
||
documentation: 'Documentation',
|
||
donate: 'Donate',
|
||
docs: 'Docs',
|
||
stars: 'stars',
|
||
forks: 'forks',
|
||
latest: 'latest',
|
||
copyCommand: 'Copy install command',
|
||
copied: 'Copied',
|
||
featuresHeading: 'Everything you need to run Xray',
|
||
featuresSubtitle:
|
||
'A modern, fast control panel for Xray-core — built for operators who want power without the command-line grind.',
|
||
features: [
|
||
{
|
||
title: 'Every major protocol',
|
||
description:
|
||
'VLESS, VMess, Trojan, Shadowsocks, WireGuard, Hysteria2, SOCKS, HTTP and Dokodemo-door — managed from one panel.',
|
||
},
|
||
{
|
||
title: 'REALITY & XTLS-Vision',
|
||
description:
|
||
'First-class support for VLESS + REALITY with x25519 keys, short IDs and the xtls-rprx-vision flow for stealth and speed.',
|
||
},
|
||
{
|
||
title: 'Clients & traffic control',
|
||
description:
|
||
'Per-client traffic quotas, expiry dates, IP limits and live online status, with one-click share links and QR codes.',
|
||
},
|
||
{
|
||
title: 'Multi-node & subscriptions',
|
||
description:
|
||
'Coordinate multiple servers, managed hosts and external proxies, and serve VLESS / Clash / JSON subscriptions.',
|
||
},
|
||
{
|
||
title: 'Telegram bot & alerts',
|
||
description:
|
||
'Built-in Telegram notifications for traffic caps, expiry warnings and system load, plus admin actions.',
|
||
},
|
||
{
|
||
title: 'Self-hosted & scriptable',
|
||
description:
|
||
'A single Go binary or Docker image, an SQLite/PostgreSQL backend, and a full REST API for automation.',
|
||
},
|
||
],
|
||
licenseBefore: 'released under the ',
|
||
licenseAfter: ' license.',
|
||
};
|
||
|
||
const fa: SiteMessages = {
|
||
tagline: 'پنل وب پیشرفته برای مدیریت سرورهای Xray-core',
|
||
getStarted: 'شروع کنید',
|
||
viewOnGitHub: 'مشاهده در GitHub',
|
||
documentation: 'مستندات',
|
||
donate: 'حمایت مالی',
|
||
docs: 'مستندات',
|
||
stars: 'ستاره',
|
||
forks: 'فورک',
|
||
latest: 'آخرین',
|
||
copyCommand: 'کپی دستور نصب',
|
||
copied: 'کپی شد',
|
||
featuresHeading: 'هر آنچه برای اجرای Xray لازم دارید',
|
||
featuresSubtitle:
|
||
'یک پنل کنترلِ مدرن و سریع برای Xray-core — ساختهشده برای ادمینهایی که قدرت میخواهند، بدون درگیری با خط فرمان.',
|
||
features: [
|
||
{
|
||
title: 'همهی پروتکلهای اصلی',
|
||
description:
|
||
'VLESS، VMess، Trojan، Shadowsocks، WireGuard، Hysteria2، SOCKS، HTTP و Dokodemo-door — همه از یک پنل مدیریت میشوند.',
|
||
},
|
||
{
|
||
title: 'REALITY و XTLS-Vision',
|
||
description:
|
||
'پشتیبانی درجهیک از VLESS + REALITY با کلیدهای x25519، short IDها و فلوی xtls-rprx-vision برای مخفیکاری و سرعت.',
|
||
},
|
||
{
|
||
title: 'کلاینتها و کنترل ترافیک',
|
||
description:
|
||
'سهمیهی ترافیک برای هر کلاینت، تاریخ انقضا، محدودیت IP و وضعیت آنلاینِ زنده، همراه با لینکهای اشتراکگذاری و کدهای QR تنها با یک کلیک.',
|
||
},
|
||
{
|
||
title: 'چندنودی و سابسکریپشنها',
|
||
description:
|
||
'هماهنگسازی چند سرور، هاستهای مدیریتشده و پروکسیهای خارجی، و ارائهی سابسکریپشنهای VLESS / Clash / JSON.',
|
||
},
|
||
{
|
||
title: 'ربات Telegram و هشدارها',
|
||
description:
|
||
'اعلانهای داخلیِ Telegram برای سقف ترافیک، هشدار انقضا و بار سیستم، بهعلاوهی کنشهای مدیریتی.',
|
||
},
|
||
{
|
||
title: 'خودمیزبان و قابلاسکریپت',
|
||
description:
|
||
'یک باینری Go یا ایمیج Docker، بکاندِ SQLite/PostgreSQL، و یک REST API کامل برای خودکارسازی.',
|
||
},
|
||
],
|
||
licenseBefore: 'تحت مجوز ',
|
||
licenseAfter: ' منتشر شده است.',
|
||
};
|
||
|
||
const ru: SiteMessages = {
|
||
tagline: 'Продвинутая веб-панель для управления серверами Xray-core',
|
||
getStarted: 'Начать',
|
||
viewOnGitHub: 'Открыть на GitHub',
|
||
documentation: 'Документация',
|
||
donate: 'Поддержать',
|
||
docs: 'Документация',
|
||
stars: 'звёзд',
|
||
forks: 'форков',
|
||
latest: 'последняя',
|
||
copyCommand: 'Скопировать команду установки',
|
||
copied: 'Скопировано',
|
||
featuresHeading: 'Всё необходимое для запуска Xray',
|
||
featuresSubtitle:
|
||
'Современная и быстрая панель управления для Xray-core — создана для администраторов, которым нужна мощь без возни с командной строкой.',
|
||
features: [
|
||
{
|
||
title: 'Все основные протоколы',
|
||
description:
|
||
'VLESS, VMess, Trojan, Shadowsocks, WireGuard, Hysteria2, SOCKS, HTTP и Dokodemo-door — под управлением из одной панели.',
|
||
},
|
||
{
|
||
title: 'REALITY и XTLS-Vision',
|
||
description:
|
||
'Первоклассная поддержка VLESS + REALITY с ключами x25519, short ID и потоком xtls-rprx-vision для скрытности и скорости.',
|
||
},
|
||
{
|
||
title: 'Клиенты и контроль трафика',
|
||
description:
|
||
'Квоты трафика по клиентам, даты окончания, лимиты IP и статус «онлайн» в реальном времени, плюс ссылки-подписки и QR-коды в один клик.',
|
||
},
|
||
{
|
||
title: 'Мультинода и подписки',
|
||
description:
|
||
'Координация нескольких серверов, управляемых хостов и внешних прокси, а также выдача подписок VLESS / Clash / JSON.',
|
||
},
|
||
{
|
||
title: 'Telegram-бот и оповещения',
|
||
description:
|
||
'Встроенные уведомления Telegram о лимитах трафика, истечении срока и нагрузке системы, а также действия администратора.',
|
||
},
|
||
{
|
||
title: 'Свой хостинг и скрипты',
|
||
description:
|
||
'Один бинарный файл Go или Docker-образ, бэкенд SQLite/PostgreSQL и полноценный REST API для автоматизации.',
|
||
},
|
||
],
|
||
licenseBefore: 'распространяется под лицензией ',
|
||
licenseAfter: '.',
|
||
};
|
||
|
||
const zh: SiteMessages = {
|
||
tagline: '用于管理 Xray-core 服务器的高级 Web 面板',
|
||
getStarted: '开始使用',
|
||
viewOnGitHub: '在 GitHub 上查看',
|
||
documentation: '文档',
|
||
donate: '捐赠',
|
||
docs: '文档',
|
||
stars: '星标',
|
||
forks: '复刻',
|
||
latest: '最新',
|
||
copyCommand: '复制安装命令',
|
||
copied: '已复制',
|
||
featuresHeading: '运行 Xray 所需的一切',
|
||
featuresSubtitle:
|
||
'为 Xray-core 打造的现代、快速控制面板 —— 专为想要强大功能又不愿折腾命令行的运维者而生。',
|
||
features: [
|
||
{
|
||
title: '支持所有主流协议',
|
||
description:
|
||
'VLESS、VMess、Trojan、Shadowsocks、WireGuard、Hysteria2、SOCKS、HTTP 和 Dokodemo-door —— 全部在一个面板中管理。',
|
||
},
|
||
{
|
||
title: 'REALITY 与 XTLS-Vision',
|
||
description:
|
||
'一流支持 VLESS + REALITY,配备 x25519 密钥、short ID 和 xtls-rprx-vision 流,兼顾隐蔽与速度。',
|
||
},
|
||
{
|
||
title: '客户端与流量控制',
|
||
description:
|
||
'为每个客户端设置流量配额、到期日期、IP 限制和实时在线状态,并支持一键分享链接和二维码。',
|
||
},
|
||
{
|
||
title: '多节点与订阅',
|
||
description: '协调多台服务器、托管主机和外部代理,并提供 VLESS / Clash / JSON 订阅。',
|
||
},
|
||
{
|
||
title: 'Telegram 机器人与告警',
|
||
description: '内置 Telegram 通知,覆盖流量上限、到期提醒和系统负载,并支持管理员操作。',
|
||
},
|
||
{
|
||
title: '自托管且可脚本化',
|
||
description:
|
||
'单个 Go 二进制文件或 Docker 镜像、SQLite/PostgreSQL 后端,以及用于自动化的完整 REST API。',
|
||
},
|
||
],
|
||
licenseBefore: '基于 ',
|
||
licenseAfter: ' 许可证发布。',
|
||
};
|
||
|
||
const messages: Record<Locale, SiteMessages> = { en, fa, ru, zh };
|
||
|
||
export function getSiteMessages(lang: string): SiteMessages {
|
||
return messages[lang as Locale] ?? en;
|
||
}
|