drop server & ui

saqqdy · Oct 17, 2023 · b86b019 · b86b019
1 parent 5bb4767
commit b86b019
Show file tree

Hide file tree

Showing 133 changed files with 1,310 additions and 10,537 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,7 +9,7 @@ updates:
     directory: / # Location of package manifests
     schedule:
       interval: weekly
-    open-pull-requests-limit: 5
+    open-pull-requests-limit: 2
     ignore:
       - dependency-name: 'core-js'
       - dependency-name: 'eslint'
@@ -25,7 +25,7 @@ updates:
     directory: /packages/core # Location of package manifests
     schedule:
       interval: weekly
-    open-pull-requests-limit: 5
+    open-pull-requests-limit: 2
     ignore:
       - dependency-name: 'core-js'
       - dependency-name: 'eslint'
@@ -41,7 +41,7 @@ updates:
     directory: /packages/docs # Location of package manifests
     schedule:
       interval: weekly
-    open-pull-requests-limit: 5
+    open-pull-requests-limit: 2
     ignore:
       - dependency-name: 'core-js'
       - dependency-name: 'eslint'
@@ -57,39 +57,7 @@ updates:
     directory: /packages/gitmars # Location of package manifests
     schedule:
       interval: weekly
-    open-pull-requests-limit: 5
-    ignore:
-      - dependency-name: 'core-js'
-      - dependency-name: 'eslint'
-      - dependency-name: 'prettier'
-      - dependency-name: '@babel/*'
-      - dependency-name: '@types/*'
-      - dependency-name: typescript
-        versions: [4.x]
-      - dependency-name: '*'
-        update-types: ['version-update:semver-patch']
-
-  - package-ecosystem: npm # See documentation for possible values
-    directory: /packages/server # Location of package manifests
-    schedule:
-      interval: weekly
-    open-pull-requests-limit: 5
-    ignore:
-      - dependency-name: 'core-js'
-      - dependency-name: 'eslint'
-      - dependency-name: 'prettier'
-      - dependency-name: '@babel/*'
-      - dependency-name: '@types/*'
-      - dependency-name: typescript
-        versions: [4.x]
-      - dependency-name: '*'
-        update-types: ['version-update:semver-patch']
-
-  - package-ecosystem: npm # See documentation for possible values
-    directory: /packages/ui # Location of package manifests
-    schedule:
-      interval: weekly
-    open-pull-requests-limit: 5
+    open-pull-requests-limit: 2
     ignore:
       - dependency-name: 'core-js'
       - dependency-name: 'eslint'

diff --git a/.github/workflows/publish-test.yml b/.github/workflows/publish-test.yml
@@ -48,8 +48,6 @@ jobs:
 
       - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/core/.npmrc
       - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/gitmars/.npmrc
-      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/server/.npmrc
-      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/ui/.npmrc
       - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/docs/.npmrc
 
       - run: pnpm pub --test
@@ -59,6 +57,4 @@ jobs:
       - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/monorepo/sync"
       - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/core/sync"
       - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/gitmars/sync"
-      - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/server/sync"
-      - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/ui/sync"
       - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/docs/sync"
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -50,8 +50,6 @@ jobs:
 
       - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/core/.npmrc
       - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/gitmars/.npmrc
-      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/server/.npmrc
-      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/ui/.npmrc
       - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/docs/.npmrc
 
       - run: pnpm pub
@@ -61,6 +59,4 @@ jobs:
       - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/monorepo/sync"
       - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/core/sync"
       - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/gitmars/sync"
-      - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/server/sync"
-      - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/ui/sync"
       - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/docs/sync"
diff --git a/.gitignore b/.gitignore
@@ -7,8 +7,6 @@ es
 app
 packages/gitmars/es
 packages/gitmars/lib
-packages/server/app
-packages/server/src/log/data
 yarn.lock
 /.pnp
 .pnp.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # 更新日志
 
+## 2023.10.20 v6.0.0 更新日志
+
+1. 移除 `server` `ui` 两个子项目
+2. 升级依赖包
+
 ## 2023.09.09 v5.3.0 更新日志
 
 1. `combine` `admin publish` `build` 指令传参增加 `--data`，用来传入其他自定义构建参数

