Merge branch 'master' into feature/tunnel

This commit is contained in:
hatim boufnichel 2021-02-26 16:52:24 +01:00
commit d7e7689e1f
30 changed files with 1785 additions and 953 deletions

View file

@ -1,6 +1,6 @@
{
"name": "shockapi",
"version": "1.0.0",
"version": "2021.1.04",
"description": "",
"main": "src/server.js",
"scripts": {
@ -11,13 +11,16 @@
"test:watch": "jest --no-cache --watch",
"typecheck": "tsc",
"lint": "eslint \"services/gunDB/**/*.js\"",
"format": "prettier --write \"./**/*.js\""
"format": "prettier --write \"./**/*.js\"",
"test:gun": "ts-node src/__gun__tests__/*.ts && rimraf -rf GUN-TEST-*"
},
"author": "",
"license": "ISC",
"dependencies": {
"@grpc/proto-loader": "^0.5.1",
"axios": "^0.20.0",
"@grpc/grpc-js": "^1.2.2",
"@grpc/proto-loader": "^0.5.5",
"assert-never": "^1.2.1",
"axios": "^0.21.1",
"basic-auth": "^2.0.0",
"big.js": "^5.2.2",
"bitcore-lib": "^0.15.0",
@ -31,7 +34,7 @@
"debug": "^3.1.0",
"dotenv": "^8.1.0",
"express": "^4.14.1",
"express-session": "^1.15.1",
"express-session": "^1.17.1",
"google-proto-files": "^1.0.3",
"graphviz": "0.0.8",
"grpc": "1.24.4",
@ -42,15 +45,16 @@
"localtunnel": "git://github.com/shocknet/localtunnel#40cc2c2a46b05da2217bf2e20da11a5343a5cce7",
"lodash": "^4.17.20",
"method-override": "^2.3.7",
"node-fetch": "^2.6.1",
"node-persist": "^3.1.0",
"promise": "^8.1.0",
"qrcode-terminal": "^0.12.0",
"ramda": "^0.27.1",
"request": "^2.88.2",
"request-promise": "^4.2.2",
"request-promise": "^4.2.6",
"response-time": "^2.3.2",
"shelljs": "^0.8.2",
"shock-common": "17.x.x",
"shock-common": "32.0.0",
"socket.io": "2.1.1",
"text-encoding": "^0.7.0",
"tingodb": "^0.6.1",
@ -58,7 +62,7 @@
"winston-daily-rotate-file": "^4.5.0"
},
"devDependencies": {
"@babel/plugin-proposal-class-properties": "^7.5.5",
"@babel/plugin-proposal-class-properties": "^7.12.1",
"@types/bluebird": "^3.5.32",
"@types/dotenv": "^6.1.1",
"@types/express": "^4.17.1",
@ -66,10 +70,12 @@
"@types/jest": "^24.0.18",
"@types/jsonwebtoken": "^8.3.7",
"@types/lodash": "^4.14.141",
"@types/node-fetch": "^2.5.8",
"@types/ramda": "types/npm-ramda#dist",
"@types/react": "16.x.x",
"@types/socket.io": "^2.1.11",
"@types/uuid": "^3.4.5",
"babel-eslint": "^10.0.3",
"babel-eslint": "^10.1.0",
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
"eslint": "^6.6.0",
"eslint-config-prettier": "^6.5.0",
@ -80,8 +86,10 @@
"lint-staged": "^10.2.2",
"nodemon": "^1.19.3",
"prettier": "^1.18.2",
"rimraf": "^3.0.2",
"ts-node": "^9.1.1",
"ts-type": "^1.2.16",
"typescript": "^4.0.2"
"typescript": "latest"
},
"lint-staged": {
"*.js": [