rigjs 3.0.2 → 3.0.6

package/demo/env.rig.json5

@@ -0,0 +1,8 @@
+{
+  dev: {
+    DEV_URL: 'test.test'
+  },
+  prod: {
+    PROD_URL: 'test.test'
+  },
+}

package/demo/package.json

@@ -9,14 +9,18 @@
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",
     "preinstall": "rig preinstall",
-    "postinstall": "rig postinstall"
+    "postinstall": "rig postinstall",
+    "test_prei": "node ../built/index.js preinstall",
+    "test_env": "node ../built/index.js --env dev",
+    "test_posti": "node ../built/index.js postinstall"
   },
   "dependencies": {
     "core-js": "^3.8.3",
     "cross-env": "^7.0.3",
     "rig-test-1": "git+ssh://git@github.com:FlashHand/rig-test-1.git#1.0.1",
-    "rig-test-2": "git+ssh://git@github.com:FlashHand/rig-test-2.git#1.0.2",
-    "vue": "^2.6.14"
+    "rig-test-2": "git+ssh://git@github.com:FlashHand/rig-test-2.git#1.0.1",
+    "vue": "^2.6.14",
+    "zenrtcjssdk": "git+ssh://git@code.y5ops.com:zenrtc/zenrtcjssdk.git#0.0.4"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",

package/demo/package.rig.json5

@@ -10,8 +10,14 @@
       dev: false,
       name: 'rig-test-2',
       source: 'git@github.com:FlashHand/rig-test-2.git',
-      version: '1.0.2',
+      version: '1.0.1',
     },
+    'zenrtcjssdk': {
+      dev: true,
+      name: 'zenrtcjssdk',
+      source: 'git@code.y5ops.com:zenrtc/zenrtcjssdk.git',
+      version: '0.0.4'
+    }
   },
   isLegacy: false,
   cicd: {
@@ -41,7 +47,7 @@
           RIG_REPLACE_GRAY: '/test-gray'
         },
         domains: [
-          "test-mp.rys.cn"
+          "test-mp.domain.com"
         ],
       },
     },

package/demo/yarn.lock

@@ -5079,9 +5079,9 @@ reusify@^1.0.4:
   version "1.0.1"
   resolved "git+ssh://git@github.com:FlashHand/rig-test-1.git#9a86b587aa9bea6c176ab8a470c8a86e7a2bf655"
 
-"rig-test-2@git+ssh://git@github.com:FlashHand/rig-test-2.git#1.0.2":
-  version "1.0.2"
-  resolved "git+ssh://git@github.com:FlashHand/rig-test-2.git#3c158c6c86276e8b3b5e5c341c01f4f4d9ea6094"
+"rig-test-2@git+ssh://git@github.com:FlashHand/rig-test-2.git#1.0.1":
+  version "1.0.1"
+  resolved "git+ssh://git@github.com:FlashHand/rig-test-2.git#abdb17fcfe11c5dff94b93be8cc690bc8583e219"
 
 rimraf@^3.0.2:
   version "3.0.2"

package/lib/build/index.ts

@@ -3,7 +3,7 @@ import CICDCmd from '@/classes/cicd/CICDCmd';
 import shell from 'shelljs';
 import path from 'path';
 import fs from 'fs';
-import vueEnv from '../vue-env';
+import vueEnv from '../env';
 
 import print from '../print';
 

package/lib/classes/RigConfig.ts

@@ -34,8 +34,6 @@ class RigConfig {
 			}
 			this.share = rigConfig.share;
 		}
-		console.log(this);
-		this.validate();
 	}
 
 	/**
@@ -67,6 +65,10 @@ class RigConfig {
 		}
 	}
 
+	/**
+	 * 检查依赖的之间的依赖(仅包含rig管理下的依赖)
+	 *
+	 */
 	validateDeps() {
 		print.info(`rig validating dependencies' requirements`);
 		let valid = true;
@@ -75,9 +77,8 @@ class RigConfig {
 			try {
 				let pkgStr: string;
 				if (rigDep.dev) {
-					// pkgStr = fsHelper.readPkgStrInRepo(rigName);
-					print.info(`${rigName} is in deleloping.Skip Validating.`);
-					continue;
+					pkgStr = fsHelper.readPkgStrInRepo(rigName);
+					print.info(`${rigName} is in deleloping.Validating ${rigName}'s dependencies...`);
 				} else {
 					const cmd = `git fetch ${rigDep.source} refs/tags/${rigDep.version} && git show FETCH_HEAD:package.json`;
 					print.info(`validateDeps:${cmd}`);
@@ -138,6 +139,7 @@ class RigConfig {
 						}
 					})
 				}
+
 			} catch (e) {
 				throw new Error(`rig validateDeps failed:${e.message}`);
 			}

