Skip to content

Commit d40271a

Browse files
saqqdysaqqdy
committed
Merge branch 'dev'
2 parents c3c2fa7 + dd60b9c commit d40271a

File tree

315 files changed

+20383
-11528
lines changed

Some content is hidden

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

315 files changed

+20383
-11528
lines changed

‎.eslintrc.js‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,19 @@ module.exports = {
66
globals: {
77
window: true,
88
global: true
9-
}
9+
},
10+
ignorePatterns: [
11+
'lib',
12+
'es',
13+
'dist',
14+
'docs',
15+
'app',
16+
'ui',
17+
'cache/*',
18+
'*_bak',
19+
'*.bak',
20+
'pnpm-lock.yaml',
21+
'stats.html',
22+
'dist_electron'
23+
]
1024
}

‎.github/dependabot.yml‎

Lines changed: 124 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,57 @@ updates:
1111
interval: weekly
1212
open-pull-requests-limit: 2
1313
ignore:
14-
- dependency-name: 'core-js'
15-
- dependency-name: 'eslint'
16-
- dependency-name: 'prettier'
14+
- dependency-name: core-js
15+
- dependency-name: eslint
16+
- dependency-name: prettier
17+
- dependency-name: '@babel/*'
18+
- dependency-name: '@types/*'
19+
- dependency-name: typescript
20+
versions: [4.x]
21+
- dependency-name: '*'
22+
update-types: ['version-update:semver-patch']
23+
24+
- package-ecosystem: npm # See documentation for possible values
25+
directory: /packages/api # Location of package manifests
26+
schedule:
27+
interval: weekly
28+
open-pull-requests-limit: 2
29+
ignore:
30+
- dependency-name: core-js
31+
- dependency-name: eslint
32+
- dependency-name: prettier
33+
- dependency-name: '@babel/*'
34+
- dependency-name: '@types/*'
35+
- dependency-name: typescript
36+
versions: [4.x]
37+
- dependency-name: '*'
38+
update-types: ['version-update:semver-patch']
39+
40+
- package-ecosystem: npm # See documentation for possible values
41+
directory: /packages/build # Location of package manifests
42+
schedule:
43+
interval: weekly
44+
open-pull-requests-limit: 2
45+
ignore:
46+
- dependency-name: core-js
47+
- dependency-name: eslint
48+
- dependency-name: prettier
49+
- dependency-name: '@babel/*'
50+
- dependency-name: '@types/*'
51+
- dependency-name: typescript
52+
versions: [4.x]
53+
- dependency-name: '*'
54+
update-types: ['version-update:semver-patch']
55+
56+
- package-ecosystem: npm # See documentation for possible values
57+
directory: /packages/cache # Location of package manifests
58+
schedule:
59+
interval: weekly
60+
open-pull-requests-limit: 2
61+
ignore:
62+
- dependency-name: core-js
63+
- dependency-name: eslint
64+
- dependency-name: prettier
1765
- dependency-name: '@babel/*'
1866
- dependency-name: '@types/*'
1967
- dependency-name: typescript
@@ -27,9 +75,73 @@ updates:
2775
interval: weekly
2876
open-pull-requests-limit: 2
2977
ignore:
30-
- dependency-name: 'core-js'
31-
- dependency-name: 'eslint'
32-
- dependency-name: 'prettier'
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/git # Location of package manifests
90+
schedule:
91+
interval: weekly
92+
open-pull-requests-limit: 2
93+
ignore:
94+
- dependency-name: core-js
95+
- dependency-name: eslint
96+
- dependency-name: prettier
97+
- dependency-name: '@babel/*'
98+
- dependency-name: '@types/*'
99+
- dependency-name: typescript
100+
versions: [4.x]
101+
- dependency-name: '*'
102+
update-types: ['version-update:semver-patch']
103+
104+
- package-ecosystem: npm # See documentation for possible values
105+
directory: /packages/go # Location of package manifests
106+
schedule:
107+
interval: weekly
108+
open-pull-requests-limit: 2
109+
ignore:
110+
- dependency-name: core-js
111+
- dependency-name: eslint
112+
- dependency-name: prettier
113+
- dependency-name: '@babel/*'
114+
- dependency-name: '@types/*'
115+
- dependency-name: typescript
116+
versions: [4.x]
117+
- dependency-name: '*'
118+
update-types: ['version-update:semver-patch']
119+
120+
- package-ecosystem: npm # See documentation for possible values
121+
directory: /packages/hook # Location of package manifests
122+
schedule:
123+
interval: weekly
124+
open-pull-requests-limit: 2
125+
ignore:
126+
- dependency-name: core-js
127+
- dependency-name: eslint
128+
- dependency-name: prettier
129+
- dependency-name: '@babel/*'
130+
- dependency-name: '@types/*'
131+
- dependency-name: typescript
132+
versions: [4.x]
133+
- dependency-name: '*'
134+
update-types: ['version-update:semver-patch']
135+
136+
- package-ecosystem: npm # See documentation for possible values
137+
directory: /packages/utils # Location of package manifests
138+
schedule:
139+
interval: weekly
140+
open-pull-requests-limit: 2
141+
ignore:
142+
- dependency-name: core-js
143+
- dependency-name: eslint
144+
- dependency-name: prettier
33145
- dependency-name: '@babel/*'
34146
- dependency-name: '@types/*'
35147
- dependency-name: typescript
@@ -43,9 +155,9 @@ updates:
43155
interval: weekly
44156
open-pull-requests-limit: 2
45157
ignore:
46-
- dependency-name: 'core-js'
47-
- dependency-name: 'eslint'
48-
- dependency-name: 'prettier'
158+
- dependency-name: core-js
159+
- dependency-name: eslint
160+
- dependency-name: prettier
49161
- dependency-name: '@babel/*'
50162
- dependency-name: '@types/*'
51163
- dependency-name: typescript
@@ -59,9 +171,9 @@ updates:
59171
interval: weekly
60172
open-pull-requests-limit: 2
61173
ignore:
62-
- dependency-name: 'core-js'
63-
- dependency-name: 'eslint'
64-
- dependency-name: 'prettier'
174+
- dependency-name: core-js
175+
- dependency-name: eslint
176+
- dependency-name: prettier
65177
- dependency-name: '@babel/*'
66178
- dependency-name: '@types/*'
67179
- dependency-name: typescript

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Use Node.js ${{ matrix.node-version }}
2323
uses: actions/setup-node@v3
2424
with:
25-
node-version: 16
25+
node-version: 18
2626
registry-url: https://registry.npmmirror.com
2727
cache: pnpm
2828

