rigjs 2.0.0-alpha.9 → 2.0.1

package/lib/publish/index.ts

@@ -1,8 +1,5 @@
-import fsHelper from '../utils/fsHelper';
 import CICD from '@/classes/cicd/CICD';
 import CICDCmd from '@/classes/cicd/CICDCmd';
-import shell from 'shelljs';
-import path from 'path';
 import CDN from '@/classes/cicd/Deploy/CDN';
 
 const setRWriteUri = async (
@@ -15,11 +12,10 @@ const setRWriteUri = async (
     domain,
     [original],
     [deployDir],
-    ['enhance_break']
+    [null]
   );
 
   const configId = rwriteResult?.DomainConfigList.DomainConfigModel[0].ConfigId;
-  console.log('Please Wait For Set RWrite URI...');
   while (true) {
     const configInfo = await cdn.describeCdnDomainConfigs(domain, configId);
     if (configInfo.DomainConfigs.DomainConfig[0].Status === 'success') {
@@ -29,7 +25,6 @@ const setRWriteUri = async (
       throw new Error('cdn rewrite fail');
     }
   }
-  console.log('Set RWrite URI Done');
 };
 
 const refreshCache = async (urls: string[], cdn: CDN) => {
@@ -67,18 +62,26 @@ export default async (cmd: any) => {
 
   const cdn = new CDN(target);
   const urls: string[] = [];
+  const setRWriteUriPromises: Promise<any>[] = [];
   for (const endpoint of cicdCmd.endpoints) {
     // 目前只支持set一个original
-    await setRWriteUri(
-      endpoint.domain,
-      `/${target.uri_rewrite.original}`,
-      `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
-      cdn
+    setRWriteUriPromises.push(
+      setRWriteUri(
+        endpoint.domain,
+        `${target.uri_rewrite.original_regexp ? target.uri_rewrite.original_regexp : target.uri_rewrite.original}`,
+        `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
+        cdn
+      )
     );
-    urls.push(`https://${endpoint.domain}/${target.uri_rewrite.original}`);
+    urls.push(`https://${endpoint.domain}${target.uri_rewrite.original}`);
   }
 
+  // 回源URI改写
+  console.log('Please Wait For Set RWrite URI...');
+  await Promise.all(setRWriteUriPromises);
+  console.log('Set RWrite URI Done');
+
   //刷新cdn
   await refreshCache(urls, cdn);
-  console.log('Start Publish-----');
+  console.log('Publish Done-----');
 };

package/lib/rig/index.ts

@@ -50,8 +50,8 @@ program.command('publish')
 	.option('-p , --params <params>', 'replace words in cicd.rig.json5, only words in ${} are replacable')
 	.action(publish);
 
-import env from '../env';
+import env from '../vue-env';
 
-program.option('-e, --env <env>', 'specify env').action(env.load);
+program.option('--vueenv <vueenv>', 'specify vue env').action(env.load);
 program.version(require('../../package.json').version, '-v,--version');
 program.parse(process.argv);

package/package.json

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