Release version 1.4.2

liriliri · Mar 20, 2019 · de2026f · de2026f
1 parent dfe136c
commit de2026f
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 38 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,4 +1,4 @@
-const each = require('licia/each');
+const { each } = require('licia');
 
 const licia = require('./index.json');
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v1.4.2 (20 Mar 2019)
+
+* Remove redundant comments
+* Fix remove ts definition
+* Add browser and node entry
+
 ## v1.4.1 (13 Mar 2019)
 
 * Fix template, use

diff --git a/bin/licia.js b/bin/licia.js
@@ -2,7 +2,7 @@
 
 const nopt = require('nopt');
 const path = require('path');
-const contain = require('licia/contain');
+const { contain } = require('licia');
 
 const knowOpts = {
         browser: Boolean,

diff --git a/lib/benchmark.js b/lib/benchmark.js
@@ -1,7 +1,5 @@
 const path = require('path');
-const fs = require('licia/fs');
-const toArr = require('licia/toArr');
-const trim = require('licia/trim');
+const { fs, toArr, trim } = require('licia');
 
 const { mkdir, fileExist, readTpl, eustiaBuild, runScript } = require('./util');
 

diff --git a/lib/help.js b/lib/help.js
@@ -1,4 +1,4 @@
-const contain = require('licia/contain');
+const { contain } = require('licia');
 
 const { readTpl } = require('./util');
 

diff --git a/lib/pack.js b/lib/pack.js
@@ -1,12 +1,14 @@
 const path = require('path');
 const babel = require('@babel/core');
-const each = require('licia/each');
-const fs = require('licia/fs');
-const last = require('licia/last');
-const trim = require('licia/trim');
-const extractBlockCmts = require('licia/extractBlockCmts');
-const startWith = require('licia/startWith');
-const stripCmt = require('licia/stripCmt');
+const {
+    each,
+    fs,
+    last,
+    trim,
+    extractBlockCmts,
+    startWith,
+    stripCmt
+} = require('licia');
 
 const modData = require('../index.json');
 const { outdentOneSpace, rmdir, glob, mkdir, cpFile } = require('./util');
@@ -40,13 +42,50 @@ async function genPackage(pkgName, files) {
         delete packInfo[val];
     });
 
+    if (pkgName === 'licia') {
+        packInfo.main = './node.js';
+        packInfo.browser = './browser.js';
+        await genIndex();
+    }
+
     await fs.writeFile(
         path.resolve('packages/' + pkgName + '/package.json'),
         JSON.stringify(packInfo, null, 2),
         'utf8'
     );
 }
 
+async function genIndex() {
+    const mods = {
+        browser: [],
+        node: []
+    };
+
+    each(modData, (mod, modName) => {
+        if (mod.env === 'browser') {
+            mods.browser.push(modName);
+        } else if (mod.env === 'node') {
+            mods.node.push(modName);
+        } else {
+            mods.browser.push(modName);
+            mods.node.push(modName);
+        }
+    });
+
+    for (const type of ['browser', 'node']) {
+        const modNames = mods[type];
+        let data = '';
+        each(modNames, name => {
+            data += `exports.${name} = require('./${name}');\n`;
+        });
+        await fs.writeFile(
+            path.resolve(`packages/licia/${type}.js`),
+            data,
+            'utf8'
+        );
+    }
+}
+
 async function genFile(file, pkgName) {
     let modName = last(file.split('/')).slice(0, -3);
 

diff --git a/lib/test.js b/lib/test.js
@@ -1,14 +1,16 @@
 const path = require('path');
 const comTranspiler = require('eustia-component');
-const each = require('licia/each');
-const defaults = require('licia/defaults');
-const fs = require('licia/fs');
-const extractBlockCmts = require('licia/extractBlockCmts');
-const trim = require('licia/trim');
-const startWith = require('licia/startWith');
-const indent = require('licia/indent');
-const toArr = require('licia/toArr');
-const rtrim = require('licia/rtrim');
+const {
+    each,
+    defaults,
+    fs,
+    extractBlockCmts,
+    trim,
+    startWith,
+    indent,
+    toArr,
+    rtrim
+} = require('licia');
 
 const {
     outdentOneSpace,

diff --git a/lib/update.js b/lib/update.js
@@ -1,13 +1,15 @@
-const trim = require('licia/trim');
-const fs = require('licia/fs');
-const extractBlockCmts = require('licia/extractBlockCmts');
-const startWith = require('licia/startWith');
-const clone = require('licia/clone');
-const keys = require('licia/keys');
-const each = require('licia/each');
-const last = require('licia/last');
-const extend = require('licia/extend');
-const map = require('licia/map');
+const {
+    trim,
+    fs,
+    extractBlockCmts,
+    startWith,
+    clone,
+    keys,
+    each,
+    last,
+    extend,
+    map
+} = require('licia');
 
 const { outdentOneSpace, glob, eustiaBuild, eustiaDoc } = require('./util');
 

diff --git a/lib/util.js b/lib/util.js
@@ -1,14 +1,10 @@
-const rmdir = require('licia/rmdir');
-const promisify = require('licia/promisify');
+const { rmdir, promisify, mkdir, fs, rpad } = require('licia');
 const npm = require('npm');
 const glob = require('glob');
-const mkdir = require('licia/mkdir');
-const fs = require('licia/fs');
 const ncp = require('ncp');
 const path = require('path');
 const chalk = require('chalk');
 const handlebars = require('handlebars');
-const rpad = require('licia/rpad');
 const eustia = require('eustia');
 
 const regStartOneSpace = /^ /gm;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "licia-src",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Useful utility collection with zero dependencies",
   "bin": {
     "licia": "./bin/licia.js"