From ee804edcae828066614e03a3b37e6ba389b09323 Mon Sep 17 00:00:00 2001 From: mesalogo Date: Sun, 6 Sep 2026 17:49:44 +0800 Subject: [PATCH] fix: isolate desktop lint from ShareServer configuration Exclude the independent prototype from root lint and explicitly anchor TypeScript parser configuration to the Desktop repository. This fixes clean CI runners detecting both root and ShareServer configuration directories. Product behavior and approved release notes are unchanged. --- docs/features/share-server/progress.md | 2 +- eslint.config.js | 35 ++++++-------------------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/docs/features/share-server/progress.md b/docs/features/share-server/progress.md index e8b618df..fa71da9e 100644 --- a/docs/features/share-server/progress.md +++ b/docs/features/share-server/progress.md @@ -11,7 +11,7 @@ ShareServer 功能尚未完成,不属于本次 Desktop `0.12.5` / Agent `0.11. 的产品交付或发布验收范围。用户确认本次发布不需要单独测试 ShareServer, 其原型测试通过也不代表生产功能已完成。 -桌面端根测试配置排除 `shareserver/**`,桌面发布 CI 不为其单独安装测试依赖。 +桌面端根测试和 lint 配置排除 `shareserver/**`,桌面发布 CI 不为其单独安装测试依赖。 ShareServer 独立项目自身的测试配置保留,供后续功能开发使用;本次不运行其独立测试。 此前候选 `89a81dd` 临时加入的 `npm ci --prefix shareserver` 步骤已撤除。 diff --git a/eslint.config.js b/eslint.config.js index 1cb980e8..2f9b29c1 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -13,13 +13,18 @@ export default tseslint.config( 'dist/**', 'node_modules/**', 'out/**', - 'shareserver/build-server/**', - 'shareserver/dist/**', - 'shareserver/node_modules/**' + 'shareserver/**' ] }, js.configs.recommended, ...tseslint.configs.recommended, + { + languageOptions: { + parserOptions: { + tsconfigRootDir: import.meta.dirname + } + } + }, { files: ['src/main/**/*.ts', 'src/preload/**/*.ts', 'src/shared/**/*.ts'], languageOptions: { @@ -53,30 +58,6 @@ export default tseslint.config( ...reactHooks.configs.recommended.rules } }, - { - files: ['shareserver/src/**/*.{ts,tsx}'], - languageOptions: { - globals: { - ...globals.browser, - ...globals.vitest - } - }, - plugins: { - 'react-hooks': reactHooks - }, - rules: { - ...reactHooks.configs.recommended.rules - } - }, - { - files: ['shareserver/server/**/*.ts'], - languageOptions: { - globals: { - ...globals.node, - ...globals.vitest - } - } - }, { files: ['sites/**/*.js'], languageOptions: {