package/lib/classes/dependencies/Dep.ts

@@ -48,6 +48,10 @@ export class Dep {
 		}
 		return isValid;
 	}
+
+	/**
+	 * 检查配置项格式是否正确
+	 */
 	validate(){
 		return  this.validateName() && this.validateSource() && this.validateVersion();
 	}

package/lib/env/index.ts

@@ -0,0 +1,52 @@
+/**
+ * @ignore
+ * @Description nothing
+ * @author Wang Bo (ralwayne@163.com)
+ * @date 2021/11/18 6:14 PM
+ */
+import * as fs from 'fs';
+import json5 from 'json5';
+import print from "@/print";
+import * as console from "console";
+const useEnv =  (mode:string,extra?:any)=>{
+	try {
+		const rigJson5 = json5.parse(fs.readFileSync('env.rig.json5'));
+		let modeObj = rigJson5[mode];
+		if (modeObj) {
+			if (extra) modeObj = Object.assign(modeObj, extra);
+			const keysArray = Object.keys(modeObj);
+			let content = "";
+			for (let i = 0; i<keysArray.length; i++) {
+				const key = keysArray[i];
+				const value = modeObj[key];
+				content += key + " = " + value + "\n"
+			}
+			print.info(`using env:`)
+			console.log(`----------${mode}----------`)
+			console.log(content);
+			console.log(`----------${mode}----------`)
+			fs.writeFileSync('./.env.rig', content, {flag: "w"});
+		} else {
+			print.error("请先在env.rig.json5文件中配置" + mode + "模式的环境变量");
+			process.exit(1)
+		}
+	} catch (e) {
+		print.error(e.message);
+		process.exit(1)
+	}
+}
+//加载命令控制器
+const load = async () => {
+	try {
+		const mode = process.argv[process.argv.length -1];
+		useEnv(mode);
+	} catch (e) {
+		print.error(e.message);
+		process.exit(1)
+	}
+}
+
+export default {
+	load,
+	useEnv
+}

package/lib/preinstall/index.ts

