Patch Tuesday 🐸 (#17811)

* Update root deps * Update `directus` deps * Update `@directus/app` deps * Update usage of knex-mock-client * Update `@directus/shared` deps * Update `extensions-sdk` deps * Update `@directus/specs` deps * Update `@directus/storage` deps * Update `@directus/storage-driver-azure` deps * Update `@directus/storage-driver-cloudinary` deps * Update `@directus/storage-driver-gcs` deps * Update `@directus/storage-driver-local` deps * Update `@directus/storage-driver-s3` deps * Update `@directus/utils` deps --------- Co-authored-by: Rijk van Zanten <rijkvanzanten@me.com> Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
directus · Mar 17, 2023 · 0293c88 · 0293c88
1 parent 3a42410
commit 0293c88
Show file tree

Hide file tree

Showing 29 changed files with 2,208 additions and 2,089 deletions.
diff --git a/api/package.json b/api/package.json
@@ -74,7 +74,7 @@
 	},
 	"dependencies": {
 		"@authenio/samlify-node-xmllint": "2.0.0",
-		"@aws-sdk/client-ses": "3.271.0",
+		"@aws-sdk/client-ses": "3.292.0",
 		"@directus/app": "workspace:*",
 		"@directus/extensions-sdk": "workspace:*",
 		"@directus/format-title": "9.15.0",
@@ -93,7 +93,7 @@
 		"@rollup/plugin-virtual": "3.0.1",
 		"argon2": "0.30.3",
 		"async": "3.2.4",
-		"axios": "1.3.3",
+		"axios": "1.3.4",
 		"busboy": "1.6.0",
 		"bytes": "3.1.2",
 		"camelcase": "6.3.0",
@@ -110,7 +110,7 @@
 		"encodeurl": "1.0.2",
 		"eventemitter2": "6.4.9",
 		"execa": "5.1.1",
-		"exif-reader": "1.1.0",
+		"exif-reader": "1.2.0",
 		"express": "4.18.2",
 		"fast-redact": "3.1.2",
 		"flat": "5.0.2",
@@ -122,7 +122,7 @@
 		"icc": "2.0.0",
 		"inquirer": "8.2.5",
 		"ioredis": "5.3.1",
-		"joi": "17.7.1",
+		"joi": "17.8.4",
 		"js-yaml": "4.1.0",
 		"js2xmlparser": "5.0.0",
 		"json2csv": "5.0.7",
@@ -131,7 +131,7 @@
 		"knex": "2.4.2",
 		"knex-schema-inspector": "3.0.1",
 		"ldapjs": "2.3.3",
-		"liquidjs": "10.5.0",
+		"liquidjs": "10.6.1",
 		"lodash": "4.17.21",
 		"marked": "4.2.12",
 		"micromustache": "8.0.3",
@@ -142,19 +142,19 @@
 		"node-machine-id": "1.1.12",
 		"nodemailer": "6.9.1",
 		"object-hash": "3.0.0",
-		"openapi3-ts": "3.1.2",
+		"openapi3-ts": "3.2.0",
 		"openid-client": "5.4.0",
 		"ora": "5.4.1",
 		"otplib": "12.0.1",
-		"pino": "8.10.0",
+		"pino": "8.11.0",
 		"pino-http": "8.3.3",
 		"pino-http-print": "3.1.0",
-		"pino-pretty": "9.2.0",
-		"qs": "6.11.0",
+		"pino-pretty": "10.0.0",
+		"qs": "6.11.1",
 		"rate-limiter-flexible": "2.4.1",
-		"rollup": "3.15.0",
-		"samlify": "2.8.9",
-		"sanitize-html": "2.9.0",
+		"rollup": "3.19.1",
+		"samlify": "2.8.10",
+		"sanitize-html": "2.10.0",
 		"sharp": "0.31.3",
 		"snappy": "7.2.2",
 		"stream-json": "1.7.5",
@@ -168,7 +168,7 @@
 	},
 	"devDependencies": {
 		"@ngneat/falso": "6.4.0",
-		"@types/async": "3.2.17",
+		"@types/async": "3.2.18",
 		"@types/busboy": "1.5.0",
 		"@types/bytes": "3.1.1",
 		"@types/cookie-parser": "1.4.3",
@@ -192,35 +192,35 @@
 		"@types/marked": "4.0.8",
 		"@types/mime-types": "2.1.1",
 		"@types/ms": "0.7.31",
-		"@types/node": "18.13.0",
+		"@types/node": "18.15.3",
 		"@types/node-cron": "3.0.7",
 		"@types/nodemailer": "6.4.7",
 		"@types/object-hash": "3.0.2",
 		"@types/qs": "6.9.7",
-		"@types/sanitize-html": "2.8.0",
+		"@types/sanitize-html": "2.9.0",
 		"@types/sharp": "0.31.1",
 		"@types/stream-json": "1.7.3",
-		"@types/uuid": "9.0.0",
+		"@types/uuid": "9.0.1",
 		"@types/uuid-validate": "0.0.1",
 		"@types/wellknown": "0.5.4",
-		"@vitest/coverage-c8": "0.28.5",
+		"@vitest/coverage-c8": "0.29.3",
 		"copyfiles": "2.4.1",
 		"form-data": "4.0.0",
-		"knex-mock-client": "1.11.0",
+		"knex-mock-client": "2.0.0",
 		"ts-node": "10.9.1",
 		"ts-node-dev": "2.0.0",
 		"typescript": "4.9.5",
-		"vitest": "0.28.5"
+		"vitest": "0.29.3"
 	},
 	"optionalDependencies": {
-		"@keyv/redis": "2.5.5",
+		"@keyv/redis": "2.5.6",
 		"keyv-memcache": "1.3.3",
 		"memcached": "2.2.2",
 		"mysql": "2.18.1",
 		"nodemailer-mailgun-transport": "2.1.5",
 		"nodemailer-sendgrid": "1.0.3",
-		"pg": "8.9.0",
-		"sqlite3": "5.1.4",
+		"pg": "8.10.0",
+		"sqlite3": "5.1.6",
 		"tedious": "15.1.3"
 	},
 	"engines": {

diff --git a/api/src/database/migrations/run.test.ts b/api/src/database/migrations/run.test.ts
@@ -1,5 +1,5 @@
 import knex, { Knex } from 'knex';
-import { getTracker, MockClient, Tracker } from 'knex-mock-client';
+import { createTracker, MockClient, Tracker } from 'knex-mock-client';
 import run from './run';
 import { describe, beforeAll, afterEach, it, expect, MockedFunction, vi } from 'vitest';
 
@@ -9,7 +9,7 @@ describe('run', () => {
 
 	beforeAll(() => {
 		db = vi.mocked(knex({ client: MockClient }));
-		tracker = getTracker();
+		tracker = createTracker(db);
 	});
 
 	afterEach(() => {

diff --git a/api/src/services/fields.test.ts b/api/src/services/fields.test.ts
@@ -1,6 +1,6 @@
 import { Field } from '@directus/shared/types';
 import knex, { Knex } from 'knex';
-import { getTracker, MockClient, Tracker } from 'knex-mock-client';
+import { createTracker, MockClient, Tracker } from 'knex-mock-client';
 import { afterEach, beforeAll, beforeEach, describe, expect, it, MockedFunction, SpyInstance, vi } from 'vitest';
 import { FieldsService } from '.';
 import { InvalidPayloadException } from '../exceptions';
@@ -17,7 +17,7 @@ describe('Integration Tests', () => {
 
 	beforeAll(() => {
 		db = vi.mocked(knex({ client: MockClient }));
-		tracker = getTracker();
+		tracker = createTracker(db);
 	});
 
 	afterEach(() => {

diff --git a/api/src/services/files.test.ts b/api/src/services/files.test.ts
@@ -1,5 +1,5 @@
 import knex, { Knex } from 'knex';
-import { getTracker, MockClient, Tracker } from 'knex-mock-client';
+import { createTracker, MockClient, Tracker } from 'knex-mock-client';
 import { afterEach, beforeAll, beforeEach, describe, expect, it, MockedFunction, SpyInstance, vi } from 'vitest';
 import { FilesService, ItemsService } from '.';
 import { InvalidPayloadException } from '../exceptions';
@@ -10,7 +10,7 @@ describe('Integration Tests', () => {
 
 	beforeAll(() => {
 		db = vi.mocked(knex({ client: MockClient }));
-		tracker = getTracker();
+		tracker = createTracker(db);
 	});
 
 	afterEach(() => {

diff --git a/api/src/services/flows.test.ts b/api/src/services/flows.test.ts
@@ -1,5 +1,5 @@
 import knex, { Knex } from 'knex';
-import { getTracker, MockClient, Tracker } from 'knex-mock-client';
+import { createTracker, MockClient, Tracker } from 'knex-mock-client';
 import { afterEach, beforeAll, beforeEach, describe, expect, it, SpyInstance, vi } from 'vitest';
 import { FlowsService } from '.';
 import { getFlowManager } from '../flows';
@@ -18,7 +18,7 @@ describe('Integration Tests', () => {
 
 	beforeAll(async () => {
 		db = knex({ client: MockClient });
-		tracker = getTracker();
+		tracker = createTracker(db);
 	});
 
 	beforeEach(() => {

diff --git a/api/src/services/import-export.test.ts b/api/src/services/import-export.test.ts
@@ -1,6 +1,6 @@
 import { parse } from 'json2csv';
 import knex, { Knex } from 'knex';
-import { getTracker, MockClient, Tracker } from 'knex-mock-client';
+import { createTracker, MockClient, Tracker } from 'knex-mock-client';
 import { EOL } from 'node:os';
 import { Readable } from 'stream';
 import { afterEach, beforeAll, beforeEach, describe, expect, it, MockedFunction, vi } from 'vitest';
@@ -19,7 +19,7 @@ describe('Integration Tests', () => {
 
 	beforeAll(async () => {
 		db = vi.mocked(knex({ client: MockClient }));
-		tracker = getTracker();
+		tracker = createTracker(db);
 	});
 
 	afterEach(() => {

diff --git a/api/src/services/items.test.ts b/api/src/services/items.test.ts
@@ -1,6 +1,6 @@
 import { NestedDeepQuery } from '@directus/shared/types';
 import knex, { Knex } from 'knex';
-import { getTracker, MockClient, Tracker } from 'knex-mock-client';
+import { createTracker, MockClient, Tracker } from 'knex-mock-client';
 import { cloneDeep } from 'lodash';
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi, MockedFunction } from 'vitest';
 import { ItemsService } from '../../src/services';
@@ -48,7 +48,7 @@ describe('Integration Tests', () => {
 
 	beforeAll(() => {
 		db = vi.mocked(knex({ client: MockClient }));
-		tracker = getTracker();
+		tracker = createTracker(db);
 	});
 
 	beforeEach(() => {

diff --git a/api/src/services/operations.test.ts b/api/src/services/operations.test.ts
@@ -1,5 +1,5 @@
 import knex, { Knex } from 'knex';
-import { getTracker, MockClient, Tracker } from 'knex-mock-client';
+import { createTracker, MockClient, Tracker } from 'knex-mock-client';
 import { afterEach, beforeAll, beforeEach, describe, expect, it, SpyInstance, vi } from 'vitest';
 import { OperationsService } from '.';
 import { getFlowManager } from '../flows';
@@ -18,7 +18,7 @@ describe('Integration Tests', () => {
 
 	beforeAll(async () => {
 		db = knex({ client: MockClient });
-		tracker = getTracker();
+		tracker = createTracker(db);
 	});
 
 	beforeEach(() => {

diff --git a/api/src/services/payload.test.ts b/api/src/services/payload.test.ts
@@ -1,5 +1,5 @@
 import knex, { Knex } from 'knex';
-import { MockClient, Tracker, getTracker } from 'knex-mock-client';
+import { MockClient, Tracker, createTracker } from 'knex-mock-client';
 import { PayloadService } from '../../src/services';
 import { getHelpers, Helpers } from '../../src/database/helpers';
 import { describe, beforeAll, afterEach, it, expect, vi, beforeEach, MockedFunction } from 'vitest';
@@ -14,7 +14,7 @@ describe('Integration Tests', () => {
 
 	beforeAll(async () => {
 		db = vi.mocked(knex({ client: MockClient }));
-		tracker = getTracker();
+		tracker = createTracker(db);
 	});
 
 	afterEach(() => {

diff --git a/api/src/services/permissions.test.ts b/api/src/services/permissions.test.ts
@@ -1,5 +1,5 @@
 import knex, { Knex } from 'knex';
-import { getTracker, MockClient, Tracker } from 'knex-mock-client';
+import { createTracker, MockClient, Tracker } from 'knex-mock-client';
 import { afterEach, beforeAll, beforeEach, describe, expect, it, SpyInstance, vi } from 'vitest';
 import { ItemsService, PermissionsService } from '.';
 import * as cache from '../cache';
@@ -14,7 +14,7 @@ describe('Integration Tests', () => {
 
 	beforeAll(async () => {
 		db = knex({ client: MockClient });
-		tracker = getTracker();
+		tracker = createTracker(db);
 	});
 
 	beforeEach(() => {

diff --git a/api/src/services/roles.test.ts b/api/src/services/roles.test.ts
@@ -1,5 +1,5 @@
 import knex, { Knex } from 'knex';
-import { getTracker, MockClient, Tracker } from 'knex-mock-client';
+import { createTracker, MockClient, Tracker } from 'knex-mock-client';
 import { afterEach, beforeAll, beforeEach, describe, expect, it, MockedFunction, SpyInstance, vi } from 'vitest';
 import { ItemsService, PermissionsService, PresetsService, RolesService, UsersService } from '.';
 import { ForbiddenException, UnprocessableEntityException } from '../exceptions';
@@ -45,7 +45,7 @@ describe('Integration Tests', () => {
 
 	beforeAll(async () => {
 		db = vi.mocked(knex({ client: MockClient }));
-		tracker = getTracker();
+		tracker = createTracker(db);
 	});
 
 	beforeEach(() => {

diff --git a/api/src/services/schema.test.ts b/api/src/services/schema.test.ts
@@ -1,6 +1,6 @@
 import { Diff } from 'deep-diff';
 import knex, { Knex } from 'knex';
-import { getTracker, MockClient, Tracker } from 'knex-mock-client';
+import { createTracker, MockClient, Tracker } from 'knex-mock-client';
 import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
 import { SchemaService } from '.';
 import { ForbiddenException } from '..';
@@ -63,7 +63,7 @@ const testCollectionDiff = {
 
 beforeAll(() => {
 	db = knex({ client: Client_PG });
-	tracker = getTracker();
+	tracker = createTracker(db);
 });
 
 afterEach(() => {

diff --git a/api/src/services/specifications.test.ts b/api/src/services/specifications.test.ts
@@ -1,5 +1,5 @@
 import knex, { Knex } from 'knex';
-import { getTracker, MockClient, Tracker } from 'knex-mock-client';
+import { createTracker, MockClient, Tracker } from 'knex-mock-client';
 import { afterEach, beforeAll, beforeEach, describe, expect, it, MockedFunction, vi } from 'vitest';
 import { CollectionsService, FieldsService, RelationsService, SpecificationService } from '../../src/services';
 import { Collection } from '../types';
@@ -12,7 +12,7 @@ describe('Integration Tests', () => {
 
 	beforeAll(async () => {
 		db = vi.mocked(knex({ client: Client_PG }));
-		tracker = getTracker();
+		tracker = createTracker(db);
 	});
 
 	afterEach(() => {

diff --git a/api/src/services/users.test.ts b/api/src/services/users.test.ts
@@ -1,6 +1,6 @@
 import { SchemaOverview } from '@directus/shared/types';
 import knex, { Knex } from 'knex';
-import { getTracker, MockClient, Tracker } from 'knex-mock-client';
+import { createTracker, MockClient, Tracker } from 'knex-mock-client';
 import { afterEach, beforeAll, beforeEach, describe, expect, it, MockedFunction, SpyInstance, vi } from 'vitest';
 import { ItemsService, UsersService } from '.';
 import { ForbiddenException, InvalidPayloadException } from '../exceptions';
@@ -49,7 +49,7 @@ describe('Integration Tests', () => {
 
 	beforeAll(async () => {
 		db = vi.mocked(knex({ client: MockClient }));
-		tracker = getTracker();
+		tracker = createTracker(db);
 	});
 
 	beforeEach(() => {

diff --git a/api/src/services/webhooks.test.ts b/api/src/services/webhooks.test.ts
@@ -1,5 +1,5 @@
 import knex, { Knex } from 'knex';
-import { getTracker, MockClient, Tracker } from 'knex-mock-client';
+import { createTracker, MockClient, Tracker } from 'knex-mock-client';
 import { afterEach, beforeAll, beforeEach, describe, expect, it, SpyInstance, vi } from 'vitest';
 import { WebhooksService } from '.';
 import { getMessenger } from '../messenger';
@@ -18,7 +18,7 @@ describe('Integration Tests', () => {
 
 	beforeAll(async () => {
 		db = knex({ client: MockClient });
-		tracker = getTracker();
+		tracker = createTracker(db);
 	});
 
 	beforeEach(() => {

diff --git a/api/src/utils/apply-snapshot.test.ts b/api/src/utils/apply-snapshot.test.ts
@@ -1,5 +1,5 @@
 import knex, { Knex } from 'knex';
-import { getTracker, MockClient, Tracker } from 'knex-mock-client';
+import { createTracker, MockClient, Tracker } from 'knex-mock-client';
 import { snapshotApplyTestSchema } from '../__utils__/schemas';
 
 import { CollectionsService, FieldsService } from '../services';
@@ -27,7 +27,7 @@ describe('applySnapshot', () => {
 
 	beforeEach(() => {
 		db = vi.mocked(knex({ client: Client_PG }));
-		tracker = getTracker();
+		tracker = createTracker(db);
 	});
 
 	afterEach(() => {