rigjs 2.0.19-alpha.4 → 2.1.1

package/lib/build/index.ts

@@ -4,6 +4,7 @@ import shell from 'shelljs';
 import path from 'path';
 import fs from 'fs';
 import vueEnv from '../vue-env';
+const print = require('../print');
 
 const JSON5 = require('json5');
 
@@ -48,9 +49,11 @@ export default async (cmd: any) => {
 			const ep = cicdCmd.endpoints[i];
 			try {
 				//替换define中的$public_path
-				Object.keys(ep.defines).forEach(key => {
-					ep.defines[key] = ep.defines[key].replace(regexPublicPath, ep.publicPath);
-				})
+				if (ep.defines){
+					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);
 			}
@@ -66,6 +69,7 @@ export default async (cmd: any) => {
 			switch (frameworktype) {
 				case FrameworkType.vue: {
 					vueEnv.useEnv(ep.vue_env!, ep.extra_env);
+					//推测vue脚本
 					if (!ep.build) ep.build = 'npx vue-cli-service build --mode rig';
 				}
 					break;
@@ -73,8 +77,8 @@ export default async (cmd: any) => {
 					break;
 			}
 			ep.build = ep.build.replace(regexPublicPath, ep.publicPath);
+			print.info(`using build script:${ep.build}`);
 			shell.exec(ep.build);
-
 			//setup default defines and replace text in built source.
 			if (!ep.defines) ep.defines = {};
 			ep.defines['__DEPLOY_DIR__'] = ep.deployDir;

package/lib/classes/cicd/CICD.ts

@@ -33,7 +33,7 @@ export interface DeployTarget {
 		original: string;
 		original_regexp: string;
 		final?: string;
-	};
+	} | undefined;
 }
 
 /**

package/lib/publish/index.ts

@@ -80,6 +80,10 @@ export default async (cmd: any) => {
         ? endpoint.uri_rewrite
         : target.uri_rewrite;
 
+      if (!uriRewrite) {
+        continue;
+      }
+
       for (const domain of endpoint.domains) {
         setRewriteUriPromises.push(
           setRewriteUri(
@@ -103,7 +107,11 @@ export default async (cmd: any) => {
     console.log('Set RWrite URI Done');
 
     //刷新cdn
-    await refreshCache(urls, cdn);
+    if (urls.length > 0) {
+      await refreshCache(urls, cdn);
+    } else {
+      console.log('Not Have To RefreshCache');
+    }
     console.log('Publish Done-----');
   } catch (e: any) {
     console.error(e.message);

package/lib/tag/index.js

@@ -11,26 +11,28 @@ const print = require('../print');
 let red = chalk.red;
 
 
-const load = async ()=>{
-  try {
-    let pkgJson = JSON.parse(fs.readFileSync('package.json').toString());
-    let version = pkgJson.version;
-    if (!fs.existsSync('.git')) {
-      print.error('.git not found at the level of package.json');
-      print.error('should run "rig tag" in the directory with both .git and package.json');
-      return;
-    }
-    let statusProcess = shell.exec('git status',{silent:true});
-    if (statusProcess.stdout.indexOf('nothing to commit')>=0) {
-      shell.exec(`git tag ${version}`);
-      print.succeed(`tag:${version} created.`);
-    }else {
-      print.error(statusProcess.stdout);
-    }
-  }catch (e){
-    console.log(red(e.message));
-  }
+const load = async () => {
+	try {
+		let pkgJson = JSON.parse(fs.readFileSync('package.json').toString());
+		let version = pkgJson.version;
+		if (!fs.existsSync('.git')) {
+			print.error('.git not found at the level of package.json');
+			print.error('should run "rig tag" in the directory with both .git and package.json');
+			process.exit(1)
+		}
+		let statusProcess = shell.exec('git status', {silent: true});
+		if (statusProcess.stdout.indexOf('nothing to commit') >= 0) {
+			shell.exec(`git tag ${version}`);
+			print.succeed(`tag:${version} created.`);
+		} else {
+			print.error(statusProcess.stdout);
+			process.exit(1)
+		}
+	} catch (e) {
+		console.log(red(e.message));
+		process.exit(1)
+	}
 }
 module.exports = {
-  load
+	load
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rigjs",
-  "version": "2.0.19-alpha.4",
+  "version": "2.1.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",
@@ -28,8 +28,8 @@
     "c": "d demo && node ../lib/rig/index.js check",
     "envmake": "cd demo && node ../lib/rig/index.js --env prod_view_zhs",
     "t": "node lib/rig/index.js tag",
-    "deliver": "yarn build & npm publish --registry=https://registry.npmjs.org",
-    "deliver:alpha": "yarn build & npm publish --registry=https://registry.npmjs.org --tag alpha",
+    "deliver": "rig tag & yarn build & npm publish --registry=https://registry.npmjs.org",
+    "deliver:alpha": "rig tag & yarn build & npm publish --registry=https://registry.npmjs.org --tag alpha",
     "build": "esbuild lib/rig/index.ts --platform=node --bundle --minify --outfile=built/index.js --external:shelljs"
   },
   "dependencies": {