@@ -26,10 +26,12 @@ const clone = (target:string, dep:Dep) => {
 export default async (cmd:any) => {
 	print.info('start rig preinstall');
 	try {
-		//读取package.rig.json5
+		//读取package.rig.json5,生成配置对象
 		const rigConfig = RigConfig.createFromCWD();
+		//检查配置项格式是否正确
 		rigConfig.validate();
-		rigConfig.validateDeps();
+		//检查依赖间的相互依赖是否有效
+		//创建rig_dev目录用来开发rig管理下的依赖
 		if (!(fs.existsSync('./rig_dev') && fs.lstatSync('./rig_dev').isDirectory())) {
 			print.info('create folder rig_dev');
 			fs.mkdirSync('rig_dev');
@@ -65,6 +67,8 @@ export default async (cmd:any) => {
 			}
 			dependencies[dep.name] = `git+ssh://${dep.source}#${dep.version}`
 		}
+		rigConfig.validateDeps();
+
 		//覆盖package.json
 		pkgJson.dependencies = dependencies;
 		fs.writeFileSync('package.json', JSON.stringify(pkgJson, null, 2));

package/lib/print/index.ts

@@ -30,7 +30,7 @@ const succeed = (str: string) => {
 }
 
 export default {
-  start,
+	start,
 	info,
 	error,
 	warn,

package/lib/rig/index.ts

@@ -66,9 +66,11 @@ program.command('sync')
 	.option('-f, --force <force>', 'force to overwrite files from package.rig.json5')
 	.action(sync);
 
-import env from '../vue-env';
+import env from '../env';
 
 program.option('--vueenv <vueenv>', 'specify vue env').action(env.load);
+program.option('--env <vueenv>', 'specify env').action(env.load);
+
 program.version(require('../../package.json').version, '-v,--version');
 program.parse(process.argv);
 

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

@@ -5,9 +5,9 @@
  * @date 2020/10/15 3:28 PM
  */
 const fs = require('fs');
-const shell = require('shelljs');
-const chalk = require('chalk');
-const print = require('../print');
+import shell from "shelljs";
+import chalk from "chalk";
+import print from '../print'
 let red = chalk.red;
 
 
@@ -33,6 +33,6 @@ const load = async () => {
 		process.exit(1);
 	}
 }
-module.exports = {
-	load
-}
+export default {
+	load,
+}

package/lib/utils/fsHelper.ts

@@ -1,4 +1,5 @@
 import fs from 'fs';
+import {cat} from "shelljs";
 
 const JSON5 = require('json5');
 const readCICDConfig = () => {
@@ -35,7 +36,11 @@ const writeConfig = (config: any, path: string = '') => {
 	}
 }
 const readPkgStrInRepo = (rigRepoName: string) => {
-	return fs.readFileSync(`${process.cwd()}/rig_dev/${rigRepoName}/package.json`).toString();
+	try{
+		return fs.readFileSync(`${process.cwd()}/rig_dev/${rigRepoName}/package.json`).toString();
+	}catch (e){
+		throw new Error(`${rigRepoName} not exists in rig_dev`);
+	}
 }
 
 export default {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rigjs",
-  "version": "3.0.2",
+  "version": "3.0.6",
   "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,6 @@
     "p": "cd demo && node ../lib/rig/index.js publish",
     "prei": "cd demo && ts-node ../lib/rig/index.ts preinstall",
     "posti": "cd demo && node ../lib/rig/index.js postinstall",
-    "preinstall": "cd demo && node ../built/index.js preinstall",
     "c": "d 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",
@@ -46,6 +45,7 @@
     "commander": "6.1.0",
     "compare-versions": "^4.1.3",
     "dayjs": "^1.11.0",
+    "dotenv": "^16.0.3",
     "inquirer": "7.3.3",
     "json5": "2.1.3",
     "ora": "^5.1.0",

package/lib/tag/index.d.ts

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

package/lib/vue-env/index.d.ts

@@ -1,6 +0,0 @@
-declare namespace env {
-	function load(): void;
-	function useEnv(env:string,extra?:any): void;
-
-}
-export default env;

package/lib/vue-env/index.js

@@ -1,50 +0,0 @@
-/**
- * @ignore
- * @Description nothing
- * @author Wang Bo (ralwayne@163.com)
- * @date 2021/11/18 6:14 PM
- */
-const fs = require('fs');
-const json5 = require('json5');
-const print = require("../print");
-
-const useEnv =  (mode,extra)=>{
-  try {
-    const rigJson5 = json5.parse(fs.readFileSync('env.rig.json5'));
-    let modeObj = rigJson5[mode];
-    if (modeObj) {
-      if (extra) modeObj = Object.assign(modeObj, extra);
-      const keysArray = Object.keys(modeObj);
-      let content = "";
-      for (let i = 0; i<keysArray.length; i++) {
-        const key = keysArray[i];
-        const value = modeObj[key];
-        content += key + " = " + value + "\n"
-      }
-      print.info(`using env:`)
-      console.log(content);
-      fs.writeFileSync('./.env.rig', content, {flag: "w"});
-    } else {
-      print.error("请先在env.rig.json5文件中配置" + mode + "模式的环境变量");
-      process.exit(1)
-    }
-  } catch (e) {
-    print.error(e.message);
-    process.exit(1)
-  }
-}
-//加载命令控制器
-const load = async (cmd) => {
-  try {
-    const mode = process.argv[process.argv.length -1];
-    useEnv(mode);
-  } catch (e) {
-    print.error(e.message);
-    process.exit(1)
-  }
-}
-
-module.exports = {
-  load,
-  useEnv
-}