diff --git a/.eslintrc.js b/.eslintrc.js index fb5cdea316180704431b8f086a3e3d6deec53ac6..b05529210baa4e2e3606a753cd9cb709eba1c508 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,7 +1,7 @@ module.exports = { parser: '@typescript-eslint/parser', parserOptions: { - project: 'tsconfig.json', + project: true, sourceType: 'module', }, plugins: ['@typescript-eslint/eslint-plugin'], diff --git a/jest.config.ts b/jest.config.ts new file mode 100644 index 0000000000000000000000000000000000000000..fc6c88bd385d7dc8e88260d1ce69a71939d06eb7 --- /dev/null +++ b/jest.config.ts @@ -0,0 +1,14 @@ +import type { Config } from 'jest'; + +const config: Config = { + moduleFileExtensions: ['ts', 'tsx', 'js', 'json'], + transform: { + '^.+\\.tsx?$': 'ts-jest', + }, + testRegex: '/src/.*\\.(test|spec).(ts|tsx|js)$', + collectCoverageFrom: ['src/**/*.{js,jsx,tsx,ts}', '!**/node_modules/**', '!**/vendor/**'], + + reporters: ['default', 'jest-junit'], +}; + +export default config; diff --git a/jest.json b/jest.json deleted file mode 100644 index 926503bf999c576622249de07afb7bccd8f377db..0000000000000000000000000000000000000000 --- a/jest.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "moduleFileExtensions": ["ts", "tsx", "js", "json"], - "transform": { - "^.+\\.tsx?$": "ts-jest" - }, - "testRegex": "/src/.*\\.(test|spec).(ts|tsx|js)$", - "collectCoverageFrom": ["src/**/*.{js,jsx,tsx,ts}", "!**/node_modules/**", "!**/vendor/**"], - "coverageReporters": ["json", "lcov"], - - "reporters": ["default", "jest-junit"] -} diff --git a/package.json b/package.json index 82636caa3ec62c97297eda876db71a50928d3e6d..1b38ea2ae1198bd75b8f6497360e4849247e4896 100644 --- a/package.json +++ b/package.json @@ -20,12 +20,12 @@ "release": "standard-version", "start:debug": "nodemon --config nodemon-debug.json", "start:dev": "nodemon", - "test": "jest --runInBand --config ./jest.json", "start:prod": "npm run migrate:up && node dist/src/main", - "test:cov": "jest --config ./jest.json --coverage --ci --reporters=default --reporters=jest-junit", - "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand", + "test": "jest --runInBand --config ./jest.config.ts", + "test:cov": "jest --config ./jest.config.ts --coverage --ci --reporters=default --reporters=jest-junit", + "test:debug": "node --config ./jest.config.ts --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand", "test:e2e": "jest --config ./test/jest-e2e.json", - "test:watch": "jest --config ./jest.json --watch --coverage" + "test:watch": "jest --config ./jest.config.ts --watch --coverage" }, "dependencies": { "@elastic/elasticsearch": "~8.5.0", @@ -91,22 +91,5 @@ "ts-node": "^10.9.1", "tsconfig-paths": "^3.9.0", "typescript": "^4.2.4" - }, - "jest": { - "moduleFileExtensions": [ - "js", - "json", - "ts" - ], - "rootDir": "src", - "testRegex": ".*\\.spec\\.ts$", - "transform": { - "^.+\\.(t|j)s$": "ts-jest" - }, - "collectCoverageFrom": [ - "**/*.(t|j)s" - ], - "coverageDirectory": "../coverage", - "testEnvironment": "node" } }