rigjs 2.0.11 → 2.0.15

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

@@ -2,6 +2,7 @@ import aliOSS from 'ali-oss';
 import fs from 'fs';
 import { DeployTarget } from '../CICD';
 import os from 'os';
+import path from 'path';
 
 class AliOSS {
   ossClient: aliOSS;
@@ -52,9 +53,13 @@ class AliOSS {
         contentLength: fs.statSync(filesList[i]).size,
       };
       if (filesList[i].includes('index.html')) {
-        options = Object.assign({
-          headers: { 'Cache-Control': 'no-cache', Expires: -1 },
-        });
+        options.headers = { 'Cache-Control': 'no-cache', Expires: -1 };
+      } else if (
+        path.extname(filesList[i]) === '.js' ||
+        path.extname(filesList[i]) === '.css' ||
+        path.extname(filesList[i]) === '.ico'
+      ) {
+        options.headers = { 'Cache-Control': 'max-age=3000000' };
       }
       const fileResult = await this.ossClient.putStream(
         ossPath,

package/lib/publish/index.ts

@@ -2,6 +2,12 @@ import CICD from '@/classes/cicd/CICD';
 import CICDCmd from '@/classes/cicd/CICDCmd';
 import CDN from '@/classes/cicd/Deploy/CDN';
 
+const delay = async (ms: number) => {
+  await new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+};
+
 const setRewriteUri = async (
   domain: string,
   original: string,
@@ -24,6 +30,7 @@ const setRewriteUri = async (
     if (configInfo.DomainConfigs.DomainConfig[0].Status === 'failed') {
       throw new Error('cdn rewrite fail');
     }
+    await delay(3000);
   }
 };
 
@@ -45,6 +52,7 @@ const refreshCache = async (urls: string[], cdn: CDN) => {
     if (successCount === desResult.Tasks.length) {
       break;
     }
+    await delay(3000);
   }
   console.log('RefreshCache Done');
 };

package/lib/vue-env/index.js

@@ -22,9 +22,13 @@ const load = async (cmd) => {
         const value = modeObj[key];
         content += key + " = " + value + "\n"
       }
+      print.info(`using env:`)
+      console.log(content);
       fs.writeFile('./.env.rig', content, {flag: "w"}, err => {
-        err && print.error(err);
-        process.exit(1)
+        if (err){
+          print.error(err);
+          process.exit(1)
+        }
       });
     } else {
       print.error("请先在env.rig.json5文件中配置" + mode + "模式的环境变量");

package/package.json

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