rigjs 1.0.25 → 1.0.29

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

@@ -117,7 +117,9 @@ let inserted = {
       }
     }
 ```
-
+rig机制概括起来就是分库开发，整体构建。
+![develop](https://github.com/FlashHand/rig/raw/main/develop.png)
+![production](https://github.com/FlashHand/rig/raw/main/production.png)
 #### 主要功能
 
 1. 更方便的进行模块化开发，
@@ -147,5 +149,9 @@ let inserted = {
 使用package.json中的version打tag
 //TODO：自动检查是否存在未提交代码。
 
+### rig --env fp_test
+该指令首先会在根目录下寻找名为'env.rig.json5'的文件，然后根据所传变量fp_test去该文件读取相应配置，
+最后自动将该配置写入固定名称为".env.rig"的文件。注意：类似"fp_test"的变量为必传项。
+
 ###rig info
 查看模块配置信息

package/demo/package.json

@@ -2,9 +2,7 @@
   "name": "demo",
   "version": "1.0.0",
   "dependencies": {
-    "moment": "^2.29.1",
-    "r-foundation": "git+ssh://git@git.rys.cn:f2e-common/r-foundation.git#1.0.1",
-    "undefined": "git+ssh://git@git.rys.cn:f2e-common/r-foundation.git#1.0.1"
+    "r-foundation": "git+ssh://git@git.rys.cn:f2e-common/r-foundation.git#1.0.1"
   },
   "private": true,
   "workspaces": [
@@ -15,5 +13,8 @@
     "preinstall": "rig preinstall",
     "postinstall": "rig postinstall"
   },
-  "info": "test"
+  "info": "test",
+  "devDependencies": {
+    "json5": "2.1.3"
+  }
 }

package/demo/rig_helper.js

@@ -0,0 +1,14 @@
+const json5 = require('json5');
+const fs = require('fs');
+const getPkgs = () => {
+  let pkgArr = json5.parse(fs.readFileSync('./package.rig.json5'));
+  let flatPkgArr = pkgArr.map((item, index) => {
+    return item.name;
+  });
+  console.log(flatPkgArr);
+  return flatPkgArr;
+}
+
+module.exports = {
+  getPkgs
+}

package/demo/yarn.lock

@@ -1,25 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-dayjs@^1.8.30:
-  version "1.9.3"
-  resolved "https://registry.npm.taobao.org/dayjs/download/dayjs-1.9.3.tgz?cache=0&sync_timestamp=1602580965878&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdayjs%2Fdownload%2Fdayjs-1.9.3.tgz#b7f94b22ad2a136a4ca02a01ab68ae893fe1a268"
-  integrity sha1-t/lLIq0qE2pMoCoBq2iuiT/homg=
-
-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=
-
-moment@^2.29.1:
-  version "2.29.1"
-  resolved "https://registry.npm.taobao.org/moment/download/moment-2.29.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmoment%2Fdownload%2Fmoment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
-  integrity sha1-sr52n6MZQL6e7qZGnAdeNQBvo9M=
-
-"r-foundation@git+ssh://git@git.rys.cn:f2e-common/r-foundation.git#1.0.1", "undefined@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/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/init/index.js

@@ -43,6 +43,27 @@ const load = async (cmd) => {
       console.log(chalk.green('create package.rig.json5'));
       fs.writeFileSync('./package.rig.json5', template);
     }
+    if (fs.existsSync('rig_helper.js')){
+      console.log(chalk.green('rig_helper.js already exists~'));
+    }else{
+      let rigHelper = `const json5 = require('json5');
+const fs = require('fs');
+const getPkgs = () => {
+  let pkgArr = json5.parse(fs.readFileSync('./package.rig.json5'));
+  let flatPkgArr = pkgArr.map((item, index) => {
+    return item.name;
+  });
+  console.log(flatPkgArr);
+  return flatPkgArr;
+}
+
+module.exports = {
+  getPkgs
+}
+`
+      console.log(chalk.green('create rig_helper.js'));
+      fs.writeFileSync('./rig_helper.js', rigHelper);
+    }
     //检查rigs是否存在
     if (fs.existsSync('./rigs') && fs.lstatSync('./rigs').isDirectory()) {
       console.log(chalk.green('folder rigs  already exists~'));
@@ -64,6 +85,7 @@ const load = async (cmd) => {
     let rigIgnoreStrArr = [
       'rigs/*',
       'rigs_dev/*',
+      '.env.rig',
       '!rigs/.gitkeep',
       '!rigs_dev/.gitkeep'
     ];
@@ -92,6 +114,9 @@ const load = async (cmd) => {
       scripts:{
         preinstall:"rig preinstall",
         postinstall:"rig postinstall",
+      },
+      devDependencies:{
+        json5:'2.1.3'
       }
     }
     pkgJSON.private = inserted.private;
@@ -122,6 +147,12 @@ const load = async (cmd) => {
     } else {
       pkgJSON.scripts = inserted.scripts
     }
+    if (pkgJSON.devDependencies){
+      //TODO:可优化
+      pkgJSON.devDependencies.json5 = inserted.devDependencies.json5;
+    }else{
+      pkgJSON.devDependencies = inserted.devDependencies;
+    }
     fs.writeFileSync('package.json', JSON.stringify(pkgJSON,null,2));
     log(green('package.json updated'))
   } catch (e) {

package/lib/postinstall/index.js

@@ -20,9 +20,11 @@ const load = async (cmd) => {
     }
     let rootPath = shell.pwd().stdout;
     let rigJson5 = json5.parse(fs.readFileSync('package.rig.json5'));
+    console.log(rigJson5);
     let devDeps = [];
     for (let dep of rigJson5) {
       if (dep.dev) {
+        print.warn(`developing:${dep.name}`);
         devDeps.push(dep.name);
         if (fs.existsSync(`node_modules/${dep.name}`)) {
           shell.rm('-rf', `node_modules/${dep.name}`);

package/lib/preinstall/index.js

@@ -63,7 +63,7 @@ const validate = (rigJson5) => {
   }
   return isValidate;
 }
-const clone = (target,dep)=>{
+const clone = (target, dep) => {
   print.info(`cloning ${dep.name}`);
   let cloneProcess = shell.exec(`git clone ${dep.source} ${target}/${dep.name}`,
     {silent: true}
@@ -108,7 +108,12 @@ const load = async (cmd) => {
       } else {
         //不是开发中状态,不处理，不去删除已下载的模块
         //预安装时在node_modules中要先清除json5里的库
-        shell.rm('-rf', `node_modules/${dep.name}`);
+        if (fs.existsSync(`node_modules/${dep.name}`)) {
+          shell.rm('-rf', `node_modules/${dep.name}`);
+        }
+        if (fs.existsSync(`node_modules/.yarn-integrity`)) {
+          shell.rm('-rf', `node_modules/.yarn-integrity`);
+        }
       }
       dependencies[dep.name] = `git+ssh://${dep.source}#${dep.version}`
     }

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.25",
+  "version": "1.0.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.",
   "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"
   },