move config/helpers to src/lib

bin/generate-plugin-definitions-source.js

@@ -3,17 +3,19 @@
  *
  * @author Yuki Takei <yuki@weseek.co.jp>
  */
+require('module-alias/register');
+
 const fs = require('graceful-fs');
 const normalize = require('normalize-path');
 const swig = require('swig-templates');
-const helpers = require('../config/helpers');
-
-const TEMPLATE = helpers.root('bin/templates/plugin-definitions.js.swig');
-const OUT = helpers.root('tmp/plugins/plugin-definitions.js');
 
+const helpers = require('@commons/util/helpers');
 const PluginUtils = require('../src/server/plugins/plugin-utils');
 const pluginUtils = new PluginUtils();
 
+const TEMPLATE = helpers.root('bin/templates/plugin-definitions.js.swig');
+const OUT = helpers.root('tmp/plugins/plugin-definitions.js');
+
 
 // list plugin names
 let pluginNames = pluginUtils.listPluginNames(helpers.root());

bin/shrink-emojione-strategy.js

@@ -3,13 +3,15 @@
  *
  * @author Yuki Takei <yuki@weseek.co.jp>
  */
+require('module-alias/register');
+
 const fs = require('graceful-fs');
-const helpers = require('../config/helpers');
 
-const OUT = helpers.root('tmp/emoji_strategy_shrinked.json');
+const helpers = require('@commons/util/helpers');
 
 const emojiStrategy = require('emojione/emoji_strategy.json');
 const markdownItEmojiFull = require('markdown-it-emoji/lib/data/full.json');
+const OUT = helpers.root('tmp/emoji_strategy_shrinked.json');
 
 let shrinkedMap = {};
 for (let unicode in emojiStrategy) {

config/webpack.common.js

@@ -1,9 +1,8 @@
 /**
  * @author: Yuki Takei <yuki@weseek.co.jp>
  */
-
 const webpack = require('webpack');
-const helpers = require('./helpers');
+const helpers = require('../src/lib/util/helpers');
 
 /*
  * Webpack Plugins

config/webpack.dev.js

@@ -4,7 +4,7 @@
 
 const path = require('path');
 const webpack = require('webpack');
-const helpers = require('./helpers');
+const helpers = require('../src/lib/util/helpers');
 
 /*
  * Webpack Plugins

config/webpack.dll.js

@@ -2,7 +2,7 @@
  * @author: Yuki Takei <yuki@weseek.co.jp>
  */
 const webpack = require('webpack');
-const helpers = require('./helpers');
+const helpers = require('../src/lib/util/helpers');
 
 
 module.exports = {

config/webpack.prod.js

@@ -1,8 +1,7 @@
 /**
  * @author: Yuki Takei <yuki@weseek.co.jp>
  */
-
-const helpers = require('./helpers');
+const helpers = require('../src/lib/util/helpers');
 
 /**
  * Webpack Plugins

package.json

@@ -199,6 +199,7 @@
   },
   "_moduleAliases": {
     "@root": ".",
+    "@commons": "src/lib",
     "@server": "src/server",
     "@alias/logger": "src/lib/service/logger",
     "debug": "src/lib/service/logger/alias-for-debug"

config/helpers.js → src/lib/util/helpers.js

@@ -3,16 +3,16 @@
  * @author: Yuki Takei <yuki@weseek.co.jp>
  */
 
-var path = require('path');
+const path = require('path');
 
 // Helper functions
-var ROOT = path.resolve(__dirname, '..');
+const ROOT = path.resolve(__dirname, '../../..');
 
 function hasProcessFlag(flag) {
   return process.argv.join('').indexOf(flag) > -1;
 }
 
-var root = path.join.bind(path, ROOT);
+const root = path.join.bind(path, ROOT);
 
 exports.hasProcessFlag = hasProcessFlag;
 exports.root = root;

src/server/app.js

@@ -8,7 +8,7 @@
 require('module-alias/register');
 
 const logger = require('@alias/logger')('growi');
-const helpers = require('../../config/helpers');
+const helpers = require('@commons/util/helpers');
 const growi = new (require('./crowi'))(helpers.root(), process.env);