status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #756 from davidmehren/master 

Remove engine.io-client dependency
This commit is contained in:
Christoph (Sheogorath) Kern 2018-03-07 11:15:54 +01:00 committed by GitHub
parent 66d8d3180a 7904558292
commit 17d6fe716d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -34,7 +34,6 @@
"diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git", "diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git",
"ejs": "^2.5.5", "ejs": "^2.5.5",
"emojify.js": "~1.1.0", "emojify.js": "~1.1.0",
"engine.io-client": "^1.8.2",
"express": ">=4.14", "express": ">=4.14",
"express-session": "^1.14.2", "express-session": "^1.14.2",
"file-saver": "^1.3.3", "file-saver": "^1.3.3",

10
webpackBaseConfig.js
View File

@ -355,10 +355,7 @@ module.exports = {
}, },
resolve: { resolve: {
modulesDirectories: [ modulesDirectories: ['node_modules'],
path.resolve(__dirname, 'src'),
path.resolve(__dirname, 'node_modules')
],
extensions: ['', '.js'], extensions: ['', '.js'],
alias: { alias: {
codemirror: path.join(__dirname, 'node_modules/codemirror/codemirror.min.js'), 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'), 'bootstrap-tooltip': path.join(__dirname, 'public/vendor/bootstrap/tooltip.min.js'),
'headjs': path.join(__dirname, 'node_modules/reveal.js/lib/js/head.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'), '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') loader: ExtractTextPlugin.extract('style-loader', 'less-loader')
}, { }, {
test: require.resolve('js-sequence-diagrams'), test: require.resolve('js-sequence-diagrams'),
loader: 'imports?_=lodash&Raphael=raphael' loader: 'imports?_=lodash&Raphael=raphael&eve=eve'
}, { }, {
test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, test: /\.eot(\?v=\d+\.\d+\.\d+)?$/,
loader: 'file' loader: 'file'