release 7.0.0

saqqdy · Apr 15, 2024 · d1bb1a2 · d1bb1a2
1 parent 5189ba4
commit d1bb1a2
Show file tree

Hide file tree

Showing 54 changed files with 1,366 additions and 2,821 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -6,5 +6,19 @@ module.exports = {
 	globals: {
 		window: true,
 		global: true
-	}
+	},
+	ignorePatterns: [
+		'lib',
+		'es',
+		'dist',
+		'docs',
+		'app',
+		'ui',
+		'cache/*',
+		'*_bak',
+		'*.bak',
+		'pnpm-lock.yaml',
+		'stats.html',
+		'dist_electron'
+	]
 }
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,9 +11,9 @@ updates:
       interval: weekly
     open-pull-requests-limit: 2
     ignore:
-      - dependency-name: 'core-js'
-      - dependency-name: 'eslint'
-      - dependency-name: 'prettier'
+      - dependency-name: core-js
+      - dependency-name: eslint
+      - dependency-name: prettier
       - dependency-name: '@babel/*'
       - dependency-name: '@types/*'
       - dependency-name: typescript
@@ -27,9 +27,9 @@ updates:
       interval: weekly
     open-pull-requests-limit: 2
     ignore:
-      - dependency-name: 'core-js'
-      - dependency-name: 'eslint'
-      - dependency-name: 'prettier'
+      - dependency-name: core-js
+      - dependency-name: eslint
+      - dependency-name: prettier
       - dependency-name: '@babel/*'
       - dependency-name: '@types/*'
       - dependency-name: typescript
@@ -43,9 +43,9 @@ updates:
       interval: weekly
     open-pull-requests-limit: 2
     ignore:
-      - dependency-name: 'core-js'
-      - dependency-name: 'eslint'
-      - dependency-name: 'prettier'
+      - dependency-name: core-js
+      - dependency-name: eslint
+      - dependency-name: prettier
       - dependency-name: '@babel/*'
       - dependency-name: '@types/*'
       - dependency-name: typescript
@@ -59,9 +59,9 @@ updates:
       interval: weekly
     open-pull-requests-limit: 2
     ignore:
-      - dependency-name: 'core-js'
-      - dependency-name: 'eslint'
-      - dependency-name: 'prettier'
+      - dependency-name: core-js
+      - dependency-name: eslint
+      - dependency-name: prettier
       - dependency-name: '@babel/*'
       - dependency-name: '@types/*'
       - dependency-name: typescript
@@ -75,9 +75,9 @@ updates:
       interval: weekly
     open-pull-requests-limit: 2
     ignore:
-      - dependency-name: 'core-js'
-      - dependency-name: 'eslint'
-      - dependency-name: 'prettier'
+      - dependency-name: core-js
+      - dependency-name: eslint
+      - dependency-name: prettier
       - dependency-name: '@babel/*'
       - dependency-name: '@types/*'
       - dependency-name: typescript
@@ -91,9 +91,9 @@ updates:
       interval: weekly
     open-pull-requests-limit: 2
     ignore:
-      - dependency-name: 'core-js'
-      - dependency-name: 'eslint'
-      - dependency-name: 'prettier'
+      - dependency-name: core-js
+      - dependency-name: eslint
+      - dependency-name: prettier
       - dependency-name: '@babel/*'
       - dependency-name: '@types/*'
       - dependency-name: typescript
@@ -107,9 +107,9 @@ updates:
       interval: weekly
     open-pull-requests-limit: 2
     ignore:
-      - dependency-name: 'core-js'
-      - dependency-name: 'eslint'
-      - dependency-name: 'prettier'
+      - dependency-name: core-js
+      - dependency-name: eslint
+      - dependency-name: prettier
       - dependency-name: '@babel/*'
       - dependency-name: '@types/*'
       - dependency-name: typescript
@@ -123,9 +123,9 @@ updates:
       interval: weekly
     open-pull-requests-limit: 2
     ignore:
-      - dependency-name: 'core-js'
-      - dependency-name: 'eslint'
-      - dependency-name: 'prettier'
+      - dependency-name: core-js
+      - dependency-name: eslint
+      - dependency-name: prettier
       - dependency-name: '@babel/*'
       - dependency-name: '@types/*'
       - dependency-name: typescript
@@ -139,9 +139,9 @@ updates:
       interval: weekly
     open-pull-requests-limit: 2
     ignore:
-      - dependency-name: 'core-js'
-      - dependency-name: 'eslint'
-      - dependency-name: 'prettier'
+      - dependency-name: core-js
+      - dependency-name: eslint
+      - dependency-name: prettier
       - dependency-name: '@babel/*'
       - dependency-name: '@types/*'
       - dependency-name: typescript
