Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump frontend dependencies #27

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ services:
command: ["flask", "run", "--host=0.0.0.0"] # overrides the uwsgi server

frontend:
image: node:10-alpine
image: node:13-alpine
ports:
- "3000:3000"
volumes:
Expand Down
4 changes: 2 additions & 2 deletions frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use node image to build static files
FROM node:12-alpine as builder
FROM node:13-alpine as builder
WORKDIR /usr/src/app
# Install dependencies
COPY package.json yarn.lock ./
Expand All @@ -10,7 +10,7 @@ COPY src ./src
RUN yarn build

# Use nginx to host the static files
FROM nginx:1.15-alpine
FROM nginx:1.17-alpine
# Copy configuration
COPY nginx/nginx.conf /etc/nginx/nginx.conf
# Get built frontend files from the node container
Expand Down
60 changes: 30 additions & 30 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,24 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"axios": "^0.18.1",
"immutability-helper": "^3.0.0",
"axios": "^0.19.0",
"immutability-helper": "^3.0.1",
"jwt-decode": "^2.2.0",
"lodash.debounce": "^4.0.8",
"moment": "^2.24.0",
"package.json": "^2.0.1",
"prop-types": "^15.7.2",
"query-string": "^6.5.0",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"query-string": "^6.8.3",
"react": "^16.11.0",
"react-dom": "^16.11.0",
"react-icons-kit": "^1.3.1",
"react-paginate": "^6.3.0",
"react-redux": "^7.0.3",
"react-scripts": "^3.0.1",
"react-redux": "^7.1.1",
"react-scripts": "^3.2.0",
"react-typist": "^2.0.5",
"redux": "^4.0.1",
"redux": "^4.0.4",
"redux-thunk": "^2.3.0",
"safe-regex": "^2.0.2"
"safe-regex": "^2.1.1"
},
"scripts": {
"start": "react-scripts start",
Expand All @@ -28,26 +29,25 @@
"eject": "react-scripts eject"
},
"devDependencies": {
"babel-eslint": "^10.0.1",
"eslint": "^5.16.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-config-prettier": "^4.2.0",
"eslint-plugin-import": "^2.17.2",
"eslint-plugin-prettier": "^3.1.0",
"eslint-plugin-react": "^7.13.0",
"prettier": "^1.17.1",
"yarn-upgrade-all": "^0.5.0"
"babel-eslint": "^10.0.3",
"eslint": "^6.6.0",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-config-prettier": "^6.5.0",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-prettier": "^3.1.1",
"eslint-plugin-react": "^7.16.0",
"prettier": "^1.18.2",
"yarn-upgrade-all": "^0.5.2"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
"browserslist": [
"last 1 version",
"> 1%",
"maintained node versions",
"not dead"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
Loading