Merge pull request #28 from NodeFactoryIo/mpetrunic/update-deps

Major update

Author: mpetrunic

.env.sample

@@ -22,5 +22,5 @@ METRICS_IP_WHITELIST=*
 # Winston-loki default url is empty
 # WINSTON_LOKI_URL=
 # WINSTON_LOKI_BASIC_AUTH=
-WINSTON_LOKI_APP_NAME=myApp
-WINSTON_LOKI_BATCHING=false
+# WINSTON_LOKI_APP_NAME=myApp
+# WINSTON_LOKI_BATCHING=false

.eslintrc

@@ -0,0 +1,57 @@
+module.exports = {
+  "root": true,
+  "env": {
+    "mocha": true,
+    "node": true,
+    "es6": true
+  },
+  "parser": "@typescript-eslint/parser",
+  "plugins": [
+    "@typescript-eslint",
+    "prettier"
+  ],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/eslint-recommended",
+    "plugin:@typescript-eslint/recommended",
+    "prettier"
+  ],
+  "rules": {
+    "@typescript-eslint/no-require-imports": "error",
+    "@typescript-eslint/no-unused-vars": ["error", {
+      "varsIgnorePattern": "^_"
+    }],
+    "@typescript-eslint/explicit-function-return-type": ["error", {
+      "allowExpressions": true
+    }],
+    "@typescript-eslint/ban-ts-comment": "error",
+    "@typescript-eslint/no-explicit-any": "error",
+    "@typescript-eslint/explicit-module-boundary-types": "error",
+    "@typescript-eslint/no-use-before-define": "off",
+    "prefer-const": "error",
+    "no-consecutive-blank-lines": 0,
+    "no-console": "error",
+    "@typescript-eslint/naming-convention": ["error", 
+      {selector: "default", format: ['camelCase']},
+      {
+        selector: [
+          "classProperty", "parameterProperty", "objectLiteralProperty",
+          "classMethod", "parameter"
+        ],
+        format: ['camelCase'], leadingUnderscore: "allow"
+      },
+      //variable must be in camel or upper case
+      {selector: "variable", format: ["camelCase", "UPPER_CASE"], leadingUnderscore: "allow"},
+      //classes and types must be in PascalCase
+      {selector: ["typeLike", "enum"], format: ['PascalCase']},
+      {selector: "enumMember", format: null},
+      {selector: "typeProperty", format: ['PascalCase', 'camelCase']},
+      //ignore rules on destructured params
+      {
+        selector: "variable",
+        modifiers: ["destructured"],
+        format: null
+      }
+  ],
+  }
+}

.eslintrc.js

@@ -11,7 +11,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@master
         with:
-          node-version: 12.4.0
+          node-version: 14
       - run: cp .env.sample .env
       - run: yarn install --frozen-lockfile
       - run: yarn run build:docker

.github/workflows/ci.yaml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@master
         with:
-          node-version: 12.4.0
+          node-version: 14
       - run: cp .env.sample .env
       - uses: azure/docker-login@v1
         with:

.github/workflows/publish.yaml

@@ -0,0 +1 @@
+14

.nvmrc

@@ -0,0 +1,11 @@
+{
+  "printWidth": 120,
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": false,
+  "quoteProps": "as-needed",
+  "trailingComma": "es5",
+  "bracketSpacing": true,
+  "arrowParens": "always"
+}

.prettierc

