Merge pull request #102 from oceanprotocol/fix/server-dev

server task cleanup

.travis.yml

@@ -9,7 +9,11 @@ script:
 notifications:
   email: false
 
-cache: npm
+cache:
+  directories:
+    - node_modules
+    - client/node_modules
+    - server/node_modules
 
 deploy:
   - provider: script

client/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts --max_old_space_size=4096 build",
-    "test": "react-scripts test",
+    "test": "react-scripts test --coverage",
     "eject": "react-scripts eject"
   },
   "dependencies": {

package.json

@@ -5,7 +5,7 @@
   "license": "Apache-2.0",
   "scripts": {
     "install": "./scripts/install.sh",
-    "start": "concurrently \"cd client && npm run start\" \"cd server && npm run start-watch\"",
+    "start": "concurrently \"cd client && npm start\" \"cd server && npm start\"",
     "build": "./scripts/build.sh",
     "test": "npm run lint && scripts/test.sh",
     "format:js": "prettier --parser typescript --write '**/*.{js,jsx,ts,tsx}'",

server/Dockerfile

@@ -5,9 +5,8 @@ WORKDIR /app/backend/
 
 COPY . .
 
-RUN npm install
+RUN npm install && \
+    npm run build
 
-RUN npm run build
+ENTRYPOINT ["npm", "run", "serve"]
-
-ENTRYPOINT ["npm", "run", "start"]
 

server/nodemon.json

@@ -1,6 +0,0 @@
-{
-  "watch": ["src"],
-  "ext": "ts",
-  "ignore": ["src/**/*.spec.ts"],
-  "exec": "ts-node src/index.ts"
-}

server/package.json

@@ -3,14 +3,13 @@
   "description": "Ocean Protocol marketplace backend.",
   "version": "1.0.0",
   "license": "Apache-2.0",
-  "main": "dist/index.js",
+  "main": "dist/server.js",
   "scripts": {
-    "start": "node dist/index.js",
+    "start": "nodemon --exec ts-node src/server.ts",
-    "start-watch": "nodemon",
+    "serve": "node dist/server.js",
     "build": "tsc",
-    "watch": "tsc -w",
     "test": "jest --coverage",
-    "watch-test": "npm run test --watchAll"
+    "test-watch": "npm run test --watchAll"
   },
   "dependencies": {
     "body-parser": "^1.18.3",

server/test/api.test.ts

@@ -1,5 +1,5 @@
 import request from 'supertest'
-import server from '../src'
+import server from '../src/server'
 import {} from 'jasmine'
 
 afterAll(done => {