Skip to content

Commit 4bac3f2

Browse files
authored
Merge pull request #263 from MaaAssistantArknights/dev
Release
2 parents af87188 + d1202e2 commit 4bac3f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+3372
-2878
lines changed

.env

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
VITE_USE_PRODUCTION_API=true
1+
# 后端接口地址
2+
VITE_API=https://prts.maa.plus
3+
4+
# 地图站地址
25
VITE_THERESA_SERVER=https://theresa.wiki

.env.development

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# 本地开发端口
2+
PORT=3000
3+
4+
# 如果需要使用生产环境的API,请把下面一行注释掉,或者在.env.development.local中覆盖
5+
VITE_API=https://maa-docker.kkdy.tech

.prettierrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"tabWidth": 2,
55
"semi": false,
66
"arrowParens": "always",
7+
"plugins": ["@trivago/prettier-plugin-sort-imports"],
78
"importOrder": [
89
"^@.*/(.*)$",
910
"<THIRD_PARTY_MODULES>",
@@ -19,4 +20,4 @@
1920
],
2021
"importOrderSeparation": true,
2122
"importOrderSortSpecifiers": true
22-
}
23+
}

README.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ MAA 作业站前端!
44

55
## 开发流程
66

7+
后端接口文档:https://maa-docker.kkdy.tech/swagger-ui/index.html
8+
79
该仓库的主分支为 `dev`,线上分支为 `main`,代码合并到 `main` 后将会自动部署到线上
810

911
在自己的 fork 上开发完成后请提交 PR 到 `dev` 分支,由管理员合并
@@ -12,15 +14,9 @@ MAA 作业站前端!
1214

1315
## 环境变量
1416

15-
环境变量在 `.env` 文件内定义,你也可以创建 `.env.local` 来覆盖 `.env` 的配置
16-
17-
```ini
18-
# 使用线上的后端 API,否则使用本地开发服务器
19-
VITE_USE_PRODUCTION_API=true
17+
环境变量定义在 `.env` `.dev.development` 文件内
2018

21-
# 地图服务器,如果正在对地图进行本地开发请改为例如 http://localhost:3001
22-
VITE_THERESA_SERVER=https://theresa.wiki
23-
```
19+
你可以创建 `.env.development.local` 文件来覆盖环境变量,优先级为 `.env.development.local` > `.env.development` > `.env`
2420

2521
## 命令
2622

package.json

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,23 @@
3030
"@iconify/react": "^3.2.2",
3131
"@sentry/react": "^7.27.0",
3232
"@sentry/tracing": "^7.27.0",
33-
"@typescript-eslint/eslint-plugin": "^5.33.1",
33+
"@typescript-eslint/eslint-plugin": "^7.0.1",
3434
"ajv": "^8.11.0",
3535
"ajv-i18n": "^4.2.0",
3636
"camelcase-keys": "^8.0.1",
3737
"clsx": "^1.2.0",
3838
"dayjs": "^1.11.3",
39-
"eslint": "^8.22.0",
40-
"eslint-plugin-react": "^7.30.1",
39+
"eslint": "^8.56.0",
40+
"eslint-plugin-react": "^7.33.2",
41+
"eslint-plugin-react-hooks": "^4.6.0",
4142
"fuse.js": "^6.6.2",
42-
"jotai": "^1.7.3",
43+
"jotai": "^2.7.0",
4344
"linkify-react": "^3.0.4",
4445
"linkifyjs": "^3.0.5",
4546
"lodash-es": "^4.17.21",
47+
"maa-copilot-client": "https://github.com/MaaAssistantArknights/maa-copilot-client-ts.git#0.1.0-SNAPSHOT.726.3d19287",
4648
"normalize.css": "^8.0.1",
49+
"prettier": "^3.2.5",
4750
"react": "^18.0.0",
4851
"react-dom": "^18.0.0",
4952
"react-hook-form": "^7.33.1",
@@ -56,36 +59,35 @@
5659
"remark-breaks": "^3.0.2",
5760
"remark-gfm": "^3.0.1",
5861
"snakecase-keys": "^5.4.4",
59-
"swr": "^2.0.0-rc.3",
60-
"type-fest": "^2.16.0",
62+
"swr": "^2.2.5",
63+
"type-fest": "^4.10.2",
6164
"unfetch": "^4.2.0",
6265
"vite-tsconfig-paths": "^3.5.0"
6366
},
6467
"devDependencies": {
6568
"@hookform/devtools": "^4.1.1",
66-
"@trivago/prettier-plugin-sort-imports": "^3.3.0",
69+
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
6770
"@types/lodash-es": "^4.17.6",
6871
"@types/node": "^18.0.0",
6972
"@types/pinyin": "^2.10.0",
7073
"@types/react": "^18.0.0",
7174
"@types/react-dom": "^18.0.0",
72-
"@typescript-eslint/parser": "^5.33.1",
75+
"@typescript-eslint/parser": "^7.0.1",
7376
"@vitejs/plugin-react": "^1.3.0",
7477
"autoprefixer": "^10.4.7",
75-
"eslint-config-prettier": "^8.5.0",
76-
"eslint-import-resolver-typescript": "^3.4.1",
77-
"eslint-plugin-import": "^2.26.0",
78-
"eslint-plugin-jsx-a11y": "^6.6.1",
79-
"eslint-plugin-prettier": "^4.2.1",
78+
"eslint-config-prettier": "^9.1.0",
79+
"eslint-import-resolver-typescript": "^3.6.1",
80+
"eslint-plugin-import": "^2.29.1",
81+
"eslint-plugin-jsx-a11y": "^6.8.0",
82+
"eslint-plugin-prettier": "^5.1.3",
8083
"esno": "^4.0.0",
8184
"less": "^4.1.2",
8285
"node-fetch": "^3.2.6",
8386
"npm-run-all2": "^6.0.2",
8487
"pinyin": "^3.0.0-alpha.5",
85-
"prettier": "^2.7.1",
8688
"simplebig": "^0.0.3",
8789
"tailwindcss": "^3.1.4",
88-
"typescript": "^4.6.3",
90+
"typescript": "^5.3.3",
8991
"vite": "^4.2.1"
9092
},
9193
"resolutions": {
47.4 KB
Loading
34.4 KB
Loading
38.2 KB
Loading
43.7 KB
Loading
16.6 KB
Loading

0 commit comments

Comments
 (0)