Skip to content

Commit b86b019

Browse files
saqqdysaqqdy
committed
drop server & ui
1 parent 5bb4767 commit b86b019

File tree

133 files changed

+1310
-10537
lines changed

Some content is hidden

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

133 files changed

+1310
-10537
lines changed

‎.github/dependabot.yml‎

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ updates:
99
directory: / # Location of package manifests
1010
schedule:
1111
interval: weekly
12-
open-pull-requests-limit: 5
12+
open-pull-requests-limit: 2
1313
ignore:
1414
- dependency-name: 'core-js'
1515
- dependency-name: 'eslint'
@@ -25,7 +25,7 @@ updates:
2525
directory: /packages/core # Location of package manifests
2626
schedule:
2727
interval: weekly
28-
open-pull-requests-limit: 5
28+
open-pull-requests-limit: 2
2929
ignore:
3030
- dependency-name: 'core-js'
3131
- dependency-name: 'eslint'
@@ -41,7 +41,7 @@ updates:
4141
directory: /packages/docs # Location of package manifests
4242
schedule:
4343
interval: weekly
44-
open-pull-requests-limit: 5
44+
open-pull-requests-limit: 2
4545
ignore:
4646
- dependency-name: 'core-js'
4747
- dependency-name: 'eslint'
@@ -57,39 +57,7 @@ updates:
5757
directory: /packages/gitmars # Location of package manifests
5858
schedule:
5959
interval: weekly
60-
open-pull-requests-limit: 5
61-
ignore:
62-
- dependency-name: 'core-js'
63-
- dependency-name: 'eslint'
64-
- dependency-name: 'prettier'
65-
- dependency-name: '@babel/*'
66-
- dependency-name: '@types/*'
67-
- dependency-name: typescript
68-
versions: [4.x]
69-
- dependency-name: '*'
70-
update-types: ['version-update:semver-patch']
71-
72-
- package-ecosystem: npm # See documentation for possible values
73-
directory: /packages/server # Location of package manifests
74-
schedule:
75-
interval: weekly
76-
open-pull-requests-limit: 5
77-
ignore:
78-
- dependency-name: 'core-js'
79-
- dependency-name: 'eslint'
80-
- dependency-name: 'prettier'
81-
- dependency-name: '@babel/*'
82-
- dependency-name: '@types/*'
83-
- dependency-name: typescript
84-
versions: [4.x]
85-
- dependency-name: '*'
86-
update-types: ['version-update:semver-patch']
87-
88-
- package-ecosystem: npm # See documentation for possible values
89-
directory: /packages/ui # Location of package manifests
90-
schedule:
91-
interval: weekly
92-
open-pull-requests-limit: 5
60+
open-pull-requests-limit: 2
9361
ignore:
9462
- dependency-name: 'core-js'
9563
- dependency-name: 'eslint'

‎.github/workflows/publish-test.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ jobs:
4848

4949
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/core/.npmrc
5050
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/gitmars/.npmrc
51-
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/server/.npmrc
52-
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/ui/.npmrc
5351
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/docs/.npmrc
5452

5553
- run: pnpm pub --test
@@ -59,6 +57,4 @@ jobs:
5957
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/monorepo/sync"
6058
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/core/sync"
6159
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/gitmars/sync"
62-
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/server/sync"
63-
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/ui/sync"
6460
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/docs/sync"

‎.github/workflows/publish.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ jobs:
5050

5151
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/core/.npmrc
5252
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/gitmars/.npmrc
53-
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/server/.npmrc
54-
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/ui/.npmrc
5553
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/docs/.npmrc
5654

5755
- run: pnpm pub
@@ -61,6 +59,4 @@ jobs:
6159
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/monorepo/sync"
6260
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/core/sync"
6361
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/gitmars/sync"
64-
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/server/sync"
65-
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/ui/sync"
6662
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/docs/sync"

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ es
77
app
88
packages/gitmars/es
99
packages/gitmars/lib
10-
packages/server/app
11-
packages/server/src/log/data
1210
yarn.lock
1311
/.pnp
1412
.pnp.js

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# 更新日志
22

3+
## 2023.10.20 v6.0.0 更新日志
4+
5+
1. 移除 `server` `ui` 两个子项目
6+
2. 升级依赖包
7+
38
## 2023.09.09 v5.3.0 更新日志
49

510
1. `combine` `admin publish` `build` 指令传参增加 `--data`，用来传入其他自定义构建参数

