From 79045582923a02063762006c09207b0b303b6619 Mon Sep 17 00:00:00 2001
From: David Mehren <dmehren1@gmail.com>
Date: Tue, 6 Mar 2018 14:38:46 +0100
Subject: [PATCH] Remove engine.io-client dependency and fix webpack config

Signed-off-by: David Mehren <dmehren1@gmail.com>
---
 package.json         |  1 -
 webpackBaseConfig.js | 10 ++++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index ba8b05d75..18c985b6e 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
     "diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git",
     "ejs": "^2.5.5",
     "emojify.js": "~1.1.0",
-    "engine.io-client": "^1.8.2",
     "express": ">=4.14",
     "express-session": "^1.14.2",
     "file-saver": "^1.3.3",
diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js
index 41a63e7d2..e8630841e 100644
--- a/webpackBaseConfig.js
+++ b/webpackBaseConfig.js
@@ -355,10 +355,7 @@ module.exports = {
   },
 
   resolve: {
-    modulesDirectories: [
-      path.resolve(__dirname, 'src'),
-      path.resolve(__dirname, 'node_modules')
-    ],
+    modulesDirectories: ['node_modules'],
     extensions: ['', '.js'],
     alias: {
       codemirror: path.join(__dirname, 'node_modules/codemirror/codemirror.min.js'),
@@ -374,7 +371,8 @@ module.exports = {
       'bootstrap-tooltip': path.join(__dirname, 'public/vendor/bootstrap/tooltip.min.js'),
       'headjs': path.join(__dirname, 'node_modules/reveal.js/lib/js/head.min.js'),
       'reveal-markdown': path.join(__dirname, 'public/js/reveal-markdown.js'),
-      abcjs: path.join(__dirname, 'public/vendor/abcjs_basic_3.1.1-min.js')
+      abcjs: path.join(__dirname, 'public/vendor/abcjs_basic_3.1.1-min.js'),
+      raphael: path.join(__dirname, 'node_modules/raphael/raphael.no-deps.js')
     }
   },
 
@@ -407,7 +405,7 @@ module.exports = {
       loader: ExtractTextPlugin.extract('style-loader', 'less-loader')
     }, {
       test: require.resolve('js-sequence-diagrams'),
-      loader: 'imports?_=lodash&Raphael=raphael'
+      loader: 'imports?_=lodash&Raphael=raphael&eve=eve'
     }, {
       test: /\.eot(\?v=\d+\.\d+\.\d+)?$/,
       loader: 'file'