@@ -155,9 +155,9 @@ updates:
       interval: weekly
     open-pull-requests-limit: 2
     ignore:
-      - dependency-name: 'core-js'
-      - dependency-name: 'eslint'
-      - dependency-name: 'prettier'
+      - dependency-name: core-js
+      - dependency-name: eslint
+      - dependency-name: prettier
       - dependency-name: '@babel/*'
       - dependency-name: '@types/*'
       - dependency-name: typescript
@@ -171,9 +171,9 @@ updates:
       interval: weekly
     open-pull-requests-limit: 2
     ignore:
-      - dependency-name: 'core-js'
-      - dependency-name: 'eslint'
-      - dependency-name: 'prettier'
+      - dependency-name: core-js
+      - dependency-name: eslint
+      - dependency-name: prettier
       - dependency-name: '@babel/*'
       - dependency-name: '@types/*'
       - dependency-name: typescript

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/monorepo",
 	"description": "这是一个git工作流工具",
-	"version": "7.0.0-beta.1",
+	"version": "7.0.0-beta.2",
 	"packageManager": "[email protected]",
 	"main": "index.js",
 	"files": [
@@ -16,9 +16,9 @@
 		"prebuild": "[[ $CI = true ]] && npx pnpm install -r --store=node_modules/.pnpm-store || echo skipping pnpm install",
 		"gen:version": "tscjs scripts/version",
 		"lib": "sh scripts/lib.sh",
-		"build": "tscjs scripts/build",
+		"build:bundle": "tscjs scripts/build",
 		"build:rollup": "cross-env NODE_OPTIONS=\"--max-old-space-size=6144\" rollup -c build/rollup.config.ts --configPlugin @rollup/plugin-typescript",
-		"build:lib": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" gulp --require @esbuild-kit/cjs-loader -f build/gulpfile.ts",
+		"build": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" gulp --preload @esbuild-kit/cjs-loader -f build/gulpfile.ts",
 		"build:types": "run-s build-temp-types roll-types",
 		"build-temp-types": "tsc --emitDeclarationOnly --outDir temp/ -p bin/",
 		"patch-types": "node scripts/patchTypes",
@@ -33,7 +33,7 @@
 		"update": "tscjs scripts/update",
 		"workflow:publish-test": "zx scripts/workflow.mjs",
 		"clean": "rimraf dist packages/*/{dist,lib,es,app}",
-		"dist": "pnpm run update && pnpm build",
+		"dist": "pnpm run update && pnpm build:bundle",
 		"docs": "rimraf typedoc && typedoc",
 		"eslint": "eslint --fix --ext .ts,.js ./",
 		"prettier": "prettier --write \"**/*.{js,ts,json,md}\"",
@@ -58,7 +58,7 @@
 		"@esbuild-kit/cjs-loader": "^2.4.4",
 		"@esbuild-kit/esm-loader": "^2.6.5",
 		"@eslint-sets/eslint-config-ts": "^5.12.0",
-		"@microsoft/api-extractor": "^7.42.1",
+		"@microsoft/api-extractor": "^7.43.1",
 		"@pnpm/logger": "^5.0.0",
 		"@rollup/plugin-alias": "^5.1.0",
 		"@rollup/plugin-babel": "^6.0.4",
@@ -70,26 +70,26 @@
 		"@rollup/plugin-typescript": "^11.1.6",
 		"@types/gulp": "^4.0.17",
 		"@types/inquirer": "^8.2.6",
-		"@types/node": "^20.11.24",
+		"@types/node": "^20.12.7",
 		"@types/rollup-plugin-css-only": "^3.1.3",
 		"@vitejs/plugin-vue": "^5.0.4",
 		"@vitejs/plugin-vue-jsx": "^3.1.0",
 		"consola": "^3.2.3",
 		"cross-env": "^7.0.3",
-		"esbuild": "^0.20.1",
+		"esbuild": "^0.20.2",
 		"eslint": "^8.57.0",
 		"fast-glob": "^3.3.2",
-		"gulp": "^4.0.2",
+		"gulp": "^5.0.0",
 		"gulp-typescript": "6.0.0-alpha.1",
 		"load-yml": "^1.4.0",
-		"madge": "^6.1.0",
+		"madge": "^7.0.0",
 		"npm-run-all": "^4.1.5",
 		"prettier": "^3.2.5",
 		"prettier-config-common": "^1.4.0",
 		"reinstaller": "^3.0.2",
 		"rimraf": "^5.0.5",
 		"rm-all": "^1.1.1",
-		"rollup": "^4.12.0",
+		"rollup": "^4.14.3",
 		"rollup-plugin-add-banner": "^1.1.0",
 		"rollup-plugin-css-only": "^4.5.2",
 		"rollup-plugin-esbuild": "^6.1.1",
@@ -98,11 +98,11 @@
 		"rollup-plugin-replace-shebang": "^1.2.0",
 		"rollup-plugin-visualizer": "^5.12.0",
 		"tsnd": "^1.1.0",
-		"typedoc": "^0.25.9",
+		"typedoc": "^0.25.13",
 		"typedoc-plugin-markdown": "^3.17.1",
-		"typescript": "^5.3.3",
-		"unplugin-vue-define-options": "^1.4.2",
-		"zx": "^7.2.3"
+		"typescript": "^5.4.5",
+		"unplugin-vue-define-options": "^1.4.3",
+		"zx": "^8.0.1"
 	},
 	"peerDependencies": {
 		"eslint": ">=8.0.0",

diff --git a/packages/api/.eslintignore b/packages/api/.eslintignore
diff --git a/packages/api/.eslintrc.js b/packages/api/.eslintrc.js
@@ -3,5 +3,19 @@ module.exports = {
 	rules: {
 		camelcase: 0,
 		'import/namespace': [2, { allowComputed: true }]
-	}
+	},
+	ignorePatterns: [
+		'lib',
+		'es',
+		'dist',
+		'docs',
+		'app',
+		'ui',
+		'cache/*',
+		'*_bak',
+		'*.bak',
+		'pnpm-lock.yaml',
+		'stats.html',
+		'dist_electron'
+	]
 }
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/api",
 	"description": "gitmars api",
