From 5cf7fe05e9271bbdf360f014c6e5d62a78ed82e8 Mon Sep 17 00:00:00 2001 From: wangziqi Date: Thu, 2 Jul 2026 15:31:29 +0800 Subject: [PATCH] feat(task4): update TypeScript configs to use shared presets --- apps/admin/package.json | 5 +++-- apps/admin/tsconfig.app.json | 21 ++----------------- apps/admin/tsconfig.node.json | 11 +++------- apps/server/package.json | 7 ++++--- apps/server/tsconfig.json | 22 ++------------------ package-lock.json | 38 ++++++++++++----------------------- 6 files changed, 27 insertions(+), 77 deletions(-) diff --git a/apps/admin/package.json b/apps/admin/package.json index 817c96c..f96241a 100644 --- a/apps/admin/package.json +++ b/apps/admin/package.json @@ -1,5 +1,5 @@ { - "name": "frontend", + "name": "@gongxue/admin", "private": true, "version": "0.0.0", "type": "module", @@ -28,6 +28,7 @@ "@types/react-dom": "^19.2.3", "@vitejs/plugin-react": "^6.0.1", "typescript": "~6.0.2", - "vite": "^8.0.9" + "vite": "^8.0.9", + "@gongxue/typescript-config": "*" } } diff --git a/apps/admin/tsconfig.app.json b/apps/admin/tsconfig.app.json index 7f42e5f..c99e380 100644 --- a/apps/admin/tsconfig.app.json +++ b/apps/admin/tsconfig.app.json @@ -1,25 +1,8 @@ { + "extends": "@gongxue/typescript-config/react-vite.json", "compilerOptions": { "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo", - "target": "es2023", - "lib": ["ES2023", "DOM"], - "module": "esnext", - "types": ["vite/client"], - "skipLibCheck": true, - - /* Bundler mode */ - "moduleResolution": "bundler", - "allowImportingTsExtensions": true, - "verbatimModuleSyntax": true, - "moduleDetection": "force", - "noEmit": true, - "jsx": "react-jsx", - - /* Linting */ - "noUnusedLocals": true, - "noUnusedParameters": true, - "erasableSyntaxOnly": true, - "noFallthroughCasesInSwitch": true + "types": ["vite/client"] }, "include": ["src"] } diff --git a/apps/admin/tsconfig.node.json b/apps/admin/tsconfig.node.json index d3c52ea..f28168f 100644 --- a/apps/admin/tsconfig.node.json +++ b/apps/admin/tsconfig.node.json @@ -1,24 +1,19 @@ { + "extends": "@gongxue/typescript-config/base.json", "compilerOptions": { "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo", - "target": "es2023", "lib": ["ES2023"], "module": "esnext", - "types": ["node"], - "skipLibCheck": true, - - /* Bundler mode */ "moduleResolution": "bundler", "allowImportingTsExtensions": true, "verbatimModuleSyntax": true, "moduleDetection": "force", "noEmit": true, - - /* Linting */ "noUnusedLocals": true, "noUnusedParameters": true, "erasableSyntaxOnly": true, - "noFallthroughCasesInSwitch": true + "noFallthroughCasesInSwitch": true, + "types": ["node"] }, "include": ["vite.config.ts"] } diff --git a/apps/server/package.json b/apps/server/package.json index d92970b..f5f9cf6 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -1,5 +1,5 @@ { - "name": "backend", + "name": "@gongxue/server", "version": "0.0.1", "description": "", "author": "", @@ -67,8 +67,9 @@ "ts-loader": "^9.5.2", "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", - "typescript": "^5.7.3", - "typescript-eslint": "^8.20.0" + "typescript": "~6.0.2", + "typescript-eslint": "^8.20.0", + "@gongxue/typescript-config": "*" }, "jest": { "moduleFileExtensions": [ diff --git a/apps/server/tsconfig.json b/apps/server/tsconfig.json index aba29b0..bc66acf 100644 --- a/apps/server/tsconfig.json +++ b/apps/server/tsconfig.json @@ -1,25 +1,7 @@ { + "extends": "@gongxue/typescript-config/nestjs.json", "compilerOptions": { - "module": "nodenext", - "moduleResolution": "nodenext", - "resolvePackageJsonExports": true, - "esModuleInterop": true, - "isolatedModules": true, - "declaration": true, - "removeComments": true, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "allowSyntheticDefaultImports": true, - "target": "ES2023", - "sourceMap": true, "outDir": "./dist", - "baseUrl": "./", - "incremental": true, - "skipLibCheck": true, - "strictNullChecks": true, - "forceConsistentCasingInFileNames": true, - "noImplicitAny": false, - "strictBindCallApply": false, - "noFallthroughCasesInSwitch": false + "baseUrl": "./" } } diff --git a/package-lock.json b/package-lock.json index 19f3298..e2542f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ } }, "apps/admin": { - "name": "frontend", + "name": "@gongxue/admin", "version": "0.0.0", "dependencies": { "@ant-design/icons": "^6.1.1", @@ -34,6 +34,7 @@ "tslib": "^2.8.1" }, "devDependencies": { + "@gongxue/typescript-config": "*", "@types/node": "^24.12.2", "@types/react": "^19.2.14", "@types/react-dom": "^19.2.3", @@ -43,7 +44,7 @@ } }, "apps/server": { - "name": "backend", + "name": "@gongxue/server", "version": "0.0.1", "license": "UNLICENSED", "dependencies": { @@ -74,6 +75,7 @@ "devDependencies": { "@eslint/eslintrc": "^3.2.0", "@eslint/js": "^9.18.0", + "@gongxue/typescript-config": "*", "@nestjs/cli": "^11.0.0", "@nestjs/schematics": "^11.0.0", "@nestjs/testing": "^11.0.1", @@ -94,24 +96,10 @@ "ts-loader": "^9.5.2", "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", - "typescript": "^5.7.3", + "typescript": "~6.0.2", "typescript-eslint": "^8.20.0" } }, - "apps/server/node_modules/typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmmirror.com/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", - "dev": true, - "license": "Apache-2.0", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, "node_modules/@angular-devkit/core": { "version": "19.2.27", "resolved": "https://registry.npmmirror.com/@angular-devkit/core/-/core-19.2.27.tgz", @@ -1335,6 +1323,14 @@ "node": ">=20.19.0" } }, + "node_modules/@gongxue/admin": { + "resolved": "apps/admin", + "link": true + }, + "node_modules/@gongxue/server": { + "resolved": "apps/server", + "link": true + }, "node_modules/@gongxue/typescript-config": { "resolved": "packages/typescript-config", "link": true @@ -7237,10 +7233,6 @@ "@babel/core": "^7.11.0 || ^8.0.0-beta.1" } }, - "node_modules/backend": { - "resolved": "apps/server", - "link": true - }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz", @@ -9483,10 +9475,6 @@ "node": ">= 0.8" } }, - "node_modules/frontend": { - "resolved": "apps/admin", - "link": true - }, "node_modules/fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/fs-constants/-/fs-constants-1.0.0.tgz",