rigjs 3.0.25 → 3.0.30

package/lib/tag/index.ts

@@ -16,9 +16,13 @@ let red = chalk.red;
 const load = async () => {
 	try {
 		let pkgJson = JSON.parse(fs.readFileSync('package.json').toString());
-		let pkgJson5 = json5.parse(fs.readFileSync('package.rig.json5').toString());
+		let pkgJson5 = null
+		try{
+			pkgJson5 = json5.parse(fs.readFileSync('package.rig.json5').toString());
+		}catch (e) {
+			print.warn('no validate package.rig.json5 found, use package.json')
+		}
 
-		console.log(pkgJson);
 		let version = pkgJson.version;
 		if (!fs.existsSync('.git')) {
 			print.error('.git not found at the level of package.json');
@@ -27,7 +31,7 @@ const load = async () => {
 		}
 		let statusProcess = shell.exec('git status', {silent: true});
 		if (statusProcess.stdout.indexOf('nothing to commit') >= 0) {
-			if(pkgJson5.tag_template){
+			if(pkgJson5&&pkgJson5.tag_template){
 				let tagStr = `${pkgJson5.tag_template}`;
 
 				try{
@@ -47,6 +51,26 @@ const load = async () => {
 					print.error(`create tag failed:${e.message}`);
 					process.exit(1)
 				}
+			}else if (pkgJson&&pkgJson.rig_tag_template){
+				let tagStr = `${pkgJson.rig_tag_template}`;
+
+				try{
+					const fields = pkgJson.tag_template.match(/(?<={)[^{}]+(?=})/g)
+					fields.forEach((field: string) => {
+						const value = pkgJson[field];
+						if (value) {
+							tagStr = tagStr.replace(`{${field}}`, value)
+						} else {
+							print.error(`field:${field} not found in package.json`);
+							process.exit(1)
+						}
+					});
+					shell.exec(`git tag ${tagStr}`);
+					print.succeed(`tag:${tagStr} created.`);
+				}catch(e:any){
+					print.error(`create tag failed:${e.message}`);
+					process.exit(1)
+				}
 			}else{
 				shell.exec(`git tag ${version}`);
 				print.succeed(`tag:${version} created.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rigjs",
-  "version": "3.0.25",
+  "version": "3.0.30",
   "description": "A multi-repos dev tool based on yarn and git.Rigjs is intended to be the simplest way to develop,share and deliver codes between different developers or different projects.",
   "keywords": [
     "modular",
@@ -13,7 +13,10 @@
     "workspaces"
   ],
   "main": "index.js",
-  "repository": "https://github.com/FlashHand/rig",
+  "repository":{
+    "type": "git",
+    "url":  "https://github.com/FlashHand/rig"
+  },
   "author": "ralwayne",
   "license": "MIT",
   "bin": {