Coffee works, Crafty is strange

2018-11-28 17:17:51 +01:00 · 2018-11-28 17:17:51 +01:00 · 339cf62b07
commit 339cf62b07
parent b62faa0530
12 changed files with 32 additions and 13 deletions
--- a/package.json
+++ b/package.json
@ -13,7 +13,10 @@
    "test":  "echo \"Error: no test specified\" && exit 1"
  },
  "devDependencies": {
+    "@babel/core": "^7.1.6",
+    "@babel/preset-env": "^7.1.6",
    "css-loader": "^1.0.1",
+    "coffee-loader": "^0.9.0",
    "postcss-loader": "^3.0.0",
    "sass-loader": "^7.1.0",
    "style-loader": "^0.23.1",
@ -26,7 +29,8 @@

    "bootstrap": "^4.1.3",
    "jquery": "^3.3.1",
-    "popper.js": "^1.14.5"
+    "popper.js": "^1.14.5",
+    "craftyjs": "^0.9.0"
  },

  "dependencies": {
--- a/server.js
+++ b/server.js
@ -5,13 +5,8 @@ var
  mysql = require('mysql'),
  bcrypt = require('bcrypt'),
  express = require('express'),
-  gulp = global.gulp = require('gulp'),
  helmet = require('helmet');

-// gulp the sources
-require('./gulpfile');
-gulp.start('default');
-
 // socket.io framework
 let app = express();
 let web = http.Server(app);
--- a/src/game.js
+++ b/src/game.js
@ -1 +1,4 @@
-import CONF from './scripts/game/10-conf.coffee'
+import Crafty from 'craftyjs'
+import CONF from './game/config.coffee'
+
+require('./game/test_entities.coffee')
--- a/src/scripts/game/20-comp-BigCard.coffee
+++ b/src/scripts/game/20-comp-BigCard.coffee
--- a/src/scripts/game/20-comp-Card.coffee
+++ b/src/scripts/game/20-comp-Card.coffee
@ -1,3 +1,5 @@
+require './BigCard.coffee'
+
 ################
 # Card
 ################
--- a/src/scripts/game/20-comp-Playmat.coffee
+++ b/src/scripts/game/20-comp-Playmat.coffee
--- a/src/scripts/game/10-conf.coffee
+++ b/src/scripts/game/10-conf.coffee
--- a/src/scripts/game/30-scene-Battle.coffee
+++ b/src/scripts/game/30-scene-Battle.coffee
@ -1,3 +1,5 @@
+require '../components/Playmat.coffee'
+
 Crafty.defineScene "Battle", ->

  # free viewport
--- a/src/scripts/game/40-test-entities.coffee
+++ b/src/scripts/game/40-test-entities.coffee
@ -1,3 +1,12 @@
+# init Socket.IO
+socket = io()
+
+# init CraftyJS framework
+Crafty.init()
+
+require './components/Card.coffee'
+require './scenes/Battle.coffee'
+
 # Load base scene
 Crafty.scene "Battle"

--- a/src/scripts/game/10-init-framework.coffee
+++ b/src/scripts/game/10-init-framework.coffee
@ -1,5 +0,0 @@
-# init Socket.IO
-socket = io()
-
-# init CraftyJS framework
-Crafty.init()
--- a/static/game.html
+++ b/static/game.html
@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Crafty Things</title>
+    <script src="/socket.io/socket.io.js"></script>
+    <script src="game.bundle.js"></script>
+  </head>
+  <body></body>
+</html>
--- a/webpack.config.js
+++ b/webpack.config.js
@ -51,7 +51,7 @@ module.exports = {
            loader: 'coffee-loader',
            options: {
              transpile: {
-                presets: ['env']
+                presets: ['@babel/env']
              }
            }
          }