diff --git a/README.md b/README.md
@@ -112,7 +112,6 @@ yarn global add gitmars
 - 查询日志 [gitm log](http://www.saqqdy.com/gitmars/api/#gitm-log)
 - 智能猜测你要执行的动作 [gitm go](http://www.saqqdy.com/gitmars/api/#gitm-go)
 - 安装和移除快捷方式 [gitm alias](http://www.saqqdy.com/gitmars/api/#gitm-alias)
-- UI 可视化操作 [gitm ui](http://www.saqqdy.com/gitmars/api/#gitm-ui)
 - 管理员创建主干分支 [gitm admin create](http://www.saqqdy.com/gitmars/api/#gitm-admin-create)
 - 发布分支 [gitm admin publish](http://www.saqqdy.com/gitmars/api/#gitm-admin-publish)
 - 更新主干分支代码 [gitm admin update](http://www.saqqdy.com/gitmars/api/#gitm-admin-update)
@@ -142,32 +141,6 @@ gitm go build
 
 ![gitmars-go.gif](https://raw.githubusercontent.com/saqqdy/gitmars/master/static/img/gitmars-go.gif)
 
-## UI 界面
-
-> 3.0.0 版本开始，UI 界面从原 gitmars 项目中抽离成了独立项目`@gitmars/ui`
-
-### gitm ui
-
-如果你厌倦了敲指令，gitmars 提供了懒人 UI 界面
-
-- 安装：`gitm install @gitmars/ui`
-- 使用：`gitm ui [-p --port [port]]`
-- 传值：
-
-| 名称   | 简写 | 说明       | 类型   | 可选值 | 传值必填 | 默认 |
-| ------ | ---- | ---------- | ------ | ------ | -------- | ---- |
-| --port | -p   | 启动端口号 | Number | -      | 否       | 3000 |
-
-- 示例：
-
-```shell
-gitm ui --port 3000
-```
-
-- 演示：
-
-![gitmars-ui.gif](https://raw.githubusercontent.com/saqqdy/gitmars/master/static/img/gitmars-ui.gif)
-
 [npm-image]: https://img.shields.io/npm/v/gitmars.svg?style=flat-square
 [npm-url]: https://npmjs.com/package/gitmars
 [travis-image]: https://travis-ci.com/saqqdy/gitmars.svg?branch=master

diff --git a/build/packages.ts b/build/packages.ts
@@ -23,28 +23,6 @@ export const packages: PackageManifest[] = [
 		output: 'lib',
 		display: '这是一个git工作流工具'
 	},
-	{
-		name: 'server',
-		pkgName: '@gitmars/server',
-		buildTask: ['lib'],
-		iife: false,
-		cjs: false,
-		mjs: true,
-		dts: false,
-		output: 'lib',
-		display: 'gitmars可视化界面服务端'
-	},
-	{
-		name: 'ui',
-		pkgName: '@gitmars/ui',
-		buildTask: 'app',
-		iife: false,
-		mjs: false,
-		dts: false,
-		submodules: false,
-		output: 'dist',
-		display: 'gitmars可视化界面'
-	},
 	{
 		name: 'docs',
 		pkgName: '@gitmars/docs',

diff --git a/build/tasks/buildLib.ts b/build/tasks/buildLib.ts
@@ -34,15 +34,7 @@ if (childBuildLibIndex > -1) {
 }
 
 export async function buildLib() {
-	const externals = [
-		'js-cool',
-		'lodash-unified',
-		'lodash-es',
-		'@gitmars/core',
-		'@gitmars/docs',
-		'@gitmars/server',
-		'@gitmars/ui'
-	]
+	const externals = ['js-cool', 'lodash-unified', 'lodash-es', '@gitmars/core', '@gitmars/docs']
 	const builds = pkgs.map(
 		async ({
 			globals = {},

diff --git a/build/utils/paths.ts b/build/utils/paths.ts
@@ -6,16 +6,10 @@ export const PACKAGE = resolve(ROOT, 'packages')
 export const CORE = resolve(PACKAGE, 'core')
 export const GITMARS = resolve(PACKAGE, 'gitmars')
 export const DOCS = resolve(PACKAGE, 'docs')
-export const SERVER = resolve(PACKAGE, 'server')
-export const UI = resolve(PACKAGE, 'ui')
 
 export const CORE_INPUT = resolve(CORE, 'src')
 export const CORE_OUTPUT = resolve(CORE, 'lib')
 export const GITMARS_INPUT = resolve(GITMARS, 'src')
 export const GITMARS_OUTPUT = resolve(GITMARS, 'lib')
 // export const DOCS_INPUT = resolve(DOCS, '.')
 export const DOCS_OUTPUT = resolve(DOCS, 'dist')
-// export const SERVER_INPUT = resolve(SERVER, '.')
-export const SERVER_OUTPUT = resolve(SERVER, 'app')
-// export const UI_INPUT = resolve(UI, '.')
-export const UI_OUTPUT = resolve(UI, 'dist')
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/monorepo",
 	"description": "这是一个git工作流工具",
-	"version": "5.3.0",
+	"version": "6.0.0-beta.1",
 	"packageManager": "[email protected]",
 	"main": "index.js",
 	"files": [
@@ -14,10 +14,6 @@
 		"docs:build": "vitepress build packages/docs",
 		"docs:deploy": "pnpm build docs",
 		"prebuild": "[[ $CI = true ]] && npx pnpm install -r --store=node_modules/.pnpm-store || echo skipping pnpm install",
-		"server:start": "node app/bin/www",
-		"server:watch": "nodemon --config nodemon.json",
-		"server:watch:debug": "nodemon --config nodemon.json --inspect-brk",
-		"server:super": "supervisor app/bin/www",
 		"gen:version": "tscjs scripts/version",
 		"lib": "sh scripts/lib.sh",
 		"build": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" gulp --require @esbuild-kit/cjs-loader -f build/gulpfile.ts",
@@ -51,28 +47,30 @@
 		"chalk": "^4.1.2",
 		"debug": "^4.3.4",
 		"inquirer": "^8.2.5",
-		"js-cool": "^5.7.2",
+		"js-cool": "^5.11.0",
 		"morgan": "^1.10.0",
 		"os-lang": "^3.2.0"
 	},
 	"devDependencies": {
-		"@esbuild-kit/cjs-loader": "^2.4.2",
-		"@esbuild-kit/esm-loader": "^2.5.5",
-		"@eslint-sets/eslint-config-ts": "^5.8.0",
-		"@microsoft/api-extractor": "^7.36.4",
+		"@esbuild-kit/cjs-loader": "^2.4.4",
+		"@esbuild-kit/esm-loader": "^2.6.5",
+		"@eslint-sets/eslint-config-ts": "^5.10.0",
+		"@microsoft/api-extractor": "^7.38.0",
 		"@pnpm/logger": "^5.0.0",
-		"@rollup/plugin-alias": "^5.0.0",
-		"@rollup/plugin-commonjs": "^25.0.4",
-		"@rollup/plugin-json": "^6.0.0",
-		"@rollup/plugin-node-resolve": "^15.2.1",
-		"@types/gulp": "^4.0.13",
+		"@rollup/plugin-alias": "^5.0.1",
+		"@rollup/plugin-commonjs": "^25.0.7",
+		"@rollup/plugin-json": "^6.0.1",
+		"@rollup/plugin-node-resolve": "^15.2.3",
+		"@types/gulp": "^4.0.15",
 		"@types/inquirer": "^8.2.6",
-		"@types/node": "^20.6.0",
-		"@types/rollup-plugin-css-only": "^3.1.0",
+		"@types/node": "^20.8.6",
+		"@types/rollup-plugin-css-only": "^3.1.1",
+		"@vitejs/plugin-vue": "^4.4.0",
+		"@vitejs/plugin-vue-jsx": "^3.0.2",
 		"consola": "^3.2.3",
 		"cross-env": "^7.0.3",
-		"esbuild": "^0.19.2",
-		"eslint": "^8.49.0",
+		"esbuild": "^0.19.4",
+		"eslint": "^8.51.0",
 		"fast-glob": "^3.3.1",
 		"gulp": "^4.0.2",
 		"gulp-typescript": "6.0.0-alpha.1",
@@ -82,22 +80,22 @@
 		"prettier": "^3.0.3",
 		"prettier-config-common": "^1.4.0",
 		"reinstaller": "^3.0.2",
-		"rimraf": "^5.0.1",
+		"rimraf": "^5.0.5",
 		"rm-all": "^1.1.1",
-		"rollup": "^3.29.0",
+		"rollup": "^4.1.4",
 		"rollup-plugin-add-banner": "^1.1.0",
 		"rollup-plugin-css-only": "^4.3.0",
-		"rollup-plugin-dts": "^6.0.1",
-		"rollup-plugin-esbuild": "^5.0.0",
+		"rollup-plugin-dts": "^6.1.0",
+		"rollup-plugin-esbuild": "^6.1.0",
 		"rollup-plugin-filesize": "^10.0.0",
-		"rollup-plugin-node-externals": "^6.1.1",
+		"rollup-plugin-node-externals": "^6.1.2",
 		"rollup-plugin-replace-shebang": "^1.2.0",
 		"rollup-plugin-visualizer": "^5.9.2",
 		"tsnd": "^1.1.0",
-		"typedoc": "^0.25.1",
+		"typedoc": "^0.25.2",
 		"typedoc-plugin-markdown": "^3.16.0",
 		"typescript": "^5.2.2",
-		"unplugin-vue-define-options": "^1.3.17",
+		"unplugin-vue-define-options": "^1.3.18",
 		"zx": "^7.2.3"
 	},
 	"peerDependencies": {

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -51,15 +51,15 @@
 	"dependencies": {
 		"@jssj/request": "^1.1.0",
 		"chalk": "^4.1.2",
-		"ci-info": "^3.8.0",
+		"ci-info": "^3.9.0",
 		"columnify": "^1.6.0",
-		"commander": "^11.0.0",
-		"cosmiconfig": "^8.3.5",
+		"commander": "^11.1.0",
+		"cosmiconfig": "^8.3.6",
 		"cross-spawn": "^7.0.3",
-		"dayjs": "^1.11.9",
+		"dayjs": "^1.11.10",
 		"debug": "^4.3.4",
 		"inquirer": "^8.2.5",
-		"js-cool": "^5.7.2",
+		"js-cool": "^5.11.0",
 		"lodash-es": "^4.17.21",
 		"lodash-unified": "^1.0.3",
 		"node-apollo": "^1.2.1",
@@ -70,14 +70,15 @@
 		"slash": "^3.0.0"
 	},
 	"devDependencies": {
-		"@eslint-sets/eslint-config-ts": "^5.8.0",
+		"@eslint-sets/eslint-config-ts": "^5.10.0",
 		"@types/cross-spawn": "^6.0.3",
+		"@types/debug": "^4.1.9",
 		"@types/inquirer": "^8.2.6",
 		"@types/lodash-es": "^4.17.9",
-		"@types/node": "^20.6.0",
-		"@types/shelljs": "^0.8.12",
+		"@types/node": "^20.8.6",
+		"@types/shelljs": "^0.8.13",
 		"cross-env": "^7.0.3",
-		"eslint": "^8.49.0",
+		"eslint": "^8.51.0",
 		"madge": "^6.1.0",
 		"prettier": "^3.0.3",
 		"prettier-config-common": "^1.4.0",

diff --git a/packages/docs/.vitepress/config.ts b/packages/docs/.vitepress/config.ts
@@ -218,10 +218,6 @@ const sidebar = {
 					text: 'gitm status',
 					link: '/api/#gitm-status'
 				},
-				{
-					text: 'gitm ui',
-					link: '/api/#gitm-ui'
-				},
 				{
 					text: 'gitm link',
 					link: '/api/#gitm-link'
@@ -305,7 +301,7 @@ const sidebar = {
 
 export default defineConfigWithTheme({
 	title: 'Gitmars',
-	description: '可视化UI界面',
+	description: '这是一个git工作流工具',
 	base: '/gitmars/',
 	outDir: 'dist',
 	// theme: '@vuepress/default',
@@ -317,7 +313,6 @@ export default defineConfigWithTheme({
 			{ text: 'API参考', link: '/api/' },
 			{ text: '示例', link: '/example/' },
 			// { text: 'Git Hooks', link: '/hook/' },
-			{ text: 'UI界面', link: '/ui/' },
 			{ text: 'Go', link: '/go/' },
 			{
 				text: '更多',