Removing ng-di on the server.

server/main.js

@@ -2,11 +2,6 @@
 /*jslint node: true */
 'use strict';
 
-// Dirty hack to allow usage of angular modules.
-global.angular = require('ng-di');
-
-angular.module('ffffng', []);
-
 (function () {
     // Use graceful-fs instead of fs also in all libraries to have more robust fs handling.
     const realFs = require('fs');
@@ -14,52 +9,24 @@ angular.module('ffffng', []);
     gracefulFs.gracefulify(realFs);
 })();
 
-require('./config');
+const config = require('./config').config;
 
-require('./logger').tag('main', 'startup').info('Server starting up...');
+const Logger = require('./logger')
+Logger.tag('main', 'startup').info('Server starting up...');
 
-require('./app');
-require('./router');
-require('./libs');
+require('./db/database').init()
+.then(() => {
+    Logger.tag('main').info('Initializing...');
 
-require('./utils/databaseUtil');
-require('./utils/errorTypes');
-require('./utils/resources');
-require('./utils/strings');
-require('./utils/urlBuilder');
+    const app = require('./app');
 
-require('./resources/versionResource');
-require('./resources/statisticsResource');
-require('./resources/frontendResource');
-require('./resources/taskResource');
-require('./resources/mailResource');
-require('./resources/nodeResource');
-require('./resources/monitoringResource');
+    require('./jobs/scheduler').init();
+    require('./router').init();
 
-require('./services/mailService');
-require('./services/mailTemplateService');
-require('./services/nodeService');
-require('./services/monitoringService');
-
-require('../shared/validation/constraints');
-require('./validation/validator');
-
-require('./jobs/scheduler');
-
-const db = require('./db/database');
-
-db.init().then(() => {
-    // WARNING: We have to use funtion() syntax here, to satisfy ng-di. m(
-    angular.injector(['ffffng']).invoke(function (config, app, Logger, Scheduler, Router) {
-        Logger.tag('main').info('Initializing...');
-
-        Scheduler.init();
-        Router.init();
-
-        app.listen(config.server.port, '::');
-        module.exports = app;
-    });
-}).catch(error => {
+    app.listen(config.server.port, '::');
+    module.exports = app;
+})
+.catch(error => {
     console.error('Could not init database: ', error);
     process.exit(1);
 });