rigjs 2.0.6 → 2.0.10

package/lib/build/index.ts

@@ -1,9 +1,9 @@
 import CICD, {Define} from '@/classes/cicd/CICD';
 import CICDCmd from '@/classes/cicd/CICDCmd';
-import shell from 'shelljs';
+import shell, {cat} from 'shelljs';
 import path from 'path';
 import fs from 'fs';
-
+import util from 'util';
 const JSON5 = require('json5');
 
 const replaceDefine = (target: string, defines?: Define) => {
@@ -30,28 +30,35 @@ const replaceDefine = (target: string, defines?: Define) => {
 	}
 }
 export default async (cmd: any) => {
-	//create cicd object
-	const cicd = CICD.createByDefault(cmd);
-	//construct cmd object
-	const cicdCmd = new CICDCmd(cmd, cicd);
-	console.log(cicd)
-	//build by cicdCmd and cicdConfig
-	console.log(cicdCmd.endpoints);
-	const regexPublicPath = new RegExp('\\$public_path', 'g');
-	for (let i = 0; i < cicdCmd.endpoints.length; i++) {
-		const ep = cicdCmd.endpoints[i];
+	try{
+		console.log('start building');
+		//create cicd object
+		const cicd = CICD.createByDefault(cmd);
+		//construct cmd object
+		const cicdCmd = new CICDCmd(cmd, cicd);
+		//build by cicdCmd and cicdConfig
+		if (cicdCmd.endpoints.length===0){
+			throw new Error('Must have validate endpoints')
+		}
+		const regexPublicPath = new RegExp('\\$public_path', 'g');
+		for (let i = 0; i < cicdCmd.endpoints.length; i++) {
+			const ep = cicdCmd.endpoints[i];
 
-		ep.build = ep.build.replace(regexPublicPath, ep.publicPath);
-		try {
-			//替换define中的$public_path
-			Object.keys(ep.defines).forEach(key=>{
-				ep.defines[key] = ep.defines[key].replace(regexPublicPath, ep.publicPath);
-			})
-		} catch (e) {
-			console.log('JSON5 error:', ep.defines,e.message);
+			ep.build = ep.build.replace(regexPublicPath, ep.publicPath);
+			try {
+				//替换define中的$public_path
+				Object.keys(ep.defines).forEach(key=>{
+					ep.defines[key] = ep.defines[key].replace(regexPublicPath, ep.publicPath);
+				})
+			} catch (e) {
+				console.log('JSON5 error:', ep.defines,e.message);
+			}
+			console.log('exec build:', ep, ep.build, ep.defines);
+			shell.exec(ep.build);
+			replaceDefine(path.join(cicd.source.root_path, ep.dir), ep.defines);
 		}
-		console.log('exec build:', ep, ep.build, ep.defines);
-		shell.exec(ep.build);
-		replaceDefine(path.join(cicd.source.root_path, ep.dir), ep.defines);
+	}catch (e) {
+		console.error(e.message);
+		process.exit(1);
 	}
 }

package/lib/classes/cicd/CICD.ts

@@ -4,6 +4,7 @@ import fs from 'fs';
 
 const JSON5 = require('json5');
 import qs from 'querystring';
+import util from 'util';
 export enum CloudType {
 	alicloud = 'alicloud',
 }
@@ -102,7 +103,9 @@ class CICD {
 			const regex = new RegExp(regStr, 'g');
 			cicdStr = cicdStr.replace(regex, params[key] as string);
 		});
-		return new CICD(JSON5.parse(cicdStr));
+		const cicd =  new CICD(JSON5.parse(cicdStr))
+		console.log(util.inspect(cicd, false, null, true))
+		return cicd;
 	}
 
 	matchEndpoints(cmdDirStrArr: string[]) {

package/lib/classes/cicd/CICDCmd.ts

@@ -3,6 +3,7 @@ import CICD, {CICDConfig} from '@/classes/cicd/CICD';
 import qs, {ParsedUrlQuery} from 'querystring';
 import path from 'path'
 import fsHelper from '@/utils/fsHelper';
+import util from 'util';
 
 /**
  * @class CICDCmd
@@ -27,6 +28,7 @@ class CICDCmd {
 
 	constructor(cmd: any, cicd: CICD) {
 		const cmdArgs = cmd.args;
+		console.log('build command:', cmdArgs[0]);
 		this.dir = cmdArgs[0];
 		//获取需要被设置的schema变量
 		const schemaKeys = this.dir.match(/(?<=\{)[a-zA-Z]+(?=\})/g) || [];
@@ -46,6 +48,7 @@ class CICDCmd {
 		this.dirInSchemaStrArr = this.dir.split('/').filter((dirStr, index) => dirStr.length > 0 && index < cicd.schema.length);
 		this.cicd = cicd;
 		this.createTargetEndpoints();
+		console.log(util.inspect(this.endpoints, false, null, true))
 	}
 
 	private createTargetEndpoints() {

package/lib/classes/cicd/Deploy/AliDeploy.ts

@@ -53,7 +53,7 @@ class AliOSS {
       };
       if (filesList[i].includes('index.html')) {
         options = Object.assign({
-          headers: { 'Cache-Control': 'max-age=0', Expires: -1 },
+          headers: { 'Cache-Control': 'no-cache', Expires: -1 },
         });
       }
       const fileResult = await this.ossClient.putStream(

package/lib/deploy/index.ts

@@ -3,7 +3,6 @@ import path from 'path';
 import CICD from '@/classes/cicd/CICD';
 import CICDCmd from '@/classes/cicd/CICDCmd';
 import AliOSS from '@/classes/cicd/Deploy/AliDeploy';
-import CDN from '@/classes/cicd/Deploy/CDN';
 
 let filesList: string[] = [];
 const traverseFolder = (url: string) => {
@@ -35,6 +34,9 @@ export default async (cmd: any) => {
 
     const aliOss = new AliOSS(target);
     console.log('Please Wait for Upload OSS...');
+    if (!cicdCmd.endpoints || cicdCmd.endpoints.length === 0) {
+      throw new Error('Endpoints.length Can Not Be 0!');
+    }
     for (let i = 0; i < cicdCmd.endpoints.length; i++) {
       const distPath = path.join(
         process.cwd(),
@@ -46,13 +48,14 @@ export default async (cmd: any) => {
         filesList,
         cicdCmd.endpoints[i].deployDir.replace(/\\/g, '/'),
         cicdCmd.endpoints[i].dir,
-        cicd.source.root_path,
+        cicd.source.root_path
       );
       filesList = [];
     }
     console.log('Upload OSS Done');
     console.log('Deploy Done-----');
-  } catch (e) {
-    throw e;
+  } catch (e: any) {
+    console.error(e.message);
+    process.exit(1);
   }
 };

package/lib/init/index.js

@@ -62,6 +62,7 @@ module.exports = {
 `
       fs.writeFileSync(`${process.cwd()}/rig_helper.js`, template);
     }
+    //检查是否存在cicd.rig.json5
     if (fs.existsSync(`${process.cwd()}/cicd.rig.json5`)) {
       console.log(chalk.green('cicd.rig.json5 already exists~'));
     } else {
@@ -79,6 +80,14 @@ module.exports = {
       fs.writeFileSync(`${process.cwd()}/cicd.rig.json5`, template);
 
     }
+    //检查是否存在env.rig.json5
+    if (fs.existsSync(`${process.cwd()}/env.rig.json5`)) {
+      console.log(chalk.green('env.rig.json5 already exists~'));
+    } else {
+      console.log(chalk.green('create env.rig.json5'));
+      let template = `{}`;
+      fs.writeFileSync(`${process.cwd()}/cicd.rig.json5`, template);
+    }
     //检查rigs是否存在
     if (fs.existsSync('./rigs') && fs.lstatSync('./rigs').isDirectory()) {
       console.log(chalk.green('folder rigs  already exists~'));

package/lib/publish/index.ts

@@ -50,47 +50,55 @@ const refreshCache = async (urls: string[], cdn: CDN) => {
 };
 
 export default async (cmd: any) => {
-  //create cicd object
-  const cicd = CICD.createByDefault(cmd);
-  //construct cmd object
-  const cicdCmd = new CICDCmd(cmd, cicd);
+  try {
+    //create cicd object
+    const cicd = CICD.createByDefault(cmd);
+    //construct cmd object
+    const cicdCmd = new CICDCmd(cmd, cicd);
 
-  console.log('Start Publish-----');
-  const target = Array.isArray(cicdCmd.cicd.target)
-    ? cicdCmd.cicd.target[0]
-    : cicdCmd.cicd.target;
+    console.log('Start Publish-----');
+    const target = Array.isArray(cicdCmd.cicd.target)
+      ? cicdCmd.cicd.target[0]
+      : cicdCmd.cicd.target;
 
-  const cdn = new CDN(target);
-  const urls: string[] = [];
-  const setRewriteUriPromises: Promise<any>[] = [];
-  for (const endpoint of cicdCmd.endpoints) {
-    const uriRewrite = endpoint.uri_rewrite
-      ? endpoint.uri_rewrite
-      : target.uri_rewrite;
-      
-    for (const domain of endpoint.domains) {
-      setRewriteUriPromises.push(
-        setRewriteUri(
-          domain,
-          `${
-            uriRewrite.original_regexp
-              ? uriRewrite.original_regexp
-              : uriRewrite.original
-          }`,
-          `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
-          cdn
-        )
-      );
-      urls.push(`https://${domain}${uriRewrite.original}`);
+    const cdn = new CDN(target);
+    const urls: string[] = [];
+    const setRewriteUriPromises: Promise<any>[] = [];
+    if (!cicdCmd.endpoints || cicdCmd.endpoints.length === 0) {
+      throw new Error('Endpoints.length Can Not Be 0!');
     }
-  }
+    for (const endpoint of cicdCmd.endpoints) {
+      const uriRewrite = endpoint.uri_rewrite
+        ? endpoint.uri_rewrite
+        : target.uri_rewrite;
 
-  // 回源URI改写
-  console.log('Please Wait For Set RWrite URI...');
-  await Promise.all(setRewriteUriPromises);
-  console.log('Set RWrite URI Done');
+      for (const domain of endpoint.domains) {
+        setRewriteUriPromises.push(
+          setRewriteUri(
+            domain,
+            `${
+              uriRewrite.original_regexp
+                ? uriRewrite.original_regexp
+                : uriRewrite.original
+            }`,
+            `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
+            cdn
+          )
+        );
+        urls.push(`https://${domain}${uriRewrite.original}`);
+      }
+    }
 
-  //刷新cdn
-  await refreshCache(urls, cdn);
-  console.log('Publish Done-----');
+    // 回源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('Publish Done-----');
+  } catch (e: any) {
+    console.error(e.message);
+    process.exit(1);
+  }
 };

package/lib/rig/index.ts

@@ -55,3 +55,4 @@ import env from '../vue-env';
 program.option('--vueenv <vueenv>', 'specify vue env').action(env.load);
 program.version(require('../../package.json').version, '-v,--version');
 program.parse(process.argv);
+

package/lib/vue-env/index.js

@@ -24,12 +24,15 @@ const load = async (cmd) => {
       }
       fs.writeFile('./.env.rig', content, {flag: "w"}, err => {
         err && print.error(err);
+        process.exit(1)
       });
     } else {
       print.error("请先在env.rig.json5文件中配置" + mode + "模式的环境变量");
+      process.exit(1)
     }
   } catch (e) {
     print.error(e.message);
+    process.exit(1)
   }
 }
 

package/package.json

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