‎README.md‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ yarn global add gitmars
112112
- 查询日志 [gitm log](http://www.saqqdy.com/gitmars/api/#gitm-log)
113113
- 智能猜测你要执行的动作 [gitm go](http://www.saqqdy.com/gitmars/api/#gitm-go)
114114
- 安装和移除快捷方式 [gitm alias](http://www.saqqdy.com/gitmars/api/#gitm-alias)
115-
- UI 可视化操作 [gitm ui](http://www.saqqdy.com/gitmars/api/#gitm-ui)
116115
- 管理员创建主干分支 [gitm admin create](http://www.saqqdy.com/gitmars/api/#gitm-admin-create)
117116
- 发布分支 [gitm admin publish](http://www.saqqdy.com/gitmars/api/#gitm-admin-publish)
118117
- 更新主干分支代码 [gitm admin update](http://www.saqqdy.com/gitmars/api/#gitm-admin-update)
@@ -142,32 +141,6 @@ gitm go build
142141

143142
![gitmars-go.gif](https://raw.githubusercontent.com/saqqdy/gitmars/master/static/img/gitmars-go.gif)
144143

145-
## UI 界面
146-
147-
> 3.0.0 版本开始，UI 界面从原 gitmars 项目中抽离成了独立项目`@gitmars/ui`
148-
149-
### gitm ui
150-
151-
如果你厌倦了敲指令，gitmars 提供了懒人 UI 界面
152-
153-
- 安装：`gitm install @gitmars/ui`
154-
- 使用：`gitm ui [-p --port [port]]`
155-
- 传值：
156-
157-
| 名称 | 简写 | 说明 | 类型 | 可选值 | 传值必填 | 默认 |
158-
| ------ | ---- | ---------- | ------ | ------ | -------- | ---- |
159-
| --port | -p | 启动端口号 | Number | - | 否 | 3000 |
160-
161-
- 示例：
162-
163-
```shell
164-
gitm ui --port 3000
165-
```
166-
167-
- 演示：
168-
169-
![gitmars-ui.gif](https://raw.githubusercontent.com/saqqdy/gitmars/master/static/img/gitmars-ui.gif)
170-
171144
[npm-image]: https://img.shields.io/npm/v/gitmars.svg?style=flat-square
172145
[npm-url]: https://npmjs.com/package/gitmars
173146
[travis-image]: https://travis-ci.com/saqqdy/gitmars.svg?branch=master

‎build/packages.ts‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,6 @@ export const packages: PackageManifest[] = [
2323
output: 'lib',
2424
display: '这是一个git工作流工具'
2525
},
26-
{
27-
name: 'server',
28-
pkgName: '@gitmars/server',
29-
buildTask: ['lib'],
30-
iife: false,
31-
cjs: false,
32-
mjs: true,
33-
dts: false,
34-
output: 'lib',
35-
display: 'gitmars可视化界面服务端'
36-
},
37-
{
38-
name: 'ui',
39-
pkgName: '@gitmars/ui',
40-
buildTask: 'app',
41-
iife: false,
42-
mjs: false,
43-
dts: false,
44-
submodules: false,
45-
output: 'dist',
46-
display: 'gitmars可视化界面'
47-
},
4826
{
4927
name: 'docs',
5028
pkgName: '@gitmars/docs',

‎build/tasks/buildLib.ts‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,7 @@ if (childBuildLibIndex > -1) {
3434
}
3535

3636
export async function buildLib() {
37-
const externals = [
38-
'js-cool',
39-
'lodash-unified',
40-
'lodash-es',
41-
'@gitmars/core',
42-
'@gitmars/docs',
43-
'@gitmars/server',
44-
'@gitmars/ui'
45-
]
37+
const externals = ['js-cool', 'lodash-unified', 'lodash-es', '@gitmars/core', '@gitmars/docs']
4638
const builds = pkgs.map(
4739
async ({
4840
globals = {},

‎build/utils/paths.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,10 @@ export const PACKAGE = resolve(ROOT, 'packages')
66
export const CORE = resolve(PACKAGE, 'core')
77
export const GITMARS = resolve(PACKAGE, 'gitmars')
88
export const DOCS = resolve(PACKAGE, 'docs')
9-
export const SERVER = resolve(PACKAGE, 'server')
10-
export const UI = resolve(PACKAGE, 'ui')
119

1210
export const CORE_INPUT = resolve(CORE, 'src')
1311
export const CORE_OUTPUT = resolve(CORE, 'lib')
1412
export const GITMARS_INPUT = resolve(GITMARS, 'src')
1513
export const GITMARS_OUTPUT = resolve(GITMARS, 'lib')
1614
// export const DOCS_INPUT = resolve(DOCS, '.')
1715
export const DOCS_OUTPUT = resolve(DOCS, 'dist')
18-
// export const SERVER_INPUT = resolve(SERVER, '.')
19-
export const SERVER_OUTPUT = resolve(SERVER, 'app')
20-
// export const UI_INPUT = resolve(UI, '.')
21-
export const UI_OUTPUT = resolve(UI, 'dist')

‎package.json‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@gitmars/monorepo",
33
"description": "这是一个git工作流工具",
4-
"version": "5.3.0",
4+
"version": "6.0.0-beta.1",
55
"packageManager": "[email protected]",
66
"main": "index.js",
77
"files": [
@@ -14,10 +14,6 @@
1414
"docs:build": "vitepress build packages/docs",
1515
"docs:deploy": "pnpm build docs",
1616
"prebuild": "[[ $CI = true ]] && npx pnpm install -r --store=node_modules/.pnpm-store || echo skipping pnpm install",
17-
"server:start": "node app/bin/www",
18-
"server:watch": "nodemon --config nodemon.json",
19-
"server:watch:debug": "nodemon --config nodemon.json --inspect-brk",
20-
"server:super": "supervisor app/bin/www",
2117
"gen:version": "tscjs scripts/version",
2218
"lib": "sh scripts/lib.sh",
2319
"build": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" gulp --require @esbuild-kit/cjs-loader -f build/gulpfile.ts",
@@ -51,28 +47,30 @@
5147
"chalk": "^4.1.2",
5248
"debug": "^4.3.4",
5349
"inquirer": "^8.2.5",
54-
"js-cool": "^5.7.2",
50+
"js-cool": "^5.11.0",
5551
"morgan": "^1.10.0",
5652
"os-lang": "^3.2.0"
5753
},
5854
"devDependencies": {
59-
"@esbuild-kit/cjs-loader": "^2.4.2",
60-
"@esbuild-kit/esm-loader": "^2.5.5",
61-
"@eslint-sets/eslint-config-ts": "^5.8.0",
62-
"@microsoft/api-extractor": "^7.36.4",
55+
"@esbuild-kit/cjs-loader": "^2.4.4",
56+
"@esbuild-kit/esm-loader": "^2.6.5",
57+
"@eslint-sets/eslint-config-ts": "^5.10.0",
58+
"@microsoft/api-extractor": "^7.38.0",
6359
"@pnpm/logger": "^5.0.0",
64-
"@rollup/plugin-alias": "^5.0.0",
65-
"@rollup/plugin-commonjs": "^25.0.4",
66-
"@rollup/plugin-json": "^6.0.0",
67-
"@rollup/plugin-node-resolve": "^15.2.1",
68-
"@types/gulp": "^4.0.13",
60+
"@rollup/plugin-alias": "^5.0.1",
61+
"@rollup/plugin-commonjs": "^25.0.7",
62+
"@rollup/plugin-json": "^6.0.1",
63+
"@rollup/plugin-node-resolve": "^15.2.3",
64+
"@types/gulp": "^4.0.15",
6965
"@types/inquirer": "^8.2.6",
70-
"@types/node": "^20.6.0",
71-
"@types/rollup-plugin-css-only": "^3.1.0",
66+
"@types/node": "^20.8.6",
67+
"@types/rollup-plugin-css-only": "^3.1.1",
68+
"@vitejs/plugin-vue": "^4.4.0",
69+
"@vitejs/plugin-vue-jsx": "^3.0.2",
7270
"consola": "^3.2.3",
7371
"cross-env": "^7.0.3",
74-
"esbuild": "^0.19.2",
75-
"eslint": "^8.49.0",
72+
"esbuild": "^0.19.4",
73+
"eslint": "^8.51.0",
7674
"fast-glob": "^3.3.1",
7775
"gulp": "^4.0.2",
7876
"gulp-typescript": "6.0.0-alpha.1",
@@ -82,22 +80,22 @@
8280
"prettier": "^3.0.3",
8381
"prettier-config-common": "^1.4.0",
8482
"reinstaller": "^3.0.2",
85-
"rimraf": "^5.0.1",
83+
"rimraf": "^5.0.5",
8684
"rm-all": "^1.1.1",
87-
"rollup": "^3.29.0",
85+
"rollup": "^4.1.4",
8886
"rollup-plugin-add-banner": "^1.1.0",
8987
"rollup-plugin-css-only": "^4.3.0",
90-
"rollup-plugin-dts": "^6.0.1",
91-
"rollup-plugin-esbuild": "^5.0.0",
88+
"rollup-plugin-dts": "^6.1.0",
89+
"rollup-plugin-esbuild": "^6.1.0",
9290
"rollup-plugin-filesize": "^10.0.0",
93-
"rollup-plugin-node-externals": "^6.1.1",
91+
"rollup-plugin-node-externals": "^6.1.2",
9492
"rollup-plugin-replace-shebang": "^1.2.0",
9593
"rollup-plugin-visualizer": "^5.9.2",
9694
"tsnd": "^1.1.0",
97-
"typedoc": "^0.25.1",
95+
"typedoc": "^0.25.2",
9896
"typedoc-plugin-markdown": "^3.16.0",
9997
"typescript": "^5.2.2",
100-
"unplugin-vue-define-options": "^1.3.17",
98+
"unplugin-vue-define-options": "^1.3.18",
10199
"zx": "^7.2.3"
102100
},
103101
"peerDependencies": {

0 commit comments

Comments
 (0)