@@ -46,7 +46,14 @@ jobs:
4646
- name: Gen .npmrc
4747
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./.npmrc
4848

49+
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/api/.npmrc
50+
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/build/.npmrc
51+
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/cache/.npmrc
4952
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/core/.npmrc
53+
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/git/.npmrc
54+
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/go/.npmrc
55+
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/hook/.npmrc
56+
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/utils/.npmrc
5057
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/gitmars/.npmrc
5158
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/docs/.npmrc
5259

@@ -55,6 +62,13 @@ jobs:
5562
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
5663

5764
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/monorepo/sync"
65+
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/api/sync"
66+
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/build/sync"
67+
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/cache/sync"
5868
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/core/sync"
69+
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/git/sync"
70+
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/go/sync"
71+
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/hook/sync"
72+
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/utils/sync"
5973
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/gitmars/sync"
6074
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/docs/sync"

‎.github/workflows/publish.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Use Node.js ${{ matrix.node-version }}
2525
uses: actions/setup-node@v3
2626
with:
27-
node-version: 16
27+
node-version: 18
2828
registry-url: https://registry.npmmirror.com
2929
cache: pnpm
3030

@@ -48,7 +48,14 @@ jobs:
4848
- name: Gen .npmrc
4949
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./.npmrc
5050

51+
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/api/.npmrc
52+
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/build/.npmrc
53+
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/cache/.npmrc
5154
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/core/.npmrc
55+
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/git/.npmrc
56+
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/go/.npmrc
57+
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/hook/.npmrc
58+
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/utils/.npmrc
5259
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/gitmars/.npmrc
5360
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ./packages/docs/.npmrc
5461

