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

Update dependencies #106

Merged
merged 4 commits into from
Jun 17, 2020
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 .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v12.16.1
v12.18.0
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
############################
# Build api
############################
FROM golang:1.14.1-alpine3.11 AS apibuilder
FROM golang:1.14.4-alpine3.12 AS apibuilder
RUN apk update && apk add --no-cache git dep
COPY api $GOPATH/src/github.com/alexbrazier/go-url/api
WORKDIR $GOPATH/src/github.com/alexbrazier/go-url/api
Expand All @@ -15,7 +15,7 @@ RUN go build -o /go/bin/server
############################
# Build frontend
############################
FROM node:12.16.1-alpine AS frontendbuilder
FROM node:12.18.0-alpine AS frontendbuilder

COPY frontend /app
WORKDIR /app
Expand All @@ -26,7 +26,7 @@ RUN yarn --frozen-lockfile --network-timeout 600000 && \
############################
# Build actual image
############################
FROM alpine:3.11
FROM alpine:3.12
# Need to get updated certificates to connect to Slack API
RUN apk update && apk add bash dumb-init ca-certificates && rm -rf /var/cache/apk/*
# Copy our static executable.
Expand Down
46 changes: 23 additions & 23 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,47 +18,47 @@
"wait:frontend": "wait-on http-get://localhost:3000/go"
},
"dependencies": {
"@material-ui/core": "^4.9.9",
"@material-ui/core": "^4.10.1",
"@material-ui/icons": "^4.9.1",
"@material-ui/styles": "^4.9.6",
"@sentry/browser": "^5.15.4",
"@material-ui/styles": "^4.10.0",
"@sentry/browser": "^5.17.0",
"axios": "^0.19.2",
"classnames": "^2.2.6",
"http-proxy-middleware": "^1.0.3",
"http-proxy-middleware": "^1.0.4",
"js-cookie": "^2.2.1",
"qs": "^6.9.3",
"qs": "^6.9.4",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-redux": "^7.2.0",
"react-router-dom": "^5.1.2",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.0",
"redux": "^4.0.5",
"typeface-roboto": "^0.0.75"
},
"devDependencies": {
"@cypress/webpack-preprocessor": "^4.1.3",
"@cypress/webpack-preprocessor": "^5.4.1",
"@types/classnames": "^2.2.10",
"@types/faker": "^4.1.11",
"@types/js-cookie": "^2.2.5",
"@types/qs": "^6.9.1",
"@types/react": "^16.9.32",
"@types/react-dom": "^16.9.6",
"@types/react-redux": "^7.1.7",
"@types/react-router-dom": "^5.1.3",
"@types/faker": "^4.1.12",
"@types/js-cookie": "^2.2.6",
"@types/qs": "^6.9.3",
"@types/react": "^16.9.36",
"@types/react-dom": "^16.9.8",
"@types/react-redux": "^7.1.9",
"@types/react-router-dom": "^5.1.5",
"@types/recompose": "^0.30.7",
"babel-eslint": "^10.1.0",
"cypress": "^4.3.0",
"eslint": "^6.8.0",
"cypress": "^4.8.0",
"eslint": "^7.2.0",
"eslint-config-airbnb": "^18.1.0",
"eslint-plugin-cypress": "^2.10.3",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-cypress": "^2.11.1",
"eslint-plugin-import": "^2.21.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.19.0",
"eslint-plugin-react": "^7.20.0",
"faker": "^4.1.0",
"prettier": "^2.0.4",
"ts-loader": "^6.2.2",
"typescript": "^3.8.3",
"wait-on": "^4.0.1"
"prettier": "^2.0.5",
"ts-loader": "^7.0.5",
"typescript": "^3.9.5",
"wait-on": "^5.0.1"
},
"resolutions": {
"set-value": "^3.0.1"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/Home/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const Home: React.FC<HomeProps> = ({ search, displayFlashError }) => {
const search = location.search;
const { message } = qs.parse(search.slice(1));
if (message) {
displayFlashError(message);
displayFlashError(message as string);
}
}, [location.search, displayFlashError]);

Expand Down
Loading