Skip to content

Commit

Permalink
Update js and docker dependencies (#114)
Browse files Browse the repository at this point in the history
* Update js and docker dependencies

* Fix wait command

* Downgrade react-scripts again as react-scripts is still broken
  • Loading branch information
alexbrazier committed Sep 16, 2020
1 parent 0cac431 commit f2cf30d
Show file tree
Hide file tree
Showing 4 changed files with 1,912 additions and 1,679 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v12.18.0
v12.18.3
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
############################
# Build api
############################
FROM golang:1.14.4-alpine3.12 AS apibuilder
FROM golang:1.15.0-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.18.0-alpine AS frontendbuilder
FROM node:12.18.3-alpine AS frontendbuilder

COPY frontend /app
WORKDIR /app
Expand Down
45 changes: 21 additions & 24 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,56 +9,53 @@
"test": "react-scripts test",
"test:e2e": "cypress run",
"test:e2e:local": "cypress open",
"eject": "react-scripts eject",
"prettier": "prettier --write \"src/**/*.{js,jsx,ts,tsx}?\"",
"prettier:check": "prettier --list-different \"src/**/*.{js,jsx,ts,tsx}?\"",
"lint": "eslint src",
"wait": "yarn wait:api",
"wait:api": "wait-on http-get://localhost:1323/health",
"wait:frontend": "wait-on http-get://localhost:3000/go"
"wait": "yarn wait-on http-get://localhost:1323/health http-get://localhost:3000/go"
},
"dependencies": {
"@material-ui/core": "^4.10.1",
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"@material-ui/styles": "^4.10.0",
"@sentry/browser": "^5.17.0",
"axios": "^0.19.2",
"@sentry/browser": "^5.23.0",
"axios": "^0.20.0",
"classnames": "^2.2.6",
"http-proxy-middleware": "^1.0.4",
"http-proxy-middleware": "^1.0.5",
"js-cookie": "^2.2.1",
"qs": "^6.9.4",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-redux": "^7.2.0",
"react-redux": "^7.2.1",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.0",
"redux": "^4.0.5",
"typeface-roboto": "^0.0.75"
},
"devDependencies": {
"@cypress/webpack-preprocessor": "^5.4.1",
"@cypress/webpack-preprocessor": "^5.4.5",
"@types/classnames": "^2.2.10",
"@types/faker": "^4.1.12",
"@types/faker": "^5.1.0",
"@types/js-cookie": "^2.2.6",
"@types/qs": "^6.9.3",
"@types/react": "^16.9.36",
"@types/qs": "^6.9.4",
"@types/react": "^16.9.49",
"@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.8.0",
"eslint": "^7.2.0",
"eslint-config-airbnb": "^18.1.0",
"cypress": "^5.2.0",
"eslint": "^7.9.0",
"eslint-config-airbnb": "^18.2.0",
"eslint-plugin-cypress": "^2.11.1",
"eslint-plugin-import": "^2.21.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.20.0",
"faker": "^4.1.0",
"prettier": "^2.0.5",
"ts-loader": "^7.0.5",
"typescript": "^3.9.5",
"wait-on": "^5.0.1"
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jsx-a11y": "^6.3.1",
"eslint-plugin-react": "^7.20.6",
"faker": "^5.1.0",
"prettier": "^2.1.2",
"ts-loader": "^8.0.3",
"typescript": "^4.0.2",
"wait-on": "^5.2.0"
},
"resolutions": {
"set-value": "^3.0.1"
Expand Down
Loading

0 comments on commit f2cf30d

Please sign in to comment.