@@ -57,6 +64,13 @@ jobs:
5764
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
5865

5966
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/monorepo/sync"
67+
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/api/sync"
68+
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/build/sync"
69+
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/cache/sync"
6070
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/core/sync"
71+
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/git/sync"
72+
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/go/sync"
73+
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/hook/sync"
74+
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/utils/sync"
6175
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/gitmars/sync"
6276
- run: curl -X PUT -d "sync_upstream=true" "https://registry-direct.npmmirror.com/@gitmars/docs/sync"

‎.gitignore‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,10 @@ yarn-error.log*
4646
*.njsproj
4747
*.sln
4848
*.sw*
49-
**/cache/*
50-
!**/cache/.gitkeep
49+
**/cache/cache/*
50+
!**/cache/cache/.gitkeep
5151
stats.html
5252

5353
#Electron-builder output
5454
dist_electron
55+
tsconfig.tsbuildinfo

‎.npmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
shamefully-hoist=true
22
strict-peer-dependencies=false
3+
git-checks=false

‎.reinstallerrc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
"packageTags": {
33
"@eslint-sets/eslint-config-ts": "latest",
44
"@eslint-sets/eslint-config-vue3": "latest",
5-
"reinstaller": "latest"
5+
"reinstaller": "latest",
6+
"@inquirer/prompts": "3",
7+
"inquirer": "8",
8+
"eslint": "8"
69
},
710
"exclude": [
811
"slash",
912
"lowdb",
1013
"chalk",
11-
"ora",
12-
"inquirer",
13-
"@types/inquirer"
14+
"ora"
1415
],
1516
"packageManager": "pnpm",
1617
"registry": "https://registry.npmmirror.com"

‎.vscode/settings.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
"lsof",
6969
"maxage",
7070
"minify",
71+
"miniprogram",
7172
"msg",
7273
"namespace",
7374
"npmjs",

‎CHANGELOG.md‎

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

3+
## 2024.04.23 v7.0.0
4+
5+
1. 重构项目，合理规划代码
6+
2. 新增`build-mp`指令构建小程序
7+
3. `end` `combine` 指令支持批量操作
8+
4. `build`指令改造成可选参数形式，project参数取消必填限制
9+
5. 构建配置支持在list里面设置token
10+
6. 清理不需要的依赖包
11+
7. 升级依赖包
12+
313
## 2024.03.17 v6.4.0
414

515
1. 优化提示信息

‎babel.config.js‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
module.exports = {
2+
presets: [
3+
[
4+
'@babel/env',
5+
{
6+
// loose: true,
7+
modules: 'auto',
8+
targets: {
9+
node: '12.20',
10+
browsers: [
11+
'> 1%',
12+
'last 2 versions',
13+
'not ie < 11',
14+
'not ie_mob < 11',
15+
'not op_mini all'
16+
]
17+
},
18+
exclude: ['transform-regenerator']
19+
}
20+
],
21+
'@babel/typescript'
22+
],
23+
env: {
24+
es5: {
25+
presets: [
26+
[
27+
'@babel/env',
28+
{
29+
modules: 'auto',
30+
corejs: 3,
31+
useBuiltIns: 'usage',
32+
targets: {
33+
node: '12.20',
34+
browsers: [
35+
'> 1%',
36+
'last 2 versions',
37+
'not ie < 11',
38+
'not ie_mob < 11',
39+
'not op_mini all'
40+
]
41+
},
42+
exclude: ['transform-regenerator']
43+
}
44+
],
45+
'@babel/typescript'
46+
]
47+
}
48+
}
49+
}

0 commit comments

Comments
 (0)