rigjs 3.0.15 → 3.0.17

package/lib/build/index.ts

@@ -78,7 +78,7 @@ export default async (cmd: any) => {
 		switch (frameworktype) {
 			case FrameworkType.vue: {
 				vueEnv.useEnv(ep.vue_env!, ep.extra_env);
-				//推测vue脚本
+				//推测vue脚本//TODO:取消推测
 				if (!ep.build) ep.build = `npx vue-cli-service build --mode rig --dest ${ep.extra_env['OUTPUT_DIR']}`;
 			}
 				break;

package/lib/classes/RigConfig.ts

@@ -5,6 +5,7 @@ import print from '@/print';
 import shell from 'shelljs';
 import semver from 'semver';
 import compareVersions from 'compare-versions'
+import os from "os";
 
 const JSON5 = require('json5');
 
@@ -81,13 +82,17 @@ class RigConfig {
 					print.info(`${rigName} is in deleloping.Skip Validating.`);
 					continue;
 				} else {
-					const cmd = `git fetch ${rigDep.source} refs/tags/${rigDep.version} && git show FETCH_HEAD:package.json`;
+					let cmd = `git fetch ${rigDep.source} refs/tags/${rigDep.version} && git show FETCH_HEAD:package.json`;
+					if (os.platform() === 'win32') {
+						 cmd = `echo (git fetch ${rigDep.source} refs/tags/${rigDep.version}) -and (git show FETCH_HEAD:package.json)`;
+					}
 					print.info(`validateDeps:${cmd}`);
 					let showPackageProcess = shell.exec(cmd,
 						{silent: true}
 					);
 					pkgStr = showPackageProcess.stdout.trim();
 				}
+				pkgStr = pkgStr.replace('-and', '');
 				console.log(pkgStr)
 				const pkg = JSON.parse(pkgStr);
 				console.log(pkg);

package/lib/classes/cicd/CICD.ts

@@ -114,6 +114,7 @@ class CICD {
 		//replace params
 		let pkgStr = fs.readFileSync(`${process.cwd()}/package.rig.json5`).toString();
 		const paramsStr = cmd.params;
+		console.log('paramsStr',paramsStr)
 		const params = qs.parse(paramsStr);
 		//替换动态变量
 		Object.keys(params).forEach(key => {

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

@@ -63,8 +63,8 @@ class CDN {
       format: 'RFC3986',
     });
 
-    const url = `http://cdn.aliyuncs.com?${paramConfig}`;
-
+    const url = `http://cdn.ap-southeast-1.aliyuncs.com?${paramConfig}`;
+    console.log('cdn update url:', url);
     const res = await axios.create().get(url);
     return res.data;
   }
@@ -115,7 +115,7 @@ class CDN {
       return data;
     } catch (e) {
       console.error(
-        `Error: ${e.response ? JSON.stringify(e.response.data.Message) : e}`
+        `setRewriteUri Error: ${e.response ? JSON.stringify(e.response.data.Message) : e}`
       );
       throw new Error(e.response.data.Message);
     }

package/lib/deploy/index.ts

@@ -33,7 +33,7 @@ export default async (cmd: any) => {
     const target = Array.isArray(cicdCmd.cicd.target)
       ? cicdCmd.cicd.target[0]
       : cicdCmd.cicd.target;
-
+    console.log('oss tagert', target);
     const aliOss = new AliOSS(target);
     console.log('Please Wait for Upload OSS...');
     if (!cicdCmd.endpoints || cicdCmd.endpoints.length === 0) {

package/lib/env/index.ts

@@ -6,7 +6,7 @@
  */
 import * as fs from 'fs';
 import json5 from 'json5';
-import print from "@/print";
+import print from "../print";
 import * as console from "console";
 const useEnv =  (mode:string,extra?:any)=>{
 	try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rigjs",
-  "version": "3.0.15",
+  "version": "3.0.17",
   "description": "A multi-repos dev tool based on yarn and git.Rigjs is intended to be the simplest way to develop,share and deliver codes between different developers or different projects.",
   "keywords": [
     "modular",