Skip to content

Commit 6ebf123

Browse files
committed
release 7.0.0
1 parent 52c4c32 commit 6ebf123

File tree

15 files changed

+27
-23
lines changed

15 files changed

+27
-23
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@gitmars/monorepo",
33
"description": "这是一个git工作流工具",
4-
"version": "7.0.0-beta.22",
4+
"version": "7.0.0-beta.23",
55
"packageManager": "[email protected]",
66
"main": "index.js",
77
"files": [

packages/api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@gitmars/api",
33
"description": "gitmars api",
4-
"version": "7.0.0-beta.22",
4+
"version": "7.0.0-beta.23",
55
"private": false,
66
"main": "./dist/index.cjs.js",
77
"module": "./dist/index.esm-bundler.js",

packages/build/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@gitmars/build",
33
"description": "gitmars build",
4-
"version": "7.0.0-beta.22",
4+
"version": "7.0.0-beta.23",
55
"private": false,
66
"main": "./dist/index.cjs.js",
77
"module": "./dist/index.esm-bundler.js",

packages/cache/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@gitmars/cache",
33
"description": "gitmars cache",
4-
"version": "7.0.0-beta.22",
4+
"version": "7.0.0-beta.23",
55
"private": false,
66
"main": "./dist/index.cjs.js",
77
"module": "./dist/index.esm-bundler.js",

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@gitmars/core",
33
"description": "gitmars核心程序",
4-
"version": "7.0.0-beta.22",
4+
"version": "7.0.0-beta.23",
55
"private": false,
66
"main": "./dist/index.cjs.js",
77
"module": "./dist/index.esm-bundler.js",

packages/core/src/versionControl.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ const { version } = require('../package.json')
2121
export async function isNeedUpgrade(type?: VersionControlType): Promise<boolean> {
2222
type ??= 'minor'
2323
const { 'dist-tags': tags } = await getPkgInfo()
24-
let targetVersion = tags.latest,
24+
let tagVersion = tags.latest,
2525
isPreVer = false
2626

2727
if (version.includes('alpha')) {
28-
targetVersion = tags.alpha
28+
tagVersion = tags.alpha
2929
isPreVer = true
3030
} else if (version.includes('beta')) {
31-
targetVersion = tags.beta
31+
tagVersion = tags.beta
3232
isPreVer = true
3333
} else if (version.includes('rc')) {
34-
targetVersion = tags.rc
34+
tagVersion = tags.rc
3535
isPreVer = true
3636
}
37-
debug('tags-versions', tags, targetVersion)
37+
debug('tags-versions', tags, tagVersion)
3838
// let compareVers = []
3939
// if (version.indexOf('1.') === 0) {
4040
// // compareVers = versions.filter(
@@ -49,9 +49,10 @@ export async function isNeedUpgrade(type?: VersionControlType): Promise<boolean>
4949
// // return false
5050
// return parseFloat(tags.lite) > parseFloat(version)
5151
// }
52-
const semver = semverDiff(version, targetVersion)
52+
const semver = semverDiff(version, tags.latest)
53+
const semverTag = semverDiff(version, tagVersion)
5354
if (!type || !semver) return false
54-
else if (isPreVer) return true
55+
else if (isPreVer && semverTag) return true
5556
return (
5657
(type === 'patch' &&
5758
['prerelease', 'major', 'premajor', 'minor', 'preminor', 'patch', 'prepatch'].includes(

packages/docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@gitmars/docs",
33
"description": "gitmars文档库",
4-
"version": "7.0.0-beta.22",
4+
"version": "7.0.0-beta.23",
55
"private": false,
66
"files": [
77
"dist",

packages/git/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@gitmars/git",
33
"description": "gitmars git",
4-
"version": "7.0.0-beta.22",
4+
"version": "7.0.0-beta.23",
55
"private": false,
66
"main": "./dist/index.cjs.js",
77
"module": "./dist/index.esm-bundler.js",

packages/gitmars/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "gitmars",
33
"description": "这是一个git工作流工具",
44
"type": "module",
5-
"version": "7.0.0-beta.22",
5+
"version": "7.0.0-beta.23",
66
"private": false,
77
"bin": {
88
"gitm": "lib/gitm.mjs"

packages/gitmars/src/gitm-build-mp.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ program.action(async (project: string, opt: GitmBuildMpOption): Promise<void> =>
9494
if (!buildConfig) {
9595
;[, app] = await to(
9696
input({
97-
message: t('Enter the miniprogram to build'),
97+
message: t('Enter the application to build'),
9898
transformer: val => val.trim()
9999
})
100100
)
101101
} else if (projectOption?.apps) {
102102
;[, app] = await to(
103103
select<string>({
104-
message: t('Select the miniprogram to build'),
104+
message: t('Select the application to build'),
105105
choices: projectOption.apps.map(name => ({
106106
name,
107107
value: name

0 commit comments

Comments
 (0)