rigjs 3.0.23 → 3.0.25

package/lib/check/index.js

@@ -14,7 +14,7 @@ const load = async () => {
     let rigJson5Str = fs.readFileSync('package.rig.json5');
     let rigJson5 = json5.parse(rigJson5Str);
     let hasErr = false;
-    for (let dep of rigJson5) {
+    for (let dep of rigJson5.dependencies) {
       if (dep.dev) {
         hasErr = true;
         print.error(`${dep.name} is in developing!\nUse correct version and set dev to false!`);

package/lib/tag/index.ts

@@ -5,15 +5,19 @@
  * @date 2020/10/15 3:28 PM
  */
 const fs = require('fs');
-import shell from "shelljs";
+import shell, {cat} from "shelljs";
 import chalk from "chalk";
 import print from '../print'
+import json5 from 'json5';
+
 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());
+
 		console.log(pkgJson);
 		let version = pkgJson.version;
 		if (!fs.existsSync('.git')) {
@@ -23,9 +27,32 @@ const load = async () => {
 		}
 		let statusProcess = shell.exec('git status', {silent: true});
 		if (statusProcess.stdout.indexOf('nothing to commit') >= 0) {
-			shell.exec(`git tag ${version}`);
-			print.succeed(`tag:${version} created.`);
+			if(pkgJson5.tag_template){
+				let tagStr = `${pkgJson5.tag_template}`;
+
+				try{
+					const fields = pkgJson5.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.`);
+			}
 		} else {
+			print.error('please commit your changes before tag');
 			print.error(statusProcess.stdout);
 			process.exit(1)
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rigjs",
-  "version": "3.0.23",
+  "version": "3.0.25",
   "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",
@@ -25,7 +25,7 @@
     "p": "cd demo && node ../lib/rig/index.js publish",
     "posti": "cd demo && node ../lib/rig/index.js postinstall",
     "prei": "cd demo && node ../built/index.js preinstall",
-    "c": "d demo && node ../lib/rig/index.js check",
+    "c": "cd demo && node ../lib/rig/index.js check",
     "envmake": "cd demo && node ../lib/rig/index.js --env prod_view_zhs",
     "t": "node lib/rig/index.js tag",
     "deliver": "npm publish --registry=https://registry.npmjs.org",