rigjs 2.1.29 → 3.0.1-alpha.2

package/lib/print/index.ts

@@ -0,0 +1,38 @@
+/**
+ * @ignore
+ * @Description nothing
+ * @author Wang Bo (ralwayne@163.com)
+ * @date 2020/10/20 7:32 PM
+ */
+const ora = require('ora');
+const chalk = require('chalk');
+
+let printer = ora();
+
+const start = (str: string) => {
+	printer.start(chalk.blueBright(str));
+}
+
+const info = (str: string) => {
+	printer.info(chalk.hex('#37BA85')(str));
+}
+
+const error = (str: string) => {
+	printer.fail(chalk.hex('#FF4848')(str));
+}
+
+const warn = (str: string) => {
+	printer.warn(chalk.yellowBright(str));
+}
+
+const succeed = (str: string) => {
+	printer.succeed(chalk.greenBright(str));
+}
+
+export default {
+  start,
+	info,
+	error,
+	warn,
+	succeed,
+}

package/lib/publish/index.ts

@@ -22,7 +22,7 @@ const setRewriteUri = async (
   );
 
   const configId = rwriteResult?.DomainConfigList.DomainConfigModel[0].ConfigId;
-  for (let i = 0; i <= 200; i++) {
+  for (let i = 0; i <= 100; i++) {
     const configInfo = await cdn.describeCdnDomainConfigs(domain, configId);
     const domainConfigs = configInfo.DomainConfigs.DomainConfig;
     let successCount = 0;
@@ -36,7 +36,7 @@ const setRewriteUri = async (
     if (successCount === domainConfigs.length) {
       break;
     }
-    if (i === 200) {
+    if (i === 100) {
       throw new Error('cdn rewrite timeout 10min');
     }
     await delay(3000);
@@ -46,7 +46,7 @@ const setRewriteUri = async (
 const refreshCache = async (urls: string[], cdn: CDN) => {
   const refreshResult = await cdn.refreshCache(urls.join('\n'));
   console.log('Please Wait For RefreshCache...');
-  for (let i = 0; i <= 200; i++) {
+  for (let i = 0; i <= 100; i++) {
     const desResult = await cdn.describeRefreshTaskById(
       refreshResult.RefreshTaskId
     );
@@ -61,7 +61,7 @@ const refreshCache = async (urls: string[], cdn: CDN) => {
     if (successCount === desResult.Tasks.length) {
       break;
     }
-    if (i === 200) {
+    if (i === 100) {
       throw new Error('refresh cache timeout 10min');
     }
     await delay(3000);

package/lib/rig/index.ts

@@ -1,30 +1,46 @@
+import semver from 'semver';
+import print from '../print';
+import add from '../add';
+import dev from '../dev';
+import preinstall from '../preinstall';
+import postinstall from '../postinstall';
+import build from '../build';
+import deploy from '../deploy';
+import publish from '../publish';
+
+import sync from '../sync';
+const nodeMin = '14.0.0';
+if (semver.gte(nodeMin,process.version)){
+	print.error('NodeJS version must be at least 14.');
+	process.exit(0);
+}
 import {Command} from 'commander';
 
 const program = new Command();
-console.log('Hello');
 
 import check from '../check';
 
 program.command('check').action(check.load);
 import init from '../init';
 
-program.command('init').action(init.load);
+program.command('init').action(init);
 import install from '../install';
 
-program.command('install').action(install.load);
-program.command('i').action(install.load);
-import preinstall from '../preinstall';
-import postinstall from '../postinstall';
+program.command('install').action(install);
+program.command('i').action(install);
 
-program.command('preinstall').action(preinstall.load);
-program.command('postinstall').action(postinstall.load);
+program.command('preinstall').action(preinstall);
+program.command('postinstall').action(postinstall);
 import tag from '../tag';
 
 program.command('tag').action(tag.load);
 import info from '../info';
 
 program.command('info').action(info.load);
-import build from '../build';
+
+program.command('add').action(add);
+
+program.command('dev').action(dev);
 
 program.command('build')
 	.option('-s, --schema <schema>', 'specify params in tree_schema')
@@ -36,20 +52,20 @@ program.command('build')
 // 	.option('-s, --schema <schema>', 'specify params in tree_schema')
 // 	.option('-p , --params <params>', 'replace words in cicd.rig.json5, only words in ${} are replacable')
 // 	.action(define);
-import deploy from '../deploy';
-
 program.command('deploy')
 	.option('-s, --schema <schema>', 'specify params in tree_schema')
 	.option('-p , --params <params>', 'replace words in cicd.rig.json5, only words in ${} are replacable')
 	.action(deploy);
 
-import publish from '../publish';
-
 program.command('publish')
 	.option('-s, --schema <schema>', 'specify params in tree_schema')
 	.option('-p , --params <params>', 'replace words in cicd.rig.json5, only words in ${} are replacable')
 	.action(publish);
 
+program.command('sync')
+	.option('-f, --force <force>', 'force to overwrite files from package.rig.json5')
+	.action(sync);
+
 import env from '../vue-env';
 
 program.option('--vueenv <vueenv>', 'specify vue env').action(env.load);

package/lib/sync/index.test.ts

@@ -0,0 +1,4 @@
+import path from 'path';
+import url from 'url';
+
+console.log(path.basename(url.parse('https://dafa.com/fafa.txt?a=1').pathname!));

package/lib/sync/index.ts

@@ -0,0 +1,32 @@
+import axios from 'axios';
+import RigConfig from '@/classes/RigConfig';
+import url from 'url';
+import path from 'path';
+import fs from 'fs';
+import print from '../print';
+
+const syncFile = async (shareContent: string, force: boolean = false) => {
+	const filename = path.basename(url.parse(shareContent).pathname!);
+	const shareFilePath = path.join(process.cwd(), filename);
+	if (fs.existsSync(shareFilePath) && !force) {
+		print.info(`${filename} already exists.`);
+		return;
+	}
+	print.info(`Start downloading ${filename}`);
+	const fileStr = (await axios.get(shareContent)).data;
+	fs.writeFileSync(shareFilePath, fileStr);
+};
+export default async (cmd: any) => {
+	const rigConfig = RigConfig.createFromCWD();
+	for (let key in rigConfig.share) {
+		if (Array.isArray(rigConfig.share[key])) {
+			const shareContentArr = rigConfig.share[key] as string[];
+			for (let shareContent of shareContentArr) {
+				await syncFile(shareContent, cmd.force);
+			}
+		} else {
+			const shareContent = rigConfig.share[key] as string;
+			await syncFile(shareContent, cmd.force);
+		}
+	}
+}

package/lib/utils/fsHelper.ts

@@ -5,6 +5,42 @@ const readCICDConfig = () => {
 	const cicdStr = fs.readFileSync(`${process.cwd()}/cicd.rig.json5`);
 	return JSON5.parse(cicdStr);
 }
+/**
+ * 读取rig配置文件
+ * @param {string} path absolute path to config json5.
+ * @returns {any}
+ */
+const readConfig = (path: string = '') => {
+	try {
+		if (path) {
+			const rigJson5Str = fs.readFileSync(path);
+			return JSON5.parse(rigJson5Str);
+		}
+		const rigJson5Str = fs.readFileSync(`${process.cwd()}/package.rig.json5`);
+		return JSON5.parse(rigJson5Str);
+	} catch (e) {
+		throw new Error(`readConfig failed:${e.message}`);
+	}
+}
+
+const writeConfig = (config: any, path: string = '') => {
+	try {
+		if (path) {
+			fs.writeFileSync(path, config.toString());
+		} else {
+			fs.writeFileSync(`${process.cwd()}/package.rig.json5`, config.toString());
+		}
+	} catch (e) {
+		throw new Error(`rig writeConfig failed:${e.message}`);
+	}
+}
+const readPkgStrInRepo = (rigRepoName: string) => {
+	return fs.readFileSync(`${process.cwd()}/rig_dev/${rigRepoName}/package.json`).toString();
+}
+
 export default {
-	readCICDConfig
+	readCICDConfig,
+	readConfig,
+	writeConfig,
+	readPkgStrInRepo
 }

package/lib/utils/objectHelper.ts

@@ -0,0 +1,12 @@
+const sortKeys = (obj: any) => {
+	return Object.keys(obj).sort().reduce(
+		(sortedObj: any, key) => {
+			sortedObj[key] = obj[key];
+			return sortedObj;
+		},
+		{}
+	);
+}
+export default {
+	sortKeys
+}

package/lib/utils/regexHelper.test.ts

@@ -0,0 +1,12 @@
+import regexHelper from '@/utils/regexHelper';
+test('matchGitName', () => {
+	const retGit = 'git@git.domain.com:f2e-common/r-test.git'.match(regexHelper.matchGitName);
+	const retHttp = 'https://git.domain.com/f2e-common/r-test.git'.match(regexHelper.matchGitName);
+	if (retGit) {
+		expect(retGit[2]).toContain('r-test');
+	}
+	if (retHttp) {
+		expect(retHttp[2]).toContain('r-test');
+	}
+});
+

package/lib/utils/{regex.ts → regexHelper.ts}

@@ -4,7 +4,9 @@
  * @author Wang Bo (ralwayne@163.com)
  * @date 2020/10/10 3:57 PM
  */
+// `^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)`,
 const gitURL = /(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\.git)(\/?|\#[-\d\w._]+?)$/;
+const matchGitName = /^(git|http).*\/(.*)(\.git)$/;
 const path = /^(\/\w+){0,2}\/?$/;
 /**
  * 文字下划线中划线
@@ -14,5 +16,6 @@ const dynamicDir = /(^\[[\w\-]+\]$)|(^\{[\w\-]+\}$)/
 export default {
 	gitURL,
 	path,
-	dynamicDir
+	dynamicDir,
+	matchGitName
 }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "rigjs",
-  "version": "2.1.29",
-  "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.",
+  "version": "3.0.1-alpha.2",
+  "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",
     "lerna",
     "monorepo",
     "multirepos",
-    "cocoapods",
+    "carthage",
     "symlink",
     "npm link",
     "workspaces"
@@ -21,14 +21,14 @@
   },
   "scripts": {
     "test": "jest",
-    "init": "cd demo && node ../lib/rig/index.js init",
-    "i": "cd demo && node ../lib/rig/index.js install",
+    "test:init": "yarn build && cd demo && ts-node ../built/index.js init",
     "p": "cd demo && node ../lib/rig/index.js publish",
     "prei": "cd demo && node ../lib/rig/index.js preinstall",
     "posti": "cd demo && node ../lib/rig/index.js postinstall",
     "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",
+    "publish": "npm publish --registry=https://registry.npmjs.org",
     "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 --sourcemap=inline --minify --outfile=built/index.js --external:shelljs"
@@ -37,6 +37,7 @@
     "@types/ali-oss": "^6.16.3",
     "@types/json5": "^2.2.0",
     "@types/qs": "^6.9.7",
+    "@types/semver": "^7.3.10",
     "@types/shelljs": "^0.8.11",
     "@types/uuid": "^8.3.4",
     "ali-oss": "^6.17.1",
@@ -48,15 +49,16 @@
     "inquirer": "7.3.3",
     "json5": "2.1.3",
     "ora": "^5.1.0",
-    "semver": "^7.3.6",
+    "semver": "^7.3.7",
     "shelljs": "^0.8.4",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@types/jest": "^27.4.1",
+    "@types/jest": "^28.1.1",
     "@types/node": "^17.0.21",
     "jest": "^27.5.1",
-    "ts-node": "^10.7.0",
+    "ts-jest": "^28.0.5",
+    "ts-node": "^10.8.1",
     "typescript": "^4.6.3"
   }
 }

package/package.rig.json5

@@ -0,0 +1,8 @@
+{
+  dependencies: {
+    'rig-test-1': {
+      name: 'rig-test-1',
+      source: 'git@github.com:FlashHand/rig-test-1.git',
+    },
+  },
+}

package/tsconfig.json

@@ -15,7 +15,8 @@
 		"outDir": "./built",
 		"allowJs": true,
 		"types": [
-			"node"
+			"node",
+			"jest",
 		],
 		"paths": {
 			"@/*": [
@@ -38,9 +39,10 @@
 	"include": [
 		"index.ts",
 		"rigs/**/*.ts",
-		"src/**/*.ts",
 		"lib/**/*.ts",
 		"lib/**/*.d.ts",
+		"lib/**/*.test.ts",
+		"lib/**/*.spec.ts",
 		"lib/**/*.js",
 		"test/**/*.ts",
 		"typings/**/*.ts",

package/demo/cicd.rig.json5

@@ -1,56 +0,0 @@
-{
-  tree_schema: 'ykp/{env}/{oem}',
-  source: {
-    root_path: 'dist',
-  },
-  target: {
-    id: 'alicloud',
-    type: 'alicloud',
-    bucket: 'cdn-rys-com',
-    region: 'oss-cn-beijing',
-    access_key: '${ak}',
-    access_secret: '${as}',
-    root_path: '/',
-    uri_rewrite: {
-      original: '/',
-    }
-  },
-  endpoints: {
-    'ykp/test/oem1': {
-      build: 'cross-env PUBLIC_PATH=$public_path npx vue-cli-service build --mode oem1',
-      defines: {
-        NGINX_REPLACE_B: 'http://',
-        NGINX_REPLACE_A: '替换了',
-        RIG_REPLACE_PUBLIC: '$public_path',
-      },
-      domain: 'cdn.rys.com',
-    },
-    'ykp/test/oem2': {
-      // build: 'yarn build:test:oem2',
-      build: 'cross-env PUBLIC_PATH=$public_path npx vue-cli-service build --mode oem2',
-      defines: {
-        NGINX_REPLACE_B: 'http://',
-        NGINX_REPLACE_A: '替换了',
-      },
-      domain: 'cdn.rys.com'
-    },
-  },
-  groups: [
-    {
-      name: '%group1',
-      level: 'oem',
-      includes: [
-        'rys',
-        'zhs',
-      ],
-    },
-    {
-      name: '%group1',
-      level: 'oem',
-      includes: [
-        'zhs',
-        'cy',
-      ],
-    }
-  ],
-}