rigjs 2.0.16 → 2.0.19-alpha.1

package/lib/build/index.ts

@@ -1,9 +1,9 @@
-import CICD, {Define} from '@/classes/cicd/CICD';
+import CICD, {Define, FrameworkType} from '@/classes/cicd/CICD';
 import CICDCmd from '@/classes/cicd/CICDCmd';
-import shell, {cat} from 'shelljs';
+import shell from 'shelljs';
 import path from 'path';
 import fs from 'fs';
-import util from 'util';
+import vueEnv from '../vue-env';
 const JSON5 = require('json5');
 
 const replaceDefine = (target: string, defines?: Define) => {
@@ -17,7 +17,7 @@ const replaceDefine = (target: string, defines?: Define) => {
 			if (defines) {
 				const namePieces = dir.split('.');
 				const fileType = namePieces[namePieces.length - 1];
-				if (['js', 'ts','html'].indexOf(fileType) >= 0) {
+				if (['js', 'ts', 'html'].indexOf(fileType) >= 0) {
 					let file = fs.readFileSync(path.join(target, dir)).toString();
 					const replaceArr = Object.keys(defines);
 					for (let replace of replaceArr) {
@@ -30,34 +30,57 @@ const replaceDefine = (target: string, defines?: Define) => {
 	}
 }
 export default async (cmd: any) => {
-	try{
+	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){
+		if (cicdCmd.endpoints.length === 0) {
 			throw new Error('Must have validate endpoints')
 		}
+		//替换build中的可替换变量
 		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=>{
+				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('JSON5 error:', ep.defines, e.message);
+			}
+			let frameworktype: FrameworkType | undefined;
+			//判断是否要生成环境变量文件,以及生成环境变量的操作
+			if (ep.vue_env){
+				frameworktype = FrameworkType.vue;
+			}
+			if (!ep.extra_env)ep.extra_env = {};
+			ep.extra_env['PUBLIC_PATH'] = ep.publicPath;
+			ep.extra_env['OUTPUT_DIR'] = path.join(cicd.source.root_path, ep.dir);
+
+			switch (frameworktype){
+				case FrameworkType.vue:{
+					vueEnv.useEnv(ep.vue_env!,ep.extra_env);
+				}
+					break;
+				default:
+					break;
 			}
-			console.log('exec build:', ep, ep.build, ep.defines);
 			shell.exec(ep.build);
+
+			//setup default defines and replace text in built source.
+			if (!ep.defines) ep.defines = {};
+			ep.defines['__DEPLOY_DIR__'] = ep.deployDir;
+			ep.defines['__RIG_PUBLIC_PATH__'] = ep.publicPath;
+			ep.defines['__RIG_DEPLOY_DIR__'] = ep.publicPath;
 			replaceDefine(path.join(cicd.source.root_path, ep.dir), ep.defines);
 		}
-	}catch (e) {
+	} catch (e) {
 		console.error(e.message);
 		process.exit(1);
 	}

package/lib/classes/cicd/CICD.ts

@@ -8,7 +8,9 @@ import util from 'util';
 export enum CloudType {
 	alicloud = 'alicloud',
 }
-
+export enum FrameworkType {
+	vue = 'vue',
+}
 /**
  * Bundle source
  */
@@ -55,8 +57,12 @@ export interface DefineDict{
 
 /**
  * Whole CI/CD config
+ * @property tree_schema string fafafa
  */
 export interface CICDConfig {
+	/**
+	 * fafafafa
+	 */
 	tree_schema: string;
 	source: DeploySource;
 	target: DeployTarget | DeployTarget[];
@@ -98,6 +104,7 @@ class CICD {
 		let cicdStr = fs.readFileSync(`${process.cwd()}/cicd.rig.json5`).toString();
 		const paramsStr = cmd.params;
 		const params = qs.parse(paramsStr);
+		//替换动态变量
 		Object.keys(params).forEach(key => {
 			const regStr = `\\$\\{${key}\\}`;
 			const regex = new RegExp(regStr, 'g');

package/lib/classes/cicd/Endpoint.ts

@@ -8,6 +8,8 @@ interface EndpointInfo {
   domain: string;
 	domains: string[];
 	defines: Define;
+	vue_env?: string;
+	extra_env?:{[env: string]: String};
   uri_rewrite: {
     original: string;
     original_regexp: string;
@@ -28,7 +30,8 @@ class Endpoint {
   domain: string;
 	domains: string[];
   deployDir: string = '';
-
+	vue_env?: string;
+	extra_env?:{[env: string]: String};
 	publicPath: string = '';
 	defines: Define;
 	uri_rewrite: {
@@ -56,6 +59,9 @@ class Endpoint {
 		this.domains = info.domains
 		this.defines = info.defines;
 		this.uri_rewrite = info.uri_rewrite;
+		this.vue_env = info.vue_env;
+		this.extra_env = info.extra_env;
+
 	}
 
   matchCmd(dirSchemaStrArr: string[], groups: DirGroup[]) {

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

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

package/lib/vue-env/index.js

@@ -8,13 +8,12 @@ const fs = require('fs');
 const json5 = require('json5');
 const print = require("../print");
 
-//加载命令控制器
-const load = async (cmd) => {
+const useEnv =  (mode,extra)=>{
   try {
-    const mode = process.argv[process.argv.length -1];
     const rigJson5 = json5.parse(fs.readFileSync('env.rig.json5'));
-    const modeObj = rigJson5[mode];
+    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++) {
@@ -39,7 +38,18 @@ const load = async (cmd) => {
     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
+  load,
+  useEnv
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rigjs",
-  "version": "2.0.16",
+  "version": "2.0.19-alpha.1",
   "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",