From 2a83d7e105aac5aa8b45603e13c8cadae2eba78e Mon Sep 17 00:00:00 2001 From: SamR1 Date: Sat, 13 Jan 2018 21:20:32 +0100 Subject: [PATCH] conf update for e2e tests --- mpwo_client/Dockerfile-ci | 7 ++----- mpwo_client/package.json | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/mpwo_client/Dockerfile-ci b/mpwo_client/Dockerfile-ci index 32ed8d92..8af5cf7d 100644 --- a/mpwo_client/Dockerfile-ci +++ b/mpwo_client/Dockerfile-ci @@ -16,13 +16,10 @@ ENV REACT_APP_USERS_SERVICE_URL $REACT_APP_USERS_SERVICE_URL # install and cache app dependencies ADD package.json /usr/src/app/package.json RUN npm install --silent -RUN npm install pushstate-server -g --silent +RUN npm install react-scripts -g # add app ADD . /usr/src/app/ -# build react app -RUN npm run build - # start app -CMD ["pushstate-server", "build"] +CMD ["npm", "start"] diff --git a/mpwo_client/package.json b/mpwo_client/package.json index d139129d..7364c2e9 100644 --- a/mpwo_client/package.json +++ b/mpwo_client/package.json @@ -1,4 +1,35 @@ { "name": "mpwo_client", - "version": "0.1.0" + "version": "0.1.0", + "private": true, + "dependencies": { + "date-fns": "^1.29.0", + "history": "^4.7.2", + "react": "^16.2.0", + "react-dom": "^16.2.0", + "react-helmet": "^5.2.0", + "react-key-index": "^0.1.1", + "react-redux": "^5.0.6", + "react-router-dom": "^4.2.2", + "react-router-redux": "^5.0.0-alpha.9", + "react-scripts": "1.0.17", + "redux": "^3.7.2", + "redux-thunk": "^2.2.0" + }, + "scripts": { + "start": "cd mpwo_client && react-scripts start", + "build": "cd mpwo_client && react-scripts build", + "test": "cd mpwo_client && testcafe firefox e2e", + "eject": "cd mpwo_client && react-scripts eject", + "lint": "cd mpwo_client && eslint --cache --ext .jsx --ext .js src" + }, + "devDependencies": { + "babel-eslint": "^8.0.3", + "eslint": "^4.13.1", + "eslint-plugin-import": "^2.8.0", + "eslint-plugin-react": "^7.5.1", + "eslint-plugin-testcafe": "^0.2.1", + "randomstring": "^1.1.5", + "testcafe": "^0.18.6" + } }