embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

add 2nd endpoint to webserver; use express

This commit is contained in:
Iuri Matias 2018-02-25 19:01:50 -05:00 committed by Pascal Precht
parent 246f24ef54
commit 0917acb02f
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/modules/webserver/backend/index.html Normal file
View File

@ -0,0 +1 @@
Welcome to Embark!

2
lib/modules/webserver/server.js
View File

@ -5,6 +5,8 @@ const expressWebSocket = require('express-ws');
const express = require('express'); const express = require('express');
const fs = require('../../core/fs'); const fs = require('../../core/fs');
require('http-shutdown').extend(); require('http-shutdown').extend();
var express = require('express');
let path = require('path');
class Server { class Server {
constructor(options) { constructor(options) {

13
package.json
View File

@ -55,6 +55,7 @@
"eth-lib": "0.2.8", "eth-lib": "0.2.8",
"babel-plugin-webpack-aliases": "^1.1.3", "babel-plugin-webpack-aliases": "^1.1.3",
"ethereumjs-wallet": "0.6.0", "ethereumjs-wallet": "0.6.0",
<<<<<<< HEAD
"express": "4.16.3", "express": "4.16.3",
"express-ws": "4.0.0", "express-ws": "4.0.0",
"file-loader": "2.0.0", "file-loader": "2.0.0",
@ -71,6 +72,18 @@
"http-proxy": "1.17.0", "http-proxy": "1.17.0",
"http-shutdown": "1.2.0", "http-shutdown": "1.2.0",
"i18n": "0.8.3", "i18n": "0.8.3",
=======
"express": "^4.16.2",
"file-loader": "^1.1.5",
"finalhandler": "^1.1.1",
"follow-redirects": "^1.2.4",
"fs-extra": "^2.0.0",
"ganache-cli": "^6.1.6",
"glob": "^7.1.2",
"globule": "^1.1.0",
"hard-source-webpack-plugin": "^0.11.1",
"http-proxy": "^1.17.0",
>>>>>>> add 2nd endpoint to webserver; use express
"handlebars": "^4.0.11", "handlebars": "^4.0.11",
"ipfs-api": "17.2.4", "ipfs-api": "17.2.4",
"is-valid-domain": "0.0.5", "is-valid-domain": "0.0.5",