Merge branch 'dev'

saqqdy · May 5, 2024 · d40271a · d40271a
2 parents c3c2fa7 + dd60b9c
commit d40271a
Show file tree

Hide file tree

Showing 315 changed files with 20,383 additions and 11,528 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,57 @@ 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
+        versions: [4.x]
+      - dependency-name: '*'
+        update-types: ['version-update:semver-patch']
+
+  - package-ecosystem: npm # See documentation for possible values
+    directory: /packages/api # Location of package manifests
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 2
+    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/build # Location of package manifests
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 2
+    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/cache # Location of package manifests
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 2
+    ignore:
+      - dependency-name: core-js
+      - dependency-name: eslint
+      - dependency-name: prettier
       - dependency-name: '@babel/*'
       - dependency-name: '@types/*'
       - dependency-name: typescript
@@ -27,9 +75,73 @@ 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
+        versions: [4.x]
+      - dependency-name: '*'
+        update-types: ['version-update:semver-patch']
+
+  - package-ecosystem: npm # See documentation for possible values
+    directory: /packages/git # Location of package manifests
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 2
+    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/go # Location of package manifests
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 2
+    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/hook # Location of package manifests
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 2
+    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/utils # Location of package manifests
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 2
+    ignore:
+      - dependency-name: core-js
+      - dependency-name: eslint
+      - dependency-name: prettier
       - dependency-name: '@babel/*'
       - dependency-name: '@types/*'
       - dependency-name: typescript
@@ -43,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
@@ -59,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/.github/workflows/publish-test.yml b/.github/workflows/publish-test.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           registry-url: https://registry.npmmirror.com
           cache: pnpm
 
@@ -46,7 +46,14 @@ jobs:
       - name: Gen .npmrc
         run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./.npmrc
 
+      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/api/.npmrc
+      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/build/.npmrc
+      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/cache/.npmrc
       - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/core/.npmrc
+      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/git/.npmrc
+      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/go/.npmrc
+      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/hook/.npmrc
+      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/utils/.npmrc
       - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/gitmars/.npmrc
       - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/docs/.npmrc
 
@@ -55,6 +62,13 @@ jobs:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
 
       - 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/api/sync"
+      - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/build/sync"
+      - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/cache/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/git/sync"
+      - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/go/sync"
+      - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/hook/sync"
+      - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/utils/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/docs/sync"
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           registry-url: https://registry.npmmirror.com
           cache: pnpm
 
@@ -48,7 +48,14 @@ jobs:
       - name: Gen .npmrc
         run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./.npmrc
 
+      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/api/.npmrc
+      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/build/.npmrc
+      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/cache/.npmrc
       - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/core/.npmrc
+      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/git/.npmrc
+      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/go/.npmrc
+      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/hook/.npmrc
+      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/utils/.npmrc
       - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/gitmars/.npmrc
       - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/docs/.npmrc
 
@@ -57,6 +64,13 @@ jobs:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
 
       - 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/api/sync"
+      - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/build/sync"
+      - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/cache/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/git/sync"
+      - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/go/sync"
+      - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/hook/sync"
+      - run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/utils/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/docs/sync"
diff --git a/.gitignore b/.gitignore
@@ -46,9 +46,10 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw*
-**/cache/*
-!**/cache/.gitkeep
+**/cache/cache/*
+!**/cache/cache/.gitkeep
 stats.html
 
 #Electron-builder output
 dist_electron
+tsconfig.tsbuildinfo
diff --git a/.npmrc b/.npmrc
@@ -1,2 +1,3 @@
 shamefully-hoist=true
 strict-peer-dependencies=false
+git-checks=false
diff --git a/.reinstallerrc b/.reinstallerrc
@@ -2,15 +2,16 @@
 	"packageTags": {
 		"@eslint-sets/eslint-config-ts": "latest",
 		"@eslint-sets/eslint-config-vue3": "latest",
-		"reinstaller": "latest"
+		"reinstaller": "latest",
+		"@inquirer/prompts": "3",
+		"inquirer": "8",
+		"eslint": "8"
 	},
 	"exclude": [
 		"slash",
 		"lowdb",
 		"chalk",
-		"ora",
-		"inquirer",
-        "@types/inquirer"
+		"ora"
 	],
 	"packageManager": "pnpm",
 	"registry": "https://registry.npmmirror.com"

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -68,6 +68,7 @@
 		"lsof",
 		"maxage",
 		"minify",
+		"miniprogram",
 		"msg",
 		"namespace",
 		"npmjs",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # 更新日志
 
+## 2024.04.23 v7.0.0
+
+1. 重构项目，合理规划代码
+2. 新增`build-mp`指令构建小程序
+3. `end` `combine` 指令支持批量操作
+4. `build`指令改造成可选参数形式，project参数取消必填限制
+5. 构建配置支持在list里面设置token
+6. 清理不需要的依赖包
+7. 升级依赖包
+
 ## 2024.03.17 v6.4.0
 
 1. 优化提示信息

diff --git a/babel.config.js b/babel.config.js
@@ -0,0 +1,49 @@
+module.exports = {
+	presets: [
+		[
+			'@babel/env',
+			{
+				// loose: true,
+				modules: 'auto',
+				targets: {
+					node: '12.20',
+					browsers: [
+						'> 1%',
+						'last 2 versions',
+						'not ie < 11',
+						'not ie_mob < 11',
+						'not op_mini all'
+					]
+				},
+				exclude: ['transform-regenerator']
+			}
+		],
+		'@babel/typescript'
+	],
+	env: {
+		es5: {
+			presets: [
+				[
+					'@babel/env',
+					{
+						modules: 'auto',
+						corejs: 3,
+						useBuiltIns: 'usage',
+						targets: {
+							node: '12.20',
+							browsers: [
+								'> 1%',
+								'last 2 versions',
+								'not ie < 11',
+								'not ie_mob < 11',
+								'not op_mini all'
+							]
+						},
+						exclude: ['transform-regenerator']
+					}
+				],
+				'@babel/typescript'
+			]
+		}
+	}
+}