@@ -1,4 +1,4 @@
-FROM node:12.13-alpine as dev
+FROM node:14.15-alpine as dev
 
 RUN apk update && apk add --no-cache libpq postgresql-dev g++ make python && rm -rf /var/cache/apk/*
 
@@ -14,7 +14,7 @@ COPY . .
 
 RUN yarn run build
 
-FROM node:12.13-alpine as production
+FROM node:14.15-alpine as production
 
 RUN apk update && apk add --no-cache libpq postgresql-dev g++ make python && rm -rf /var/cache/apk/*
 

@types/fastify-env/index.d.ts

@@ -6,6 +6,9 @@
     "Marin Petrunić <[email protected]>",
     "Belma Gutlić <[email protected]>"
   ],
+  "engines": {
+    "node": "14.x"
+  },
   "license": "MIT",
   "scripts": {
     "start:dev": "npx task dev",
@@ -36,53 +39,55 @@
     "nodemon": "cross-env NODE_ENV=development ./node_modules/nodemon/bin/nodemon.js"
   },
   "dependencies": {
-    "@nodefactory/fastify-blipp": "^2.2.1",
     "@nodefactory/winston": "^3.2.1",
-    "fastify": "^2.15.1",
-    "fastify-compress": "^2.0.1",
-    "fastify-cors": "^3.0.3",
-    "fastify-env": "^1.0.1",
-    "fastify-formbody": "^3.1.0",
-    "fastify-healthcheck": "^2.1.0",
-    "fastify-helmet": "^3.0.2",
-    "fastify-metrics": "5.0.1",
-    "fastify-rate-limit": "^3.0.1",
-    "fastify-sensible": "^2.1.1",
-    "fastify-swagger": "^2.5.1",
+    "fastify": "^3.10.1",
+    "fastify-compress": "^3.4.1",
+    "fastify-cors": "^5.1.0",
+    "fastify-env": "^2.1.0",
+    "fastify-formbody": "^5.0.0",
+    "fastify-healthcheck": "^3.0.0",
+    "fastify-helmet": "^5.1.0",
+    "fastify-metrics": "^6.0.3",
+    "fastify-rate-limit": "^5.0.1",
+    "fastify-sensible": "^3.1.0",
+    "fastify-swagger": "^3.5.0",
     "node-cleanup": "^2.1.2",
-    "pg": "^8.0.2",
+    "pg": "^8.5.1",
     "pg-native": "^3.0.0",
-    "typeorm": "^0.2.24",
-    "typeorm-seeding": "^1.4.4",
-    "winston-loki": "6.0.0-rc.4"
+    "typeorm": "^0.2.30",
+    "typeorm-seeding": "^1.6.1",
+    "winston-loki": "6.0.0-rc.9"
   },
   "devDependencies": {
-    "@types/chai": "^4.1.7",
-    "@types/faker": "^4.1.11",
-    "@types/mocha": "^5.2.7",
-    "@types/node": "^12.12.20",
+    "@types/chai": "^4.2.14",
+    "@types/faker": "^5.1.5",
+    "@types/mocha": "^8.2.0",
+    "@types/node": "^14.14.22",
     "@types/node-cleanup": "^2.1.1",
-    "@types/sinon": "^7.0.13",
-    "@types/supertest": "^2.0.5",
-    "@typescript-eslint/eslint-plugin": "^2.12.0",
-    "@typescript-eslint/parser": "^2.12.0",
+    "@types/sinon": "^9.0.10",
+    "@types/supertest": "^2.0.10",
+    "@typescript-eslint/eslint-plugin": "^4.14.0",
+    "@typescript-eslint/parser": "^4.14.0",
     "chai": "^4.2.0",
-    "coveralls": "^3.0.2",
-    "cross-env": "^7.0.2",
-    "dotenv": "^5.0.1",
-    "env-prompt": "^1.0.7",
-    "eslint": "^6.7.2",
-    "mocha": "^6.1.4",
-    "nodemon": "^2.0.2",
-    "nyc": "^15.0.1",
-    "sinon": "^7.3.2",
-    "supertest": "^3.1.0",
-    "tasksfile": "5.1.0",
-    "ts-node": "^8.5.4",
-    "typescript": "^3.7.3",
-    "typescript-eslint-parser": "^18.0.0"
+    "coveralls": "^3.1.0",
+    "cross-env": "^7.0.3",
+    "dotenv": "^8.2.0",
+    "env-prompt": "^1.2.3",
+    "eslint": "^7.18.0",
+    "eslint-config-prettier": "^7.2.0",
+    "eslint-plugin-prettier": "^3.3.1",
+    "mocha": "^8.2.1",
+    "nodemon": "^2.0.7",
+    "nyc": "^15.1.0",
+    "prettier": "^2.2.1",
+    "sinon": "^9.2.3",
+    "supertest": "^6.1.1",
+    "tasksfile": "5.1.1",
+    "ts-node": "^9.1.1",
+    "typescript": "^4.1.3",
+    "typescript-eslint-parser": "^22.0.0"
   },
   "resolutions": {
-    "lodash": "4.17.19"
+    "lodash": "4.17.20"
   }
 }