From 2a1272ec67f17cd3f46e8c1adeaa0c4804ed294d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 16:58:08 +0000 Subject: [PATCH 1/9] build(deps): bump @elastic/elasticsearch from 8.13.1 to 8.15.0 Bumps [@elastic/elasticsearch](https://github.com/elastic/elasticsearch-js) from 8.13.1 to 8.15.0. - [Release notes](https://github.com/elastic/elasticsearch-js/releases) - [Changelog](https://github.com/elastic/elasticsearch-js/blob/main/docs/changelog.asciidoc) - [Commits](https://github.com/elastic/elasticsearch-js/compare/v8.13.1...v8.15.0) --- updated-dependencies: - dependency-name: "@elastic/elasticsearch" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9b6d811d4..c4fc23023 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1129,11 +1129,11 @@ } }, "node_modules/@elastic/elasticsearch": { - "version": "8.13.1", - "resolved": "https://registry.npmjs.org/@elastic/elasticsearch/-/elasticsearch-8.13.1.tgz", - "integrity": "sha512-2G4Vu6OHw4+XTrp7AGIcOEezpPEoVrWg2JTK1v/exEKSLYquZkUdd+m4yOL3/UZ6bTj7hmXwrmYzW76BnLCkJQ==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/@elastic/elasticsearch/-/elasticsearch-8.15.0.tgz", + "integrity": "sha512-mG90EMdTDoT6GFSdqpUAhWK9LGuiJo6tOWqs0Usd/t15mPQDj7ZqHXfCBqNkASZpwPZpbAYVjd57S6nbUBINCg==", "dependencies": { - "@elastic/transport": "~8.4.1", + "@elastic/transport": "^8.7.0", "tslib": "^2.4.0" }, "engines": { @@ -1141,19 +1141,20 @@ } }, "node_modules/@elastic/transport": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/@elastic/transport/-/transport-8.4.1.tgz", - "integrity": "sha512-/SXVuVnuU5b4dq8OFY4izG+dmGla185PcoqgK6+AJMpmOeY1QYVNbWtCwvSvoAANN5D/wV+EBU8+x7Vf9EphbA==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/@elastic/transport/-/transport-8.7.0.tgz", + "integrity": "sha512-IqXT7a8DZPJtqP2qmX1I2QKmxYyN27kvSW4g6pInESE1SuGwZDp2FxHJ6W2kwmYOJwQdAt+2aWwzXO5jHo9l4A==", "dependencies": { + "@opentelemetry/api": "1.x", "debug": "^4.3.4", "hpagent": "^1.0.0", "ms": "^2.1.3", "secure-json-parse": "^2.4.0", "tslib": "^2.4.0", - "undici": "^5.22.1" + "undici": "^6.12.0" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@elastic/transport/node_modules/ms": { @@ -1255,14 +1256,6 @@ "npm": ">=6.14.13" } }, - "node_modules/@fastify/busboy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.0.tgz", - "integrity": "sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==", - "engines": { - "node": ">=14" - } - }, "node_modules/@hapi/hoek": { "version": "9.3.0", "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", @@ -2598,6 +2591,14 @@ "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==", "optional": true }, + "node_modules/@opentelemetry/api": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz", + "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==", + "engines": { + "node": ">=8.0.0" + } + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -13473,14 +13474,11 @@ } }, "node_modules/undici": { - "version": "5.28.4", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.4.tgz", - "integrity": "sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==", - "dependencies": { - "@fastify/busboy": "^2.0.0" - }, + "version": "6.19.7", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.7.tgz", + "integrity": "sha512-HR3W/bMGPSr90i8AAp2C4DM3wChFdJPLrWYpIS++LxS8K+W535qftjt+4MyjNYHeWabMj1nvtmLIi7l++iq91A==", "engines": { - "node": ">=14.0" + "node": ">=18.17" } }, "node_modules/undici-types": { From 9000ad176dbc51b010aead294c4e381cbcd722c3 Mon Sep 17 00:00:00 2001 From: junjiequan Date: Tue, 27 Aug 2024 15:58:21 +0200 Subject: [PATCH 2/9] chore: Update @elastic/elasticsearch dependency to version 8.15.0 --- package-lock.json | 2 +- package.json | 2 +- src/elastic-search/elastic-search.service.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index c4fc23023..6105a1db3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "BSD-3-Clause", "dependencies": { "@casl/ability": "^6.3.2", - "@elastic/elasticsearch": "^8.9.0", + "@elastic/elasticsearch": "^8.15.0", "@nestjs-modules/mailer": "^2.0.2", "@nestjs/axios": "^3.0.0", "@nestjs/common": "^10.3.8", diff --git a/package.json b/package.json index 8bbe9c638..2ca16fd70 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "@casl/ability": "^6.3.2", - "@elastic/elasticsearch": "^8.9.0", + "@elastic/elasticsearch": "^8.15.0", "@nestjs-modules/mailer": "^2.0.2", "@nestjs/axios": "^3.0.0", "@nestjs/common": "^10.3.8", diff --git a/src/elastic-search/elastic-search.service.ts b/src/elastic-search/elastic-search.service.ts index 12a02353f..36d6bb44b 100644 --- a/src/elastic-search/elastic-search.service.ts +++ b/src/elastic-search/elastic-search.service.ts @@ -262,7 +262,7 @@ export class ElasticSearchService implements OnModuleInit { limit = 20, skip = 0, sort?: Record, - ): Promise<{ totalCount: number; data: string[] }> { + ): Promise<{ totalCount: number; data: (string | undefined)[] }> { const defaultMinScore = searchParam.text ? 1 : 0; try { From cb48b70179fa0058b6587c34f69f4102460022e0 Mon Sep 17 00:00:00 2001 From: junjiequan Date: Fri, 30 Aug 2024 12:22:30 +0200 Subject: [PATCH 3/9] fix for readableStream error --- package.json | 3 +++ test/config/jest.setup.js | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 test/config/jest.setup.js diff --git a/package.json b/package.json index 2ca16fd70..9793fb573 100644 --- a/package.json +++ b/package.json @@ -118,6 +118,9 @@ "wait-on": "^8.0.0" }, "jest": { + "setupFilesAfterEnv": [ + "./test/config/jest.setup.js" + ], "moduleFileExtensions": [ "js", "json", diff --git a/test/config/jest.setup.js b/test/config/jest.setup.js new file mode 100644 index 000000000..009d18510 --- /dev/null +++ b/test/config/jest.setup.js @@ -0,0 +1,2 @@ +import { ReadableStream } from "node:stream/web"; +this.global.ReadableStream = ReadableStream; From 9e126ee84e58e4d8488518e56e1abe4b53df6c68 Mon Sep 17 00:00:00 2001 From: junjiequan Date: Fri, 30 Aug 2024 12:24:26 +0200 Subject: [PATCH 4/9] update jest setup file path in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9793fb573..748681b4c 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ }, "jest": { "setupFilesAfterEnv": [ - "./test/config/jest.setup.js" + "../test/config/jest.setup.js" ], "moduleFileExtensions": [ "js", From 1e90192307d6ca04daf62c75f8842c417a1c0ad8 Mon Sep 17 00:00:00 2001 From: junjiequan Date: Fri, 30 Aug 2024 12:26:06 +0200 Subject: [PATCH 5/9] Fix global assignment of ReadableStream in jest setup file --- test/config/jest.setup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/config/jest.setup.js b/test/config/jest.setup.js index 009d18510..bcaae7d16 100644 --- a/test/config/jest.setup.js +++ b/test/config/jest.setup.js @@ -1,2 +1,2 @@ import { ReadableStream } from "node:stream/web"; -this.global.ReadableStream = ReadableStream; +global.ReadableStream = ReadableStream; From 4b7e34b82df3c8b087a761a960c7a8b07ecd1c3b Mon Sep 17 00:00:00 2001 From: junjiequan Date: Fri, 30 Aug 2024 12:30:23 +0200 Subject: [PATCH 6/9] update jest-e2e.json configuration --- test/config/jest-e2e.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/config/jest-e2e.json b/test/config/jest-e2e.json index cf83246b2..45a2bf8e0 100644 --- a/test/config/jest-e2e.json +++ b/test/config/jest-e2e.json @@ -1,4 +1,5 @@ { + "setupFilesAfterEnv": ["jest.setup.js"], "moduleFileExtensions": ["js", "json", "ts"], "rootDir": "../../", "testTimeout": 30000, @@ -16,5 +17,4 @@ "isolatedModules": true } } - } From 717b3ce46deee1224d9d9f15ccb61d5dce5c386c Mon Sep 17 00:00:00 2001 From: junjiequan Date: Fri, 30 Aug 2024 12:33:01 +0200 Subject: [PATCH 7/9] update jest-e2e.json configuration --- test/config/jest-e2e.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/config/jest-e2e.json b/test/config/jest-e2e.json index 45a2bf8e0..f4b781d49 100644 --- a/test/config/jest-e2e.json +++ b/test/config/jest-e2e.json @@ -1,5 +1,5 @@ { - "setupFilesAfterEnv": ["jest.setup.js"], + "setupFilesAfterEnv": ["test/config/jest.setup.js"], "moduleFileExtensions": ["js", "json", "ts"], "rootDir": "../../", "testTimeout": 30000, From 5c3bcd80ad38583441b053814770da553efeaeb6 Mon Sep 17 00:00:00 2001 From: junjiequan Date: Fri, 30 Aug 2024 12:34:50 +0200 Subject: [PATCH 8/9] update jest-e2e.json setupFilesAfterEnv path --- test/config/jest-e2e.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/config/jest-e2e.json b/test/config/jest-e2e.json index f4b781d49..0fb0cd924 100644 --- a/test/config/jest-e2e.json +++ b/test/config/jest-e2e.json @@ -1,5 +1,5 @@ { - "setupFilesAfterEnv": ["test/config/jest.setup.js"], + "setupFilesAfterEnv": ["./test/config/jest.setup.js"], "moduleFileExtensions": ["js", "json", "ts"], "rootDir": "../../", "testTimeout": 30000, From a7558f4955d07a170c4e1af4aca48ab58f3c742b Mon Sep 17 00:00:00 2001 From: junjiequan Date: Fri, 30 Aug 2024 12:39:36 +0200 Subject: [PATCH 9/9] Fix global assignment of ReadableStream in jest setup file --- test/config/jest.setup.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/config/jest.setup.js b/test/config/jest.setup.js index bcaae7d16..a861b3a8c 100644 --- a/test/config/jest.setup.js +++ b/test/config/jest.setup.js @@ -1,2 +1,2 @@ -import { ReadableStream } from "node:stream/web"; -global.ReadableStream = ReadableStream; +/* eslint-disable @typescript-eslint/no-var-requires */ +global.ReadableStream = require("node:stream/web").ReadableStream;