rigjs 2.1.10 → 2.1.11

package/lib/build/index.ts

@@ -6,8 +6,6 @@ import fs from 'fs';
 import vueEnv from '../vue-env';
 const print = require('../print');
 
-const JSON5 = require('json5');
-
 const replaceDefine = (target: string, defines?: Define) => {
 	console.log(`start replaceDefine:${target}`);
 	const dirs = fs.readdirSync(target);
@@ -44,6 +42,8 @@ export default async (cmd: any) => {
 		}
 		//替换build中的可替换变量
 		const regexPublicPath = new RegExp('\\$public_path', 'g');
+		const regexPublicPath2 = new RegExp('__PUBLIC_PATH__', 'g');
+		const regexDomain = new RegExp('__DOMAIN__', 'g');
 
 		for (let i = 0; i < cicdCmd.endpoints.length; i++) {
 			const ep = cicdCmd.endpoints[i];
@@ -52,6 +52,8 @@ export default async (cmd: any) => {
 				if (ep.defines){
 					Object.keys(ep.defines).forEach(key => {
 						ep.defines[key] = ep.defines[key].replace(regexPublicPath, ep.publicPath);
+						ep.defines[key] = ep.defines[key].replace(regexPublicPath2, ep.publicPath);
+						ep.defines[key] = ep.defines[key].replace(regexDomain, ep.domains[0]);
 					});
 				}
 			} catch (e) {
@@ -64,7 +66,7 @@ export default async (cmd: any) => {
 			}
 			if (!ep.extra_env) ep.extra_env = {};
 			ep.extra_env['PUBLIC_PATH'] = ep.publicPath;
-			ep.extra_env['OUTPUT_DIR'] = path.join(cicd.source.root_path, ep.deployDir);
+			ep.extra_env['OUTPUT_DIR'] = path.join(cicd.source.root_path, ep.publicPath);
 
 			switch (frameworktype) {
 				case FrameworkType.vue: {
@@ -81,10 +83,11 @@ export default async (cmd: any) => {
 			shell.exec(ep.build);
 			//setup default defines and replace text in built source.
 			if (!ep.defines) ep.defines = {};
-			ep.defines['__DEPLOY_DIR__'] = ep.deployDir;
+			ep.defines['__PUBLIC_PATH__'] = ep.publicPath;
+			ep.defines['__DEPLOY_DIR__'] = ep.publicPath;
 			ep.defines['__RIG_PUBLIC_PATH__'] = ep.publicPath;
 			ep.defines['__RIG_DEPLOY_DIR__'] = ep.publicPath;
-			replaceDefine(path.join(cicd.source.root_path, ep.deployDir), ep.defines);
+			replaceDefine(path.join(cicd.source.root_path, ep.publicPath), ep.defines);
 		}
 	} catch (e) {
 		console.error(e.message);

package/lib/classes/cicd/CICD.ts

@@ -1,16 +1,19 @@
 import DirLevel from '@/classes/cicd/DirLevel';
-import Endpoint, { EndpointDict} from '@/classes/cicd/Endpoint';
+import Endpoint, {EndpointDict} from '@/classes/cicd/Endpoint';
 import fs from 'fs';
 
 const JSON5 = require('json5');
 import qs from 'querystring';
 import util from 'util';
+
 export enum CloudType {
 	alicloud = 'alicloud',
 }
+
 export enum FrameworkType {
 	vue = 'vue',
 }
+
 /**
  * Bundle source
  */
@@ -29,9 +32,11 @@ export interface DeployTarget {
 	access_key: string;
 	access_secret: string;
 	root_path: '/';
+	bucket_root_path: '/';//equals to root_path
+	web_entry_path: '/';
 	uri_rewrite: {
-		original: string;
-		original_regexp: string;
+		original?: string;
+		original_regexp?: string;
 		final?: string;
 	} | undefined;
 }
@@ -48,10 +53,12 @@ export interface DirGroup {
 	level: string,
 	includes: string[],
 }
-export interface Define{
+
+export interface Define {
 	[replace: string]: String;
 }
-export interface DefineDict{
+
+export interface DefineDict {
 	[group: string]: Define;
 }
 
@@ -64,6 +71,7 @@ export interface CICDConfig {
 	 * fafafafa
 	 */
 	tree_schema: string;
+	web_type: 'spa'|'mpa';
 	source: DeploySource;
 	target: DeployTarget | DeployTarget[];
 	endpoints: EndpointDict;
@@ -77,6 +85,7 @@ class CICD {
 	 * @type {string}
 	 */
 	treeSchema: string;
+	web_type: 'spa' | 'mpa' = 'spa';
 	/**
 	 * DirLevel shows every level of the directory structure
 	 * @type {DirLevel[]}
@@ -93,13 +102,15 @@ class CICD {
 
 	constructor(config: CICDConfig) {
 		this.treeSchema = config.tree_schema;
+		this.web_type = config.web_type || 'spa';
 		this.schema = DirLevel.createSchema(this.treeSchema);
-		this.endpoints = Endpoint.createEndpointArr(config,this.schema);
+		this.endpoints = Endpoint.createEndpointArr(config, this.schema);
 		this.source = config.source;
 		this.target = config.target;
 		this.groups = config.groups;
 	}
-	static createByDefault(cmd:any){
+
+	static createByDefault(cmd: any) {
 		//replace params
 		let cicdStr = fs.readFileSync(`${process.cwd()}/cicd.rig.json5`).toString();
 		const paramsStr = cmd.params;
@@ -110,7 +121,7 @@ class CICD {
 			const regex = new RegExp(regStr, 'g');
 			cicdStr = cicdStr.replace(regex, params[key] as string);
 		});
-		const cicd =  new CICD(JSON5.parse(cicdStr))
+		const cicd = new CICD(JSON5.parse(cicdStr))
 		return cicd;
 	}
 

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

@@ -32,12 +32,7 @@ class AliOSS {
     } catch (e) {}
   }
 
-  public async putStreamFiles(
-    filesList: string[],
-    ossBasePath: string,
-    dir: string,
-    rootPath: string
-  ) {
+  public async putStreamFiles(filesList: string[], rootPath: string) {
     for (let i = 0; i < filesList.length; i++) {
       let filePath = '';
       if (os.platform() === 'win32') {
@@ -45,8 +40,7 @@ class AliOSS {
       } else {
         filePath = filesList[i].split(`${rootPath}/`)[1];
       }
-      const ossPath =
-        ossBasePath + filePath.replace(/\\/g, '/').replace(dir, '');
+      const ossPath = filePath.replace(/\\/g, '/');
 
       //@ts-ignore
       let options: aliOSS.PutStreamOptions = {

package/lib/classes/cicd/Endpoint.ts

@@ -1,7 +1,7 @@
 import { CICDConfig, Define, DefineDict, DeployTarget, DirGroup } from './CICD';
 import { mkdirSync } from 'fs';
 import DirLevel from '@/classes/cicd/DirLevel';
-
+//Mapping endpoints in cicd.rig.json5
 interface EndpointInfo {
   build: string;
   target: string;
@@ -10,6 +10,7 @@ interface EndpointInfo {
 	defines: Define;
 	vue_env?: string;
 	extra_env?:{[env: string]: String};
+	web_entry_path: string;
   uri_rewrite: {
     original: string;
     original_regexp: string;
@@ -34,6 +35,7 @@ class Endpoint {
 	extra_env?:{[env: string]: String};
 	publicPath: string = '';
 	defines: Define;
+	web_entry_path: string = '/';//effective when no validate uri_rewrite
 	uri_rewrite: {
 		original: string,
 		original_regexp: string;
@@ -60,6 +62,7 @@ class Endpoint {
 		this.domains = info.domains
 		this.defines = info.defines;
 		this.uri_rewrite = info.uri_rewrite;
+		this.web_entry_path = info.web_entry_path || '/';
 		this.vue_env = info.vue_env;
 		this.extra_env = info.extra_env;
 

package/lib/deploy/index.ts

@@ -44,12 +44,7 @@ export default async (cmd: any) => {
         cicdCmd.endpoints[i].deployDir
       );
       traverseFolder(distPath);
-      await aliOss.putStreamFiles(
-        filesList,
-        cicdCmd.endpoints[i].deployDir.replace(/\\/g, '/'),
-        cicdCmd.endpoints[i].deployDir,
-        cicd.source.root_path
-      );
+      await aliOss.putStreamFiles(filesList, cicd.source.root_path);
       filesList = [];
     }
     console.log('Upload OSS Done');

package/lib/publish/index.ts

@@ -18,7 +18,7 @@ const setRewriteUri = async (
     domain,
     [original],
     [deployDir],
-    [null]
+    ['enhance_break']
   );
 
   const configId = rwriteResult?.DomainConfigList.DomainConfigModel[0].ConfigId;
@@ -76,34 +76,92 @@ export default async (cmd: any) => {
       throw new Error('Endpoints.length Can Not Be 0!');
     }
     for (const endpoint of cicdCmd.endpoints) {
-      const uriRewrite = endpoint.uri_rewrite
-        ? endpoint.uri_rewrite
-        : target.uri_rewrite;
+      if (
+        !endpoint.uri_rewrite &&
+        (!target.uri_rewrite ||
+          !target.uri_rewrite.original ||
+          !target.uri_rewrite.original_regexp)
+      ) {
+        let webEntryPath: string;
+        if (cicd.web_type === 'mpa') {
+          webEntryPath = '/';
+        } else {
+          webEntryPath = endpoint.web_entry_path
+            ? endpoint.web_entry_path
+            : target.web_entry_path || '/';
+        }
+        for (const domain of endpoint.domains) {
+          if (cicd.web_type === 'mpa') {
+            setRewriteUriPromises.push(
+              setRewriteUri(
+                domain,
+                '^\\/(.*\\.\\w+)($|\\?)',
+                `/${endpoint.deployDir.replace(/\\/g, '/')}/$1`,
+                cdn
+              )
+            );
+            setRewriteUriPromises.push(
+              setRewriteUri(
+                domain,
+                '^\\/([\\w-]+)($|\\/$|\\?)(?!.*.\\w+)',
+                `/${endpoint.deployDir.replace(/\\/g, '/')}/$1.html`,
+                cdn
+              )
+            );
+          } else {
+            setRewriteUriPromises.push(
+              setRewriteUri(
+                domain,
+                '^\\/(.*\\.\\w+)($|\\?)',
+                `/$1`,
+                cdn
+              )
+            );
+          }
+          setRewriteUriPromises.push(
+            setRewriteUri(
+              domain,
+              `^(${webEntryPath})($|\\?|#|\\/\\?|\\/$)`,
+              `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
+              cdn
+            )
+          );
+          urls.push(`https://${domain}${webEntryPath}`);
+        }
+      } else {
+        const uriRewrite = endpoint.uri_rewrite
+          ? endpoint.uri_rewrite
+          : target.uri_rewrite;
 
-      if (!uriRewrite) {
-        continue;
-      }
+        if (!uriRewrite) {
+          continue;
+        }
 
-      for (const domain of endpoint.domains) {
-        setRewriteUriPromises.push(
-          setRewriteUri(
-            domain,
-            `${
-              uriRewrite.original_regexp
-                ? uriRewrite.original_regexp
-                : uriRewrite.original
-            }`,
-            `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
-            cdn
-          )
-        );
-        urls.push(`https://${domain}${uriRewrite.original}`);
+        for (const domain of endpoint.domains) {
+          setRewriteUriPromises.push(
+            setRewriteUri(
+              domain,
+              `${
+                uriRewrite.original_regexp
+                  ? uriRewrite.original_regexp
+                  : uriRewrite.original
+              }`,
+              `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
+              cdn
+            )
+          );
+          urls.push(`https://${domain}${uriRewrite.original}`);
+        }
       }
     }
 
     // 回源URI改写
     console.log('Please Wait For Set RWrite URI...');
-    await Promise.all(setRewriteUriPromises);
+    if (setRewriteUriPromises.length > 0) {
+      await Promise.all(setRewriteUriPromises);
+    } else {
+      console.log('Not Have To Set RWrite URI');
+    }
     console.log('Set RWrite URI Done');
 
     //刷新cdn

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rigjs",
-  "version": "2.1.10",
+  "version": "2.1.11",
   "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",