From 198faaebf2a9a1df2933de87e1b2eabc49a4cf7c Mon Sep 17 00:00:00 2001 From: andrewnoyes Date: Sat, 30 Nov 2019 16:47:27 -0700 Subject: [PATCH 1/2] update engine + node types --- package.json | 4 +-- packages/common/package.json | 3 ++- packages/core/package.json | 6 ++--- packages/server/package.json | 6 ++--- packages/web/package.json | 4 +-- yarn.lock | 51 ++++++++++++++++++++++-------------- 6 files changed, 43 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index ee43041..f40c5f3 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,6 @@ "prettier": "^1.19.1" }, "engines": { - "node": "10.16.3" + "node": "12.13.1" } -} +} \ No newline at end of file diff --git a/packages/common/package.json b/packages/common/package.json index bf2b59e..6177297 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -11,6 +11,7 @@ "postinstall": "yarn build" }, "devDependencies": { + "@types/node": "^12.12.14", "typescript": "^3.7.2" } -} \ No newline at end of file +} diff --git a/packages/core/package.json b/packages/core/package.json index 217e265..2a60a91 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -13,14 +13,14 @@ "author": "", "license": "ISC", "dependencies": { - "@carpool/common": "^1.0.0", "@carpool/client": "0.0.6", + "@carpool/common": "^1.0.0", "mobx": "^5.13.0", "socket.io-client": "^2.3.0" }, "devDependencies": { - "@types/node": "^10.16.3", + "@types/node": "^12.12.14", "@types/socket.io-client": "^1.4.32", "typescript": "^3.7.2" } -} \ No newline at end of file +} diff --git a/packages/server/package.json b/packages/server/package.json index 8f72ec1..5545d5f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -31,7 +31,7 @@ "@nestjs/swagger": "^3.1.0", "@nestjs/typeorm": "^6.2.0", "@nestjs/websockets": "^6.8.3", - "bcrypt": "^3.0.4", + "bcrypt": "^3.0.7", "class-transformer": "^0.2.3", "class-validator": "^0.10.1", "crypto-random-string": "^3.0.1", @@ -59,7 +59,7 @@ "@types/express": "^4.16.0", "@types/ioredis": "^4.0.18", "@types/jest": "^23.3.1", - "@types/node": "^10.16.3", + "@types/node": "^12.12.14", "@types/shortid": "^0.0.29", "@types/socket.io": "^2.1.4", "@types/socket.io-redis": "^1.0.25", @@ -88,4 +88,4 @@ "coverageDirectory": "../coverage", "testEnvironment": "node" } -} \ No newline at end of file +} diff --git a/packages/web/package.json b/packages/web/package.json index f67317e..6d57420 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -48,7 +48,7 @@ "@types/history": "^4.7.3", "@types/lodash": "^4.14.144", "@types/mapbox__mapbox-sdk": "^0.6.1", - "@types/node": "^10.16.3", + "@types/node": "^12.12.14", "@types/react": "^16.8.7", "@types/react-autosuggest": "^9.3.11", "@types/react-dom": "^16.8.2", @@ -58,4 +58,4 @@ "@types/react-text-mask": "^5.4.6", "typescript": "^3.7.2" } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 5639891..f6a1e92 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1426,10 +1426,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.9.tgz#da0210f91096aa67138cf5afd04c4d629f8a406a" integrity sha512-P57oKTJ/vYivL2BCfxCC5tQjlS8qW31pbOL6qt99Yrjm95YdHgNZwjrTTjMBh+C2/y6PXIX4oz253+jUzxKKfQ== -"@types/node@^10.16.3": - version "10.17.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.5.tgz#c1920150f7b90708a7d0f3add12a06bc9123c055" - integrity sha512-RElZIr/7JreF1eY6oD5RF3kpmdcreuQPjg5ri4oQ5g9sq7YWU8HkfB3eH8GwAwxf5OaCh0VPi7r4N/yoTGelrA== +"@types/node@^12.12.14": + version "12.12.14" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.14.tgz#1c1d6e3c75dba466e0326948d56e8bd72a1903d2" + integrity sha512-u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA== "@types/prop-types@*": version "15.7.3" @@ -2527,13 +2527,13 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -bcrypt@^3.0.4: - version "3.0.6" - resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-3.0.6.tgz#f607846df62d27e60d5e795612c4f67d70206eb2" - integrity sha512-taA5bCTfXe7FUjKroKky9EXpdhkVvhE5owfxfLYodbrAR1Ul3juLmIQmIQBK4L9a5BuUcE6cqmwT+Da20lF9tg== +bcrypt@^3.0.7: + version "3.0.7" + resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-3.0.7.tgz#1187d29df2e1cde44268152b13e3d4a655a7c7de" + integrity sha512-K5UglF9VQvBMHl/1elNyyFvAfOY9Bj+rpKrCSR9sFwcW8FywAYJSRwTURNej5TaAK2TEJkcJ6r6lh1YPmspx5Q== dependencies: - nan "2.13.2" - node-pre-gyp "0.12.0" + nan "2.14.0" + node-pre-gyp "0.13.0" better-assert@~1.0.0: version "1.0.2" @@ -8259,12 +8259,7 @@ mz@^2.4.0: object-assign "^4.0.1" thenify-all "^1.0.0" -nan@2.13.2: - version "2.13.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7" - integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw== - -nan@^2.12.1, nan@^2.9.2: +nan@2.14.0, nan@^2.12.1, nan@^2.9.2: version "2.14.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== @@ -8392,10 +8387,10 @@ node-notifier@^5.2.1: shellwords "^0.1.1" which "^1.3.0" -node-pre-gyp@0.12.0, node-pre-gyp@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149" - integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A== +node-pre-gyp@0.13.0: + version "0.13.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.13.0.tgz#df9ab7b68dd6498137717838e4f92a33fc9daa42" + integrity sha512-Md1D3xnEne8b/HGVQkZZwV27WUi1ZRuZBij24TNaZwUPU3ZAFtvT6xxJGaUVillfmMKnn5oD1HoGsp2Ftik7SQ== dependencies: detect-libc "^1.0.2" mkdirp "^0.5.1" @@ -8424,6 +8419,22 @@ node-pre-gyp@^0.10.0: semver "^5.3.0" tar "^4" +node-pre-gyp@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149" + integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4" + node-releases@^1.1.29, node-releases@^1.1.3: version "1.1.33" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.33.tgz#349f10291234624574f44cf32b7de259bf028303" From ed3f99157dd3e344eb89584857e3a67204d40c14 Mon Sep 17 00:00:00 2001 From: andrewnoyes Date: Sat, 30 Nov 2019 17:15:15 -0700 Subject: [PATCH 2/2] update readme --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index c2cc891..5fab22b 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,7 @@ This is the monorepo for the server and web carpool projects. It is setup using # Setup -1. Ensure Node.js, Docker, and yarn are installed. - - At the moment only node v10.16.3 (the current lts) is supported +1. Ensure Node.js LTS, Docker, and yarn are installed. 2. From root project directory, run `yarn install`. This will install the dependencies of all projects. 3. To run server services/services and the core/web projects in dev mode, run `yarn start:all` after dependencies are installed.