rigjs 2.0.19-alpha.1 → 2.0.19-alpha.4

package/lib/build/index.ts

@@ -4,10 +4,11 @@ import shell from 'shelljs';
 import path from 'path';
 import fs from 'fs';
 import vueEnv from '../vue-env';
+
 const JSON5 = require('json5');
 
 const replaceDefine = (target: string, defines?: Define) => {
-	console.log('start replaceDefine');
+	console.log(`start replaceDefine:${target}`);
 	const dirs = fs.readdirSync(target);
 	for (let dir of dirs) {
 		const stat = fs.statSync(path.join(target, dir));
@@ -45,7 +46,6 @@ export default async (cmd: any) => {
 
 		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 => {
@@ -56,21 +56,23 @@ export default async (cmd: any) => {
 			}
 			let frameworktype: FrameworkType | undefined;
 			//判断是否要生成环境变量文件,以及生成环境变量的操作
-			if (ep.vue_env){
+			if (ep.vue_env) {
 				frameworktype = FrameworkType.vue;
 			}
-			if (!ep.extra_env)ep.extra_env = {};
+			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);
+			switch (frameworktype) {
+				case FrameworkType.vue: {
+					vueEnv.useEnv(ep.vue_env!, ep.extra_env);
+					if (!ep.build) ep.build = 'npx vue-cli-service build --mode rig';
 				}
 					break;
 				default:
 					break;
 			}
+			ep.build = ep.build.replace(regexPublicPath, ep.publicPath);
 			shell.exec(ep.build);
 
 			//setup default defines and replace text in built source.

package/lib/init/cicd.rig.json5

@@ -4,6 +4,8 @@
     root_path: 'dist',
   },
   target: {},
-  endpoints: {},
+  endpoints: {
+
+  },
   groups: [],
 }

package/lib/vue-env/index.js

@@ -23,12 +23,7 @@ const useEnv =  (mode,extra)=>{
       }
       print.info(`using env:`)
       console.log(content);
-      fs.writeFile('./.env.rig', content, {flag: "w"}, err => {
-        if (err){
-          print.error(err);
-          process.exit(1)
-        }
-      });
+      fs.writeFileSync('./.env.rig', content, {flag: "w"});
     } else {
       print.error("请先在env.rig.json5文件中配置" + mode + "模式的环境变量");
       process.exit(1)

package/package.json

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