move src/lib to src/server

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('../src/lib/plugins/plugin-utils');
+const PluginUtils = require('../src/server/plugins/plugin-utils');
 const pluginUtils = new PluginUtils();
 
 
@@ -45,8 +45,8 @@ const definitions = pluginNames
     return definition;
   });
 
-var compiledTemplate = swig.compileFile(TEMPLATE);
-var code = compiledTemplate({definitions});
+const compiledTemplate = swig.compileFile(TEMPLATE);
+const code = compiledTemplate({definitions});
 
 // write
 fs.writeFileSync(OUT, code);

config/webpack.common.js

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

package.json

@@ -42,8 +42,8 @@
     "prebuild:dev:app": "env-cmd config/env.dev.js npm run plugin:def",
     "prebuild:prod": "npm run plugin:def",
     "prestart": "npm run build:prod",
-    "server:debug": "env-cmd config/env.dev.js node-dev --inspect src/lib/app.js",
-    "server:dev": "env-cmd config/env.dev.js node-dev --respawn src/lib/app.js",
+    "server:debug": "env-cmd config/env.dev.js node-dev --inspect src/server/app.js",
+    "server:dev": "env-cmd config/env.dev.js node-dev --respawn src/server/app.js",
     "server:prod:ci": "npm run server:prod -- --ci",
     "server:prod": "env-cmd config/env.prod.js node app.js",
     "server": "npm run server:dev",
@@ -199,7 +199,7 @@
   },
   "_moduleAliases": {
     "@root": ".",
-    "@server": "src/lib",
+    "@server": "src/server",
     "@alias/logger": "src/lib/service/logger",
     "debug": "src/lib/service/logger/alias-for-debug"
   },

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

@@ -23,7 +23,7 @@ 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, 'src/lib') + sep;
+  this.libDir      = path.join(this.rootDir, 'src/server') + sep;
   this.eventsDir   = path.join(this.libDir, 'events') + sep;
   this.viewsDir    = path.join(this.libDir, 'views') + sep;
   this.mailDir     = path.join(this.viewsDir, 'mail') + sep;