From 11fe624e35c2ebd69d10514d4a8366d25ddbb076 Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Sun, 19 Feb 2023 14:38:17 +0800 Subject: [PATCH] chore: update repo config --- .dockerignore | 4 +++- .eslintrc.js | 2 +- .gitignore | 1 + .husky/pre-commit | 2 +- .npmrc | 2 +- .release-it.json | 2 +- Dockerfile | 2 +- commitlint.config.js | 16 ++++++++-------- docker-compose.yml | 21 +++++++++++---------- pnpm-workspace.yaml | 2 +- tsconfig.json | 1 + 11 files changed, 30 insertions(+), 25 deletions(-) diff --git a/.dockerignore b/.dockerignore index ea583aa9..a6d4bc0e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,4 +6,6 @@ website page client/desktop client/desktop-old -client/app +client/mobile +apps +server/admin-next diff --git a/.eslintrc.js b/.eslintrc.js index b7cb6c4c..33f343ec 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -28,9 +28,9 @@ module.exports = { '@typescript-eslint/explicit-module-boundary-types': 'off', '@typescript-eslint/no-empty-function': 'off', '@typescript-eslint/no-var-requires': 'off', - 'react/prop-types': 'off', '@typescript-eslint/ban-ts-comment': 'off', '@typescript-eslint/ban-types': 'off', 'react/react-in-jsx-scope': 'off', + 'react/prop-types': 'off', }, }; diff --git a/.gitignore b/.gitignore index 2d150342..23dc814f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ client/locales .vercel .DS_Store +# yalc .yalc yalc.lock diff --git a/.husky/pre-commit b/.husky/pre-commit index fab6428a..36af2198 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,4 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" -pnpm lint-staged +npx lint-staged diff --git a/.npmrc b/.npmrc index 148425a0..4ec9013d 100644 --- a/.npmrc +++ b/.npmrc @@ -1,3 +1,3 @@ # https://npmmirror.com/ registry = https://registry.npmmirror.com -strict-peer-dependencies = false +strict-peer-dependencies = false # some dependency is not fit tailchat, tailchat's dependency is complex, every peer dependencies problem should check with manual. diff --git a/.release-it.json b/.release-it.json index 4e5fdb5c..3f89c682 100644 --- a/.release-it.json +++ b/.release-it.json @@ -9,7 +9,7 @@ "publish": false }, "hooks": { - "after:bump": "echo 更新版本成功" + "after:bump": "echo Version Upgrade Success. checkout more in CHANGELOG" }, "plugins": { "@release-it/conventional-changelog": { diff --git a/Dockerfile b/Dockerfile index 614a217a..8ed506d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,5 +40,5 @@ RUN pnpm run build # web static service port EXPOSE 3000 -# Start server +# Start server, ENV var is necessary CMD ["pnpm", "start:service"] diff --git a/commitlint.config.js b/commitlint.config.js index 244687b5..9bec8137 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -2,14 +2,14 @@ * document: https://commitlint.js.org/#/reference-configuration * * https://github.com/angular/angular/blob/master/CONTRIBUTING.md#type - * feat：新功能（feature） - * fix：修补bug - * docs：文档（documentation） - * style： 格式（不影响代码运行的变动） - * refactor：重构（即不是新增功能，也不是修改bug的代码变动） - * perf：性能优化 - * test：增加测试 - * chore：构建过程或辅助工具的变动 + * feat：new feature 新功能（feature） + * fix：bug fix 修补bug + * docs：document 文档（documentation） + * style：style(Changes that do not affect code execution) 格式（不影响代码运行的变动） + * refactor：Refactoring (i.e., code changes that are not new features or bug fixes) 重构（即不是新增功能，也不是修改bug的代码变动） + * perf：performance optimization 性能优化 + * test：add test case 增加测试 + * chore：Changes to the build process or accessibility tools 构建过程或辅助工具的变动 */ module.exports = { diff --git a/docker-compose.yml b/docker-compose.yml index 3a445ecc..07b64940 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.3" services: - # 应用网关 + # Gateway service-gateway: build: context: . @@ -21,7 +21,7 @@ services: networks: - internal - # 用户服务 + # User Service service-user: build: context: . @@ -36,7 +36,7 @@ services: networks: - internal - # 群组服务 + # Group Service service-group: build: context: . @@ -51,7 +51,7 @@ services: networks: - internal - # 聊天服务 + # Chat Service service-chat: build: context: . @@ -66,7 +66,7 @@ services: networks: - internal - # 文件服务 / 插件注册中心 / 配置服务 + # File Service / Plugin Registry / Configuration Service service-file: build: context: . @@ -82,6 +82,7 @@ services: networks: - internal + # Open Platform service-openapi: build: context: . @@ -103,7 +104,7 @@ services: networks: - internal - # 插件服务(所有插件) + # Plugin Service (All Plugins) service-all-plugins: build: context: . @@ -119,7 +120,7 @@ services: networks: - internal - # 数据库 + # Database mongo: image: mongo:4 restart: on-failure @@ -128,14 +129,14 @@ services: networks: - internal - # 数据缓存与中转通讯 + # Data cache and Transporter redis: image: redis:alpine restart: on-failure networks: - internal - # 存储服务 + # Persist Storage minio: image: minio/minio restart: on-failure @@ -148,7 +149,7 @@ services: - storage:/data command: minio server /data --console-address ":9001" - # 路由转发 + # Router traefik: image: traefik:v2.1 restart: unless-stopped diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 44391e47..df1bc2b6 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -6,7 +6,7 @@ packages: - 'client/packages/**' - 'server' - 'server/admin' - - 'server/admin-next' + - 'server/admin-next' # wait for delete - 'server/packages/**' - 'server/plugins/**' - 'server/test/demo/**' diff --git a/tsconfig.json b/tsconfig.json index 40134578..758cb904 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,6 +3,7 @@ "esModuleInterop": true, "isolatedModules": true, "strict": true, + "pretty": true, "importsNotUsedAsValues": "error", "experimentalDecorators": true, }