rigjs 3.0.19 → 3.0.21

package/lib/info/index.ts

@@ -16,15 +16,18 @@ const info = () => {
 	const depKeyArr = Object.keys(rigJson5.dependencies);
 	for (let depKey of depKeyArr) {
 		const dep = rigJson5.dependencies[depKey];
-		if (process.platform === 'win32'){
+		if (process.platform === 'win32') {
 			print.info(`skip info on windows`);
 			return;
 		}
-		let describeProcess = process.platform === 'win32'?shell.exec(`git ls-remote --tags --refs --sort="version:refname" ${dep.source} | awk -F/ "END{print$NF}"`,
+		// let describeProcess = process.platform === 'win32'?shell.exec(`git ls-remote --tags --refs --sort="version:refname" ${dep.source} | awk -F/ "END{print$NF}"`,
+		// 	{silent: true}
+		// ):  shell.exec(`git ls-remote --tags --refs --sort="version:refname" ${dep.source} | awk -F/ 'END{print$NF}'`,
+		// 	{silent: true}
+		// );
+		let describeProcess = shell.exec(`git ls-remote --tags --refs --sort="version:refname" ${dep.source} | awk -F/ 'END{print$NF}'`,
 			{silent: true}
-		):  shell.exec(`git ls-remote --tags --refs --sort="version:refname" ${dep.source} | awk -F/ 'END{print$NF}'`,
-			{silent: true}
-		);
+		)
 		let remoteLatestTag = describeProcess.stdout.trim();
 		if (dep.dev) {
 			print.warn(`[${dep.name}] is in developing.latest:${remoteLatestTag},`);

package/lib/init/index.ts

@@ -26,23 +26,23 @@ export default async () => {
       fs.writeFileSync('./package.rig.json5', packageRigJSON5);
     }
     //检查是否存在rig_helper.js
-    if (fs.existsSync(`${process.cwd()}/rig_helper.js`)) {
-      print.info('rig_helper.js already exists~');
-    } else {
-      print.info('create rig_helper.js');
-      const resRigHelper = await axios.get('https://gist.githubusercontent.com/FlashHand/f468123502fd7aa87933fd8e39ed6926/raw/6835c8bc56480f1ada64b99040806f1968778912/rig_helper.js');
-      const rigHelper = resRigHelper.data;
-      fs.writeFileSync(`${process.cwd()}/rig_helper.js`, rigHelper);
-    }
-    //检查是否存在rig_helper.d.ts
-    if (fs.existsSync(`${process.cwd()}/rig_helper.d.ts`)) {
-      print.info('rig_helper.d.ts already exists~');
-    } else {
-      print.info('create rig_helper.d.ts');
-      const resRigHelperDts = await axios.get('https://gist.githubusercontent.com/FlashHand/f468123502fd7aa87933fd8e39ed6926/raw/6835c8bc56480f1ada64b99040806f1968778912/rig_helper.d.ts');
-      const rigHelperDts = resRigHelperDts.data;
-      fs.writeFileSync(`${process.cwd()}/rig_helper.d.ts`, rigHelperDts);
-    }
+    // if (fs.existsSync(`${process.cwd()}/rig_helper.js`)) {
+    //   print.info('rig_helper.js already exists~');
+    // } else {
+    //   print.info('create rig_helper.js');
+    //   const resRigHelper = await axios.get('https://gist.githubusercontent.com/FlashHand/f468123502fd7aa87933fd8e39ed6926/raw/6835c8bc56480f1ada64b99040806f1968778912/rig_helper.js');
+    //   const rigHelper = resRigHelper.data;
+    //   fs.writeFileSync(`${process.cwd()}/rig_helper.js`, rigHelper);
+    // }
+    // //检查是否存在rig_helper.d.ts
+    // if (fs.existsSync(`${process.cwd()}/rig_helper.d.ts`)) {
+    //   print.info('rig_helper.d.ts already exists~');
+    // } else {
+    //   print.info('create rig_helper.d.ts');
+    //   const resRigHelperDts = await axios.get('https://gist.githubusercontent.com/FlashHand/f468123502fd7aa87933fd8e39ed6926/raw/6835c8bc56480f1ada64b99040806f1968778912/rig_helper.d.ts');
+    //   const rigHelperDts = resRigHelperDts.data;
+    //   fs.writeFileSync(`${process.cwd()}/rig_helper.d.ts`, rigHelperDts);
+    // }
     //检查rig_dev是否存在
     if (fs.existsSync('./rig_dev') && fs.lstatSync('./rig_dev').isDirectory()) {
       print.info('folder rig_dev  already exists~');
@@ -95,7 +95,8 @@ export default async () => {
         postinstall: "rig postinstall",
       },
       devDependencies: {
-        json5: '2.2.1'
+        json5: '2.2.1',
+        "rig-helper": '^1.0.2'
       }
     }
     pkgJSON.private = inserted.private;
@@ -124,9 +125,11 @@ export default async () => {
     }
     if (pkgJSON.devDependencies) {
       pkgJSON.devDependencies.json5 = inserted.devDependencies.json5;
+      pkgJSON.devDependencies["rig-helper"] = inserted.devDependencies["rig-helper"];
     } else {
       pkgJSON.devDependencies = inserted.devDependencies;
     }
+    //检查是否存在rig-helper
     fs.writeFileSync('package.json', JSON.stringify(pkgJSON, null, 2));
     print.succeed('rig init succeed');
   } catch (e) {

package/lib/preinstall/index.ts

@@ -9,7 +9,7 @@ import fs from 'fs';
 import print from '../print';
 import RigConfig from '@/classes/RigConfig';
 import {Dep} from '@/classes/dependencies/Dep';
-
+import pkg from '../../package.json';
 // let semverReg = /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/;
 const clone = (target:string, dep:Dep) => {
 	print.info(`cloning ${dep.name}`);
@@ -24,6 +24,8 @@ const clone = (target:string, dep:Dep) => {
 }
 //加载命令控制器
 export default async (cmd:any) => {
+	print.info(`version:${pkg.version}`);
+
 	print.info('start rig preinstall');
 	try {
 		//读取package.rig.json5,生成配置对象

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rigjs",
-  "version": "3.0.19",
+  "version": "3.0.21",
   "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",