Remove babel and fix some bugs

Astro36 · Astro36 · commit 4ff8c0cf458d · 2017-08-09T15:04:04.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -57,9 +57,6 @@ typings/
 # dotenv environment variables file
 .env
 
-# Compiled files
-lib/
-
 # Locked file
 package-lock.json
 
diff --git a/server/.babelrc b/server/.babelrc
diff --git a/server/package.json b/server/package.json
@@ -5,8 +5,7 @@
   "main": "src/main.js",
   "private": true,
   "scripts": {
-    "start": "babel src -d lib & node lib/main.js",
-    "build": "babel src -d lib",
+    "start": "node src/main.js",
     "lint": "eslint src",
     "lint-fix": "eslint src --fix"
   },
@@ -45,11 +44,6 @@
     "socket.io": "^2.0.3"
   },
   "devDependencies": {
-    "babel-cli": "^6.24.1",
-    "babel-eslint": "^7.2.3",
-    "babel-plugin-array-includes": "^2.0.3",
-    "babel-preset-env": "^1.6.0",
-    "babel-preset-stage-2": "^6.24.1",
     "eslint": "^4.3.0",
     "eslint-config-airbnb-base": "^11.3.1",
     "eslint-plugin-import": "^2.7.0"
diff --git a/server/src/game/controller/CellController.js b/server/src/game/controller/CellController.js
@@ -1,10 +1,12 @@
-import EntityController from './EntityController';
+const EntityController = require('./EntityController');
 
-export default class CellController extends EntityController {
+class CellController extends EntityController {
   update() {
     Object.entries(this.elements).forEach((element) => {
       // const [name, cell] = element;
       // 각 세포를 주인공 세포 방향으로 이동
     });
   }
 }
+
+module.exports = CellController;
diff --git a/server/src/game/controller/EntityController.js b/server/src/game/controller/EntityController.js
@@ -1,4 +1,4 @@
-export default class EntityController {
+class EntityController {
   constructor(stage) {
     this.elements = {};
     this.stage = stage;
@@ -24,3 +24,5 @@ export default class EntityController {
     throw new Error('must be implemented by subclass!');
   }
 }
+
+module.exports = EntityController;
diff --git a/server/src/game/controller/ItemController.js b/server/src/game/controller/ItemController.js
@@ -1,7 +1,7 @@
-import EntityController from './EntityController';
-import { frame } from '../../config.json';
+const EntityController = require('./EntityController');
+const { frame } = require('../../config.json');
 
-export default class ItemController extends EntityController {
+class ItemController extends EntityController {
   update() {
     Object.entries(this.elements).forEach((element) => {
       const [, item] = element;
@@ -12,3 +12,5 @@ export default class ItemController extends EntityController {
     });
   }
 }
+
+module.exports = ItemController;
diff --git a/server/src/game/controller/PlayerCellController.js b/server/src/game/controller/PlayerCellController.js
@@ -1,11 +1,13 @@
-import EntityController from './EntityController';
-import Vector from '../utils/Vector';
+const EntityController = require('./EntityController');
+const Vector = require('../utils/Vector');
 
-export default class PlayerCellController extends EntityController {
+class PlayerCellController extends EntityController {
   update(data) {
     Object.entries(data).forEach((element) => {
       const [name, vectorArray] = element;
       this.elements[name].moveAt(Vector.arrayTo(vectorArray));
     });
   }
 }
+
+module.exports = PlayerCellController;
diff --git a/server/src/game/data/ItemInfo.js b/server/src/game/data/ItemInfo.js
@@ -1,6 +1,4 @@
-import Item from '../data/ItemInfo';
-
-export default class ItemInfo {
+class ItemInfo {
   constructor(name) {
     this.name = name;
   }
@@ -13,3 +11,5 @@ export default class ItemInfo {
     this.name = name;
   }
 }
+
+module.exports = ItemInfo;
diff --git a/server/src/game/entity/Cell.js b/server/src/game/entity/Cell.js
@@ -1,6 +1,6 @@
-import Entity from './Entity';
+const Entity = require('./Entity');
 
-export default class Cell extends Entity {
+class Cell extends Entity {
   constructor(vector, color = '#fff') {
     super(vector);
     this.setName('Cell');
@@ -29,3 +29,5 @@ export default class Cell extends Entity {
     this.color = color;
   }
 }
+
+module.exports = Cell;
diff --git a/server/src/game/entity/Entity.js b/server/src/game/entity/Entity.js
@@ -1,8 +1,8 @@
-import Stage from '../stage/Stage';
-import Utils from '../utils/Utils';
-import Vector from '../utils/Vector';
+const Stage = require('../stage/Stage');
+const Utils = require('../utils/Utils');
+const Vector = require('../utils/Vector');
 
-export default class Entity {
+class Entity {
   constructor(vector = new Vector()) {
     this.name = `Entity:${Utils.getHash(new Date().toString())}`;
     this.vector = vector;
@@ -39,3 +39,5 @@ export default class Entity {
     this.notifyStage('vector', vector);
   }
 }
+
+module.exports = Entity;
diff --git a/server/src/game/entity/Item.js b/server/src/game/entity/Item.js
@@ -1,10 +1,12 @@
-import Entity from './Entity';
+const Entity = require('./Entity');
 
-export default class Item extends Entity {
+class Item extends Entity {
   constructor(vector, itemInfo) {
     super(vector);
     this.setName('Item');
     this.age = 0;
     this.itemInfo = itemInfo;
   }
 }
+
+module.exports = Item;
diff --git a/server/src/game/entity/PlayerCell.js b/server/src/game/entity/PlayerCell.js
@@ -1,7 +1,7 @@
-import Cell from './Cell';
-import Vector from '../utils/Vector';
+const Cell = require('./Cell');
+const Vector = require('../utils/Vector');
 
-export default class PlayerCell extends Cell {
+class PlayerCell extends Cell {
   constructor(vector, color) {
     super(vector, color);
     this.setName('PlayerCell');
@@ -13,3 +13,5 @@ export default class PlayerCell extends Cell {
     }
   }
 }
+
+module.exports = PlayerCell;
diff --git a/server/src/game/index.js b/server/src/game/index.js
@@ -1,15 +1,15 @@
-import http from 'http';
-import socketio from 'socket.io';
-import fs from 'fs';
-import ItemInfo from './data/ItemInfo';
-import Stage from './stage/Stage';
-import Inventory from './system/Inventory';
-import CellController from './controller/CellController';
-import ItemController from './controller/ItemController';
-import PlayerCellController from './controller/PlayerCellController';
-import { frame } from '../config.json';
+const http = require('http');
+const socketio = require('socket.io');
+const fs = require('fs');
+const ItemInfo = require('./data/ItemInfo');
+const Stage = require('./stage/Stage');
+const Inventory = require('./system/Inventory');
+const CellController = require('./controller/CellController');
+const ItemController = require('./controller/ItemController');
+const PlayerCellController = require('./controller/PlayerCellController');
+const { frame } = require('../config.json');
 
-export default class Game {
+class Game {
   constructor() {
     this.stage = new Stage();
     this.stage.setCellController(new CellController());
@@ -43,10 +43,9 @@ export default class Game {
         }
       });
     });
-    const io = socketio(app);
+    this.socket = socketio(app);
     app.listen(5000);
-    io.on('connection', (socket) => {
-      this.socket = socket;
+    this.socket.on('connection', (socket) => {
       socket.emit('news', { hello: 'world' });
       socket.on('my other event', (data) => {
         console.log(data);
@@ -74,3 +73,5 @@ export default class Game {
     clearInterval(this.loop);
   }
 }
+
+module.exports = Game;
diff --git a/server/src/game/stage/Stage.js b/server/src/game/stage/Stage.js
@@ -1,8 +1,8 @@
-import CellController from '../controller/CellController';
-import ItemController from '../controller/ItemController';
-import PlayerCellController from '../controller/PlayerCellController';
+const CellController = require('../controller/CellController');
+const ItemController = require('../controller/ItemController');
+const PlayerCellController = require('../controller/PlayerCellController');
 
-export default class Stage {
+class Stage {
   constructor(width = 512, height = 512) {
     this.width = width;
     this.height = height;
@@ -77,3 +77,5 @@ export default class Stage {
     }
   }
 }
+
+module.exports = Stage;
diff --git a/server/src/game/system/Inventory.js b/server/src/game/system/Inventory.js
@@ -1,6 +1,6 @@
-import ItemInfo from '../data/ItemInfo';
+const ItemInfo = require('../data/ItemInfo');
 
-export default class Inventory {
+class Inventory {
   constructor(items = {}) {
     this.items = items;
   }
@@ -35,3 +35,5 @@ export default class Inventory {
     }
   }
 }
+
+module.exports = Inventory;
diff --git a/server/src/game/utils/Utils.js b/server/src/game/utils/Utils.js
@@ -1,7 +1,9 @@
 const crypto = require('crypto');
 
-export default class Utils {
+class Utils {
   static getHash(text) {
     return crypto.createHash('sha256').update(text).digest('base64').replace('=', '');
   }
 }
+
+module.exports = Utils;
diff --git a/server/src/game/utils/Vector.js b/server/src/game/utils/Vector.js
@@ -1,4 +1,4 @@
-export default class Vector {
+class Vector {
   constructor(x = 0, y = 0) {
     this.x = x;
     this.y = y;
@@ -79,3 +79,5 @@ export default class Vector {
     return [this.x, this.y];
   }
 }
+
+module.exports = Vector;
diff --git a/server/src/main.js b/server/src/main.js
@@ -1,14 +1,17 @@
-import Koa from 'koa';
-import Path from 'path';
-import Pug from 'koa-pug';
+const path = require('path');
+const Koa = require('koa');
+const Pug = require('koa-pug');
+const Game = require('./game');
 
-const root = Path.join(__dirname, '../../');
+const root = path.join(__dirname, '../../');
 
 const app = new Koa();
 const pug = new Pug({
-  viewPath: Path.join(root, '/client/view/'),
+  viewPath: path.join(root, '/client/view/'),
   app,
 });
+const game = new Game();
+game.run();
 
 app.use(async (ctx) => {
   ctx.body = pug.render('index');

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,12 @@`
`1`		`-import EntityController from './EntityController';`
	`1`	`+const EntityController = require('./EntityController');`
`2`	`2`
`3`		`-export default class CellController extends EntityController {`
	`3`	`+class CellController extends EntityController {`
`4`	`4`	`update() {`
`5`	`5`	`Object.entries(this.elements).forEach((element) => {`
`6`	`6`	`// const [name, cell] = element;`
`7`	`7`	`// 각 세포를 주인공 세포 방향으로 이동`
`8`	`8`	`});`
`9`	`9`	`}`
`10`	`10`	`}`
	`11`	`+`
	`12`	`+module.exports = CellController;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-export default class EntityController {`
	`1`	`+class EntityController {`
`2`	`2`	`constructor(stage) {`
`3`	`3`	`this.elements = {};`
`4`	`4`	`this.stage = stage;`
`@@ -24,3 +24,5 @@ export default class EntityController {`
`24`	`24`	`throw new Error('must be implemented by subclass!');`
`25`	`25`	`}`
`26`	`26`	`}`
	`27`	`+`
	`28`	`+module.exports = EntityController;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-import Item from '../data/ItemInfo';`
`2`		`-`
`3`		`-export default class ItemInfo {`
	`1`	`+class ItemInfo {`
`4`	`2`	`constructor(name) {`
`5`	`3`	`this.name = name;`
`6`	`4`	`}`
`@@ -13,3 +11,5 @@ export default class ItemInfo {`
`13`	`11`	`this.name = name;`
`14`	`12`	`}`
`15`	`13`	`}`
	`14`	`+`
	`15`	`+module.exports = ItemInfo;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-import Entity from './Entity';`
	`1`	`+const Entity = require('./Entity');`
`2`	`2`
`3`		`-export default class Cell extends Entity {`
	`3`	`+class Cell extends Entity {`
`4`	`4`	`constructor(vector, color = '#fff') {`
`5`	`5`	`super(vector);`
`6`	`6`	`this.setName('Cell');`
`@@ -29,3 +29,5 @@ export default class Cell extends Entity {`
`29`	`29`	`this.color = color;`
`30`	`30`	`}`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+module.exports = Cell;`