rigjs 1.0.27 → 1.0.30

package/README.md

@@ -152,6 +152,12 @@ Make sure you are not using developing modules for production.
 ### rig tag
 Using version in package.json to tag.
 
+### rig --env fp_test
+This command automatically reads the file named "env.rig.json5" in the root directory,
+  and looks for the environment variable configuration in mode "fp_test",
+  and eventually generates a file for you with a fixed name of ".env.rig".
+  Warning: Like "fp_test" is a mandatory variable.
+
 ## TODO
 rig install不覆盖rigs下的文件
 es5兼容文档

package/README_CN.md

@@ -149,5 +149,9 @@ rig机制概括起来就是分库开发，整体构建。
 使用package.json中的version打tag
 //TODO：自动检查是否存在未提交代码。
 
+### rig --env fp_test
+该指令首先会在根目录下寻找名为'env.rig.json5'的文件，然后根据所传变量fp_test去该文件读取相应配置，
+最后自动将该配置写入固定名称为".env.rig"的文件。注意：类似"fp_test"的变量为必传项。
+
 ###rig info
 查看模块配置信息

package/demo/test.js

@@ -1,11 +1,18 @@
-const fs = require('fs');
-let pkgStr = fs.readFileSync('package.json').toString();
-let pkg = JSON.parse(pkgStr);
-console.log(pkg);
-pkg.info = 'test';
-// fs.('package.json');
-fs.writeFileSync('package.json', JSON.stringify(pkg,null,2));
- pkgStr = fs.readFileSync('package.json').toString();
- pkg = JSON.parse(pkgStr);
-console.log(pkg);
+// const fs = require('fs');
+// let pkgStr = fs.readFileSync('package.json').toString();
+// let pkg = JSON.parse(pkgStr);
+// console.log(pkg);
+// pkg.info = 'test';
+// // fs.('package.json');
+// fs.writeFileSync('package.json', JSON.stringify(pkg,null,2));
+//  pkgStr = fs.readFileSync('package.json').toString();
+//  pkg = JSON.parse(pkgStr);
+// console.log(pkg);
+//
+console.log(/^([a-z]+-){1,3}([0-9]+)(\.([0-9]+)){3}$/.test('a-a-1.2.1.1'));
+//cmd
+// console.log(/^(\.([0-9]+)){3}$/.test('a-a-1.2.1.1'));
+console.log('a-a-1.2.1.1'.split(/(?<=[a-z])-(?=[0-9])/));
+
+//抓取版本
 

package/demo/yarn.lock

@@ -1,20 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-dayjs@^1.8.30:
-  version "1.9.4"
-  resolved "https://registry.npm.taobao.org/dayjs/download/dayjs-1.9.4.tgz?cache=0&sync_timestamp=1603435778328&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdayjs%2Fdownload%2Fdayjs-1.9.4.tgz#fcde984e227f4296f04e7b05720adad2e1071f1b"
-  integrity sha1-/N6YTiJ/QpbwTnsFcgra0uEHHxs=
-
-lodash@^4.17.19:
-  version "4.17.20"
-  resolved "https://registry.npm.taobao.org/lodash/download/lodash-4.17.20.tgz?cache=0&sync_timestamp=1597336082988&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
-  integrity sha1-tEqbYpe8tpjxxRo1RaKzs2jVnFI=
-
-"r-foundation@git+ssh://git@git.rys.cn:f2e-common/r-foundation.git#1.0.1":
-  version "1.0.0"
-  resolved "git+ssh://git@git.rys.cn:f2e-common/r-foundation.git#ea22c1bcb7b84b2e5ea52683c36aaad73ef26100"
-  dependencies:
-    dayjs "^1.8.30"
-    lodash "^4.17.19"

package/lib/check/index.js

