Skip to content

Commit

Permalink
Patch Tuesday 🐸 (#16875)
Browse files Browse the repository at this point in the history 
* Update versions

* Fix usage of fullcalendar

* Patch Tuesday Additions 🐸🐸 (#16878)

* Interop default in vitest

* Update exif-reader

* remove deprecated @types/pino

* remove old "grant" package type shim

* Small clean-up of dependencies (#16576)

* Remove outdated type deps & update concurrently

* fix lock file

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

Co-authored-by: Pascal Jufer <pascal-jufer@bluewin.ch>
Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
  • Loading branch information
@rijkvanzanten @paescuj @azrikahar
3 people committed Dec 23, 2022
1 parent fdeddf0 commit 40f94e6
Show file tree
Hide file tree
Showing 21 changed files with 2,333 additions and 3,767 deletions.
78 changes: 38 additions & 40 deletions api/package.json
View file
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.211.0",
"@aws-sdk/client-ses": "3.236.0",
"@directus/app": "workspace:*",
"@directus/extensions-sdk": "workspace:*",
"@directus/format-title": "9.15.0",
Expand All @@ -93,7 +93,7 @@
"argon2": "0.30.2",
"async": "3.2.4",
"async-mutex": "0.4.0",
"axios": "1.1.3",
"axios": "1.2.1",
"busboy": "1.6.0",
"bytes": "3.1.2",
"camelcase": "6.3.0",
Expand All @@ -110,74 +110,74 @@
"encodeurl": "1.0.2",
"eventemitter2": "6.4.9",
"execa": "5.1.1",
"exif-reader": "1.0.3",
"exif-reader": "1.1.0",
"express": "4.18.2",
"fast-redact": "3.1.2",
"flat": "5.0.2",
"fs-extra": "10.1.0",
"fs-extra": "11.1.0",
"globby": "11.0.4",
"graphql": "16.6.0",
"graphql-compose": "9.0.10",
"helmet": "6.0.0",
"helmet": "6.0.1",
"icc": "2.0.0",
"inquirer": "8.2.4",
"ioredis": "5.2.4",
"joi": "17.7.0",
"js-yaml": "4.1.0",
"js2xmlparser": "5.0.0",
"json2csv": "5.0.7",
"jsonwebtoken": "8.5.1",
"jsonwebtoken": "9.0.0",
"keyv": "4.5.2",
"knex": "2.3.0",
"knex-schema-inspector": "3.0.0",
"ldapjs": "2.3.3",
"liquidjs": "9.42.1",
"liquidjs": "10.3.3",
"lodash": "4.17.21",
"marked": "4.2.2",
"marked": "4.2.4",
"micromustache": "8.0.3",
"mime-types": "2.1.35",
"ms": "2.1.3",
"nanoid": "3.1.23",
"nanoid": "3.3.4",
"node-cron": "3.0.2",
"node-machine-id": "1.1.12",
"nodemailer": "6.8.0",
"object-hash": "3.0.0",
"openapi3-ts": "3.1.1",
"openid-client": "5.3.0",
"openapi3-ts": "3.1.2",
"openid-client": "5.3.1",
"ora": "5.4.0",
"otplib": "12.0.1",
"pino": "8.7.0",
"pino-http": "8.2.1",
"pino": "8.8.0",
"pino-http": "8.3.0",
"pino-http-print": "3.1.0",
"pino-pretty": "9.1.1",
"qs": "6.11.0",
"rate-limiter-flexible": "2.4.1",
"rollup": "3.3.0",
"rollup": "3.7.5",
"samlify": "2.8.7",
"sanitize-html": "2.7.3",
"sharp": "0.31.2",
"sanitize-html": "2.8.1",
"sharp": "0.31.3",
"snappy": "7.2.2",
"stream-json": "1.7.4",
"stream-json": "1.7.5",
"strip-bom-stream": "4.0.0",
"tmp-promise": "3.0.3",
"update-check": "1.5.4",
"uuid": "9.0.0",
"uuid-validate": "0.0.3",
"vm2": "3.9.11",
"vm2": "3.9.13",
"wellknown": "0.5.0"
},
"devDependencies": {
"@ngneat/falso": "6.3.0",
"@types/async": "3.2.15",
"@ngneat/falso": "6.3.2",
"@types/async": "3.2.16",
"@types/busboy": "1.5.0",
"@types/bytes": "3.1.1",
"@types/cookie-parser": "1.4.3",
"@types/cors": "2.8.12",
"@types/deep-diff": "1.0.1",
"@types/cors": "2.8.13",
"@types/deep-diff": "1.0.2",
"@types/destroy": "1.0.0",
"@types/encodeurl": "1.0.0",
"@types/exif-reader": "1.0.0",
"@types/express": "4.17.14",
"@types/express": "4.17.15",
"@types/express-serve-static-core": "4.17.31",
"@types/fast-redact": "3.0.2",
"@types/flat": "5.0.2",
Expand All @@ -188,42 +188,40 @@
"@types/jsonwebtoken": "8.5.9",
"@types/keyv": "3.1.4",
"@types/ldapjs": "2.2.5",
"@types/lodash": "4.14.189",
"@types/marked": "4.0.7",
"@types/lodash": "4.14.191",
"@types/marked": "4.0.8",
"@types/mime-types": "2.1.1",
"@types/ms": "0.7.31",
"@types/node": "18.11.9",
"@types/node": "18.11.17",
"@types/node-cron": "3.0.6",
"@types/nodemailer": "6.4.6",
"@types/object-hash": "2.2.1",
"@types/pino": "7.0.4",
"@types/pino-http": "5.8.1",
"@types/nodemailer": "6.4.7",
"@types/object-hash": "3.0.2",
"@types/qs": "6.9.7",
"@types/sanitize-html": "2.6.2",
"@types/sanitize-html": "2.8.0",
"@types/sharp": "0.31.0",
"@types/stream-json": "1.7.2",
"@types/uuid": "8.3.4",
"@types/uuid": "9.0.0",
"@types/uuid-validate": "0.0.1",
"@types/wellknown": "0.5.4",
"@vitest/coverage-c8": "0.25.2",
"@vitest/coverage-c8": "0.26.2",
"copyfiles": "2.4.1",
"form-data": "4.0.0",
"knex-mock-client": "1.8.4",
"knex-mock-client": "1.11.0",
"ts-node": "10.9.1",
"ts-node-dev": "2.0.0",
"typescript": "4.9.3",
"vitest": "0.25.2"
"typescript": "4.9.4",
"vitest": "0.26.2"
},
"optionalDependencies": {
"@keyv/redis": "2.5.3",
"keyv-memcache": "1.2.5",
"@keyv/redis": "2.5.4",
"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.8.0",
"sqlite3": "5.1.2",
"tedious": "15.1.1"
"sqlite3": "5.1.4",
"tedious": "15.1.2"
},
"engines": {
"node": ">=12.20.0"
Expand Down
14 changes: 0 additions & 14 deletions api/src/types/shims.d.ts
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
declare module 'grant' {
const grant: any;
export default grant;
}

declare module 'pino-http' {
import PinoHttp from '@types/pino-http';
const pinoHttp: PinoHttp;
export default pinoHttp;
export const stdSerializers: {
req: (req: any) => Record<string, any>;
};
}

declare module 'icc' {
const parse: (buf: Buffer) => Record<string, string>;
export { parse };
Expand Down
3 changes: 3 additions & 0 deletions api/vitest.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,8 @@ export default defineConfig({
replacement: path.resolve(__dirname, '../app/node_modules/@directus/format-title'),
},
],
deps: {
interopDefault: true,
},
},
});
64 changes: 32 additions & 32 deletions app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@
"test:watch": "vitest"
},
"devDependencies": {
"@babel/core": "7.20.2",
"@babel/core": "7.20.5",
"@babel/preset-env": "7.20.2",
"@directus/docs": "9.22.0",
"@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": "5.11.3",
"@fullcalendar/daygrid": "5.11.3",
"@fullcalendar/interaction": "5.11.3",
"@fullcalendar/list": "5.11.3",
"@fullcalendar/timegrid": "5.11.3",
"@fullcalendar/core": "6.0.1",
"@fullcalendar/daygrid": "6.0.1",
"@fullcalendar/interaction": "6.0.1",
"@fullcalendar/list": "6.0.1",
"@fullcalendar/timegrid": "6.0.1",
"@joeattardi/emoji-button": "4.6.4",
"@mapbox/mapbox-gl-draw": "1.3.0",
"@mapbox/mapbox-gl-draw-static-mode": "1.0.1",
Expand All @@ -50,17 +50,17 @@
"@popperjs/core": "2.11.6",
"@rollup/plugin-yaml": "4.0.1",
"@sindresorhus/slugify": "2.1.1",
"@storybook/addon-actions": "6.5.13",
"@storybook/addon-backgrounds": "6.5.13",
"@storybook/addon-docs": "6.5.13",
"@storybook/addon-essentials": "6.5.13",
"@storybook/addon-links": "6.5.13",
"@storybook/addon-measure": "6.5.13",
"@storybook/addon-outline": "6.5.13",
"@storybook/builder-vite": "0.2.5",
"@storybook/client-api": "6.5.13",
"@storybook/client-logger": "6.5.13",
"@storybook/vue3": "6.5.13",
"@storybook/addon-actions": "6.5.15",
"@storybook/addon-backgrounds": "6.5.15",
"@storybook/addon-docs": "6.5.15",
"@storybook/addon-essentials": "6.5.15",
"@storybook/addon-links": "6.5.15",
"@storybook/addon-measure": "6.5.15",
"@storybook/addon-outline": "6.5.15",
"@storybook/builder-vite": "0.2.6",
"@storybook/client-api": "6.5.15",
"@storybook/client-logger": "6.5.15",
"@storybook/vue3": "6.5.15",
"@tinymce/tinymce-vue": "4.0.5",
"@turf/meta": "6.5.0",
"@types/base-64": "1.0.0",
Expand All @@ -72,26 +72,26 @@
"@types/file-saver": "2.0.5",
"@types/geojson": "7946.0.10",
"@types/json2csv": "5.0.3",
"@types/lodash": "4.14.189",
"@types/lodash": "4.14.191",
"@types/mapbox__mapbox-gl-draw": "1.3.3",
"@types/mapbox__mapbox-gl-geocoder": "4.7.3",
"@types/markdown-it": "12.2.3",
"@types/marked": "4.0.7",
"@types/marked": "4.0.8",
"@types/mime": "3.0.1",
"@types/qrcode": "1.5.0",
"@types/wellknown": "0.5.4",
"@vitejs/plugin-vue": "3.2.0",
"@vitejs/plugin-vue": "4.0.0",
"@vue/compiler-sfc": "3.2.45",
"@vue/test-utils": "2.2.3",
"@vue/test-utils": "2.2.6",
"apexcharts": "3.36.3",
"axios": "1.1.3",
"axios": "1.2.1",
"babel-loader": "9",
"base-64": "1.0.0",
"c8": "7.12.0",
"caret-pos": "2.0.0",
"codemirror": "5.64.0",
"color": "4.2.3",
"cropperjs": "1.5.12",
"cropperjs": "1.5.13",
"date-fns": "2.29.3",
"diacritics": "1.3.0",
"diff": "5.1.0",
Expand All @@ -100,8 +100,8 @@
"file-saver": "2.0.5",
"flatpickr": "4.6.13",
"geojson": "0.5.0",
"happy-dom": "7.7.0",
"highlight.js": "11.6.0",
"happy-dom": "8.1.1",
"highlight.js": "11.7.0",
"html-entities": "2.3.3",
"json-to-graphql-query": "2.2.4",
"json2csv": "5.0.7",
Expand All @@ -110,27 +110,27 @@
"mapbox-gl": "1.13.2",
"maplibre-gl": "1.15.3",
"markdown-it": "13.0.1",
"markdown-it-anchor": "8.6.5",
"markdown-it-anchor": "8.6.6",
"markdown-it-container": "3.0.0",
"markdown-it-table-of-contents": "0.6.0",
"marked": "4.2.2",
"marked": "4.2.4",
"micromustache": "8.0.3",
"mime": "3.0.0",
"mitt": "3.0.0",
"nanoid": "4.0.0",
"p-queue": "7.3.0",
"pinia": "2.0.23",
"pinia": "2.0.28",
"pretty-bytes": "6.0.0",
"pretty-ms": "8.0.0",
"qrcode": "1.5.1",
"react": "18",
"react-dom": "18",
"sass": "1.56.1",
"sass": "1.57.1",
"tinymce": "5.10.2",
"typescript": "4.9.3",
"vite": "3.2.4",
"typescript": "4.9.4",
"vite": "4.0.3",
"vite-plugin-vue-markdown": "0.22.1",
"vitest": "0.25.2",
"vitest": "0.25.8",
"vue": "3.2.45",
"vue-i18n": "9.2.2",
"vue-router": "4.1.6",
Expand Down
2 changes: 1 addition & 1 deletion app/src/layouts/calendar/calendar.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import { onMounted, onUnmounted, computed, ref } from 'vue';
import { useI18n } from 'vue-i18n';
import '@fullcalendar/core/vdom';
import '@fullcalendar/core';
const { n, t } = useI18n();
Expand Down

0 comments on commit 40f94e6

Please sign in to comment.