Skip to content

Commit

Permalink
merge: merge dependency conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
arthurfiorette committed Sep 24, 2021
2 parents 9a6f9b2 + 982234a commit 5e632ba
Show file tree
Hide file tree
Showing 6 changed files with 176 additions and 182 deletions.
2 changes: 1 addition & 1 deletion app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16.8.0-alpine
FROM node:16.9.1-alpine

LABEL maintainer="arthurfiorette <arthur.fiorette@gmail.com>"

Expand Down
6 changes: 3 additions & 3 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"start:nodemon": "ts-node src/index.ts"
},
"dependencies": {
"axios": "^0.21.3",
"axios": "^0.21.4",
"colors": "^1.4.0",
"cors": "^2.8.5",
"dotenv": "^10.0.0",
Expand All @@ -31,15 +31,15 @@
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-object-rest-spread": "^7.13.8",
"@babel/plugin-transform-runtime": "^7.15.0",
"@babel/preset-env": "^7.15.4",
"@babel/preset-env": "^7.15.6",
"@babel/preset-typescript": "^7.15.0",
"@types/cors": "^2.8.12",
"@types/currency-formatter": "^1.5.1",
"@types/express": "^4.17.13",
"@types/node": "^16.7.10",
"@types/steam-totp": "^2.1.0",
"currency-formatter": "^1.5.8",
"nodemon": "^2.0.12",
"nodemon": "^2.0.13",
"ts-node": "^10.2.1"
}
}

0 comments on commit 5e632ba

Please sign in to comment.