diff options
| author | Christoph (Sheogorath) Kern | 2018-03-07 11:15:54 +0100 |
|---|---|---|
| committer | GitHub | 2018-03-07 11:15:54 +0100 |
| commit | 17d6fe716d6a758021e668e032032aa8f8fac63c (patch) | |
| tree | f3b397e301724ec8a9b30e85eadd1b377947ff29 | |
| parent | 66d8d3180a5cb9ac216222ebbfc258f76dbf41d6 (diff) | |
| parent | 79045582923a02063762006c09207b0b303b6619 (diff) | |
Merge pull request #756 from davidmehren/master
Remove engine.io-client dependency
Diffstat (limited to '')
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | webpackBaseConfig.js | 10 |
2 files changed, 4 insertions, 7 deletions
diff --git a/package.json b/package.json index ba8b05d7..18c985b6 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 41a63e7d..e8630841 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' |