@@ -14,12 +14,14 @@ const load = async () => {
   try {
     let rigJson5Str = fs.readFileSync('package.rig.json5');
     let rigJson5 = json5.parse(rigJson5Str);
+    let hasErr = false;
     for (let dep of rigJson5) {
       if (dep.dev) {
+        hasErr = true;
         print.error(`${dep.name} is in developing!\nUse correct version and set dev to false!`);
-        process.exit(1);
       }
     }
+    if (hasErr) process.exit(1);
     print.succeed(`Ready for production!`);
   } catch (e) {
     print.error(e.message);

package/lib/deps/index.js

@@ -0,0 +1,10 @@
+const checkDepVersions = ()=>{
+	console.log('deps is in developing');
+}
+const load = async (cmd) => {
+	checkDepVersions();
+}
+module.exports = {
+	load,
+	checkDepVersions,
+}

package/lib/env/index.js

@@ -0,0 +1,38 @@
+/**
+ * @ignore
+ * @Description nothing
+ * @author Wang Bo (ralwayne@163.com)
+ * @date 2021/11/18 6:14 PM
+ */
+const fs = require('fs');
+const json5 = require('json5');
+const print = require("../print");
+
+//加载命令控制器
+const load = async (cmd) => {
+  try {
+    const mode = process.argv[process.argv.length -1];
+    const rigJson5 = json5.parse(fs.readFileSync('env.rig.json5'));
+    const modeObj = rigJson5[mode];
+    if (modeObj) {
+      const keysArray = Object.keys(modeObj);
+      let content = "";
+      for (let i = 0; i<keysArray.length; i++) {
+        const key = keysArray[i];
+        const value = modeObj[key];
+        content += key + " = " + value + "\n"
+      }
+      fs.writeFile('./.env.rig', content, {flag: "w"}, err => {
+        err && print.error(err);
+      });
+    } else {
+      print.error("请先在env.rig.json5文件中配置" + mode + "模式的环境变量");
+    }
+  } catch (e) {
+    print.error(e.message);
+  }
+}
+
+module.exports = {
+  load
+}

package/lib/info/index.js

@@ -9,34 +9,34 @@ const fs = require('fs');
 const json5 = require('json5');
 const print = require('../print');
 //加载命令控制器
-const info = ()=>{
-  print.info(`start checking modules`);
-  let rigJson5 = json5.parse(fs.readFileSync('package.rig.json5'));
-  for (let dep of rigJson5) {
-    let describeProcess = shell.exec(`git ls-remote --tags --refs --sort="version:refname" ${dep.source} | awk -F/ 'END{print$NF}'`,
-      {silent: true}
-    );
-    let remoteLatestTag = describeProcess.stdout.trim();
-    if (dep.dev){
-      print.warn(`[${dep.name}] is in developing.latest:${remoteLatestTag},`);
-    }else{
-      if (remoteLatestTag) {
-        if (dep.version === remoteLatestTag) {
-          print.info(`[${dep.name}] using:${dep.version},latest:${remoteLatestTag}`);
-        } else {
-          print.warn(`[${dep.name}] using:${dep.version},latest:${remoteLatestTag},Please confirm before updating!!!`);
-        }
-      } else {
-        print.warn(`Get latest tag failed!Error:${describeProcess.stderr}`);
-      }
-    }
-  }
+const info = () => {
+	print.info(`start checking modules`);
+	let rigJson5 = json5.parse(fs.readFileSync('package.rig.json5'));
+	for (let dep of rigJson5) {
+		let describeProcess = shell.exec(`git ls-remote --tags --refs --sort="version:refname" ${dep.source} | awk -F/ 'END{print$NF}'`,
+			{silent: true}
+		);
+		let remoteLatestTag = describeProcess.stdout.trim();
+		if (dep.dev) {
+			print.warn(`[${dep.name}] is in developing.latest:${remoteLatestTag},`);
+		} else {
+			if (remoteLatestTag) {
+				if (dep.version === remoteLatestTag) {
+					print.info(`[${dep.name}] using:${dep.version},latest:${remoteLatestTag}`);
+				} else {
+					print.warn(`[${dep.name}] using:${dep.version},latest:${remoteLatestTag},Please confirm before updating!!!`);
+				}
+			} else {
+				print.error(`Get latest tag of ${dep.name} failed!Error:${describeProcess.stderr}`);
+			}
+		}
+	}
 
 }
 const load = async (cmd) => {
-  info();
+	info();
 }
 module.exports = {
-  load,
-  info,
+	load,
+	info,
 }

package/lib/init/index.js

@@ -85,6 +85,7 @@ module.exports = {
     let rigIgnoreStrArr = [
       'rigs/*',
       'rigs_dev/*',
+      '.env.rig',
       '!rigs/.gitkeep',
       '!rigs_dev/.gitkeep'
     ];

package/lib/postinstall/index.js

@@ -23,6 +23,7 @@ const load = async (cmd) => {
     console.log(rigJson5);
     let devDeps = [];
     for (let dep of rigJson5) {
+
       if (dep.dev) {
         print.warn(`developing:${dep.name}`);
         devDeps.push(dep.name);
@@ -35,6 +36,7 @@ const load = async (cmd) => {
           'dir'
         );
       }
+      //TODO:检查依赖间的版本号要求
     }
     info.info();
     print.succeed(`postinstall SUCCEED!`);

package/lib/rig/index.js

@@ -11,7 +11,7 @@ program.command('preinstall').action(require('../preinstall').load);
 program.command('postinstall').action(require('../postinstall').load);
 program.command('tag').action(require('../tag').load);
 program.command('info').action(require('../info').load);
+program.option('-e, --env <env>', 'specify env').action(require('../env').load);
 
 program.version(require('../../package.json').version,'-v,--version');
 program.parse(process.argv);
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rigjs",
-  "version": "1.0.27",
+  "version": "1.0.30",
   "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",
@@ -26,6 +26,7 @@
     "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",
     "deliver": "npm publish --registry=https://registry.npmjs.org"
   },