Skip to content

Commit

Permalink
Patch Tuesday 🐸 (#17530)
Browse files Browse the repository at this point in the history
* Update root deps

* Reformat files with new prettier version

* Update `directus` deps

* Update `@directus/app` deps

* Update `@directus/shared` deps

* Update components snapshots after updates

prop order has changed

* Update `extensions-sdk` deps

* pin version of zod in shared

* Update `@directus/storage` deps

* Update `@directus/storage-driver-azure` deps

* Update `storage-driver-cloudinary` deps

* Update `@directus/storage-driver-cloudinary` 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>
  • Loading branch information
paescuj and rijkvanzanten committed Feb 16, 2023
1 parent 89fbac3 commit 37faf3b
Show file tree
Hide file tree
Showing 66 changed files with 1,992 additions and 1,927 deletions.
42 changes: 21 additions & 21 deletions api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
},
"dependencies": {
"@authenio/samlify-node-xmllint": "2.0.0",
"@aws-sdk/client-ses": "3.261.0",
"@aws-sdk/client-ses": "3.271.0",
"@directus/app": "workspace:*",
"@directus/extensions-sdk": "workspace:*",
"@directus/format-title": "9.15.0",
Expand All @@ -94,7 +94,7 @@
"argon2": "0.30.3",
"async": "3.2.4",
"async-mutex": "0.4.0",
"axios": "1.3.0",
"axios": "1.3.3",
"busboy": "1.6.0",
"bytes": "3.1.2",
"camelcase": "6.3.0",
Expand Down Expand Up @@ -122,8 +122,8 @@
"helmet": "6.0.1",
"icc": "2.0.0",
"inquirer": "8.2.5",
"ioredis": "5.3.0",
"joi": "17.7.0",
"ioredis": "5.3.1",
"joi": "17.7.1",
"js-yaml": "4.1.0",
"js2xmlparser": "5.0.0",
"json2csv": "5.0.7",
Expand All @@ -132,7 +132,7 @@
"knex": "2.4.2",
"knex-schema-inspector": "3.0.1",
"ldapjs": "2.3.3",
"liquidjs": "10.4.0",
"liquidjs": "10.5.0",
"lodash": "4.17.21",
"marked": "4.2.12",
"micromustache": "8.0.3",
Expand All @@ -144,18 +144,18 @@
"nodemailer": "6.9.1",
"object-hash": "3.0.0",
"openapi3-ts": "3.1.2",
"openid-client": "5.3.2",
"openid-client": "5.4.0",
"ora": "5.4.1",
"otplib": "12.0.1",
"pino": "8.8.0",
"pino-http": "8.3.2",
"pino": "8.10.0",
"pino-http": "8.3.3",
"pino-http-print": "3.1.0",
"pino-pretty": "9.1.1",
"pino-pretty": "9.2.0",
"qs": "6.11.0",
"rate-limiter-flexible": "2.4.1",
"rollup": "3.12.0",
"samlify": "2.8.8",
"sanitize-html": "2.8.1",
"rollup": "3.15.0",
"samlify": "2.8.9",
"sanitize-html": "2.9.0",
"sharp": "0.31.3",
"snappy": "7.2.2",
"stream-json": "1.7.5",
Expand All @@ -164,12 +164,12 @@
"update-check": "1.5.4",
"uuid": "9.0.0",
"uuid-validate": "0.0.3",
"vm2": "3.9.13",
"vm2": "3.9.14",
"wellknown": "0.5.0"
},
"devDependencies": {
"@ngneat/falso": "6.4.0",
"@types/async": "3.2.16",
"@types/async": "3.2.17",
"@types/busboy": "1.5.0",
"@types/bytes": "3.1.1",
"@types/cookie-parser": "1.4.3",
Expand All @@ -178,12 +178,12 @@
"@types/destroy": "1.0.0",
"@types/encodeurl": "1.0.0",
"@types/exif-reader": "1.0.0",
"@types/express": "4.17.16",
"@types/express": "4.17.17",
"@types/express-serve-static-core": "4.17.33",
"@types/fast-redact": "3.0.2",
"@types/flat": "5.0.2",
"@types/fs-extra": "11.0.1",
"@types/inquirer": "8.2.5",
"@types/inquirer": "8.2.6",
"@types/js-yaml": "4.0.5",
"@types/json2csv": "5.0.3",
"@types/jsonwebtoken": "9.0.1",
Expand All @@ -193,7 +193,7 @@
"@types/marked": "4.0.8",
"@types/mime-types": "2.1.1",
"@types/ms": "0.7.31",
"@types/node": "18.11.18",
"@types/node": "18.13.0",
"@types/node-cron": "3.0.7",
"@types/nodemailer": "6.4.7",
"@types/object-hash": "3.0.2",
Expand All @@ -204,25 +204,25 @@
"@types/uuid": "9.0.0",
"@types/uuid-validate": "0.0.1",
"@types/wellknown": "0.5.4",
"@vitest/coverage-c8": "0.28.3",
"@vitest/coverage-c8": "0.28.5",
"copyfiles": "2.4.1",
"form-data": "4.0.0",
"knex-mock-client": "1.11.0",
"ts-node": "10.9.1",
"ts-node-dev": "2.0.0",
"typescript": "4.9.5",
"vitest": "0.28.3"
"vitest": "0.28.5"
},
"optionalDependencies": {
"@keyv/redis": "2.5.4",
"@keyv/redis": "2.5.5",
"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",
"tedious": "15.1.2"
"tedious": "15.1.3"
},
"engines": {
"node": ">=12.20.0"
Expand Down
2 changes: 1 addition & 1 deletion api/src/database/helpers/schema/dialects/cockroachdb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export class SchemaHelperCockroachDb extends SchemaHelper {
async changeToType(
table: string,
column: string,
type: typeof KNEX_TYPES[number],
type: (typeof KNEX_TYPES)[number],
options: Options = {}
): Promise<void> {
await this.changeToTypeByCopy(table, column, type, options);
Expand Down
2 changes: 1 addition & 1 deletion api/src/database/helpers/schema/dialects/oracle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export class SchemaHelperOracle extends SchemaHelper {
async changeToType(
table: string,
column: string,
type: typeof KNEX_TYPES[number],
type: (typeof KNEX_TYPES)[number],
options: Options = {}
): Promise<void> {
await this.changeToTypeByCopy(table, column, type, options);
Expand Down
4 changes: 2 additions & 2 deletions api/src/database/helpers/schema/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export abstract class SchemaHelper extends DatabaseHelper {
async changeToType(
table: string,
column: string,
type: typeof KNEX_TYPES[number],
type: (typeof KNEX_TYPES)[number],
options: Options = {}
): Promise<void> {
await this.knex.schema.alterTable(table, (builder) => {
Expand All @@ -50,7 +50,7 @@ export abstract class SchemaHelper extends DatabaseHelper {
protected async changeToTypeByCopy(
table: string,
column: string,
type: typeof KNEX_TYPES[number],
type: (typeof KNEX_TYPES)[number],
options: Options
): Promise<void> {
const tempName = `${column}__temp`;
Expand Down
4 changes: 2 additions & 2 deletions api/src/services/fields.ts
Original file line number Diff line number Diff line change
Expand Up @@ -670,8 +670,8 @@ export class FieldsService {
column = table.timestamp(field.field, { useTz: true });
} else if (field.type.startsWith('geometry')) {
column = this.helpers.st.createColumn(table, field);
} else if (KNEX_TYPES.includes(field.type as typeof KNEX_TYPES[number])) {
column = table[field.type as typeof KNEX_TYPES[number]](field.field);
} else if (KNEX_TYPES.includes(field.type as (typeof KNEX_TYPES)[number])) {
column = table[field.type as (typeof KNEX_TYPES)[number]](field.field);
} else {
throw new InvalidPayloadException(`Illegal type passed: "${field.type}"`);
}
Expand Down
2 changes: 1 addition & 1 deletion api/src/types/assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const TransformationMethods /*: readonly (keyof Sharp)[]*/ = [
] as const;

// Helper types
type AllowedSharpMethods = Pick<Sharp, typeof TransformationMethods[number]>;
type AllowedSharpMethods = Pick<Sharp, (typeof TransformationMethods)[number]>;

export type TransformationMap = {
[M in keyof AllowedSharpMethods]: readonly [M, ...Parameters<AllowedSharpMethods[M]>];
Expand Down
2 changes: 1 addition & 1 deletion api/src/types/database.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export type Driver = 'mysql' | 'pg' | 'cockroachdb' | 'sqlite3' | 'oracledb' | 'mssql';

export const DatabaseClients = ['mysql', 'postgres', 'cockroachdb', 'sqlite', 'oracle', 'mssql', 'redshift'] as const;
export type DatabaseClient = typeof DatabaseClients[number];
export type DatabaseClient = (typeof DatabaseClients)[number];
48 changes: 24 additions & 24 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@
"@directus/extensions-sdk": "workspace:*",
"@directus/format-title": "10.0.0",
"@directus/shared": "workspace:*",
"@fortawesome/fontawesome-svg-core": "6.2.1",
"@fortawesome/free-brands-svg-icons": "6.2.1",
"@fullcalendar/core": "6.1.1",
"@fullcalendar/daygrid": "6.1.1",
"@fullcalendar/interaction": "6.1.1",
"@fullcalendar/list": "6.1.1",
"@fullcalendar/timegrid": "6.1.1",
"@fortawesome/fontawesome-svg-core": "6.3.0",
"@fortawesome/free-brands-svg-icons": "6.3.0",
"@fullcalendar/core": "6.1.4",
"@fullcalendar/daygrid": "6.1.4",
"@fullcalendar/interaction": "6.1.4",
"@fullcalendar/list": "6.1.4",
"@fullcalendar/timegrid": "6.1.4",
"@joeattardi/emoji-button": "4.6.4",
"@mapbox/mapbox-gl-draw": "1.4.0",
"@mapbox/mapbox-gl-draw": "1.4.1",
"@mapbox/mapbox-gl-draw-static-mode": "1.0.1",
"@mapbox/mapbox-gl-geocoder": "5.0.1",
"@pinia/testing": "0.0.14",
Expand All @@ -56,7 +56,7 @@
"@storybook/addon-links": "6.5.16",
"@storybook/addon-measure": "6.5.16",
"@storybook/addon-outline": "6.5.16",
"@storybook/builder-vite": "0.3.0",
"@storybook/builder-vite": "0.4.2",
"@storybook/client-api": "6.5.16",
"@storybook/client-logger": "6.5.16",
"@storybook/vue3": "6.5.16",
Expand All @@ -79,10 +79,10 @@
"@types/qrcode": "1.5.0",
"@types/wellknown": "0.5.4",
"@vitejs/plugin-vue": "4.0.0",
"@vue/compiler-sfc": "3.2.45",
"@vue/test-utils": "2.2.8",
"apexcharts": "3.36.3",
"axios": "1.3.0",
"@vue/compiler-sfc": "3.2.47",
"@vue/test-utils": "2.2.10",
"apexcharts": "3.37.0",
"axios": "1.3.3",
"babel-loader": "9",
"base-64": "1.0.0",
"c8": "7.12.0",
Expand All @@ -93,14 +93,14 @@
"date-fns": "2.29.3",
"diacritics": "1.3.0",
"diff": "5.1.0",
"dompurify": "2.4.3",
"dompurify": "3.0.0",
"escape-string-regexp": "5.0.0",
"file-saver": "2.0.5",
"flatpickr": "4.6.13",
"geojson": "0.5.0",
"happy-dom": "8.2.2",
"happy-dom": "8.4.0",
"html-entities": "2.3.3",
"json-to-graphql-query": "2.2.4",
"json-to-graphql-query": "2.2.5",
"json2csv": "5.0.7",
"jsonlint-mod": "1.7.6",
"lodash": "4.17.21",
Expand All @@ -110,20 +110,20 @@
"micromustache": "8.0.3",
"mime": "3.0.0",
"mitt": "3.0.0",
"nanoid": "4.0.0",
"p-queue": "7.3.0",
"pinia": "2.0.29",
"pretty-bytes": "6.0.0",
"nanoid": "4.0.1",
"p-queue": "7.3.4",
"pinia": "2.0.30",
"pretty-bytes": "6.1.0",
"pretty-ms": "8.0.0",
"qrcode": "1.5.1",
"react": "18",
"react-dom": "18",
"sass": "1.57.1",
"sass": "1.58.1",
"tinymce": "5.10.7",
"typescript": "4.9.5",
"vite": "4.0.4",
"vitest": "0.28.3",
"vue": "3.2.45",
"vite": "4.1.1",
"vitest": "0.28.5",
"vue": "3.2.47",
"vue-i18n": "9.2.2",
"vue-router": "4.1.6",
"vuedraggable": "4.1.0",
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/__snapshots__/v-avatar.test.ts.snap
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Vitest Snapshot v1

exports[`Mount component 1`] = `"<div class=\\"v-avatar\\" data-v-8dd7c482=\\"\\">Slot Content</div>"`;
exports[`Mount component 1`] = `"<div data-v-8dd7c482=\\"\\" class=\\"v-avatar\\">Slot Content</div>"`;
2 changes: 1 addition & 1 deletion app/src/components/__snapshots__/v-badge.test.ts.snap
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Vitest Snapshot v1

exports[`Mount component 1`] = `"<div class=\\"v-badge\\" data-v-a39517a7=\\"\\"><span class=\\"badge\\" data-v-a39517a7=\\"\\"><span data-v-a39517a7=\\"\\"></span></span>Slot Content</div>"`;
exports[`Mount component 1`] = `"<div data-v-a39517a7=\\"\\" class=\\"v-badge\\"><span data-v-a39517a7=\\"\\" class=\\"badge\\"><span data-v-a39517a7=\\"\\"></span></span>Slot Content</div>"`;
2 changes: 1 addition & 1 deletion app/src/components/__snapshots__/v-breadcrumb.test.ts.snap
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Vitest Snapshot v1

exports[`Mount component 1`] = `"<span class=\\"v-breadcrumb\\" data-v-273d8978=\\"\\"><span class=\\"section\\" data-v-273d8978=\\"\\"><!--v-if--><router-link-stub to=\\"hi\\" class=\\"section-link\\" data-v-273d8978=\\"\\"></router-link-stub></span><span class=\\"section\\" data-v-273d8978=\\"\\"><v-icon-stub name=\\"chevron_right\\" small=\\"\\" data-v-273d8978=\\"\\"></v-icon-stub><router-link-stub to=\\"wow\\" class=\\"section-link\\" data-v-273d8978=\\"\\"></router-link-stub></span><span class=\\"section disabled\\" data-v-273d8978=\\"\\"><v-icon-stub name=\\"chevron_right\\" small=\\"\\" data-v-273d8978=\\"\\"></v-icon-stub><span class=\\"section-link\\" data-v-273d8978=\\"\\"><!--v-if--> Disabled</span></span></span>"`;
exports[`Mount component 1`] = `"<span data-v-273d8978=\\"\\" class=\\"v-breadcrumb\\"><span data-v-273d8978=\\"\\" class=\\"section\\"><!--v-if--><router-link-stub data-v-273d8978=\\"\\" to=\\"hi\\" class=\\"section-link\\"></router-link-stub></span><span data-v-273d8978=\\"\\" class=\\"section\\"><v-icon-stub data-v-273d8978=\\"\\" name=\\"chevron_right\\" small=\\"\\"></v-icon-stub><router-link-stub data-v-273d8978=\\"\\" to=\\"wow\\" class=\\"section-link\\"></router-link-stub></span><span data-v-273d8978=\\"\\" class=\\"section disabled\\"><v-icon-stub data-v-273d8978=\\"\\" name=\\"chevron_right\\" small=\\"\\"></v-icon-stub><span data-v-273d8978=\\"\\" class=\\"section-link\\"><!--v-if--> Disabled</span></span></span>"`;
4 changes: 2 additions & 2 deletions app/src/components/__snapshots__/v-button.test.ts.snap
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Vitest Snapshot v1

exports[`Mount component 1`] = `
"<div class=\\"v-button\\" data-v-28d526fe=\\"\\"><button class=\\"button align-center normal\\" type=\\"button\\" data-v-28d526fe=\\"\\"><span class=\\"content\\" data-v-28d526fe=\\"\\"></span>
<div class=\\"spinner\\" data-v-28d526fe=\\"\\">
"<div data-v-28d526fe=\\"\\" class=\\"v-button\\"><button data-v-28d526fe=\\"\\" class=\\"button align-center normal\\" type=\\"button\\"><span data-v-28d526fe=\\"\\" class=\\"content\\"></span>
<div data-v-28d526fe=\\"\\" class=\\"spinner\\">
<!--v-if-->
</div>
</button></div>"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Vitest Snapshot v1

exports[`Mount component 1`] = `"<div class=\\"v-card-actions\\" data-v-b9233e5b=\\"\\">Slot Content</div>"`;
exports[`Mount component 1`] = `"<div data-v-b9233e5b=\\"\\" class=\\"v-card-actions\\">Slot Content</div>"`;
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Vitest Snapshot v1

exports[`Mount component 1`] = `"<div class=\\"v-card-subtitle\\" data-v-f6658148=\\"\\">Slot Content</div>"`;
exports[`Mount component 1`] = `"<div data-v-f6658148=\\"\\" class=\\"v-card-subtitle\\">Slot Content</div>"`;
2 changes: 1 addition & 1 deletion app/src/components/__snapshots__/v-card-text.test.ts.snap
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Vitest Snapshot v1

exports[`Mount component 1`] = `"<div class=\\"v-card-text\\" data-v-de36d604=\\"\\">Slot Content</div>"`;
exports[`Mount component 1`] = `"<div data-v-de36d604=\\"\\" class=\\"v-card-text\\">Slot Content</div>"`;
2 changes: 1 addition & 1 deletion app/src/components/__snapshots__/v-card-title.test.ts.snap
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Vitest Snapshot v1

exports[`Mount component 1`] = `"<div class=\\"v-card-title type-label\\" data-v-0768f50f=\\"\\">Slot Content</div>"`;
exports[`Mount component 1`] = `"<div data-v-0768f50f=\\"\\" class=\\"v-card-title type-label\\">Slot Content</div>"`;
2 changes: 1 addition & 1 deletion app/src/components/__snapshots__/v-card.test.ts.snap
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Vitest Snapshot v1

exports[`Mount component 1`] = `"<div class=\\"v-card\\" data-v-12731031=\\"\\">Slot Content</div>"`;
exports[`Mount component 1`] = `"<div data-v-12731031=\\"\\" class=\\"v-card\\">Slot Content</div>"`;
4 changes: 2 additions & 2 deletions app/src/components/__snapshots__/v-checkbox.test.ts.snap
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Vitest Snapshot v1

exports[`Mount component 1`] = `
"<button class=\\"v-checkbox\\" type=\\"button\\" role=\\"checkbox\\" aria-pressed=\\"false\\" data-v-61c33115=\\"\\">
"<button data-v-61c33115=\\"\\" class=\\"v-checkbox\\" type=\\"button\\" role=\\"checkbox\\" aria-pressed=\\"false\\">
<!--v-if-->
<v-icon-stub class=\\"checkbox\\" name=\\"indeterminate_check_box\\" disabled=\\"false\\" data-v-61c33115=\\"\\"></v-icon-stub><span class=\\"label type-text\\" data-v-61c33115=\\"\\"><div>Hi</div></span>
<v-icon-stub data-v-61c33115=\\"\\" class=\\"checkbox\\" name=\\"indeterminate_check_box\\" disabled=\\"false\\"></v-icon-stub><span data-v-61c33115=\\"\\" class=\\"label type-text\\"><div>Hi</div></span>
<!--v-if-->
</button>"
`;
2 changes: 1 addition & 1 deletion app/src/components/__snapshots__/v-chip.test.ts.snap
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Vitest Snapshot v1

exports[`Mount component 1`] = `"<span class=\\"v-chip label\\" data-v-0ab7ac28=\\"\\"><span class=\\"chip-content\\" data-v-0ab7ac28=\\"\\"><!--v-if--></span></span>"`;
exports[`Mount component 1`] = `"<span data-v-0ab7ac28=\\"\\" class=\\"v-chip label\\"><span data-v-0ab7ac28=\\"\\" class=\\"chip-content\\"><!--v-if--></span></span>"`;
4 changes: 2 additions & 2 deletions app/src/components/__snapshots__/v-divider.test.ts.snap
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Vitest Snapshot v1

exports[`Mount component 1`] = `
"<div class=\\"v-divider inlineTitle\\" data-v-51167fde=\\"\\"><span class=\\"wrapper\\" data-v-51167fde=\\"\\"><span class=\\"type-text\\" data-v-51167fde=\\"\\">Default slot</span></span>
<hr role=\\"separator\\" aria-orientation=\\"horizontal\\" data-v-51167fde=\\"\\">
"<div data-v-51167fde=\\"\\" class=\\"v-divider inlineTitle\\"><span data-v-51167fde=\\"\\" class=\\"wrapper\\"><span data-v-51167fde=\\"\\" class=\\"type-text\\">Default slot</span></span>
<hr data-v-51167fde=\\"\\" role=\\"separator\\" aria-orientation=\\"horizontal\\">
</div>"
`;

0 comments on commit 37faf3b

Please sign in to comment.