Skip to content

Commit

Permalink
Update dependencies and node and docker version (#119)
Browse files Browse the repository at this point in the history
* Update frontend dependencies

* Update node and go version

* Update ci config

* Update docker version

* Update
  • Loading branch information
alexbrazier committed Dec 12, 2020
1 parent f2cf30d commit 0dbf615
Show file tree
Hide file tree
Showing 8 changed files with 3,771 additions and 3,630 deletions.
10 changes: 6 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ executors:
default:
working_directory: /go/src/github.com/alexbrazier/go-url
docker:
- image: circleci/golang:1.13-node
- image: circleci/golang:1.15-node

browsers:
working_directory: /go/src/github.com/alexbrazier/go-url
docker:
- image: circleci/golang:1.13-node-browsers
- image: circleci/golang:1.15-node-browsers
- image: circleci/postgres:9.6.2-alpine
environment:
POSTGRES_USER: postgres
Expand Down Expand Up @@ -75,7 +75,8 @@ jobs:
at: /go/src/github.com/alexbrazier
- attach_workspace:
at: ~/
- setup_remote_docker
- setup_remote_docker:
version: 19.03.13
- run:
name: E2E frontend background
command: cd frontend && yarn start
Expand Down Expand Up @@ -107,7 +108,8 @@ jobs:
steps:
- attach_workspace:
at: /go/src/github.com/alexbrazier
- setup_remote_docker
- setup_remote_docker:
version: 19.03.13
- run:
name: Build Docker image
command: |
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v12.18.3
v14.15.1
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.15.0-alpine3.12 AS apibuilder
FROM golang:1.15.3-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.3-alpine AS frontendbuilder
FROM node:14.15.1-alpine AS frontendbuilder

COPY frontend /app
WORKDIR /app
Expand Down
48 changes: 0 additions & 48 deletions frontend/.eslintrc.yml

This file was deleted.

2 changes: 1 addition & 1 deletion frontend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
.env.development.local
.env.test.local
.env.production.local

.eslintcache
58 changes: 29 additions & 29 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,46 +15,46 @@
"wait": "yarn wait-on http-get://localhost:1323/health http-get://localhost:3000/go"
},
"dependencies": {
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"@material-ui/styles": "^4.10.0",
"@sentry/browser": "^5.23.0",
"axios": "^0.20.0",
"@material-ui/core": "^4.11.2",
"@material-ui/icons": "^4.11.2",
"@material-ui/styles": "^4.11.2",
"@sentry/browser": "^5.29.0",
"axios": "^0.21.0",
"classnames": "^2.2.6",
"http-proxy-middleware": "^1.0.5",
"http-proxy-middleware": "^1.0.6",
"js-cookie": "^2.2.1",
"qs": "^6.9.4",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-redux": "^7.2.1",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-redux": "^7.2.2",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.0",
"react-scripts": "4.0.1",
"redux": "^4.0.5",
"typeface-roboto": "^0.0.75"
"typeface-roboto": "^1.1.13"
},
"devDependencies": {
"@cypress/webpack-preprocessor": "^5.4.5",
"@types/classnames": "^2.2.10",
"@types/faker": "^5.1.0",
"@cypress/webpack-preprocessor": "^5.4.11",
"@types/classnames": "^2.2.11",
"@types/faker": "^5.1.5",
"@types/js-cookie": "^2.2.6",
"@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/qs": "^6.9.5",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@types/react-redux": "^7.1.12",
"@types/react-router-dom": "^5.1.6",
"@types/recompose": "^0.30.7",
"babel-eslint": "^10.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.22.0",
"eslint-plugin-jsx-a11y": "^6.3.1",
"eslint-plugin-react": "^7.20.6",
"cypress": "^5.6.0",
"eslint": "^7.15.0",
"eslint-config-airbnb": "^18.2.1",
"eslint-plugin-cypress": "^2.11.2",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.21.5",
"faker": "^5.1.0",
"prettier": "^2.1.2",
"ts-loader": "^8.0.3",
"typescript": "^4.0.2",
"prettier": "^2.2.1",
"ts-loader": "^8.0.12",
"typescript": "^4.1.3",
"wait-on": "^5.2.0"
},
"resolutions": {
Expand Down
3 changes: 2 additions & 1 deletion frontend/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "preserve"
"jsx": "react-jsx",
"noFallthroughCasesInSwitch": true
},
"include": [
"src"
Expand Down
Loading

0 comments on commit 0dbf615

Please sign in to comment.