minor fixes: npm updates, fonts, image serve fix.

README.md

@@ -1 +1,3 @@
-roleypoly
+**Hey there.** You're probably looking for https://roleypoly.com (formerly https://rp.kat.cafe)
+
+[If you're wanting to develop on Roleypoly, please check the `develop` branch.](https://github.com/kayteh/roleypoly/tree/develop) This is the old v1 branch, and is only maintenance supported. No new features or major bug reports will be accepted on this `master` branch.

Server/index.js

@@ -47,7 +47,7 @@ async function start () {
 
   // SPA + Static
   if (process.env.NODE_ENV === 'production') {
-    const pub = path.join(__dirname, 'public')
+    const pub = path.resolve(path.join(__dirname, 'public'))
     log.info('public path', pub)
 
     const staticFiles = require('koa-static')
@@ -69,7 +69,7 @@ async function start () {
       try {
         fs.statSync(chkPath)
         log.info('sync pass')
-        ctx.body = fs.readFileSync(chkPath, { encoding: 'utf-8' })
+        ctx.body = fs.readFileSync(chkPath)
         ctx.type = path.extname(ctx.path)
         log.info('body sent')
         ctx.status = 200

Server/package.json

@@ -10,29 +10,29 @@
   },
   "dependencies": {
     "@discordjs/uws": "^11.149.1",
-    "chalk": "^2.4.1",
+    "chalk": "^2.4.2",
     "discord.js": "^11.4.2",
-    "dotenv": "^6.1.0",
+    "dotenv": "^7.0.0",
     "erlpack": "github:discordapp/erlpack",
-    "eslint": "^5.8.0",
+    "eslint": "^5.15.3",
     "eslint-config-standard": "^12.0.0",
     "glob": "^7.1.3",
-    "immutable": "^3.8.2",
+    "immutable": "^4.0.0-rc.12",
-    "koa": "^2.6.2",
+    "koa": "^2.7.0",
     "koa-better-router": "^2.1.1",
     "koa-bodyparser": "^4.2.1",
     "koa-compress": "^3.0.0",
-    "koa-send": "latest-2",
+    "koa-send": "5.0.0",
-    "koa-session": "^5.10.0",
+    "koa-session": "^5.10.1",
     "koa-static": "^5.0.0",
     "ksuid": "^1.1.3",
-    "lru-cache": "^4.1.3",
+    "lru-cache": "^5.1.1",
-    "pg": "^7.6.1",
+    "pg": "^7.9.0",
     "pg-hstore": "^2.3.2",
-    "pm2": "^2.10.4",
+    "pm2": "^3.4.0",
-    "sequelize": "^4.41.2",
+    "sequelize": "^4",
     "socket.io": "^2.2.0",
-    "superagent": "^4.0.0",
+    "superagent": "^4.1.0",
     "uuid": "^3.3.2"
   }
 }

Server/services/presentation.js

@@ -7,7 +7,7 @@ class PresentationService extends Service {
     this.M = ctx.M
     this.discord = ctx.discord
 
-    this.cache = LRU({ max: 500, maxAge: 100 * 60 * 5 })
+    this.cache = new LRU({ max: 500, maxAge: 100 * 60 * 5 })
   }
 
   serverSlug (server) {

UI/package.json

@@ -18,7 +18,7 @@
     "react-router": "^4.3.1",
     "react-router-dom": "^4.3.1",
     "react-router-redux": "^5.0.0-alpha.8",
-    "react-scripts": "2.1.1",
+    "react-scripts": "2.1.8",
     "react-typist": "^2.0.4",
     "react-typist-cycle": "^0.1.2",
     "redux": "^4.0.1",
@@ -42,10 +42,10 @@
     "not ie <= 11",
     "not op_mini all"
   ],
-  "proxy": "http://localhost:6769",
+  "proxy": "http://localhost:6768",
   "devDependencies": {
-    "@babel/plugin-proposal-decorators": "^7.1.2",
+    "@babel/plugin-proposal-decorators": "^7.4.0",
-    "customize-cra": "^0.2.1",
+    "customize-cra": "^0.2.12",
     "eslint-config-standard": "^12.0.0",
     "eslint-plugin-import": "^2.14.0",
     "eslint-plugin-node": "^8.0.0",
@@ -54,7 +54,7 @@
     "eslint-plugin-standard": "^4.0.0",
     "node-sass-chokidar": "^1.3.4",
     "react-app-rewire-scss": "^1.0.2",
-    "react-app-rewired": "^1.6.2",
+    "react-app-rewired": "^2.1.1",
     "redux-devtools": "^3.4.1",
     "redux-devtools-dock-monitor": "^1.1.3",
     "redux-devtools-log-monitor": "^1.4.0"

UI/public/index.html

@@ -5,8 +5,8 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/png" sizes="any" href="%PUBLIC_URL%/favicon.png"/>
   <title>Roleypoly</title>
-  <!-- <script src="https://use.typekit.net/bck0pci.js"></script>
+  <script src="https://use.typekit.net/bck0pci.js"></script>
-  <script>try{Typekit.load({ async: true });}catch(e){}</script> -->
+  <script>try{Typekit.load({ async: true });}catch(e){}</script>
   <link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.0.0-rc.24/css/uikit.min.css" />
   <script defer src="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.0.0-rc.24/js/uikit.min.js"></script>
   <script defer src="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.0.0-rc.24/js/uikit-icons.min.js"></script>