-	"version": "7.0.0-beta.1",
+	"version": "7.0.0-beta.2",
 	"private": false,
 	"main": "./dist/index.cjs.js",
 	"module": "./dist/index.esm-bundler.js",
@@ -40,15 +40,15 @@
 	"devDependencies": {
 		"@eslint-sets/eslint-config-ts": "^5.12.0",
 		"@types/lodash-es": "^4.17.12",
-		"@types/node": "^20.11.24",
+		"@types/node": "^20.12.7",
 		"@types/shelljs": "^0.8.15",
 		"cross-env": "^7.0.3",
 		"eslint": "^8.57.0",
-		"madge": "^6.1.0",
+		"madge": "^7.0.0",
 		"prettier": "^3.2.5",
 		"prettier-config-common": "^1.4.0",
 		"tsnd": "^1.1.0",
-		"typescript": "^5.3.3"
+		"typescript": "^5.4.5"
 	},
 	"sideEffects": false,
 	"keywords": [

diff --git a/packages/api/src/getUserInfo.ts b/packages/api/src/getUserInfo.ts
@@ -1,9 +1,8 @@
 import sh from 'shelljs'
 import chalk from 'chalk'
 import request from '@jssj/request'
-import { getConfig } from '@gitmars/git'
+import { getConfig, getGitUser } from '@gitmars/git'
 import { debug } from '@gitmars/utils'
-import { getGitUser } from '@gitmars/git'
 import type { FetchDataType } from './types'
 import lang from './lang'
 

diff --git a/packages/api/src/mergeRequest.ts b/packages/api/src/mergeRequest.ts
@@ -1,8 +1,7 @@
 import chalk from 'chalk'
 import request from '@jssj/request'
-import { getConfig } from '@gitmars/git'
+import { getConfig, getGitToken } from '@gitmars/git'
 import { debug } from '@gitmars/utils'
-import { getGitToken } from '@gitmars/git'
 import lang from './lang'
 
 const { t } = lang

diff --git a/packages/api/src/mergeRequestNotes.ts b/packages/api/src/mergeRequestNotes.ts
@@ -1,8 +1,7 @@
 import chalk from 'chalk'
 import request from '@jssj/request'
-import { getConfig } from '@gitmars/git'
+import { getConfig, getGitToken } from '@gitmars/git'
 import { debug } from '@gitmars/utils'
-import { getGitToken } from '@gitmars/git'
 import lang from './lang'
 
 const { t } = lang

diff --git a/packages/build/.eslintignore b/packages/build/.eslintignore
diff --git a/packages/build/.eslintrc.js b/packages/build/.eslintrc.js
@@ -3,5 +3,19 @@ module.exports = {
 	rules: {
 		camelcase: 0,
 		'import/namespace': [2, { allowComputed: true }]
-	}
+	},
+	ignorePatterns: [
+		'lib',
+		'es',
+		'dist',
+		'docs',
+		'app',
+		'ui',
+		'cache/*',
+		'*_bak',
+		'*.bak',
+		'pnpm-lock.yaml',
+		'stats.html',
+		'dist_electron'
+	]
 }