Skip to content

Commit

Permalink
Patch Tuesday 🐸 (#18643)
Browse files Browse the repository at this point in the history 
* Update `directus-monorepo` deps

* Update `@directus/api` deps

* Update `@directus/app` deps

* Update `@directus/composables` deps

* Update `create-directus-extension` deps

* Update `@directus/exceptions` deps

* Update `@directus/data` deps

* Update `@directus/data-driver-postgres` deps

* Update `@directus/extensions-sdk` deps

* Update `@directus/pressure` deps

* Update `@directus/random` deps

* Update `@directus/release-notes-generator` 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/types` deps

* Update `@directus/update-check` deps

* Update `@directus/utils` deps

* Update `docs` deps

* Update `tests-blackbox` deps

* Bump pnpm to 8.5.1

* Bump build-push-action in release workflow to v4

* Assign new spy instances before each test

See vitest-dev/vitest#3386

* Create clean-needles-nail.md

* Remove leftover 'beforeAll' imports

Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com>

---------

Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
  • Loading branch information
@paescuj @azrikahar @rijkvanzanten
3 people committed May 19, 2023
1 parent 2016afa commit 2e647d8
Show file tree
Hide file tree
Showing 28 changed files with 2,862 additions and 2,761 deletions.
27 changes: 27 additions & 0 deletions .changeset/clean-needles-nail.md
View file
@@ -0,0 +1,27 @@
---
"directus": patch
"@directus/app": patch
"@directus/api": patch
"docs": patch
"@directus/composables": patch
"create-directus-extension": patch
"@directus/data-driver-postgres": patch
"@directus/data": patch
"@directus/exceptions": patch
"@directus/extensions-sdk": patch
"@directus/pressure": patch
"@directus/random": patch
"@directus/release-notes-generator": patch
"@directus/storage-driver-azure": patch
"@directus/storage-driver-cloudinary": patch
"@directus/storage-driver-gcs": patch
"@directus/storage-driver-local": patch
"@directus/storage-driver-s3": patch
"@directus/storage": patch
"@directus/types": patch
"@directus/update-check": patch
"@directus/utils": patch
"tests-blackbox": patch
---

Updated dependencies in all packages
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Expand Up @@ -88,7 +88,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: .
file: ./Dockerfile
Expand Down
54 changes: 27 additions & 27 deletions api/package.json
View file
Expand Up @@ -68,7 +68,7 @@
},
"dependencies": {
"@authenio/samlify-node-xmllint": "2.0.0",
"@aws-sdk/client-ses": "3.316.0",
"@aws-sdk/client-ses": "3.332.0",
"@directus/app": "workspace:*",
"@directus/constants": "workspace:*",
"@directus/exceptions": "workspace:*",
Expand All @@ -91,7 +91,7 @@
"@rollup/plugin-virtual": "3.0.1",
"argon2": "0.30.3",
"async": "3.2.4",
"axios": "1.3.6",
"axios": "1.4.0",
"busboy": "1.6.0",
"bytes": "3.1.2",
"camelcase": "7.0.1",
Expand All @@ -102,7 +102,7 @@
"cookie-parser": "1.4.6",
"cors": "2.8.5",
"csv-parser": "3.0.0",
"date-fns": "2.29.3",
"date-fns": "2.30.0",
"deep-diff": "1.0.2",
"destroy": "1.2.0",
"dotenv": "16.0.3",
Expand All @@ -115,58 +115,58 @@
"fs-extra": "11.1.1",
"graphql": "16.6.0",
"graphql-compose": "9.0.10",
"helmet": "6.1.5",
"helmet": "7.0.0",
"icc": "3.0.0",
"inquirer": "9.1.5",
"inquirer": "9.2.4",
"ioredis": "5.3.2",
"joi": "17.9.1",
"joi": "17.9.2",
"js-yaml": "4.1.0",
"js2xmlparser": "5.0.0",
"json2csv": "5.0.7",
"jsonwebtoken": "9.0.0",
"keyv": "4.5.2",
"knex": "2.4.2",
"ldapjs": "2.3.3",
"liquidjs": "10.7.0",
"liquidjs": "10.7.1",
"lodash-es": "4.17.21",
"marked": "4.3.0",
"marked": "5.0.2",
"micromustache": "8.0.3",
"mime-types": "2.1.35",
"ms": "2.1.3",
"nanoid": "4.0.2",
"node-cron": "3.0.2",
"node-machine-id": "1.1.12",
"nodemailer": "6.9.1",
"nodemailer": "6.9.2",
"object-hash": "3.0.0",
"openapi3-ts": "3.2.0",
"openid-client": "5.4.0",
"ora": "6.3.0",
"openid-client": "5.4.2",
"ora": "6.3.1",
"otplib": "12.0.1",
"pino": "8.11.0",
"pino": "8.14.1",
"pino-http": "8.3.3",
"pino-http-print": "3.1.0",
"pino-pretty": "10.0.0",
"qs": "6.11.1",
"qs": "6.11.2",
"rate-limiter-flexible": "2.4.1",
"rollup": "3.20.7",
"rollup": "3.22.0",
"samlify": "2.8.10",
"sanitize-html": "2.10.0",
"sharp": "0.32.0",
"sharp": "0.32.1",
"snappy": "7.2.2",
"stream-json": "1.7.5",
"strip-bom-stream": "5.0.0",
"tmp-promise": "3.0.3",
"tsx": "3.12.6",
"tsx": "3.12.7",
"uuid": "9.0.0",
"uuid-validate": "0.0.3",
"vm2": "3.9.18",
"vm2": "3.9.19",
"wellknown": "0.5.0"
},
"devDependencies": {
"@directus/tsconfig": "0.0.7",
"@directus/types": "workspace:*",
"@ngneat/falso": "6.4.0",
"@types/async": "3.2.19",
"@types/async": "3.2.20",
"@types/busboy": "1.5.0",
"@types/bytes": "3.1.1",
"@types/content-disposition": "0.5.5",
Expand All @@ -177,20 +177,20 @@
"@types/encodeurl": "1.0.0",
"@types/exif-reader": "1.0.0",
"@types/express": "4.17.17",
"@types/express-serve-static-core": "4.17.33",
"@types/express-serve-static-core": "4.17.35",
"@types/flat": "5.0.2",
"@types/fs-extra": "11.0.1",
"@types/inquirer": "9.0.3",
"@types/js-yaml": "4.0.5",
"@types/json2csv": "5.0.3",
"@types/jsonwebtoken": "9.0.1",
"@types/jsonwebtoken": "9.0.2",
"@types/keyv": "4.2.0",
"@types/ldapjs": "2.2.5",
"@types/lodash-es": "4.17.7",
"@types/marked": "4.0.8",
"@types/marked": "4.3.0",
"@types/mime-types": "2.1.1",
"@types/ms": "0.7.31",
"@types/node": "18.15.13",
"@types/node": "18.16.12",
"@types/node-cron": "3.0.7",
"@types/nodemailer": "6.4.7",
"@types/object-hash": "3.0.2",
Expand All @@ -201,24 +201,24 @@
"@types/uuid": "9.0.1",
"@types/uuid-validate": "0.0.1",
"@types/wellknown": "0.5.4",
"@vitest/coverage-c8": "0.31.0",
"@vitest/coverage-c8": "0.31.1",
"copyfiles": "2.4.1",
"form-data": "4.0.0",
"knex-mock-client": "2.0.0",
"supertest": "6.3.3",
"typescript": "5.0.4",
"vitest": "0.31.0"
"vitest": "0.31.1"
},
"optionalDependencies": {
"@keyv/redis": "2.5.7",
"@keyv/redis": "2.5.8",
"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.10.0",
"pg": "8.11.0",
"sqlite3": "5.1.6",
"tedious": "16.0.0"
"tedious": "16.1.0"
},
"engines": {
"node": ">=18.0.0"
Expand Down
78 changes: 39 additions & 39 deletions app/package.json
View file
Expand Up @@ -29,8 +29,8 @@
"typecheck": "vue-tsc --noEmit -p tsconfig.json"
},
"devDependencies": {
"@babel/core": "7.21.4",
"@babel/preset-env": "7.21.4",
"@babel/core": "7.21.8",
"@babel/preset-env": "7.21.5",
"@directus/constants": "workspace:*",
"@directus/exceptions": "workspace:*",
"@directus/extensions-sdk": "workspace:*",
Expand All @@ -41,7 +41,7 @@
"@editorjs/checklist": "1.5.0",
"@editorjs/code": "2.8.0",
"@editorjs/delimiter": "1.3.0",
"@editorjs/editorjs": "2.26.5",
"@editorjs/editorjs": "2.27.0",
"@editorjs/embed": "2.5.3",
"@editorjs/header": "2.7.0",
"@editorjs/image": "2.8.1",
Expand All @@ -54,31 +54,31 @@
"@editorjs/underline": "1.1.0",
"@fortawesome/fontawesome-svg-core": "6.4.0",
"@fortawesome/free-brands-svg-icons": "6.4.0",
"@fullcalendar/core": "6.1.5",
"@fullcalendar/daygrid": "6.1.5",
"@fullcalendar/interaction": "6.1.5",
"@fullcalendar/list": "6.1.5",
"@fullcalendar/timegrid": "6.1.5",
"@fullcalendar/core": "6.1.7",
"@fullcalendar/daygrid": "6.1.7",
"@fullcalendar/interaction": "6.1.7",
"@fullcalendar/list": "6.1.7",
"@fullcalendar/timegrid": "6.1.7",
"@joeattardi/emoji-button": "4.6.4",
"@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.1.0",
"@pinia/testing": "0.1.1",
"@popperjs/core": "2.11.7",
"@rollup/plugin-yaml": "4.0.1",
"@rollup/plugin-yaml": "4.1.0",
"@sindresorhus/slugify": "2.2.1",
"@storybook/addon-actions": "7.0.6",
"@storybook/addon-backgrounds": "7.0.6",
"@storybook/addon-docs": "7.0.6",
"@storybook/addon-essentials": "7.0.6",
"@storybook/addon-links": "7.0.6",
"@storybook/addon-mdx-gfm": "7.0.6",
"@storybook/addon-measure": "7.0.6",
"@storybook/addon-outline": "7.0.6",
"@storybook/client-api": "7.0.6",
"@storybook/client-logger": "7.0.6",
"@storybook/vue3": "7.0.6",
"@storybook/vue3-vite": "7.0.6",
"@storybook/addon-actions": "7.0.12",
"@storybook/addon-backgrounds": "7.0.12",
"@storybook/addon-docs": "7.0.12",
"@storybook/addon-essentials": "7.0.12",
"@storybook/addon-links": "7.0.12",
"@storybook/addon-mdx-gfm": "7.0.12",
"@storybook/addon-measure": "7.0.12",
"@storybook/addon-outline": "7.0.12",
"@storybook/client-api": "7.0.12",
"@storybook/client-logger": "7.0.12",
"@storybook/vue3": "7.0.12",
"@storybook/vue3-vite": "7.0.12",
"@tinymce/tinymce-vue": "5.1.0",
"@turf/meta": "6.5.0",
"@types/base-64": "1.0.0",
Expand All @@ -92,65 +92,65 @@
"@types/geojson": "7946.0.10",
"@types/json2csv": "5.0.3",
"@types/lodash": "4.14.194",
"@types/mapbox__mapbox-gl-draw": "1.3.3",
"@types/mapbox__mapbox-gl-draw": "1.4.0",
"@types/mapbox__mapbox-gl-geocoder": "4.7.3",
"@types/marked": "4.0.8",
"@types/marked": "4.3.0",
"@types/mime": "3.0.1",
"@types/qrcode": "1.5.0",
"@types/wellknown": "0.5.4",
"@vitejs/plugin-vue": "4.2.3",
"@vue/test-utils": "2.3.2",
"apexcharts": "3.39.0",
"axios": "1.3.6",
"apexcharts": "3.40.0",
"axios": "1.4.0",
"babel-loader": "9",
"base-64": "1.0.0",
"c8": "7.13.0",
"caret-pos": "2.0.0",
"chroma-js": "2.4.2",
"codemirror": "5.65.12",
"codemirror": "5.65.13",
"color": "4.2.3",
"cropperjs": "1.5.13",
"date-fns": "2.29.3",
"date-fns": "2.30.0",
"diacritics": "1.3.0",
"diff": "5.1.0",
"dompurify": "3.0.2",
"dompurify": "3.0.3",
"editorjs-text-alignment-blocktune": "1.0.3",
"editorjs-toggle-block": "0.3.11",
"escape-string-regexp": "5.0.0",
"file-saver": "2.0.5",
"flatpickr": "4.6.13",
"geojson": "0.5.0",
"happy-dom": "9.8.4",
"happy-dom": "9.18.3",
"html-entities": "2.3.3",
"json-to-graphql-query": "2.2.5",
"json2csv": "5.0.7",
"jsonlint-mod": "1.7.6",
"lodash": "4.17.21",
"mapbox-gl": "1.13.3",
"maplibre-gl": "1.15.3",
"marked": "4.3.0",
"marked": "5.0.2",
"micromustache": "8.0.3",
"mime": "3.0.0",
"mitt": "3.0.0",
"nanoid": "4.0.2",
"p-queue": "7.3.4",
"pinia": "2.0.36",
"pinia": "2.1.1",
"pretty-ms": "8.0.0",
"qrcode": "1.5.1",
"qrcode": "1.5.3",
"react": "18",
"react-dom": "18",
"sass": "1.62.0",
"storybook": "7.0.6",
"tinymce": "6.4.1",
"sass": "1.62.1",
"storybook": "7.0.12",
"tinymce": "6.4.2",
"typescript": "5.0.4",
"vite": "4.3.1",
"vitest": "0.31.0",
"vite": "4.3.7",
"vitest": "0.31.1",
"vue": "3.3.2",
"vue-i18n": "9.2.2",
"vue-router": "4.2.0",
"vue-tsc": "1.6.5",
"vuedraggable": "4.1.0",
"webpack": "5.80.0",
"webpack": "5.83.1",
"wellknown": "0.5.0"
},
"publishConfig": {
Expand Down
4 changes: 2 additions & 2 deletions app/src/stores/server.test.ts
View file
Expand Up @@ -3,7 +3,7 @@ import * as setLanguageDefault from '@/lang/set-language';
import { User } from '@directus/types';
import { createTestingPinia } from '@pinia/testing';
import { setActivePinia } from 'pinia';
import { afterEach, beforeAll, beforeEach, describe, expect, SpyInstance, test, vi } from 'vitest';
import { afterEach, beforeEach, describe, expect, SpyInstance, test, vi } from 'vitest';
import { Auth, Info, useServerStore } from './server';
import { useUserStore } from './user';

Expand Down Expand Up @@ -49,7 +49,7 @@ let apiGetSpy: SpyInstance;
let replaceQueueSpy: SpyInstance;
let setLanguageSpy: SpyInstance;

beforeAll(() => {
beforeEach(() => {
apiGetSpy = vi.spyOn(api, 'get');
replaceQueueSpy = vi.spyOn(apiFunctions, 'replaceQueue').mockResolvedValue();
setLanguageSpy = vi.spyOn(setLanguageDefault, 'setLanguage').mockResolvedValue(true);
Expand Down
8 changes: 4 additions & 4 deletions app/src/stores/settings.test.ts
View file
@@ -1,11 +1,11 @@
import api from '@/api';
import { Settings } from '@directus/types';
import { createTestingPinia } from '@pinia/testing';
import * as notifyUtil from '@/utils/notify';
import * as unexpectedErrorUtil from '@/utils/unexpected-error';
import { Settings } from '@directus/types';
import { createTestingPinia } from '@pinia/testing';
import { AxiosRequestConfig } from 'axios';
import { setActivePinia } from 'pinia';
import { afterEach, beforeAll, beforeEach, describe, expect, SpyInstance, test, vi } from 'vitest';
import { afterEach, beforeEach, describe, expect, SpyInstance, test, vi } from 'vitest';

beforeEach(() => {
setActivePinia(
Expand Down Expand Up @@ -98,7 +98,7 @@ vi.mock('@/api', () => {

let apiGetSpy: SpyInstance;

beforeAll(() => {
beforeEach(() => {
apiGetSpy = vi.spyOn(api, 'get');
});

Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
View file
Expand Up @@ -12,7 +12,7 @@
"@thumbsmith/url": "0.1.3",
"@unhead/vue": "1.1.26",
"spellchecker-cli": "6.1.1",
"vitepress": "1.0.0-alpha.73",
"vitepress": "1.0.0-alpha.75",
"vue": "3.3.2"
},
"dependencies": {
Expand Down

0 comments on commit 2e647d8

Please sign in to comment.