rigjs 2.0.0-alpha.12 → 2.0.0-alpha.15

package/demo/cicd.rig.json5

@@ -21,6 +21,7 @@
       defines: {
         NGINX_REPLACE_B: 'http://',
         NGINX_REPLACE_A: '替换了',
+        RIG_REPLACE_PUBLIC: '$public_path',
       },
       domain: 'cdn.rys.com',
     },

package/lib/build/index.ts

@@ -4,23 +4,26 @@ import CICDCmd from '@/classes/cicd/CICDCmd';
 import shell from 'shelljs';
 import path from 'path';
 import fs from 'fs';
-const replaceDefine = (target:string,defines?:Define)=>{
+
+const JSON5 = require('json5');
+
+const replaceDefine = (target: string, defines?: Define) => {
 	const dirs = fs.readdirSync(target);
-	for (let dir of dirs){
+	for (let dir of dirs) {
 		const stat = fs.statSync(path.join(target, dir));
-		if (stat.isDirectory()){
-			replaceDefine(path.join(target, dir),defines);
-		}else{
-			if (defines){
+		if (stat.isDirectory()) {
+			replaceDefine(path.join(target, dir), defines);
+		} else {
+			if (defines) {
 				const namePieces = dir.split('.');
 				const fileType = namePieces[namePieces.length - 1];
-				if (['js','ts'].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){
-						file = file.replace(new RegExp(replace,'g'),defines[replace] as string);
+					for (let replace of replaceArr) {
+						file = file.replace(new RegExp(replace, 'g'), defines[replace] as string);
 					}
-					fs.writeFileSync(path.join(target, dir),file);
+					fs.writeFileSync(path.join(target, dir), file);
 				}
 			}
 		}
@@ -34,17 +37,18 @@ export default async (cmd: any) => {
 	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];
-		ep.build = ep.build.replace('$public_path', ep.publicPath);
-		try{
+
+		ep.build = ep.build.replace(regexPublicPath, ep.publicPath);
+		try {
 			//替换define中的$public_path
-			ep.defines = JSON.parse(JSON.stringify(ep.defines).replace('$public_path', ep.publicPath));
-		}catch (e) {
-			console.log(e.message);
+			ep.defines = JSON5.parse(JSON5.stringify(ep.defines).replace(regexPublicPath, ep.publicPath));
+		} catch (e) {
+			console.log('JSON5 error:', e.message);
 		}
-		console.log('exec build:', ep.build);
+		console.log('exec build:', ep, ep.build, ep.defines);
 		shell.exec(ep.build);
 		replaceDefine(path.join(cicd.source.root_path, ep.dir), ep.defines);
 	}

package/package.json

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