rigjs 2.0.0-alpha.8 → 2.0.2

package/lib/preinstall/index.js

@@ -8,126 +8,178 @@ const shell = require('shelljs');
 const fs = require('fs');
 const json5 = require('json5');
 const print = require('../print');
-let semverReg = /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/;
+const path = require('path');
+// let semverReg = /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/;
 let gitUrlReg = /(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\.git)(\/?|\#[-\d\w._]+?)$/;
 const validateName = (name) => {
-  if (name) {
-    return true;
-  } else {
-    print.error(`name value(${name}) invalidate！`);
-    return false;
-  }
+	if (name) {
+		return true;
+	} else {
+		print.error(`name value(${name}) invalidate！`);
+		return false;
+	}
 }
 const validateSource = (source) => {
-  let isValidate;
-  try {
-    isValidate = gitUrlReg.test(source);
-  } catch (e) {
-    isValidate = false;
-    print.error(e.message);
-  }
-  if (!isValidate) {
-    print.error(`source value(${source}) invalidate！`);
-  }
-  return isValidate;
+	let isValidate;
+	try {
+		isValidate = gitUrlReg.test(source);
+	} catch (e) {
+		isValidate = false;
+		print.error(e.message);
+	}
+	if (!isValidate) {
+		print.error(`source value(${source}) invalidate！`);
+	}
+	return isValidate;
 }
 const validateVersion = (version) => {
-  let isValidate;
-  try {
-    isValidate = semverReg.test(version);
-  } catch (e) {
-    isValidate = false;
-    print.error(e.message);
-  }
-  if (!isValidate) {
-    print.error(`version value(${version}) invalidate！`);
-  }
-  return isValidate;
+	let isValidate;
+	try {
+		isValidate = version.length > 0;
+	} catch (e) {
+		isValidate = false;
+		print.error(e.message);
+	}
+	if (!isValidate) {
+		print.error(`version value(${version}) invalidate！`);
+	}
+	return isValidate;
 }
 const validate = (rigJson5) => {
-  let isValidate = true;
-  try {
-    for (let dep of rigJson5) {
-      if (!(validateName(dep.name) && validateSource(dep.source) && validateVersion(dep.version))) {
-        isValidate = false;
-        print.error(`!INVALID CONFIG!:${JSON.stringify(dep)}`);
-        break;
-      }
-    }
-  } catch (e) {
-    print.error(e.message);
-    isValidate = false;
-  }
-  if (!isValidate) {
-    print.info(`Visit https://github.com/FlashHand/rig for documentation`);
-  }
-  return isValidate;
+	let isValidate = true;
+	try {
+		for (let dep of rigJson5) {
+			if (!(validateName(dep.name) && validateSource(dep.source) && validateVersion(dep.version))) {
+				isValidate = false;
+				print.error(`!INVALID CONFIG!:${JSON.stringify(dep)}`);
+				break;
+			}
+		}
+	} catch (e) {
+		print.error(e.message);
+		isValidate = false;
+	}
+	if (!isValidate) {
+		print.info(`Visit https://github.com/FlashHand/rig for documentation`);
+	}
+	return isValidate;
 }
 const clone = (target, dep) => {
-  print.info(`cloning ${dep.name}`);
-  let cloneProcess = shell.exec(`git clone ${dep.source} ${target}/${dep.name}`,
-    {silent: true}
-  );
-  if (cloneProcess.stderr && !fs.existsSync(`${target}/${dep.name}`)) {
-    print.error(`clone failed:${dep.source}`);
-    print.error(cloneProcess.stderr);
-    process.exit(1);
-  }
+	print.info(`cloning ${dep.name}`);
+	let cloneProcess = shell.exec(`git clone ${dep.source} ${target}/${dep.name}`,
+		{silent: true}
+	);
+	if (cloneProcess.stderr && !fs.existsSync(`${target}/${dep.name}`)) {
+		print.error(`clone failed:${dep.source}`);
+		print.error(cloneProcess.stderr);
+		process.exit(1);
+	}
+}
+const checkDepsValid = (rigJson5) => {
+	// git show origin/master:package.json
+// ➜  projects git show tags/2.0.1:package.json
+	for (let rig of rigJson5) {
+		try {
+			const cmd = `git fetch  ${rig.source} --tag ${rig.version} -n && git show FETCH_HEAD:package.json`;
+			console.log(cmd);
+			let showPackageProcess = shell.exec(cmd,
+				{silent: true}
+			);
+			let pkgStr = showPackageProcess.stdout.trim();
+			const pkg = JSON.parse(pkgStr);
+			console.log(pkgStr);
+			//获取rig依赖
+			if (pkg.rig){
+				const rigConfig = pkg.rig;
+				//遍历rig依赖
+				Object.keys(rigConfig).forEach(key => {
+					//获取该rig依赖的要求的版本范围
+					let max='';
+					let min = '';
+					if (Array.isArray(rigConfig[key]) ) {
+						//使用数组的情况
+						if (rigConfig[key].length === 2){
+							console.log('array\'s length must equal to 2!');
+							process.exit(1);
+						}else{
+							min = rigConfig[key][0]
+							max = rigConfig[key][1];
+						}
+					} else {
+						//使用字典的情况
+						min = rigConfig[key]['min'];
+						max = rigConfig[key]['max'];
+					}
+					//从rigJson5获取该依赖的版本号
+					const dep = rigJson5.find(r => r.name === key);
+					if (dep){
+
+					}else{
+						console.log(`${key}[${min},${max}] is required`);
+						process.exit(1);
+					}
+				})
+			}
+		} catch (e) {
+			console.log(e);
+		}
+	}
 }
 //加载命令控制器
 const load = async (cmd) => {
-  print.info('start rig preinstall');
-  try {
-    //读取package.rig.json5
-    let rigJson5Str = fs.readFileSync('package.rig.json5');
-    let rigJson5 = json5.parse(rigJson5Str);
-    if (!validate(rigJson5)) process.exit(1);
-    //重置rigs
-    if (!(fs.existsSync('./rigs') && fs.lstatSync('./rigs').isDirectory())) {
-      print.info('create folder rigs');
-      fs.mkdirSync('rigs');
-      fs.writeFileSync('rigs/.gitkeep', '')
-    }
-    shell.chmod('777', 'rigs');
-    let target = 'rigs';
-    let pkgJson = JSON.parse(fs.readFileSync('package.json').toString());
-    let dependencies = pkgJson['dependencies'];
-    /**
-     * 核心原则
-     * 1. install 不应该覆盖或删除已经clone到rigs下的模块，由开发者自己选择要不要删
-     * 2. rigs下的模块更新，由开发者自己git操作解决。
-     */
-    for (let dep of rigJson5) {
-      if (dep.dev) {
-        //不去覆盖已下载的库
-        if (fs.existsSync(`${target}/${dep.name}`)) {
-          print.info(`${dep.name} already exists.`);
-        } else {
-          clone(target, dep);
-        }
-      } else {
-        //不是开发中状态,不处理，不去删除已下载的模块
-        //预安装时在node_modules中要先清除json5里的库
-        if (fs.existsSync(`node_modules/${dep.name}`)) {
-          shell.rm('-rf', `node_modules/${dep.name}`);
-        }
-        if (fs.existsSync(`node_modules/.yarn-integrity`)) {
-          shell.rm('-rf', `node_modules/.yarn-integrity`);
-        }
-      }
-      dependencies[dep.name] = `git+ssh://${dep.source}#${dep.version}`
-    }
-    //覆盖package.json
-    pkgJson.dependencies = dependencies;
-    fs.writeFileSync('package.json', JSON.stringify(pkgJson, null, 2));
-    //收尾
-    print.succeed(`preinstall SUCCEED! Will do "yarn install"`);
-    //远程链接设置完成，开发库设置完成，准备执行yarn install
-  } catch (e) {
-    print.error(e.message);
-  }
+	print.info('start rig preinstall');
+	try {
+		//读取package.rig.json5
+		let rigJson5Str = fs.readFileSync(path.join(process.cwd(), 'package.rig.json5'));
+		let rigJson5 = json5.parse(rigJson5Str);
+		if (!validate(rigJson5)) process.exit(1);
+		checkDepsValid(rigJson5);
+		//重置rigs
+		if (!(fs.existsSync('./rigs') && fs.lstatSync('./rigs').isDirectory())) {
+			print.info('create folder rigs');
+			fs.mkdirSync('rigs');
+			fs.writeFileSync('rigs/.gitkeep', '')
+		}
+		shell.chmod('777', 'rigs');
+		let target = 'rigs';
+		let pkgJson = JSON.parse(fs.readFileSync('package.json').toString());
+		let dependencies = pkgJson['dependencies'];
+		/**
+		 * 核心原则
+		 * 1. install 不应该覆盖或删除已经clone到rigs下的模块，由开发者自己选择要不要删
+		 * 2. rigs下的模块更新，由开发者自己git操作解决。
+		 */
+		for (let dep of rigJson5) {
+			if (dep.dev) {
+				//不去覆盖已下载的库
+				if (fs.existsSync(`${target}/${dep.name}`)) {
+					print.info(`${dep.name} already exists.`);
+				} else {
+					clone(target, dep);
+				}
+			} else {
+				//不是开发中状态,不处理，不去删除已下载的模块
+				//预安装时在node_modules中要先清除json5里的库
+				if (fs.existsSync(`node_modules/${dep.name}`)) {
+					shell.rm('-rf', `node_modules/${dep.name}`);
+				}
+				if (fs.existsSync(`node_modules/.yarn-integrity`)) {
+					shell.rm('-rf', `node_modules/.yarn-integrity`);
+				}
+			}
+			dependencies[dep.name] = `git+ssh://${dep.source}#${dep.version}`
+		}
+		//覆盖package.json
+		pkgJson.dependencies = dependencies;
+		fs.writeFileSync('package.json', JSON.stringify(pkgJson, null, 2));
+		//收尾
+		print.succeed(`preinstall SUCCEED! Will do "yarn install"`);
+		//远程链接设置完成，开发库设置完成，准备执行yarn install
+	} catch (e) {
+		print.error(e.message);
+	}
 }
 module.exports = {
-  name: 'install',
-  load
+	name: 'install',
+	load
 }

package/lib/publish/index.ts

@@ -1,25 +1,21 @@
-import fsHelper from '../utils/fsHelper';
 import CICD from '@/classes/cicd/CICD';
 import CICDCmd from '@/classes/cicd/CICDCmd';
-import shell from 'shelljs';
-import path from 'path';
 import CDN from '@/classes/cicd/Deploy/CDN';
 
-const setRWriteUri = async (
+const setRewriteUri = async (
   domain: string,
   original: string,
   deployDir: string,
   cdn: CDN
 ) => {
-  const rwriteResult = await cdn.setRWriteUri(
+  const rwriteResult = await cdn.setRewriteUri(
     domain,
     [original],
     [deployDir],
-    ['enhance_break']
+    [null]
   );
 
   const configId = rwriteResult?.DomainConfigList.DomainConfigModel[0].ConfigId;
-  console.log('Please Wait For Set RWrite URI...');
   while (true) {
     const configInfo = await cdn.describeCdnDomainConfigs(domain, configId);
     if (configInfo.DomainConfigs.DomainConfig[0].Status === 'success') {
@@ -29,7 +25,6 @@ const setRWriteUri = async (
       throw new Error('cdn rewrite fail');
     }
   }
-  console.log('Set RWrite URI Done');
 };
 
 const refreshCache = async (urls: string[], cdn: CDN) => {
@@ -67,18 +62,26 @@ export default async (cmd: any) => {
 
   const cdn = new CDN(target);
   const urls: string[] = [];
+  const setRewriteUriPromises: Promise<any>[] = [];
   for (const endpoint of cicdCmd.endpoints) {
-    // 目前只支持set一个original
-    await setRWriteUri(
-      endpoint.domain,
-      `/${target.uri_rewrite.original}`,
-      `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
-      cdn
+    const uriRewrite = endpoint.uri_rewrite ? endpoint.uri_rewrite : target.uri_rewrite;
+    setRewriteUriPromises.push(
+      setRewriteUri(
+        endpoint.domain,
+        `${uriRewrite.original_regexp ? uriRewrite.original_regexp : uriRewrite.original}`,
+        `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
+        cdn
+      )
     );
-    urls.push(`https://${endpoint.domain}/${target.uri_rewrite.original}`);
+    urls.push(`https://${endpoint.domain}${uriRewrite.original}`);
   }
 
+  // 回源URI改写
+  console.log('Please Wait For Set RWrite URI...');
+  await Promise.all(setRewriteUriPromises);
+  console.log('Set RWrite URI Done');
+
   //刷新cdn
   await refreshCache(urls, cdn);
-  console.log('Start Publish-----');
+  console.log('Publish Done-----');
 };

package/lib/rig/index.ts

@@ -50,8 +50,8 @@ program.command('publish')
 	.option('-p , --params <params>', 'replace words in cicd.rig.json5, only words in ${} are replacable')
 	.action(publish);
 
-import env from '../env';
+import env from '../vue-env';
 
-program.option('-e, --env <env>', 'specify env').action(env.load);
+program.option('--vueenv <vueenv>', 'specify vue env').action(env.load);
 program.version(require('../../package.json').version, '-v,--version');
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rigjs",
-  "version": "2.0.0-alpha.8",
+  "version": "2.0.2",
   "description": "A multi-repos dev tool based on yarn and git.Rig is inspired by cocoapods. Not like those monorepo solutions,rig is a tool for organizing multi-repos.",
   "keywords": [
     "modular",