refactor: place servers in separate directories

SteveVanOpstal · Jul 11, 2016 · cc14da2 · cc14da2
1 parent 08747c0
commit cc14da2
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 14 deletions.
diff --git a/config/webpack/server/dev.js b/config/webpack/server/dev.js
@@ -18,8 +18,8 @@ module.exports = webpackMerge(commonConfig, {
   target: 'node',
 
   entry: {
-    'static-server': helpers.root('src/server/static-server.ts'),
-    'match-server': helpers.root('src/server/match-server.ts')
+    'static-server': helpers.root('src/server/static/server.ts'),
+    'match-server': helpers.root('src/server/match/server.ts'),
   },
 
   output: {path: helpers.root('dist/server'), filename: '[name].js'},

diff --git a/config/webpack/server/prod.js b/config/webpack/server/prod.js
@@ -19,8 +19,8 @@ module.exports = webpackMerge(commonConfig, {
   target: 'node',
 
   entry: {
-    'static-server': helpers.root('src/server/static-server.ts'),
-    'match-server': helpers.root('src/server/match-server.ts')
+    'static-server': helpers.root('src/server/static/server.ts'),
+    'match-server': helpers.root('src/server/match/server.ts'),
   },
 
   output: {path: helpers.root('dist/server'), filename: '[name].js'},

diff --git a/src/server/match.spec.ts → src/server/match/match.spec.ts b/src/server/match.spec.ts → src/server/match/match.spec.ts
diff --git a/src/server/match.ts → src/server/match/match.ts b/src/server/match.ts → src/server/match/match.ts
@@ -1,9 +1,9 @@
 import {parallel, waterfall} from 'async';
 import {IncomingMessage, ServerResponse} from 'http';
 
-import {settings} from '../../config/settings';
+import {settings} from '../../../config/settings';
 
-import {HostResponse, HttpError, Server} from './server';
+import {HostResponse, HttpError, Server} from '../server';
 import {Summoner} from './summoner';
 
 let config = {

diff --git a/src/server/match-server.ts → src/server/match/server.ts b/src/server/match-server.ts → src/server/match/server.ts
@@ -1,9 +1,9 @@
 import {IncomingMessage, ServerResponse} from 'http';
 
-import {settings} from '../../config/settings';
+import {settings} from '../../../config/settings';
+import {Server, getPathname, getQuery} from '../server';
 
 import {Match} from './match';
-import {Server, getPathname, getQuery} from './server';
 import {Summoner} from './summoner';
 
 let server =

diff --git a/src/server/summoner.spec.ts → src/server/match/summoner.spec.ts b/src/server/summoner.spec.ts → src/server/match/summoner.spec.ts
diff --git a/src/server/summoner.ts → src/server/match/summoner.ts b/src/server/summoner.ts → src/server/match/summoner.ts
@@ -1,8 +1,7 @@
 import {IncomingMessage, ServerResponse} from 'http';
 
-import {settings} from '../../config/settings';
-
-import {HostResponse, Server} from './server';
+import {settings} from '../../../config/settings';
+import {HostResponse, Server} from '../server';
 
 export class Summoner {
   constructor(private server: Server) {}

diff --git a/src/server/static-server.ts → src/server/static/server.ts b/src/server/static-server.ts → src/server/static/server.ts
@@ -1,8 +1,7 @@
 import {IncomingMessage, ServerResponse} from 'http';
 
-import {settings} from '../../config/settings';
-
-import {HostResponse, Server, getPathname} from './server';
+import {settings} from '../../../config/settings';
+import {HostResponse, Server, getPathname} from '../server';
 
 let server = new Server(settings.staticServer.host, settings.staticServer.port);