From 15a66c79fb6c5111ecd72c5d329248bd9cd2eef9 Mon Sep 17 00:00:00 2001 From: Vlad Holubiev Date: Mon, 30 May 2022 17:15:42 +0200 Subject: [PATCH] chore: jest v28 support --- .eslintrc | 9 ++++++--- environment.js | 4 +--- mongo-aggregate.test.js | 1 - package.json | 13 +++++++------ setup.js | 1 + 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.eslintrc b/.eslintrc index f725a987..f271674e 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,8 +1,11 @@ { "root": true, - "extends": ["@shelf/eslint-config/backend"], + "extends": [ + "@shelf/eslint-config/typescript" + ], "rules": { - "no-console": 0, - "import/order": 0 + "@typescript-eslint/no-var-requires": "off", + "no-console": "off", + "import/order": "off" } } diff --git a/environment.js b/environment.js index d2262c76..692119d9 100644 --- a/environment.js +++ b/environment.js @@ -1,4 +1,4 @@ -const NodeEnvironment = require('jest-environment-node'); +const {TestEnvironment} = require('jest-environment-node'); const path = require('path'); const fs = require('fs'); const uuid = require('uuid'); @@ -13,8 +13,6 @@ const globalConfigPath = path.join(cwd, 'globalConfig.json'); const options = getMongodbMemoryOptions(); const isReplSet = Boolean(options.replSet); -const TestEnvironment = NodeEnvironment.default ? NodeEnvironment.default : NodeEnvironment; - debug(`isReplSet`, isReplSet); let mongo = isReplSet ? new MongoMemoryReplSet(options) : new MongoMemoryServer(options); diff --git a/mongo-aggregate.test.js b/mongo-aggregate.test.js index e3d23905..daec0a7c 100644 --- a/mongo-aggregate.test.js +++ b/mongo-aggregate.test.js @@ -5,7 +5,6 @@ describe('insert', () => { let connection; let db; - beforeAll(async () => { connection = await MongoClient.connect(uri, { useNewUrlParser: true, diff --git a/package.json b/package.json index c0dd3e9a..bc913c99 100644 --- a/package.json +++ b/package.json @@ -42,14 +42,15 @@ "uuid": "8.3.2" }, "devDependencies": { - "@shelf/eslint-config": "1.5.0", + "@shelf/eslint-config": "2.18.0", "@shelf/prettier-config": "1.0.0", - "eslint": "7.32.0", - "husky": "7.0.4", - "jest": "27.5.1", + "eslint": "8.16.0", + "husky": "8.0.1", + "jest": "28.1.0", "lint-staged": "12.4.3", - "mongodb": "4.2.2", - "prettier": "2.6.2" + "mongodb": "4.6.0", + "prettier": "2.6.2", + "typescript": "4.7.2" }, "peerDependencies": { "jest-environment-node": "27.x.x", diff --git a/setup.js b/setup.js index d7bb6a97..6bb2fb38 100644 --- a/setup.js +++ b/setup.js @@ -1,3 +1,4 @@ +/* eslint-disable multiline-ternary */ const fs = require('fs'); const {join} = require('path'); const {MongoMemoryServer, MongoMemoryReplSet} = require('mongodb-memory-server');