fix appversion bug

saqqdy · saqqdy · commit 3e114aa0cbcd · 2023-07-31T15:32:55.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change logs
 
+## 2023.07.31 v5.3.1
+
+1. fix appVersion bug
+
 ## 2023.07.18 v5.3.0
 
 1. new `spliceUrlParam` function
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "js-cool",
 	"description": "Collection of common JavaScript / TypeScript utilities",
-	"version": "5.3.0",
+	"version": "5.3.1",
 	"packageManager": "pnpm@8.6.3",
 	"main": "dist/index.cjs.js",
 	"module": "dist/index.esm-bundler.js",
diff --git a/src/appVersion.ts b/src/appVersion.ts
@@ -35,10 +35,10 @@ function appVersion(appName: string, ua?: string | boolean, ignoreCase?: boolean
 	}
 	if (typeof ignoreCase !== 'boolean') ignoreCase = true
 
-	const reg = new RegExp(`${appName}\/\\d+(.\\d)*(-\\w+.\\d+)*`, ignoreCase ? 'gi' : 'g')
+	const reg = new RegExp(`${appName}\/(\\d+(?:.\\d)*(?:-\\w+.\\d+)*)`, ignoreCase ? 'i' : '')
 	const match = ua.match(reg)
 
-	return match ? match[0] : null
+	return match ? match[1] : null
 }
 
 export default appVersion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "js-cool",`
`3`	`3`	`"description": "Collection of common JavaScript / TypeScript utilities",`
`4`		`- "version": "5.3.0",`
	`4`	`+ "version": "5.3.1",`
`5`	`5`	`"packageManager": "pnpm@8.6.3",`
`6`	`6`	`"main": "dist/index.cjs.js",`
`7`	`7`	`"module": "dist/index.esm-bundler.js",`
Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,10 @@ function appVersion(appName: string, ua?: string \| boolean, ignoreCase?: boolean`
`35`	`35`	`}`
`36`	`36`	`if (typeof ignoreCase !== 'boolean') ignoreCase = true`
`37`	`37`
`38`		- const reg = new RegExp(`${appName}\/\\d+(.\\d)(-\\w+.\\d+)`, ignoreCase ? 'gi' : 'g')
	`38`	+ const reg = new RegExp(`${appName}\/(\\d+(?:.\\d)(?:-\\w+.\\d+))`, ignoreCase ? 'i' : '')
`39`	`39`	`const match = ua.match(reg)`
`40`	`40`
`41`		`- return match ? match[0] : null`
	`41`	`+ return match ? match[1] : null`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`export default appVersion`