rigjs 3.0.10 → 3.0.12

package/demo/package.json

@@ -9,6 +9,7 @@
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",
     "test_prei": "node ../built/index.js preinstall",
+    "test_tag": "node ../built/index.js tag",
     "test_env": "node ../built/index.js --env dev",
     "test_posti": "node ../built/index.js postinstall"
   },

package/demo/package.rig.json5

@@ -17,6 +17,12 @@
       source: 'git@github.com:FlashHand/r-foundation.git',
       version: '1.1.7',
       dev: true,
+    },
+    'zenrtcjssdk': {
+      //      dev: true,
+      name: 'zenrtcjssdk',
+      source: 'git@code.y5ops.com:zenrtc/zenrtcjssdk.git',
+      version: '1.8.16-dev.5'
     }
   },
   isLegacy: false,

package/lib/classes/RigConfig.ts

@@ -74,8 +74,8 @@ class RigConfig {
 		let valid = true;
 		for (let rigName in this.dependencies) {
 			const rigDep = this.dependencies[rigName];
+			let pkgStr: string;
 			try {
-				let pkgStr: string;
 				if (rigDep.dev) {
 					// pkgStr = fsHelper.readPkgStrInRepo(rigName);
 					print.info(`${rigName} is in deleloping.Skip Validating.`);
@@ -88,7 +88,9 @@ class RigConfig {
 					);
 					pkgStr = showPackageProcess.stdout.trim();
 				}
+				console.log(pkgStr)
 				const pkg = JSON.parse(pkgStr);
+				console.log(pkg);
 				//获取rig依赖
 				if (pkg.rig) {
 					const pkgRig = pkg.rig;
@@ -140,9 +142,9 @@ class RigConfig {
 						}
 					})
 				}
-
 			} catch (e) {
-				throw new Error(`rig validateDeps failed:${e.message}`);
+				// @ts-ignore
+				throw new Error(`rig validateDeps:${rigDep.source} failed:${e.message},${pkgStr}`);
 			}
 		}
 	}

package/lib/info/{index.js → index.ts}

@@ -4,16 +4,19 @@
  * @author Wang Bo (ralwayne@163.com)
  * @date 2020/10/20 6:58 PM
  */
-const shell = require('shelljs');
-const fs = require('fs');
-const json5 = require('json5');
-const print = require('../print');
+import shell from "shelljs";
+import * as fs from 'fs'
+import print from "@/print";
+import json5 from 'json5';
 //加载命令控制器
 const info = () => {
 	console.log('process.platform');
 	print.info(`start checking modules|OS:${process.platform} `);
-	let rigJson5 = json5.parse(fs.readFileSync('package.rig.json5'));
-	for (let dep of rigJson5) {
+	let rigJson5 = json5.parse(fs.readFileSync('package.rig.json5').toString());
+	const depKeyArr = Object.keys(rigJson5.dependencies);
+	for (let depKey of depKeyArr) {
+		const dep = rigJson5.dependencies[depKey];
+
 		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}'`,
@@ -36,10 +39,10 @@ const info = () => {
 	}
 
 }
-const load = async (cmd) => {
+const load = async () => {
 	info();
 }
-module.exports = {
+export default {
 	load,
 	info,
 }

package/lib/init/index.ts

@@ -30,7 +30,7 @@ export default async () => {
       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/d5c219db59df54656e614a98c7ed3eb79e9d86f4/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);
     }
@@ -39,7 +39,7 @@ export default async () => {
       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/d5c219db59df54656e614a98c7ed3eb79e9d86f4/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);
     }

package/lib/preinstall/index.ts

@@ -48,6 +48,7 @@ export default async (cmd:any) => {
 		 */
 		for (let rigName in rigConfig.dependencies) {
 			const dep = rigConfig.dependencies[rigName];
+			dep.name = rigName;
 			if (dep.dev) {
 				//不去覆盖已下载的库
 				if (fs.existsSync(`${target}/${dep.name}`)) {
@@ -55,7 +56,7 @@ export default async (cmd:any) => {
 				} else {
 					clone(target, dep);
 				}
-				//dev的库改为*,安装时忽略
+				//删除package.json中的dev rig库,安装时忽略
 				delete dependencies[dep.name]
 				//dev模式下使用workspace
 			} else {

package/lib/tag/index.ts

@@ -14,6 +14,7 @@ let red = chalk.red;
 const load = async () => {
 	try {
 		let pkgJson = JSON.parse(fs.readFileSync('package.json').toString());
+		console.log(pkgJson);
 		let version = pkgJson.version;
 		if (!fs.existsSync('.git')) {
 			print.error('.git not found at the level of package.json');

package/package.json

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

package/lib/info/index.d.ts

@@ -1,6 +0,0 @@
-declare namespace info {
-	function load(): void;
-	function info(): void;
-
-}
-export default info;