move lib dir

app.js

@@ -9,7 +9,7 @@ require('module-alias/register');
 
 const logger = require('@alias/logger')('growi');
 const helpers = require('./config/helpers');
-const growi = new (require('./lib/crowi'))(__dirname, process.env);
+const growi = new (require('./src/lib/crowi'))(__dirname, process.env);
 
 
 /************************************

bin/generate-plugin-definitions-source.js

@@ -11,7 +11,7 @@ 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 PluginUtils = require('../lib/plugins/plugin-utils');
+const PluginUtils = require('../src/lib/plugins/plugin-utils');
 const pluginUtils = new PluginUtils();
 
 

config/webpack.common.js

@@ -58,10 +58,10 @@ module.exports = (options) => {
       modules: [helpers.root('node_modules')],
       alias: {
         '@root': helpers.root('/'),
-        '@commons': helpers.root('lib'),
+        '@commons': helpers.root('src/lib'),
         '@tmp': helpers.root('tmp'),
-        '@alias/logger': helpers.root('lib/service/logger'),
-        '@alias/locales': helpers.root('lib/locales'),
+        '@alias/logger': helpers.root('src/lib/service/logger'),
+        '@alias/locales': helpers.root('resource/locales'),
         // replace bunyan
         'bunyan': 'browser-bunyan',
       }

package.json

@@ -199,9 +199,9 @@
   },
   "_moduleAliases": {
     "@root": ".",
-    "@server": "lib",
-    "@alias/logger": "lib/service/logger",
-    "debug": "lib/service/logger/alias-for-debug"
+    "@server": "src/lib",
+    "@alias/logger": "src/lib/service/logger",
+    "debug": "src/lib/service/logger/alias-for-debug"
   },
   "engines": {
     "node": ">=8.11.1 <9",
@@ -210,7 +210,7 @@
   },
   "config": {
     "blanket": {
-      "pattern": "./lib/**/*.js"
+      "pattern": "./src/lib/**/*.js"
     }
   }
 }

lib/crowi/index.js → src/lib/crowi/index.js

@@ -23,12 +23,12 @@ function Crowi(rootdir, env) {
   this.rootDir     = rootdir;
   this.pluginDir   = path.join(this.rootDir, 'node_modules') + sep;
   this.publicDir   = path.join(this.rootDir, 'public') + sep;
-  this.libDir      = path.join(this.rootDir, 'lib') + sep;
+  this.libDir      = path.join(this.rootDir, 'src/lib') + sep;
   this.eventsDir   = path.join(this.libDir, 'events') + sep;
-  this.localeDir   = path.join(this.libDir, 'locales') + sep;
-  this.resourceDir = path.join(this.rootDir, 'resource') + sep;
   this.viewsDir    = path.join(this.libDir, 'views') + sep;
   this.mailDir     = path.join(this.viewsDir, 'mail') + sep;
+  this.resourceDir = path.join(this.rootDir, 'resource') + sep;
+  this.localeDir   = path.join(this.resourceDir, 'locales') + sep;
   this.tmpDir      = path.join(this.rootDir, 'tmp') + sep;
   this.cacheDir    = path.join(this.tmpDir, 'cache');
 
@@ -276,7 +276,7 @@ Crowi.prototype.setupPassport = function() {
     this.passportService.setupLdapStrategy();
     this.passportService.setupGoogleStrategy();
     this.passportService.setupGitHubStrategy();
-    this.passportService.setupTwitterStrategy(); 
+    this.passportService.setupTwitterStrategy();
   }
   catch (err) {
     logger.error(err);