Deps update

.gitlab-ci.yml

@@ -9,7 +9,8 @@ cache:
 
 deploy_staging:
   stage: deploy
-  environment: staging
+  environment:
+    name: staging
   only:
     - tags
   script:

client/package.json

@@ -25,8 +25,8 @@
     "graphql": "^14.0.2",
     "graphql-tag": "^2.9.2",
     "graphql-tools": "^4.0.3",
-    "jest": "^24.1.0",
-    "jest-cli": "24.1.0",
+    "jest": "^24.8.0",
+    "jest-cli": "^24.8.0",
     "keycode": "^2.2.0",
     "mustache": "^3.0.1",
     "node-fetch": "^2.6.0",
@@ -69,7 +69,7 @@
     "ts-node": "^8.0.2",
     "tslint": "^5.12.1",
     "tslint-config-prettier": "^1.16.0",
-    "typescript": "^3.3.3",
+    "typescript": "^3.5.3",
     "webpack": "^4.30.0",
     "webpack-cli": "^3.2.3",
     "webpack-dev-server": "^3.3.1",

server/Dockerfile

@@ -3,8 +3,15 @@ FROM ubuntu:18.04
 RUN apt-get update
 RUN apt-get install -y curl
 
-# Node
 RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+
+RUN apt-get update
+RUN apt-get install -y nodejs yarn
+
+# Node
 RUN apt-get install -y nodejs
 
 # postgres
@@ -19,7 +26,7 @@ RUN mkdir /opt/server
 COPY ./lib ./opt/server
 COPY ./package.json /opt/server
 
-RUN (cd /opt/server; npm install)
+RUN (cd /opt/server; yarn)
 
 WORKDIR /opt
 

server/package.json

@@ -9,51 +9,44 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "@types/graphql": "^14.0.7",
-    "apollo-server": "^2.4.8",
-    "apollo-server-testing": "^2.4.8",
+    "@types/graphql": "^14.2.3",
+    "apollo-server": "^2.8.1",
+    "apollo-server-testing": "^2.8.1",
     "atob": "^2.1.2",
+    "axios": "^0.19.0",
     "client": "0.0.1",
-    "axios": "^0.18.0",
-    "cookie": "^0.3.1",
-    "cors": "^2.8.4",
-    "google-auth-library": "^1.5.0",
-    "googleapis": "^31.0.2",
-    "graphql": "^14.0.2",
-    "graphql-code-generator": "^0.16.0",
+    "cookie": "^0.4.0",
+    "cors": "^2.8.5",
+    "graphql": "^14.4.2",
     "graphql-import": "^0.7.1",
-    "graphql-tag": "^2.10.0",
-    "graphql-tools": "^4.0.3",
-    "joi": "^13.6.0",
-    "joi-phone-number": "^2.0.12",
-    "joi-timezone": "^2.0.0",
-    "jsonwebtoken": "^8.2.1",
-    "luxon": "^1.12.0",
+    "graphql-tag": "^2.10.1",
+    "graphql-tools": "^4.0.5",
+    "jsonwebtoken": "^8.5.1",
+    "luxon": "^1.17.2",
     "mailgun-js": "^0.22.0",
-    "node-pre-gyp": "^0.12.0",
-    "pg": "^7.8.2",
+    "node-pre-gyp": "^0.13.0",
+    "pg": "^7.12.0",
     "random-string": "^0.2.0",
     "randomstring": "^1.1.5",
     "react-dom": "^16.8.6",
-    "rrule": "^2.6.0",
-    "superagent": "^3.8.3",
-    "typeorm": "^0.2.14",
+    "rrule": "^2.6.2",
+    "superagent": "^5.1.0",
+    "typeorm": "^0.2.18",
+    "typescript": "^3.5.3",
     "uuid": "^3.3.2",
     "webpack-node-externals": "^1.7.2"
   },
   "devDependencies": {
-    "@types/gapi.client.calendar": "^3.0.0",
-    "@types/jest": "^24.0.9",
-    "@types/joi": "^13.0.8",
-    "@types/luxon": "^1.11.1",
-    "@types/node": "^11.11.0",
-    "@types/uuid": "^3.4.4",
-    "jest": "^23.6.0",
-    "nodemon": "^1.18.10",
-    "ts-jest": "23.10.3",
-    "ts-node": "^8.0.3",
-    "tslint": "^5.9.1",
-    "typescript": "^3.4.5"
+    "@types/jest": "^24.0.16",
+    "@types/luxon": "^1.15.2",
+    "@types/node": "^10.12.30",
+    "@types/uuid": "^3.4.5",
+    "jest": "^24.8.0",
+    "nodemon": "^1.19.1",
+    "ts-jest": "^24.0.2",
+    "ts-node": "^8.3.0",
+    "tslint": "^5.18.0",
+    "typescript": "^3.5.3"
   },
   "private": true,
   "version": "1.0.0",