Skip to content

Commit cffc89d

Browse files
authored
Update dependencies (#106)
* Update dependencies * Update docker dependencies * Fix typescript error * Downgrade cra version causing build to fail Caused by facebook/create-react-app/issues/8688
1 parent 6bd0272 commit cffc89d

File tree

5 files changed

+560
-438
lines changed

5 files changed

+560
-438
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v12.16.1
1+
v12.18.0

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
############################
22
# Build api
33
############################
4-
FROM golang:1.14.1-alpine3.11 AS apibuilder
4+
FROM golang:1.14.4-alpine3.12 AS apibuilder
55
RUN apk update && apk add --no-cache git dep
66
COPY api $GOPATH/src/github.com/alexbrazier/go-url/api
77
WORKDIR $GOPATH/src/github.com/alexbrazier/go-url/api
@@ -15,7 +15,7 @@ RUN go build -o /go/bin/server
1515
############################
1616
# Build frontend
1717
############################
18-
FROM node:12.16.1-alpine AS frontendbuilder
18+
FROM node:12.18.0-alpine AS frontendbuilder
1919

2020
COPY frontend /app
2121
WORKDIR /app
@@ -26,7 +26,7 @@ RUN yarn --frozen-lockfile --network-timeout 600000 && \
2626
############################
2727
# Build actual image
2828
############################
29-
FROM alpine:3.11
29+
FROM alpine:3.12
3030
# Need to get updated certificates to connect to Slack API
3131
RUN apk update && apk add bash dumb-init ca-certificates && rm -rf /var/cache/apk/*
3232
# Copy our static executable.

frontend/package.json

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,47 +18,47 @@
1818
"wait:frontend": "wait-on http-get://localhost:3000/go"
1919
},
2020
"dependencies": {
21-
"@material-ui/core": "^4.9.9",
21+
"@material-ui/core": "^4.10.1",
2222
"@material-ui/icons": "^4.9.1",
23-
"@material-ui/styles": "^4.9.6",
24-
"@sentry/browser": "^5.15.4",
23+
"@material-ui/styles": "^4.10.0",
24+
"@sentry/browser": "^5.17.0",
2525
"axios": "^0.19.2",
2626
"classnames": "^2.2.6",
27-
"http-proxy-middleware": "^1.0.3",
27+
"http-proxy-middleware": "^1.0.4",
2828
"js-cookie": "^2.2.1",
29-
"qs": "^6.9.3",
29+
"qs": "^6.9.4",
3030
"react": "^16.13.1",
3131
"react-dom": "^16.13.1",
3232
"react-redux": "^7.2.0",
33-
"react-router-dom": "^5.1.2",
33+
"react-router-dom": "^5.2.0",
3434
"react-scripts": "3.4.0",
3535
"redux": "^4.0.5",
3636
"typeface-roboto": "^0.0.75"
3737
},
3838
"devDependencies": {
39-
"@cypress/webpack-preprocessor": "^4.1.3",
39+
"@cypress/webpack-preprocessor": "^5.4.1",
4040
"@types/classnames": "^2.2.10",
41-
"@types/faker": "^4.1.11",
42-
"@types/js-cookie": "^2.2.5",
43-
"@types/qs": "^6.9.1",
44-
"@types/react": "^16.9.32",
45-
"@types/react-dom": "^16.9.6",
46-
"@types/react-redux": "^7.1.7",
47-
"@types/react-router-dom": "^5.1.3",
41+
"@types/faker": "^4.1.12",
42+
"@types/js-cookie": "^2.2.6",
43+
"@types/qs": "^6.9.3",
44+
"@types/react": "^16.9.36",
45+
"@types/react-dom": "^16.9.8",
46+
"@types/react-redux": "^7.1.9",
47+
"@types/react-router-dom": "^5.1.5",
4848
"@types/recompose": "^0.30.7",
4949
"babel-eslint": "^10.1.0",
50-
"cypress": "^4.3.0",
51-
"eslint": "^6.8.0",
50+
"cypress": "^4.8.0",
51+
"eslint": "^7.2.0",
5252
"eslint-config-airbnb": "^18.1.0",
53-
"eslint-plugin-cypress": "^2.10.3",
54-
"eslint-plugin-import": "^2.20.2",
53+
"eslint-plugin-cypress": "^2.11.1",
54+
"eslint-plugin-import": "^2.21.2",
5555
"eslint-plugin-jsx-a11y": "^6.2.3",
56-
"eslint-plugin-react": "^7.19.0",
56+
"eslint-plugin-react": "^7.20.0",
5757
"faker": "^4.1.0",
58-
"prettier": "^2.0.4",
59-
"ts-loader": "^6.2.2",
60-
"typescript": "^3.8.3",
61-
"wait-on": "^4.0.1"
58+
"prettier": "^2.0.5",
59+
"ts-loader": "^7.0.5",
60+
"typescript": "^3.9.5",
61+
"wait-on": "^5.0.1"
6262
},
6363
"resolutions": {
6464
"set-value": "^3.0.1"

frontend/src/views/Home/Home.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const Home: React.FC<HomeProps> = ({ search, displayFlashError }) => {
2929
const search = location.search;
3030
const { message } = qs.parse(search.slice(1));
3131
if (message) {
32-
displayFlashError(message);
32+
displayFlashError(message as string);
3333
}
3434
}, [location.search, displayFlashError]);
3535

0 commit comments

Comments
 (0)