From 73012baddc97185db8935a99a022d2fd075b222a Mon Sep 17 00:00:00 2001 From: Rijk van Zanten Date: Wed, 16 Jun 2021 15:58:08 -0400 Subject: [PATCH 01/30] Delete dependabot.yml --- .github/dependabot.yml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index ffc0382299..0000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "npm" - directory: "/" - schedule: - interval: "daily" - versioning-strategy: increase From 14e7c9ab2c7f6991882afecbb72701a586a72ed6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:00:45 -0400 Subject: [PATCH 02/30] Add renovate.json (#6322) Co-authored-by: Renovate Bot --- renovate.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000000..f45d8f110c --- /dev/null +++ b/renovate.json @@ -0,0 +1,5 @@ +{ + "extends": [ + "config:base" + ] +} From 230060e5750a6131dc2f4f7aeb06578d96c64c5e Mon Sep 17 00:00:00 2001 From: Rijk van Zanten Date: Wed, 16 Jun 2021 16:01:28 -0400 Subject: [PATCH 03/30] New Crowdin updates (#6309) * New translations en-US.yaml (Japanese) * New translations en-US.yaml (Japanese) * New translations en-US.yaml (Arabic) * New translations en-US.yaml (Arabic) * New translations en-US.yaml (Arabic) * New translations en-US.yaml (Arabic) --- app/src/lang/translations/ar-SA.yaml | 70 ++++++++++++++++++++++++++-- app/src/lang/translations/ja-JP.yaml | 2 + 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/app/src/lang/translations/ar-SA.yaml b/app/src/lang/translations/ar-SA.yaml index fef4d47d51..8bb44ace76 100644 --- a/app/src/lang/translations/ar-SA.yaml +++ b/app/src/lang/translations/ar-SA.yaml @@ -227,9 +227,17 @@ updates_made: ترقيات مصنوعة leave_comment: اترك تعليقا... post_comment_success: تم ارسال التعليق this_collection: هذه المجموعة -related_collection: المجموعات ذات الصلة +related_collection: مجموعة ذات صلة +related_collections: مجموعات ذات صلة +export_data: تصدير البيانات format: التنسيق submit: إرسال +move_to_folder: أنقل إلى مجلد +move: نقل +system: نظام +today: اليوم +yesterday: أمس +select_all: تحديد الكل months: january: يناير february: فبراير @@ -250,6 +258,7 @@ size: حجم created: تم الإنشاء checksum: بصمة الملف owner: المالك +folder: مجلد download: تنزيل open: فتح open_in_new_window: فتح في نافذة جديدة @@ -279,8 +288,8 @@ save_as_copy: حفظ كنسخة إضافية add_existing: إضافة من القائمة creating_items: إنشاء عنصر enable_create_button: تفعيل زر إعادة المحاولة -selecting_items: حدد العناصر -enable_select_button: تمكين زر التجانب +selecting_items: تحديد العناصر +enable_select_button: تفعيل زر التحديد comments: تعليقات no_comments: لا توجد تعليقات بعد click_to_expand: أضغط للمزيد @@ -340,7 +349,7 @@ toggle_manual_sorting: تفعيل الترتيب اليدوي bookmark_doesnt_exist: الإشارة المرجعية غير موجودة bookmark_doesnt_exist_copy: لم يتم العثور على العلامة المرجعية التي تحاول فتحها. bookmark_doesnt_exist_cta: إضافة إلى مجموعة -select_an_item: Select an item... +select_an_item: تحديد عنصر... edit: تعديل enabled: تمكين disable_tfa: تعطيل المصادقة الثنائية 2FA @@ -358,11 +367,18 @@ errors: INVALID_OTP: كلمة مرور لمرة واحدة خاطئة INVALID_PAYLOAD: Invalid payload ROUTE_NOT_FOUND: غير موجود + USER_SUSPENDED: المستخدم موقوف + UNKNOWN: خطأ غير متوقع + INTERNAL_SERVER_ERROR: خطأ غير متوقع bookmarks: محفوظات +presets: الإعدادات المسبقة +unexpected_error: خطأ غير متوقع unexpected_error_copy: حدث خطأ غير متوقع. الرجاء المحاولة مرة أخرى لاحقاً. copy_details: نسخ التفاصيل back: رجوع square: مربع +rotate: تدوير +all_users: كل المستخدمين placeholder: مكان محجوز icon_left: أيقونة اليسار icon_right: أيقونة اليمين @@ -371,7 +387,10 @@ monospace: Monospace divider: الفاصل color: لون circle: دائرة +empty_item: عنصر فارغ log_in_with: 'تسجيل الدخول باستخدام {provider}' +advanced_filter: تصفية متقدمة +delete_advanced_filter: حذف التصفية operators: lt: أقل من gt: أكبر من @@ -404,7 +423,14 @@ columns: أعمدة collection_setup: لا توجد مجموعات الإعداد value_unique: القيمة يجب أن تكون display_template: عرض القالب +all_files: '‮كل الملفات' +my_files: ملفاتي +create_folder: أنشئ مجلد +folder_name: اسم المجلد... +add_file: أضف ملف +replace_file: استبدال ملف no_results: لا توجد نتائج +saves_automatically: يحفظ تلقائياً role: الدور create: انشاء on_update: عند التحديث @@ -413,24 +439,40 @@ update: تحديث select_fields: حدد حقول width: العرض height: الارتفاع +unlimited: غير محدود +open_link_in: افتح الرابط في wysiwyg_options: codeblock: نص برمجي + unlink: إزالة الرابط + fontsizeselect: حدد حجم الخط remove: احذف + selectall: تحديد الكل table: الجدول dropdown: قائمة منسدلة choices: الخيارات deselect: إلغاء تحديد +deselect_all: إلغاء تحديد الكل other: أخرى... unknown_user: مستخدم غير معروف +editing_in: 'تعديل عنصر في {collection}' +creating_unit: 'إنشاء {unit}' +editing_unit: 'تعديل {unit}' editing_in_batch: 'تعديل دفعة من {count} عناصر' +no_options_available: لا توجد خيارات متاحة +settings_data_model: نموذج البيانات settings_permissions: الأدوار والأذونات settings_project: إعدادات المشروع settings_webhooks: روابط الويب (Webhooks) +settings_presets: الإعدادات المسبقة والعلامات +scope: مجال +select: حدد... +changes_are_permanent: التغييرات دائمة unsaved_changes: لم يتم حفظ التعديلات unsaved_changes_copy: هل ترغب حقّا بمغادرة هذه الصفحة؟ discard_changes: تجاهل التغييرات keep_editing: استمر في التحرير add_new: إضافة جديدة +create_new: أنشئ جديد all: الجميع batch_delete_confirm: >- لم يتم اختيار عناصر | هل أنت متأكد أنك تريد حذف هذا البند؟ لا يمكن التراجع عن هذا الإجراء. | هل تريد بالتأكيد حذف هذه {count} عنصر ؟ لا يمكن التراجع عن هذا الإجراء. @@ -462,11 +504,13 @@ fields: location: الموقع metadata: البيانات التعريفية filesize: حجم الملف + modified_by: تم تعديله بواسطة modified_on: التعديل في created_on: تم الإنشاء بتاريخ created_by: تم الإنشاء بواسطة embed: تضمين uploaded_by: تم التحميل بواسطة + folder: مجلد width: العرض uploaded_on: تم التحميل بتاريخ height: الارتفاع @@ -489,18 +533,25 @@ fields: role: الدور directus_settings: project_name: اسم المشروع + project_url: رابط المشروع project_color: لون المشروع project_logo: شعار المشروع directus_fields: + icon: أيقونة المجموعة note: ملحوظة hidden: مخفي translation: ترجمة اسم الحقل display_template: قالب directus_roles: name: إسم الدور + icon: أيقونة الدور description: التفاصيل do_nothing: لا تفعل شيئا comment: تعليق +referential_action_field_label_m2o: عند حذف {collection}... +referential_action_field_label_o2m: عند إلغاء تحديد {collection}... +referential_action_no_action: منع الحذف +referential_action_set_default: تعيين {field} إلى قيمته الافتراضية continue: واصل default: الإفتراضي delete: حذف @@ -563,6 +614,10 @@ interfaces: collections: مجموعات select-color: color: لون + placeholder: اختر لون... + preset_colors: ألوان محددة مسبقًا + preset_colors_add_label: إضافة لون جديد... + name_placeholder: أدخل اسم اللون... datetime: datetime: التاريخ والوقت system-display-template: @@ -572,7 +627,11 @@ interfaces: presentation-divider: divider: الفاصل select-dropdown: + choices_placeholder: أضف خيار جديد + choices_name_placeholder: أدخل اسم... choices_value_placeholder: أدخل قيمة... + select-multiple-dropdown: + select-multiple-dropdown: منسدلة (متعدد) file: file: ملف files: @@ -581,6 +640,7 @@ interfaces: hash: الهاش select-icon: icon: أيقونة + search_for_icon: البحث عن أيقونة... select-dropdown-m2o: display_template: عرض القالب slider: @@ -588,6 +648,8 @@ interfaces: always_show_value: إظهار القيمة دائمًا tags: tags: الوسوم + description: حدد أو أضف وسوم + add_tags: إضافة وسوم... boolean: label_default: تمكين translations: diff --git a/app/src/lang/translations/ja-JP.yaml b/app/src/lang/translations/ja-JP.yaml index 7e5a9420c0..3c3a869210 100644 --- a/app/src/lang/translations/ja-JP.yaml +++ b/app/src/lang/translations/ja-JP.yaml @@ -229,6 +229,8 @@ operators: loading: 読み込み中... upload_files_indeterminate: '{done}/{total} ファイルをアップロードしています' upload_files_success: '{count} 個のファイルがアップロードされました' +drag_file_here: ここにファイルをドラッグ & ドロップ +click_to_browse: クリックしてローカルフォルダを参照 layout_options: レイアウト設定 collection_setup: コレクションの作成 optional_system_fields: システムフィールドのオプション From 02ec28f5f3d106c567bc56b1c3b1c6ee1b2b1c9d Mon Sep 17 00:00:00 2001 From: Geert Ijewski <51948919+geertijewski@users.noreply.github.com> Date: Thu, 17 Jun 2021 15:19:30 +0200 Subject: [PATCH 04/30] fix link (#6339) --- docs/getting-started/quickstart.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started/quickstart.md b/docs/getting-started/quickstart.md index bab0298e92..5b6da3e20b 100644 --- a/docs/getting-started/quickstart.md +++ b/docs/getting-started/quickstart.md @@ -103,7 +103,7 @@ roles & permissions, see [Roles](/guides/roles) & [Permissions](/guides/permissi Now that your project has some content in it, it's time to start using this content externally. Data can be accessed in a number of ways, including the REST API, GraphQL, the CLI, or even straight from the database. In this case, we'll use -[the `/items/` REST API endpoint](/reference/api/rest/items) to retrieve the item we just created. +[the `/items/` REST API endpoint](/reference/api/items) to retrieve the item we just created. Using your browser, or an API tool like [Postman](http://postman.com) or [Paw](https://paw.cloud), open [http://localhost:8055/items/articles](http://localhost:8055/items/articles). From d4be69afefff85baa10eb75585ec5b40bdce5e86 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 09:50:17 -0400 Subject: [PATCH 05/30] fix(deps): pin dependencies (#6323) Co-authored-by: Renovate Bot --- api/package.json | 62 +- app/package.json | 114 +-- docs/package.json | 16 +- package-lock.json | 975 ++++++++++--------- package.json | 76 +- packages/cli/package.json | 26 +- packages/drive-azure/package.json | 20 +- packages/drive-gcs/package.json | 20 +- packages/drive-s3/package.json | 22 +- packages/drive/package.json | 16 +- packages/format-title/package.json | 18 +- packages/gatsby-source-directus/package.json | 10 +- packages/schema/package.json | 4 +- packages/sdk/package.json | 40 +- packages/specs/package.json | 6 +- 15 files changed, 720 insertions(+), 705 deletions(-) diff --git a/api/package.json b/api/package.json index bc1adad6e6..b8f48edbf1 100644 --- a/api/package.json +++ b/api/package.json @@ -151,36 +151,36 @@ }, "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd", "devDependencies": { - "@types/async": "^3.2.6", - "@types/atob": "^2.1.2", - "@types/body-parser": "^1.19.0", - "@types/busboy": "^0.2.3", - "@types/cookie-parser": "^1.4.2", - "@types/cors": "^2.8.10", - "@types/destroy": "^1.0.0", - "@types/express": "^4.17.12", - "@types/express-pino-logger": "^4.0.2", - "@types/express-session": "^1.17.3", - "@types/fs-extra": "^9.0.11", - "@types/inquirer": "^7.3.1", - "@types/js-yaml": "^4.0.1", - "@types/json2csv": "^5.0.2", - "@types/jsonwebtoken": "^8.5.1", - "@types/keyv": "^3.1.1", - "@types/lodash": "^4.14.170", - "@types/mime-types": "^2.1.0", - "@types/ms": "^0.7.31", - "@types/node": "^15.12.0", - "@types/node-cron": "^2.0.3", - "@types/nodemailer": "^6.4.1", - "@types/qs": "^6.9.6", - "@types/sharp": "^0.28.3", - "@types/stream-json": "^1.7.0", - "@types/uuid": "^8.3.0", - "@types/uuid-validate": "^0.0.1", - "copyfiles": "^2.4.0", - "cross-env": "^7.0.2", - "ts-node-dev": "^1.0.0", - "typescript": "^4.3.2" + "@types/async": "3.2.6", + "@types/atob": "2.1.2", + "@types/body-parser": "1.19.0", + "@types/busboy": "0.2.3", + "@types/cookie-parser": "1.4.2", + "@types/cors": "2.8.10", + "@types/destroy": "1.0.0", + "@types/express": "4.17.12", + "@types/express-pino-logger": "4.0.2", + "@types/express-session": "1.17.3", + "@types/fs-extra": "9.0.11", + "@types/inquirer": "7.3.1", + "@types/js-yaml": "4.0.1", + "@types/json2csv": "5.0.2", + "@types/jsonwebtoken": "8.5.1", + "@types/keyv": "3.1.1", + "@types/lodash": "4.14.170", + "@types/mime-types": "2.1.0", + "@types/ms": "0.7.31", + "@types/node": "15.12.2", + "@types/node-cron": "2.0.3", + "@types/nodemailer": "6.4.2", + "@types/qs": "6.9.6", + "@types/sharp": "0.28.3", + "@types/stream-json": "1.7.0", + "@types/uuid": "8.3.0", + "@types/uuid-validate": "0.0.1", + "copyfiles": "2.4.1", + "cross-env": "7.0.3", + "ts-node-dev": "1.1.6", + "typescript": "4.3.2" } } diff --git a/app/package.json b/app/package.json index dfab22a762..efb1c2b86c 100644 --- a/app/package.json +++ b/app/package.json @@ -30,62 +30,62 @@ "devDependencies": { "@directus/docs": "9.0.0-rc.76", "@directus/format-title": "9.0.0-rc.76", - "@fullcalendar/core": "^5.7.2", - "@fullcalendar/daygrid": "^5.7.2", - "@fullcalendar/interaction": "^5.7.2", - "@fullcalendar/list": "^5.7.2", - "@fullcalendar/timegrid": "^5.7.2", - "@popperjs/core": "^2.9.2", - "@rollup/plugin-yaml": "^3.0.0", - "@sindresorhus/slugify": "^2.1.0", - "@tinymce/tinymce-vue": "^4.0.3", - "@types/base-64": "^1.0.0", - "@types/bytes": "^3.1.0", - "@types/codemirror": "^5.60.0", - "@types/color": "^3.0.1", - "@types/diff": "^5.0.0", - "@types/dompurify": "^2.2.2", - "@types/lodash": "^4.14.170", - "@types/markdown-it": "^12.0.1", - "@types/marked": "^2.0.3", - "@types/mime-types": "^2.1.0", - "@types/ms": "^0.7.31", - "@types/qrcode": "^1.4.0", - "@vitejs/plugin-vue": "^1.2.1", - "@vue/cli-plugin-babel": "^4.5.13", - "@vue/cli-plugin-router": "^4.5.8", - "@vue/cli-plugin-typescript": "^4.5.13", - "@vue/cli-plugin-vuex": "^4.5.8", - "@vue/cli-service": "^4.5.13", - "@vue/compiler-sfc": "^3.0.5", - "axios": "^0.21.1", - "base-64": "^1.0.0", - "codemirror": "^5.61.1", - "copyfiles": "^2.4.1", - "cropperjs": "^1.5.12", - "date-fns": "^2.21.1", - "dompurify": "^2.2.9", - "escape-string-regexp": "^5.0.0", - "front-matter": "^4.0.2", - "html-entities": "^2.3.2", - "jsonlint-mod": "^1.7.6", - "marked": "^2.0.7", - "micromustache": "^8.0.3", - "mime": "^2.5.2", - "mitt": "^2.1.0", - "nanoid": "^3.1.23", - "pinia": "^2.0.0-alpha.13", - "prettier": "^2.3.1", - "pretty-ms": "^7.0.1", - "qrcode": "^1.4.4", - "rimraf": "^3.0.2", - "sass": "^1.35.1", - "tinymce": "^5.7.1", - "typescript": "^4.2.4", - "vite": "^2.3.7", - "vue": "^3.0.5", - "vue-i18n": "^9.1.6", - "vue-router": "^4.0.6", - "vuedraggable": "^4.0.3" + "@fullcalendar/core": "5.7.2", + "@fullcalendar/daygrid": "5.7.2", + "@fullcalendar/interaction": "5.7.2", + "@fullcalendar/list": "5.7.2", + "@fullcalendar/timegrid": "5.7.2", + "@popperjs/core": "2.9.2", + "@rollup/plugin-yaml": "3.0.0", + "@sindresorhus/slugify": "2.1.0", + "@tinymce/tinymce-vue": "4.0.3", + "@types/base-64": "1.0.0", + "@types/bytes": "3.1.0", + "@types/codemirror": "5.60.0", + "@types/color": "3.0.1", + "@types/diff": "5.0.0", + "@types/dompurify": "2.2.2", + "@types/lodash": "4.14.170", + "@types/markdown-it": "12.0.2", + "@types/marked": "2.0.3", + "@types/mime-types": "2.1.0", + "@types/ms": "0.7.31", + "@types/qrcode": "1.4.0", + "@vitejs/plugin-vue": "1.2.3", + "@vue/cli-plugin-babel": "4.5.13", + "@vue/cli-plugin-router": "4.5.13", + "@vue/cli-plugin-typescript": "4.5.13", + "@vue/cli-plugin-vuex": "4.5.13", + "@vue/cli-service": "4.5.13", + "@vue/compiler-sfc": "3.1.1", + "axios": "0.21.1", + "base-64": "1.0.0", + "codemirror": "5.61.1", + "copyfiles": "2.4.1", + "cropperjs": "1.5.12", + "date-fns": "2.22.1", + "dompurify": "2.2.9", + "escape-string-regexp": "5.0.0", + "front-matter": "4.0.2", + "html-entities": "2.3.2", + "jsonlint-mod": "1.7.6", + "marked": "2.0.7", + "micromustache": "8.0.3", + "mime": "2.5.2", + "mitt": "2.1.0", + "nanoid": "3.1.23", + "pinia": "2.0.0-beta.2", + "prettier": "2.3.1", + "pretty-ms": "7.0.1", + "qrcode": "1.4.4", + "rimraf": "3.0.2", + "sass": "1.35.1", + "tinymce": "5.8.1", + "typescript": "4.3.2", + "vite": "2.3.7", + "vue": "3.1.1", + "vue-i18n": "9.1.6", + "vue-router": "4.0.8", + "vuedraggable": "4.0.3" } } diff --git a/docs/package.json b/docs/package.json index 2e90b3cb16..190fc93563 100644 --- a/docs/package.json +++ b/docs/package.json @@ -30,13 +30,13 @@ "license": "ISC", "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd", "devDependencies": { - "directory-tree": "^2.2.9", - "fs-extra": "^10.0.0", - "lodash.get": "^4.4.2", - "micromark": "^2.10.1", - "npm-watch": "^0.10.0", - "slugify": "^1.5.3", - "vuepress": "^1.7.1", - "vuepress-plugin-clean-urls": "^1.1.2" + "directory-tree": "2.2.9", + "fs-extra": "7.0.1", + "lodash.get": "4.4.2", + "micromark": "2.11.4", + "npm-watch": "0.10.0", + "slugify": "1.5.3", + "vuepress": "1.8.2", + "vuepress-plugin-clean-urls": "1.1.2" } } diff --git a/package-lock.json b/package-lock.json index 07ab859e5c..04642115bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,44 +12,44 @@ "./packages/*" ], "devDependencies": { - "@types/dockerode": "^3.2.3", - "@types/jest": "^26.0.22", - "@types/listr": "^0.14.3", - "@types/node": "^15.12.0", - "@types/supertest": "^2.0.11", - "@typescript-eslint/eslint-plugin": "^4.27.0", - "@typescript-eslint/parser": "^4.27.0", - "axios": "^0.21.1", - "dockerode": "^3.3.0", - "eslint": "^7.27.0", - "eslint-config-prettier": "^8.3.0", - "eslint-plugin-prettier": "^3.4.0", - "eslint-plugin-prettier-vue": "^3.1.0", - "eslint-plugin-vue": "^7.11.1", - "globby": "^11.0.3", - "jest": "^27.0.4", - "knex": "^0.95.6", - "lerna": "^4.0.0", - "lint-staged": "^11.0.0", - "listr": "^0.14.3", - "mysql": "^2.18.1", - "nanoid": "^3.1.23", - "npm-run-all": "^4.1.5", - "oracledb": "^5.1.0", - "pg": "^8.6.0", - "prettier": "^2.3.1", - "simple-git-hooks": "^2.4.1", - "sqlite3": "^5.0.2", - "stylelint": "^13.13.1", - "stylelint-config-prettier": "^8.0.2", - "stylelint-config-rational-order": "^0.1.2", - "stylelint-config-standard": "^22.0.0", - "stylelint-order": "^4.1.0", - "stylelint-scss": "^3.19.0", - "supertest": "^6.1.3", - "tedious": "^11.0.8", - "ts-jest": "^27.0.2", - "ts-node": "^10.0.0" + "@types/dockerode": "3.2.3", + "@types/jest": "26.0.23", + "@types/listr": "0.14.3", + "@types/node": "15.12.2", + "@types/supertest": "2.0.11", + "@typescript-eslint/eslint-plugin": "4.27.0", + "@typescript-eslint/parser": "4.27.0", + "axios": "0.21.1", + "dockerode": "3.3.0", + "eslint": "7.28.0", + "eslint-config-prettier": "8.3.0", + "eslint-plugin-prettier": "3.4.0", + "eslint-plugin-prettier-vue": "3.1.0", + "eslint-plugin-vue": "7.11.1", + "globby": "11.0.3", + "jest": "27.0.4", + "knex": "0.95.6", + "lerna": "4.0.0", + "lint-staged": "11.0.0", + "listr": "0.14.3", + "mysql": "2.18.1", + "nanoid": "3.1.23", + "npm-run-all": "4.1.5", + "oracledb": "5.2.0", + "pg": "8.6.0", + "prettier": "2.3.1", + "simple-git-hooks": "2.4.1", + "sqlite3": "5.0.2", + "stylelint": "13.13.1", + "stylelint-config-prettier": "8.0.2", + "stylelint-config-rational-order": "0.1.2", + "stylelint-config-standard": "22.0.0", + "stylelint-order": "4.1.0", + "stylelint-scss": "3.19.0", + "supertest": "6.1.3", + "tedious": "11.0.9", + "ts-jest": "27.0.3", + "ts-node": "10.0.0" } }, "api": { @@ -129,37 +129,37 @@ "directus": "cli.js" }, "devDependencies": { - "@types/async": "^3.2.6", - "@types/atob": "^2.1.2", - "@types/body-parser": "^1.19.0", - "@types/busboy": "^0.2.3", - "@types/cookie-parser": "^1.4.2", - "@types/cors": "^2.8.10", - "@types/destroy": "^1.0.0", - "@types/express": "^4.17.12", - "@types/express-pino-logger": "^4.0.2", - "@types/express-session": "^1.17.3", - "@types/fs-extra": "^9.0.11", - "@types/inquirer": "^7.3.1", - "@types/js-yaml": "^4.0.1", - "@types/json2csv": "^5.0.2", - "@types/jsonwebtoken": "^8.5.1", - "@types/keyv": "^3.1.1", - "@types/lodash": "^4.14.170", - "@types/mime-types": "^2.1.0", - "@types/ms": "^0.7.31", - "@types/node": "^15.12.0", - "@types/node-cron": "^2.0.3", - "@types/nodemailer": "^6.4.1", - "@types/qs": "^6.9.6", - "@types/sharp": "^0.28.3", - "@types/stream-json": "^1.7.0", - "@types/uuid": "^8.3.0", - "@types/uuid-validate": "^0.0.1", - "copyfiles": "^2.4.0", - "cross-env": "^7.0.2", - "ts-node-dev": "^1.0.0", - "typescript": "^4.3.2" + "@types/async": "3.2.6", + "@types/atob": "2.1.2", + "@types/body-parser": "1.19.0", + "@types/busboy": "0.2.3", + "@types/cookie-parser": "1.4.2", + "@types/cors": "2.8.10", + "@types/destroy": "1.0.0", + "@types/express": "4.17.12", + "@types/express-pino-logger": "4.0.2", + "@types/express-session": "1.17.3", + "@types/fs-extra": "9.0.11", + "@types/inquirer": "7.3.1", + "@types/js-yaml": "4.0.1", + "@types/json2csv": "5.0.2", + "@types/jsonwebtoken": "8.5.1", + "@types/keyv": "3.1.1", + "@types/lodash": "4.14.170", + "@types/mime-types": "2.1.0", + "@types/ms": "0.7.31", + "@types/node": "15.12.2", + "@types/node-cron": "2.0.3", + "@types/nodemailer": "6.4.2", + "@types/qs": "6.9.6", + "@types/sharp": "0.28.3", + "@types/stream-json": "1.7.0", + "@types/uuid": "8.3.0", + "@types/uuid-validate": "0.0.1", + "copyfiles": "2.4.1", + "cross-env": "7.0.3", + "ts-node-dev": "1.1.6", + "typescript": "4.3.2" }, "optionalDependencies": { "@keyv/redis": "^2.1.2", @@ -451,63 +451,63 @@ "devDependencies": { "@directus/docs": "9.0.0-rc.76", "@directus/format-title": "9.0.0-rc.76", - "@fullcalendar/core": "^5.7.2", - "@fullcalendar/daygrid": "^5.7.2", - "@fullcalendar/interaction": "^5.7.2", - "@fullcalendar/list": "^5.7.2", - "@fullcalendar/timegrid": "^5.7.2", - "@popperjs/core": "^2.9.2", - "@rollup/plugin-yaml": "^3.0.0", - "@sindresorhus/slugify": "^2.1.0", - "@tinymce/tinymce-vue": "^4.0.3", - "@types/base-64": "^1.0.0", - "@types/bytes": "^3.1.0", - "@types/codemirror": "^5.60.0", - "@types/color": "^3.0.1", - "@types/diff": "^5.0.0", - "@types/dompurify": "^2.2.2", - "@types/lodash": "^4.14.170", - "@types/markdown-it": "^12.0.1", - "@types/marked": "^2.0.3", - "@types/mime-types": "^2.1.0", - "@types/ms": "^0.7.31", - "@types/qrcode": "^1.4.0", - "@vitejs/plugin-vue": "^1.2.1", - "@vue/cli-plugin-babel": "^4.5.13", - "@vue/cli-plugin-router": "^4.5.8", - "@vue/cli-plugin-typescript": "^4.5.13", - "@vue/cli-plugin-vuex": "^4.5.8", - "@vue/cli-service": "^4.5.13", - "@vue/compiler-sfc": "^3.0.5", - "axios": "^0.21.1", - "base-64": "^1.0.0", - "codemirror": "^5.61.1", - "copyfiles": "^2.4.1", - "cropperjs": "^1.5.12", - "date-fns": "^2.21.1", - "dompurify": "^2.2.9", - "escape-string-regexp": "^5.0.0", - "front-matter": "^4.0.2", - "html-entities": "^2.3.2", - "jsonlint-mod": "^1.7.6", - "marked": "^2.0.7", - "micromustache": "^8.0.3", - "mime": "^2.5.2", - "mitt": "^2.1.0", - "nanoid": "^3.1.23", - "pinia": "^2.0.0-alpha.13", - "prettier": "^2.3.1", - "pretty-ms": "^7.0.1", - "qrcode": "^1.4.4", - "rimraf": "^3.0.2", - "sass": "^1.35.1", - "tinymce": "^5.7.1", - "typescript": "^4.2.4", - "vite": "^2.3.7", - "vue": "^3.0.5", - "vue-i18n": "^9.1.6", - "vue-router": "^4.0.6", - "vuedraggable": "^4.0.3" + "@fullcalendar/core": "5.7.2", + "@fullcalendar/daygrid": "5.7.2", + "@fullcalendar/interaction": "5.7.2", + "@fullcalendar/list": "5.7.2", + "@fullcalendar/timegrid": "5.7.2", + "@popperjs/core": "2.9.2", + "@rollup/plugin-yaml": "3.0.0", + "@sindresorhus/slugify": "2.1.0", + "@tinymce/tinymce-vue": "4.0.3", + "@types/base-64": "1.0.0", + "@types/bytes": "3.1.0", + "@types/codemirror": "5.60.0", + "@types/color": "3.0.1", + "@types/diff": "5.0.0", + "@types/dompurify": "2.2.2", + "@types/lodash": "4.14.170", + "@types/markdown-it": "12.0.2", + "@types/marked": "2.0.3", + "@types/mime-types": "2.1.0", + "@types/ms": "0.7.31", + "@types/qrcode": "1.4.0", + "@vitejs/plugin-vue": "1.2.3", + "@vue/cli-plugin-babel": "4.5.13", + "@vue/cli-plugin-router": "4.5.13", + "@vue/cli-plugin-typescript": "4.5.13", + "@vue/cli-plugin-vuex": "4.5.13", + "@vue/cli-service": "4.5.13", + "@vue/compiler-sfc": "3.1.1", + "axios": "0.21.1", + "base-64": "1.0.0", + "codemirror": "5.61.1", + "copyfiles": "2.4.1", + "cropperjs": "1.5.12", + "date-fns": "2.22.1", + "dompurify": "2.2.9", + "escape-string-regexp": "5.0.0", + "front-matter": "4.0.2", + "html-entities": "2.3.2", + "jsonlint-mod": "1.7.6", + "marked": "2.0.7", + "micromustache": "8.0.3", + "mime": "2.5.2", + "mitt": "2.1.0", + "nanoid": "3.1.23", + "pinia": "2.0.0-beta.2", + "prettier": "2.3.1", + "pretty-ms": "7.0.1", + "qrcode": "1.4.4", + "rimraf": "3.0.2", + "sass": "1.35.1", + "tinymce": "5.8.1", + "typescript": "4.3.2", + "vite": "2.3.7", + "vue": "3.1.1", + "vue-i18n": "9.1.6", + "vue-router": "4.0.8", + "vuedraggable": "4.0.3" } }, "docs": { @@ -515,14 +515,14 @@ "version": "9.0.0-rc.76", "license": "ISC", "devDependencies": { - "directory-tree": "^2.2.9", - "fs-extra": "^10.0.0", - "lodash.get": "^4.4.2", - "micromark": "^2.10.1", - "npm-watch": "^0.10.0", - "slugify": "^1.5.3", - "vuepress": "^1.7.1", - "vuepress-plugin-clean-urls": "^1.1.2" + "directory-tree": "2.2.9", + "fs-extra": "7.0.1", + "lodash.get": "4.4.2", + "micromark": "2.11.4", + "npm-watch": "0.10.0", + "slugify": "1.5.3", + "vuepress": "1.8.2", + "vuepress-plugin-clean-urls": "1.1.2" } }, "docs/node_modules/fs-extra": { @@ -11700,7 +11700,7 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "devOptional": true, + "dev": true, "dependencies": { "safer-buffer": "~2.1.0" } @@ -11734,7 +11734,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "devOptional": true, + "dev": true, "engines": { "node": ">=0.8" } @@ -11999,7 +11999,7 @@ "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "devOptional": true, + "dev": true, "engines": { "node": "*" } @@ -12008,7 +12008,7 @@ "version": "1.11.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", - "devOptional": true + "dev": true }, "node_modules/axe-core": { "version": "4.2.2", @@ -12612,7 +12612,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "devOptional": true, + "dev": true, "dependencies": { "tweetnacl": "^0.14.3" } @@ -12734,6 +12734,7 @@ "version": "0.0.9", "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", + "dev": true, "optional": true, "dependencies": { "inherits": "~2.0.0" @@ -13621,7 +13622,7 @@ "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "devOptional": true + "dev": true }, "node_modules/ccount": { "version": "1.1.0", @@ -16261,7 +16262,7 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "devOptional": true, + "dev": true, "dependencies": { "assert-plus": "^1.0.0" }, @@ -17334,7 +17335,7 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "devOptional": true, + "dev": true, "dependencies": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" @@ -19567,7 +19568,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "devOptional": true, + "dev": true, "engines": [ "node >=0.6.0" ] @@ -20071,7 +20072,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "devOptional": true, + "dev": true, "engines": { "node": "*" } @@ -20558,6 +20559,7 @@ "version": "1.0.12", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", + "dev": true, "optional": true, "dependencies": { "graceful-fs": "^4.1.2", @@ -20573,6 +20575,7 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, "optional": true, "dependencies": { "glob": "^7.1.3" @@ -23900,7 +23903,7 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "devOptional": true, + "dev": true, "dependencies": { "assert-plus": "^1.0.0" } @@ -25071,7 +25074,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "devOptional": true, + "dev": true, "engines": { "node": ">=4" } @@ -25081,7 +25084,7 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "deprecated": "this library is no longer supported", - "devOptional": true, + "dev": true, "dependencies": { "ajv": "^6.12.3", "har-schema": "^2.0.0" @@ -25742,7 +25745,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "devOptional": true, + "dev": true, "dependencies": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", @@ -27096,7 +27099,7 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "devOptional": true + "dev": true }, "node_modules/istanbul-lib-coverage": { "version": "3.0.0", @@ -29398,7 +29401,7 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "devOptional": true + "dev": true }, "node_modules/jsdom": { "version": "16.6.0", @@ -29539,7 +29542,7 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "devOptional": true + "dev": true }, "node_modules/json-schema-traverse": { "version": "0.4.1", @@ -29710,7 +29713,7 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "devOptional": true, + "dev": true, "engines": [ "node >=0.6.0" ], @@ -29777,6 +29780,7 @@ "version": "7.7.0", "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz", "integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==", + "dev": true, "hasInstallScript": true, "optional": true, "dependencies": { @@ -36678,7 +36682,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "devOptional": true + "dev": true }, "node_modules/pg": { "version": "8.6.0", @@ -40357,7 +40361,7 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", - "devOptional": true, + "dev": true, "dependencies": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -40417,7 +40421,7 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "devOptional": true, + "dev": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -40431,7 +40435,7 @@ "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "devOptional": true, + "dev": true, "engines": { "node": ">=0.6" } @@ -40440,7 +40444,7 @@ "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "devOptional": true, + "dev": true, "dependencies": { "psl": "^1.1.28", "punycode": "^2.1.1" @@ -42261,6 +42265,7 @@ "version": "3.8.0", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", + "dev": true, "optional": true, "dependencies": { "fstream": "^1.0.0", @@ -42287,6 +42292,7 @@ "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, "optional": true, "dependencies": { "abbrev": "1" @@ -42299,6 +42305,7 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, "optional": true, "dependencies": { "glob": "^7.1.3" @@ -42311,6 +42318,7 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "dev": true, "optional": true, "bin": { "semver": "bin/semver" @@ -42320,6 +42328,7 @@ "version": "2.2.2", "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", + "dev": true, "optional": true, "dependencies": { "block-stream": "*", @@ -42331,6 +42340,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, "optional": true, "dependencies": { "isexe": "^2.0.0" @@ -42378,7 +42388,7 @@ "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "devOptional": true, + "dev": true, "dependencies": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -46324,7 +46334,7 @@ "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "devOptional": true + "dev": true }, "node_modules/type": { "version": "1.2.0", @@ -47328,7 +47338,7 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "devOptional": true, + "dev": true, "engines": [ "node >=0.6.0" ], @@ -50369,19 +50379,19 @@ "directusctl": "bin/directus.js" }, "devDependencies": { - "@types/figlet": "^1.5.0", - "@types/fs-extra": "^9.0.11", - "@types/jest": "^26.0.23", - "@types/js-yaml": "^4.0.0", - "@types/marked-terminal": "^3.1.1", - "jest": "^27.0.4", - "nock": "^13.0.10", - "npm-run-all": "^4.1.5", - "prettier": "^2.3.1", - "rimraf": "^3.0.2", - "ts-jest": "^27.0.2", - "ts-node": "^10.0.0", - "typescript": "^4.3.2" + "@types/figlet": "1.5.1", + "@types/fs-extra": "9.0.11", + "@types/jest": "26.0.23", + "@types/js-yaml": "4.0.1", + "@types/marked-terminal": "3.1.1", + "jest": "27.0.4", + "nock": "13.1.0", + "npm-run-all": "4.1.5", + "prettier": "2.3.1", + "rimraf": "3.0.2", + "ts-jest": "27.0.3", + "ts-node": "10.0.0", + "typescript": "4.3.2" } }, "packages/cli/node_modules/@types/yargs": { @@ -50974,14 +50984,14 @@ "node-exceptions": "^4.0.1" }, "devDependencies": { - "@types/fs-extra": "^9.0.11", - "@types/jest": "^26.0.22", - "@types/node": "^15.12.0", - "dotenv": "^10.0.0", - "jest": "^27.0.4", - "npm-run-all": "^4.1.5", - "ts-jest": "^27.0.2", - "typescript": "^4.3.2" + "@types/fs-extra": "9.0.11", + "@types/jest": "26.0.23", + "@types/node": "15.12.2", + "dotenv": "8.6.0", + "jest": "27.0.4", + "npm-run-all": "4.1.5", + "ts-jest": "27.0.3", + "typescript": "4.3.2" } }, "packages/drive-azure": { @@ -50994,16 +51004,16 @@ "normalize-path": "^3.0.0" }, "devDependencies": { - "@types/fs-extra": "^9.0.11", - "@types/jest": "^26.0.22", - "@types/node": "^15.12.0", - "@types/normalize-path": "^3.0.0", - "dotenv": "^10.0.0", - "fs-extra": "^10.0.0", - "jest": "^27.0.4", - "npm-run-all": "^4.1.5", - "ts-jest": "^27.0.2", - "typescript": "^4.3.2" + "@types/fs-extra": "9.0.11", + "@types/jest": "26.0.23", + "@types/node": "15.12.2", + "@types/normalize-path": "3.0.0", + "dotenv": "8.6.0", + "fs-extra": "7.0.1", + "jest": "27.0.4", + "npm-run-all": "4.1.5", + "ts-jest": "27.0.3", + "typescript": "4.3.2" } }, "packages/drive-azure/node_modules/dotenv": { @@ -51060,16 +51070,16 @@ "normalize-path": "^3.0.0" }, "devDependencies": { - "@lukeed/uuid": "^2.0.0", - "@types/fs-extra": "^9.0.11", - "@types/jest": "^26.0.22", - "@types/node": "^15.12.0", - "@types/normalize-path": "^3.0.0", - "dotenv": "^10.0.0", - "jest": "^27.0.4", - "npm-run-all": "^4.1.5", - "ts-jest": "^27.0.2", - "typescript": "^4.3.2" + "@lukeed/uuid": "2.0.0", + "@types/fs-extra": "9.0.11", + "@types/jest": "26.0.23", + "@types/node": "15.12.2", + "@types/normalize-path": "3.0.0", + "dotenv": "8.6.0", + "jest": "27.0.4", + "npm-run-all": "4.1.5", + "ts-jest": "27.0.3", + "typescript": "4.3.2" } }, "packages/drive-gcs/node_modules/dotenv": { @@ -51091,17 +51101,17 @@ "normalize-path": "^3.0.0" }, "devDependencies": { - "@lukeed/uuid": "^2.0.0", - "@types/fs-extra": "^9.0.11", - "@types/jest": "^26.0.22", - "@types/node": "^15.12.0", - "@types/normalize-path": "^3.0.0", - "dotenv": "^10.0.0", - "fs-extra": "^10.0.0", - "jest": "^27.0.4", - "npm-run-all": "^4.1.5", - "ts-jest": "^27.0.2", - "typescript": "^4.3.2" + "@lukeed/uuid": "2.0.0", + "@types/fs-extra": "9.0.11", + "@types/jest": "26.0.23", + "@types/node": "15.12.2", + "@types/normalize-path": "3.0.0", + "dotenv": "8.6.0", + "fs-extra": "7.0.1", + "jest": "27.0.4", + "npm-run-all": "4.1.5", + "ts-jest": "27.0.3", + "typescript": "4.3.2" } }, "packages/drive-s3/node_modules/dotenv": { @@ -51194,15 +51204,15 @@ "version": "9.0.0-rc.76", "license": "MIT", "devDependencies": { - "@rollup/plugin-commonjs": "^19.0.0", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^13.0.0", - "rimraf": "^3.0.2", - "rollup": "^2.52.0", - "rollup-plugin-sourcemaps": "^0.6.3", - "rollup-plugin-terser": "^7.0.2", - "rollup-plugin-typescript2": "^0.30.0", - "typescript": "^4.3.2" + "@rollup/plugin-commonjs": "19.0.0", + "@rollup/plugin-json": "4.1.0", + "@rollup/plugin-node-resolve": "13.0.0", + "rimraf": "3.0.2", + "rollup": "2.52.0", + "rollup-plugin-sourcemaps": "0.6.3", + "rollup-plugin-terser": "7.0.2", + "rollup-plugin-typescript2": "0.30.0", + "typescript": "4.3.2" }, "engines": { "node": ">=6.0.0" @@ -51213,12 +51223,12 @@ "version": "9.0.0-rc.76", "license": "MIT", "dependencies": { - "@directus/sdk-js": "^9.0.0-rc.53", + "@directus/sdk-js": "9.0.0-rc.53", "@lnfusion/gatsby-source-graphql": "0.0.4", - "chalk": "^4.1.1", - "gatsby-source-filesystem": "^3.7.1", - "invariant": "^2.2.4", - "ms": "^2.1.3" + "chalk": "2.4.2", + "gatsby-source-filesystem": "3.7.1", + "invariant": "2.2.4", + "ms": "2.1.2" } }, "packages/gatsby-source-directus/node_modules/@jest/types": { @@ -55179,8 +55189,8 @@ "lodash": "^4.17.21" }, "devDependencies": { - "npm-watch": "^0.10.0", - "typescript": "^4.3.2" + "npm-watch": "0.10.0", + "typescript": "4.3.2" } }, "packages/sdk": { @@ -55191,26 +55201,26 @@ "axios": "^0.21.1" }, "devDependencies": { - "@rollup/plugin-commonjs": "^19.0.0", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^13.0.0", - "@types/jest": "^26.0.22", - "argon2": "^0.28.1", - "dotenv": "^10.0.0", - "jest": "^27.0.3", - "jest-environment-jsdom-global": "^2.0.4", - "mockdate": "^3.0.5", - "nock": "^13.0.10", - "npm-run-all": "^4.1.5", - "rimraf": "^3.0.2", - "rollup": "^2.52.0", - "rollup-plugin-copy": "^3.4.0", - "rollup-plugin-sourcemaps": "^0.6.3", - "rollup-plugin-terser": "^7.0.2", - "rollup-plugin-typescript2": "^0.30.0", - "ts-jest": "^27.0.2", - "ts-node": "^10.0.0", - "typescript": "^4.3.2" + "@rollup/plugin-commonjs": "19.0.0", + "@rollup/plugin-json": "4.1.0", + "@rollup/plugin-node-resolve": "13.0.0", + "@types/jest": "26.0.23", + "argon2": "0.28.2", + "dotenv": "8.6.0", + "jest": "27.0.4", + "jest-environment-jsdom-global": "2.0.4", + "mockdate": "3.0.5", + "nock": "13.1.0", + "npm-run-all": "4.1.5", + "rimraf": "3.0.2", + "rollup": "2.52.0", + "rollup-plugin-copy": "3.4.0", + "rollup-plugin-sourcemaps": "0.6.3", + "rollup-plugin-terser": "7.0.2", + "rollup-plugin-typescript2": "0.30.0", + "ts-jest": "27.0.3", + "ts-node": "10.0.0", + "typescript": "4.3.2" } }, "packages/sdk/node_modules/@jest/environment": { @@ -55492,9 +55502,9 @@ "openapi3-ts": "^2.0.1" }, "devDependencies": { - "npm-watch": "^0.10.0", - "swagger-cli": "^4.0.4", - "swagger-ui-watcher": "^2.1.11" + "npm-watch": "0.10.0", + "swagger-cli": "4.0.4", + "swagger-ui-watcher": "2.1.11" } } }, @@ -57178,63 +57188,63 @@ "requires": { "@directus/docs": "9.0.0-rc.76", "@directus/format-title": "9.0.0-rc.76", - "@fullcalendar/core": "^5.7.2", - "@fullcalendar/daygrid": "^5.7.2", - "@fullcalendar/interaction": "^5.7.2", - "@fullcalendar/list": "^5.7.2", - "@fullcalendar/timegrid": "^5.7.2", - "@popperjs/core": "^2.9.2", - "@rollup/plugin-yaml": "^3.0.0", - "@sindresorhus/slugify": "^2.1.0", - "@tinymce/tinymce-vue": "^4.0.3", - "@types/base-64": "^1.0.0", - "@types/bytes": "^3.1.0", - "@types/codemirror": "^5.60.0", - "@types/color": "^3.0.1", - "@types/diff": "^5.0.0", - "@types/dompurify": "^2.2.2", - "@types/lodash": "^4.14.170", - "@types/markdown-it": "^12.0.1", - "@types/marked": "^2.0.3", - "@types/mime-types": "^2.1.0", - "@types/ms": "^0.7.31", - "@types/qrcode": "^1.4.0", - "@vitejs/plugin-vue": "^1.2.1", - "@vue/cli-plugin-babel": "^4.5.13", - "@vue/cli-plugin-router": "^4.5.8", - "@vue/cli-plugin-typescript": "^4.5.13", - "@vue/cli-plugin-vuex": "^4.5.8", - "@vue/cli-service": "^4.5.13", - "@vue/compiler-sfc": "^3.0.5", - "axios": "^0.21.1", - "base-64": "^1.0.0", - "codemirror": "^5.61.1", - "copyfiles": "^2.4.1", - "cropperjs": "^1.5.12", - "date-fns": "^2.21.1", - "dompurify": "^2.2.9", - "escape-string-regexp": "^5.0.0", - "front-matter": "^4.0.2", - "html-entities": "^2.3.2", - "jsonlint-mod": "^1.7.6", - "marked": "^2.0.7", - "micromustache": "^8.0.3", - "mime": "^2.5.2", - "mitt": "^2.1.0", - "nanoid": "^3.1.23", - "pinia": "^2.0.0-alpha.13", - "prettier": "^2.3.1", - "pretty-ms": "^7.0.1", - "qrcode": "^1.4.4", - "rimraf": "^3.0.2", - "sass": "^1.35.1", - "tinymce": "^5.7.1", - "typescript": "^4.2.4", - "vite": "^2.3.7", - "vue": "^3.0.5", - "vue-i18n": "^9.1.6", - "vue-router": "^4.0.6", - "vuedraggable": "^4.0.3" + "@fullcalendar/core": "5.7.2", + "@fullcalendar/daygrid": "5.7.2", + "@fullcalendar/interaction": "5.7.2", + "@fullcalendar/list": "5.7.2", + "@fullcalendar/timegrid": "5.7.2", + "@popperjs/core": "2.9.2", + "@rollup/plugin-yaml": "3.0.0", + "@sindresorhus/slugify": "2.1.0", + "@tinymce/tinymce-vue": "4.0.3", + "@types/base-64": "1.0.0", + "@types/bytes": "3.1.0", + "@types/codemirror": "5.60.0", + "@types/color": "3.0.1", + "@types/diff": "5.0.0", + "@types/dompurify": "2.2.2", + "@types/lodash": "4.14.170", + "@types/markdown-it": "12.0.2", + "@types/marked": "2.0.3", + "@types/mime-types": "2.1.0", + "@types/ms": "0.7.31", + "@types/qrcode": "1.4.0", + "@vitejs/plugin-vue": "1.2.3", + "@vue/cli-plugin-babel": "4.5.13", + "@vue/cli-plugin-router": "4.5.13", + "@vue/cli-plugin-typescript": "4.5.13", + "@vue/cli-plugin-vuex": "4.5.13", + "@vue/cli-service": "4.5.13", + "@vue/compiler-sfc": "3.1.1", + "axios": "0.21.1", + "base-64": "1.0.0", + "codemirror": "5.61.1", + "copyfiles": "2.4.1", + "cropperjs": "1.5.12", + "date-fns": "2.22.1", + "dompurify": "2.2.9", + "escape-string-regexp": "5.0.0", + "front-matter": "4.0.2", + "html-entities": "2.3.2", + "jsonlint-mod": "1.7.6", + "marked": "2.0.7", + "micromustache": "8.0.3", + "mime": "2.5.2", + "mitt": "2.1.0", + "nanoid": "3.1.23", + "pinia": "2.0.0-beta.2", + "prettier": "2.3.1", + "pretty-ms": "7.0.1", + "qrcode": "1.4.4", + "rimraf": "3.0.2", + "sass": "1.35.1", + "tinymce": "5.8.1", + "typescript": "4.3.2", + "vite": "2.3.7", + "vue": "3.1.1", + "vue-i18n": "9.1.6", + "vue-router": "4.0.8", + "vuedraggable": "4.0.3" } }, "@directus/cli": { @@ -57242,11 +57252,11 @@ "requires": { "@directus/format-title": "9.0.0-rc.76", "@directus/sdk": "9.0.0-rc.76", - "@types/figlet": "^1.5.0", - "@types/fs-extra": "^9.0.11", - "@types/jest": "^26.0.23", - "@types/js-yaml": "^4.0.0", - "@types/marked-terminal": "^3.1.1", + "@types/figlet": "1.5.1", + "@types/fs-extra": "9.0.11", + "@types/jest": "26.0.23", + "@types/js-yaml": "4.0.1", + "@types/marked-terminal": "3.1.1", "@types/yargs": "^17.0.0", "app-module-path": "^2.2.0", "chalk": "^4.1.0", @@ -57264,7 +57274,7 @@ "gluegun": "^4.6.1", "indent-string": "^5.0.0", "jaro-winkler": "^0.2.8", - "jest": "^27.0.4", + "jest": "27.0.4", "joi": "^17.4.0", "js-yaml": "^4.1.0", "json5": "^2.2.0", @@ -57272,18 +57282,18 @@ "marked": "^2.0.7", "marked-terminal": "^4.1.1", "merge-options": "^3.0.4", - "nock": "^13.0.10", - "npm-run-all": "^4.1.5", + "nock": "13.1.0", + "npm-run-all": "4.1.5", "open": "^8.2.0", - "prettier": "^2.3.1", + "prettier": "2.3.1", "pretty-ms": "^7.0.1", - "rimraf": "^3.0.2", + "rimraf": "3.0.2", "shimmer": "^1.2.1", "strip-ansi": "^7.0.0", "strip-indent": "^4.0.0", - "ts-jest": "^27.0.2", - "ts-node": "^10.0.0", - "typescript": "^4.3.2", + "ts-jest": "27.0.3", + "ts-node": "10.0.0", + "typescript": "4.3.2", "yargs": "^17.0.1", "yargs-parser": "^20.2.7" }, @@ -57558,19 +57568,18 @@ "@directus/docs": { "version": "file:docs", "requires": { - "directory-tree": "^2.2.9", - "fs-extra": "^10.0.0", - "lodash.get": "^4.4.2", - "micromark": "^2.10.1", - "npm-watch": "^0.10.0", - "slugify": "^1.5.3", - "vuepress": "^1.7.1", - "vuepress-plugin-clean-urls": "^1.1.2" + "directory-tree": "2.2.9", + "fs-extra": "7.0.1", + "lodash.get": "4.4.2", + "micromark": "2.11.4", + "npm-watch": "0.10.0", + "slugify": "1.5.3", + "vuepress": "1.8.2", + "vuepress-plugin-clean-urls": "1.1.2" }, "dependencies": { "fs-extra": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", + "version": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", "dev": true, "requires": { @@ -57600,21 +57609,20 @@ "@directus/drive": { "version": "file:packages/drive", "requires": { - "@types/fs-extra": "^9.0.11", - "@types/jest": "^26.0.22", - "@types/node": "^15.12.0", - "dotenv": "^10.0.0", + "@types/fs-extra": "9.0.11", + "@types/jest": "26.0.23", + "@types/node": "15.12.2", + "dotenv": "8.6.0", "fs-extra": "^10.0.0", - "jest": "^27.0.4", + "jest": "27.0.4", "node-exceptions": "^4.0.1", - "npm-run-all": "^4.1.5", - "ts-jest": "^27.0.2", - "typescript": "^4.3.2" + "npm-run-all": "4.1.5", + "ts-jest": "27.0.3", + "typescript": "4.3.2" }, "dependencies": { "dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "version": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", "dev": true }, @@ -57649,28 +57657,26 @@ "requires": { "@azure/storage-blob": "^12.6.0", "@directus/drive": "9.0.0-rc.76", - "@types/fs-extra": "^9.0.11", - "@types/jest": "^26.0.22", - "@types/node": "^15.12.0", - "@types/normalize-path": "^3.0.0", - "dotenv": "^10.0.0", - "fs-extra": "^10.0.0", - "jest": "^27.0.4", + "@types/fs-extra": "9.0.11", + "@types/jest": "26.0.23", + "@types/node": "15.12.2", + "@types/normalize-path": "3.0.0", + "dotenv": "8.6.0", + "fs-extra": "7.0.1", + "jest": "27.0.4", "normalize-path": "^3.0.0", - "npm-run-all": "^4.1.5", - "ts-jest": "^27.0.2", - "typescript": "^4.3.2" + "npm-run-all": "4.1.5", + "ts-jest": "27.0.3", + "typescript": "4.3.2" }, "dependencies": { "dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "version": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", "dev": true }, "fs-extra": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", + "version": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", "dev": true, "requires": { @@ -57702,22 +57708,21 @@ "requires": { "@directus/drive": "9.0.0-rc.76", "@google-cloud/storage": "^5.8.5", - "@lukeed/uuid": "^2.0.0", - "@types/fs-extra": "^9.0.11", - "@types/jest": "^26.0.22", - "@types/node": "^15.12.0", - "@types/normalize-path": "^3.0.0", - "dotenv": "^10.0.0", - "jest": "^27.0.4", + "@lukeed/uuid": "2.0.0", + "@types/fs-extra": "9.0.11", + "@types/jest": "26.0.23", + "@types/node": "15.12.2", + "@types/normalize-path": "3.0.0", + "dotenv": "8.6.0", + "jest": "27.0.4", "normalize-path": "^3.0.0", - "npm-run-all": "^4.1.5", - "ts-jest": "^27.0.2", - "typescript": "^4.3.2" + "npm-run-all": "4.1.5", + "ts-jest": "27.0.3", + "typescript": "4.3.2" }, "dependencies": { "dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "version": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", "dev": true } @@ -57727,30 +57732,28 @@ "version": "file:packages/drive-s3", "requires": { "@directus/drive": "9.0.0-rc.76", - "@lukeed/uuid": "^2.0.0", - "@types/fs-extra": "^9.0.11", - "@types/jest": "^26.0.22", - "@types/node": "^15.12.0", - "@types/normalize-path": "^3.0.0", + "@lukeed/uuid": "2.0.0", + "@types/fs-extra": "9.0.11", + "@types/jest": "26.0.23", + "@types/node": "15.12.2", + "@types/normalize-path": "3.0.0", "aws-sdk": "^2.928.0", - "dotenv": "^10.0.0", - "fs-extra": "^10.0.0", - "jest": "^27.0.4", + "dotenv": "8.6.0", + "fs-extra": "7.0.1", + "jest": "27.0.4", "normalize-path": "^3.0.0", - "npm-run-all": "^4.1.5", - "ts-jest": "^27.0.2", - "typescript": "^4.3.2" + "npm-run-all": "4.1.5", + "ts-jest": "27.0.3", + "typescript": "4.3.2" }, "dependencies": { "dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "version": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", "dev": true }, "fs-extra": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", + "version": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", "dev": true, "requires": { @@ -57780,26 +57783,26 @@ "@directus/format-title": { "version": "file:packages/format-title", "requires": { - "@rollup/plugin-commonjs": "^19.0.0", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^13.0.0", - "rimraf": "^3.0.2", - "rollup": "^2.52.0", - "rollup-plugin-sourcemaps": "^0.6.3", - "rollup-plugin-terser": "^7.0.2", - "rollup-plugin-typescript2": "^0.30.0", - "typescript": "^4.3.2" + "@rollup/plugin-commonjs": "19.0.0", + "@rollup/plugin-json": "4.1.0", + "@rollup/plugin-node-resolve": "13.0.0", + "rimraf": "3.0.2", + "rollup": "2.52.0", + "rollup-plugin-sourcemaps": "0.6.3", + "rollup-plugin-terser": "7.0.2", + "rollup-plugin-typescript2": "0.30.0", + "typescript": "4.3.2" } }, "@directus/gatsby-source-directus": { "version": "file:packages/gatsby-source-directus", "requires": { - "@directus/sdk-js": "^9.0.0-rc.53", + "@directus/sdk-js": "9.0.0-rc.53", "@lnfusion/gatsby-source-graphql": "0.0.4", - "chalk": "^4.1.1", - "gatsby-source-filesystem": "^3.7.1", - "invariant": "^2.2.4", - "ms": "^2.1.3" + "chalk": "2.4.2", + "gatsby-source-filesystem": "3.7.1", + "invariant": "2.2.4", + "ms": "2.1.2" }, "dependencies": { "@jest/types": { @@ -60724,34 +60727,34 @@ "requires": { "knex-schema-inspector": "^1.3.0", "lodash": "^4.17.21", - "npm-watch": "^0.10.0", - "typescript": "^4.3.2" + "npm-watch": "0.10.0", + "typescript": "4.3.2" } }, "@directus/sdk": { "version": "file:packages/sdk", "requires": { - "@rollup/plugin-commonjs": "^19.0.0", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^13.0.0", - "@types/jest": "^26.0.22", - "argon2": "^0.28.1", + "@rollup/plugin-commonjs": "19.0.0", + "@rollup/plugin-json": "4.1.0", + "@rollup/plugin-node-resolve": "13.0.0", + "@types/jest": "26.0.23", + "argon2": "0.28.2", "axios": "^0.21.1", - "dotenv": "^10.0.0", - "jest": "^27.0.3", - "jest-environment-jsdom-global": "^2.0.4", - "mockdate": "^3.0.5", - "nock": "^13.0.10", - "npm-run-all": "^4.1.5", - "rimraf": "^3.0.2", - "rollup": "^2.52.0", - "rollup-plugin-copy": "^3.4.0", - "rollup-plugin-sourcemaps": "^0.6.3", - "rollup-plugin-terser": "^7.0.2", - "rollup-plugin-typescript2": "^0.30.0", - "ts-jest": "^27.0.2", - "ts-node": "^10.0.0", - "typescript": "^4.3.2" + "dotenv": "8.6.0", + "jest": "27.0.4", + "jest-environment-jsdom-global": "2.0.4", + "mockdate": "3.0.5", + "nock": "13.1.0", + "npm-run-all": "4.1.5", + "rimraf": "3.0.2", + "rollup": "2.52.0", + "rollup-plugin-copy": "3.4.0", + "rollup-plugin-sourcemaps": "0.6.3", + "rollup-plugin-terser": "7.0.2", + "rollup-plugin-typescript2": "0.30.0", + "ts-jest": "27.0.3", + "ts-node": "10.0.0", + "typescript": "4.3.2" }, "dependencies": { "@jest/environment": { @@ -60862,8 +60865,7 @@ "peer": true }, "dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "version": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", "dev": true }, @@ -60986,10 +60988,10 @@ "@directus/specs": { "version": "file:packages/specs", "requires": { - "npm-watch": "^0.10.0", + "npm-watch": "0.10.0", "openapi3-ts": "^2.0.1", - "swagger-cli": "^4.0.4", - "swagger-ui-watcher": "^2.1.11" + "swagger-cli": "4.0.4", + "swagger-ui-watcher": "2.1.11" } }, "@eslint/eslintrc": { @@ -64041,6 +64043,7 @@ "resolved": "https://registry.npmjs.org/@oclif/command/-/command-1.8.0.tgz", "integrity": "sha512-5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw==", "requires": { + "@oclif/config": "^1.15.1", "@oclif/errors": "^1.3.3", "@oclif/parser": "^3.8.3", "@oclif/plugin-help": "^3", @@ -65980,6 +65983,7 @@ "integrity": "sha512-pM7CR3yXB6L8Gfn6EmX7FLNE3+V/15I3o33GkSNsWvgsMp6HVGXKkXgojrcfUUauyL1LZOdvTmu4enU2RePGHw==", "dev": true, "requires": { + "@babel/core": "^7.11.0", "@babel/helper-compilation-targets": "^7.9.6", "@babel/helper-module-imports": "^7.8.3", "@babel/plugin-proposal-class-properties": "^7.8.3", @@ -65992,6 +65996,7 @@ "@vue/babel-plugin-jsx": "^1.0.3", "@vue/babel-preset-jsx": "^1.2.4", "babel-plugin-dynamic-import-node": "^2.3.3", + "core-js": "^3.6.5", "core-js-compat": "^3.6.5", "semver": "^6.1.0" }, @@ -68369,7 +68374,7 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "devOptional": true, + "dev": true, "requires": { "safer-buffer": "~2.1.0" } @@ -68420,7 +68425,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "devOptional": true + "dev": true }, "assign-symbols": { "version": "1.0.0", @@ -68634,13 +68639,13 @@ "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "devOptional": true + "dev": true }, "aws4": { "version": "1.11.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", - "devOptional": true + "dev": true }, "axe-core": { "version": "4.2.2", @@ -69101,7 +69106,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "devOptional": true, + "dev": true, "requires": { "tweetnacl": "^0.14.3" } @@ -69204,6 +69209,7 @@ "version": "0.0.9", "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", + "dev": true, "optional": true, "requires": { "inherits": "~2.0.0" @@ -69921,7 +69927,7 @@ "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "devOptional": true + "dev": true }, "ccount": { "version": "1.1.0", @@ -72145,7 +72151,7 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "devOptional": true, + "dev": true, "requires": { "assert-plus": "^1.0.0" } @@ -72756,33 +72762,33 @@ "@directus/specs": "9.0.0-rc.76", "@godaddy/terminus": "^4.9.0", "@keyv/redis": "^2.1.2", - "@types/async": "^3.2.6", - "@types/atob": "^2.1.2", - "@types/body-parser": "^1.19.0", - "@types/busboy": "^0.2.3", - "@types/cookie-parser": "^1.4.2", - "@types/cors": "^2.8.10", - "@types/destroy": "^1.0.0", - "@types/express": "^4.17.12", - "@types/express-pino-logger": "^4.0.2", - "@types/express-session": "^1.17.3", - "@types/fs-extra": "^9.0.11", - "@types/inquirer": "^7.3.1", - "@types/js-yaml": "^4.0.1", - "@types/json2csv": "^5.0.2", - "@types/jsonwebtoken": "^8.5.1", - "@types/keyv": "^3.1.1", - "@types/lodash": "^4.14.170", - "@types/mime-types": "^2.1.0", - "@types/ms": "^0.7.31", - "@types/node": "^15.12.0", - "@types/node-cron": "^2.0.3", - "@types/nodemailer": "^6.4.1", - "@types/qs": "^6.9.6", - "@types/sharp": "^0.28.3", - "@types/stream-json": "^1.7.0", - "@types/uuid": "^8.3.0", - "@types/uuid-validate": "^0.0.1", + "@types/async": "3.2.6", + "@types/atob": "2.1.2", + "@types/body-parser": "1.19.0", + "@types/busboy": "0.2.3", + "@types/cookie-parser": "1.4.2", + "@types/cors": "2.8.10", + "@types/destroy": "1.0.0", + "@types/express": "4.17.12", + "@types/express-pino-logger": "4.0.2", + "@types/express-session": "1.17.3", + "@types/fs-extra": "9.0.11", + "@types/inquirer": "7.3.1", + "@types/js-yaml": "4.0.1", + "@types/json2csv": "5.0.2", + "@types/jsonwebtoken": "8.5.1", + "@types/keyv": "3.1.1", + "@types/lodash": "4.14.170", + "@types/mime-types": "2.1.0", + "@types/ms": "0.7.31", + "@types/node": "15.12.2", + "@types/node-cron": "2.0.3", + "@types/nodemailer": "6.4.2", + "@types/qs": "6.9.6", + "@types/sharp": "0.28.3", + "@types/stream-json": "1.7.0", + "@types/uuid": "8.3.0", + "@types/uuid-validate": "0.0.1", "argon2": "^0.28.1", "async": "^3.2.0", "async-mutex": "^0.3.1", @@ -72796,9 +72802,9 @@ "connect-redis": "^6.0.0", "connect-session-knex": "^2.1.0", "cookie-parser": "^1.4.5", - "copyfiles": "^2.4.0", + "copyfiles": "2.4.1", "cors": "^2.8.5", - "cross-env": "^7.0.2", + "cross-env": "7.0.3", "csv-parser": "^3.0.0", "date-fns": "^2.21.1", "deep-map": "^2.0.0", @@ -72853,8 +72859,8 @@ "sqlite3": "^5.0.2", "stream-json": "^1.7.1", "tedious": "^11.0.8", - "ts-node-dev": "^1.0.0", - "typescript": "^4.3.2", + "ts-node-dev": "1.1.6", + "typescript": "4.3.2", "uuid": "^8.3.2", "uuid-validate": "0.0.3" }, @@ -73318,7 +73324,7 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "devOptional": true, + "dev": true, "requires": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" @@ -75044,7 +75050,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "devOptional": true + "dev": true }, "fast-copy": { "version": "2.1.1", @@ -75451,7 +75457,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "devOptional": true + "dev": true }, "fork-ts-checker-webpack-plugin": { "version": "3.1.1", @@ -75838,6 +75844,7 @@ "version": "1.0.12", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", + "dev": true, "optional": true, "requires": { "graceful-fs": "^4.1.2", @@ -75850,6 +75857,7 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, "optional": true, "requires": { "glob": "^7.1.3" @@ -78422,7 +78430,7 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "devOptional": true, + "dev": true, "requires": { "assert-plus": "^1.0.0" } @@ -79322,13 +79330,13 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "devOptional": true + "dev": true }, "har-validator": { "version": "5.1.5", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "devOptional": true, + "dev": true, "requires": { "ajv": "^6.12.3", "har-schema": "^2.0.0" @@ -79859,7 +79867,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "devOptional": true, + "dev": true, "requires": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", @@ -80827,7 +80835,7 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "devOptional": true + "dev": true }, "istanbul-lib-coverage": { "version": "3.0.0", @@ -82575,7 +82583,7 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "devOptional": true + "dev": true }, "jsdom": { "version": "16.6.0", @@ -82688,7 +82696,7 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "devOptional": true + "dev": true }, "json-schema-traverse": { "version": "0.4.1", @@ -82822,7 +82830,7 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "devOptional": true, + "dev": true, "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -82880,6 +82888,7 @@ "version": "7.7.0", "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz", "integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==", + "dev": true, "optional": true, "requires": { "node-addon-api": "^3.0.0", @@ -88404,7 +88413,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "devOptional": true + "dev": true }, "pg": { "version": "8.6.0", @@ -91398,7 +91407,7 @@ "version": "2.88.2", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "devOptional": true, + "dev": true, "requires": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -91426,7 +91435,7 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "devOptional": true, + "dev": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -91437,13 +91446,13 @@ "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "devOptional": true + "dev": true }, "tough-cookie": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "devOptional": true, + "dev": true, "requires": { "psl": "^1.1.28", "punycode": "^2.1.1" @@ -92948,6 +92957,7 @@ "version": "3.8.0", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", + "dev": true, "optional": true, "requires": { "fstream": "^1.0.0", @@ -92968,6 +92978,7 @@ "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, "optional": true, "requires": { "abbrev": "1" @@ -92977,6 +92988,7 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, "optional": true, "requires": { "glob": "^7.1.3" @@ -92986,12 +92998,14 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "dev": true, "optional": true }, "tar": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", + "dev": true, "optional": true, "requires": { "block-stream": "*", @@ -93003,6 +93017,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, "optional": true, "requires": { "isexe": "^2.0.0" @@ -93040,7 +93055,7 @@ "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "devOptional": true, + "dev": true, "requires": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -96140,7 +96155,7 @@ "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "devOptional": true + "dev": true }, "type": { "version": "1.2.0", @@ -96933,7 +96948,7 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "devOptional": true, + "dev": true, "requires": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", diff --git a/package.json b/package.json index 8573c90146..dbc4bbf3b7 100644 --- a/package.json +++ b/package.json @@ -21,44 +21,44 @@ "cli": "cross-env DIRECTUS_DEV=true NODE_ENV=development DOTENV_CONFIG_PATH=api/.env ts-node -r dotenv/config --script-mode --transpile-only api/src/cli/index.ts" }, "devDependencies": { - "@types/dockerode": "^3.2.3", - "@types/jest": "^26.0.22", - "@types/listr": "^0.14.3", - "@types/node": "^15.12.0", - "@types/supertest": "^2.0.11", - "@typescript-eslint/eslint-plugin": "^4.27.0", - "@typescript-eslint/parser": "^4.27.0", - "axios": "^0.21.1", - "dockerode": "^3.3.0", - "eslint": "^7.27.0", - "eslint-config-prettier": "^8.3.0", - "eslint-plugin-prettier": "^3.4.0", - "eslint-plugin-prettier-vue": "^3.1.0", - "eslint-plugin-vue": "^7.11.1", - "globby": "^11.0.3", - "jest": "^27.0.4", - "knex": "^0.95.6", - "lerna": "^4.0.0", - "lint-staged": "^11.0.0", - "listr": "^0.14.3", - "mysql": "^2.18.1", - "nanoid": "^3.1.23", - "npm-run-all": "^4.1.5", - "oracledb": "^5.1.0", - "pg": "^8.6.0", - "prettier": "^2.3.1", - "simple-git-hooks": "^2.4.1", - "sqlite3": "^5.0.2", - "stylelint": "^13.13.1", - "stylelint-config-prettier": "^8.0.2", - "stylelint-config-rational-order": "^0.1.2", - "stylelint-config-standard": "^22.0.0", - "stylelint-order": "^4.1.0", - "stylelint-scss": "^3.19.0", - "supertest": "^6.1.3", - "tedious": "^11.0.8", - "ts-jest": "^27.0.2", - "ts-node": "^10.0.0" + "@types/dockerode": "3.2.3", + "@types/jest": "26.0.23", + "@types/listr": "0.14.3", + "@types/node": "15.12.2", + "@types/supertest": "2.0.11", + "@typescript-eslint/eslint-plugin": "4.27.0", + "@typescript-eslint/parser": "4.27.0", + "axios": "0.21.1", + "dockerode": "3.3.0", + "eslint": "7.28.0", + "eslint-config-prettier": "8.3.0", + "eslint-plugin-prettier": "3.4.0", + "eslint-plugin-prettier-vue": "3.1.0", + "eslint-plugin-vue": "7.11.1", + "globby": "11.0.3", + "jest": "27.0.4", + "knex": "0.95.6", + "lerna": "4.0.0", + "lint-staged": "11.0.0", + "listr": "0.14.3", + "mysql": "2.18.1", + "nanoid": "3.1.23", + "npm-run-all": "4.1.5", + "oracledb": "5.2.0", + "pg": "8.6.0", + "prettier": "2.3.1", + "simple-git-hooks": "2.4.1", + "sqlite3": "5.0.2", + "stylelint": "13.13.1", + "stylelint-config-prettier": "8.0.2", + "stylelint-config-rational-order": "0.1.2", + "stylelint-config-standard": "22.0.0", + "stylelint-order": "4.1.0", + "stylelint-scss": "3.19.0", + "supertest": "6.1.3", + "tedious": "11.0.9", + "ts-jest": "27.0.3", + "ts-node": "10.0.0" }, "simple-git-hooks": { "pre-commit": "npx lint-staged" diff --git a/packages/cli/package.json b/packages/cli/package.json index 87b1dcc7a0..0e9d71fef9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -76,19 +76,19 @@ "yargs-parser": "^20.2.7" }, "devDependencies": { - "@types/figlet": "^1.5.0", - "@types/fs-extra": "^9.0.11", - "@types/jest": "^26.0.23", - "@types/js-yaml": "^4.0.0", - "@types/marked-terminal": "^3.1.1", - "jest": "^27.0.4", - "nock": "^13.0.10", - "npm-run-all": "^4.1.5", - "prettier": "^2.3.1", - "rimraf": "^3.0.2", - "ts-jest": "^27.0.2", - "ts-node": "^10.0.0", - "typescript": "^4.3.2" + "@types/figlet": "1.5.1", + "@types/fs-extra": "9.0.11", + "@types/jest": "26.0.23", + "@types/js-yaml": "4.0.1", + "@types/marked-terminal": "3.1.1", + "jest": "27.0.4", + "nock": "13.1.0", + "npm-run-all": "4.1.5", + "prettier": "2.3.1", + "rimraf": "3.0.2", + "ts-jest": "27.0.3", + "ts-node": "10.0.0", + "typescript": "4.3.2" }, "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd" } diff --git a/packages/drive-azure/package.json b/packages/drive-azure/package.json index d35acb0027..72a7322ce6 100644 --- a/packages/drive-azure/package.json +++ b/packages/drive-azure/package.json @@ -39,16 +39,16 @@ "normalize-path": "^3.0.0" }, "devDependencies": { - "@types/fs-extra": "^9.0.11", - "@types/jest": "^26.0.22", - "@types/node": "^15.12.0", - "@types/normalize-path": "^3.0.0", - "dotenv": "^10.0.0", - "fs-extra": "^10.0.0", - "jest": "^27.0.4", - "npm-run-all": "^4.1.5", - "ts-jest": "^27.0.2", - "typescript": "^4.3.2" + "@types/fs-extra": "9.0.11", + "@types/jest": "26.0.23", + "@types/node": "15.12.2", + "@types/normalize-path": "3.0.0", + "dotenv": "8.6.0", + "fs-extra": "7.0.1", + "jest": "27.0.4", + "npm-run-all": "4.1.5", + "ts-jest": "27.0.3", + "typescript": "4.3.2" }, "publishConfig": { "access": "public" diff --git a/packages/drive-gcs/package.json b/packages/drive-gcs/package.json index 73bb53f4fe..e69c696e74 100644 --- a/packages/drive-gcs/package.json +++ b/packages/drive-gcs/package.json @@ -38,16 +38,16 @@ "normalize-path": "^3.0.0" }, "devDependencies": { - "@lukeed/uuid": "^2.0.0", - "@types/fs-extra": "^9.0.11", - "@types/jest": "^26.0.22", - "@types/node": "^15.12.0", - "@types/normalize-path": "^3.0.0", - "dotenv": "^10.0.0", - "jest": "^27.0.4", - "npm-run-all": "^4.1.5", - "ts-jest": "^27.0.2", - "typescript": "^4.3.2" + "@lukeed/uuid": "2.0.0", + "@types/fs-extra": "9.0.11", + "@types/jest": "26.0.23", + "@types/node": "15.12.2", + "@types/normalize-path": "3.0.0", + "dotenv": "8.6.0", + "jest": "27.0.4", + "npm-run-all": "4.1.5", + "ts-jest": "27.0.3", + "typescript": "4.3.2" }, "publishConfig": { "access": "public" diff --git a/packages/drive-s3/package.json b/packages/drive-s3/package.json index bacf3acc2c..08993af3a3 100644 --- a/packages/drive-s3/package.json +++ b/packages/drive-s3/package.json @@ -39,17 +39,17 @@ "normalize-path": "^3.0.0" }, "devDependencies": { - "@lukeed/uuid": "^2.0.0", - "@types/fs-extra": "^9.0.11", - "@types/jest": "^26.0.22", - "@types/node": "^15.12.0", - "@types/normalize-path": "^3.0.0", - "dotenv": "^10.0.0", - "fs-extra": "^10.0.0", - "jest": "^27.0.4", - "npm-run-all": "^4.1.5", - "ts-jest": "^27.0.2", - "typescript": "^4.3.2" + "@lukeed/uuid": "2.0.0", + "@types/fs-extra": "9.0.11", + "@types/jest": "26.0.23", + "@types/node": "15.12.2", + "@types/normalize-path": "3.0.0", + "dotenv": "8.6.0", + "fs-extra": "7.0.1", + "jest": "27.0.4", + "npm-run-all": "4.1.5", + "ts-jest": "27.0.3", + "typescript": "4.3.2" }, "publishConfig": { "access": "public" diff --git a/packages/drive/package.json b/packages/drive/package.json index 71df090100..4e4dc0fcda 100644 --- a/packages/drive/package.json +++ b/packages/drive/package.json @@ -50,13 +50,13 @@ }, "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd", "devDependencies": { - "@types/fs-extra": "^9.0.11", - "@types/jest": "^26.0.22", - "@types/node": "^15.12.0", - "dotenv": "^10.0.0", - "jest": "^27.0.4", - "npm-run-all": "^4.1.5", - "ts-jest": "^27.0.2", - "typescript": "^4.3.2" + "@types/fs-extra": "9.0.11", + "@types/jest": "26.0.23", + "@types/node": "15.12.2", + "dotenv": "8.6.0", + "jest": "27.0.4", + "npm-run-all": "4.1.5", + "ts-jest": "27.0.3", + "typescript": "4.3.2" } } diff --git a/packages/format-title/package.json b/packages/format-title/package.json index f41afd3916..48babfe436 100644 --- a/packages/format-title/package.json +++ b/packages/format-title/package.json @@ -33,15 +33,15 @@ "prepublishOnly": "npm run build" }, "devDependencies": { - "@rollup/plugin-commonjs": "^19.0.0", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^13.0.0", - "rimraf": "^3.0.2", - "rollup": "^2.52.0", - "rollup-plugin-sourcemaps": "^0.6.3", - "rollup-plugin-terser": "^7.0.2", - "rollup-plugin-typescript2": "^0.30.0", - "typescript": "^4.3.2" + "@rollup/plugin-commonjs": "19.0.0", + "@rollup/plugin-json": "4.1.0", + "@rollup/plugin-node-resolve": "13.0.0", + "rimraf": "3.0.2", + "rollup": "2.52.0", + "rollup-plugin-sourcemaps": "0.6.3", + "rollup-plugin-terser": "7.0.2", + "rollup-plugin-typescript2": "0.30.0", + "typescript": "4.3.2" }, "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd" } diff --git a/packages/gatsby-source-directus/package.json b/packages/gatsby-source-directus/package.json index 0c03a1619f..d8b73eec96 100644 --- a/packages/gatsby-source-directus/package.json +++ b/packages/gatsby-source-directus/package.json @@ -10,12 +10,12 @@ "directus" ], "dependencies": { - "@directus/sdk-js": "^9.0.0-rc.53", + "@directus/sdk-js": "9.0.0-rc.53", "@lnfusion/gatsby-source-graphql": "0.0.4", - "chalk": "^4.1.1", - "gatsby-source-filesystem": "^3.7.1", - "invariant": "^2.2.4", - "ms": "^2.1.3" + "chalk": "2.4.2", + "gatsby-source-filesystem": "3.7.1", + "invariant": "2.2.4", + "ms": "2.1.2" }, "repository": { "type": "git", diff --git a/packages/schema/package.json b/packages/schema/package.json index ef933eb168..2165a20596 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -39,8 +39,8 @@ }, "homepage": "https://github.com/directus/directus#readme", "devDependencies": { - "npm-watch": "^0.10.0", - "typescript": "^4.3.2" + "npm-watch": "0.10.0", + "typescript": "4.3.2" }, "dependencies": { "knex-schema-inspector": "^1.3.0", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 9b27d58832..fc1b450803 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -47,26 +47,26 @@ "axios": "^0.21.1" }, "devDependencies": { - "@rollup/plugin-commonjs": "^19.0.0", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^13.0.0", - "@types/jest": "^26.0.22", - "argon2": "^0.28.1", - "dotenv": "^10.0.0", - "jest": "^27.0.3", - "jest-environment-jsdom-global": "^2.0.4", - "mockdate": "^3.0.5", - "nock": "^13.0.10", - "npm-run-all": "^4.1.5", - "rimraf": "^3.0.2", - "rollup": "^2.52.0", - "rollup-plugin-copy": "^3.4.0", - "rollup-plugin-sourcemaps": "^0.6.3", - "rollup-plugin-terser": "^7.0.2", - "rollup-plugin-typescript2": "^0.30.0", - "ts-jest": "^27.0.2", - "ts-node": "^10.0.0", - "typescript": "^4.3.2" + "@rollup/plugin-commonjs": "19.0.0", + "@rollup/plugin-json": "4.1.0", + "@rollup/plugin-node-resolve": "13.0.0", + "@types/jest": "26.0.23", + "argon2": "0.28.2", + "dotenv": "8.6.0", + "jest": "27.0.4", + "jest-environment-jsdom-global": "2.0.4", + "mockdate": "3.0.5", + "nock": "13.1.0", + "npm-run-all": "4.1.5", + "rimraf": "3.0.2", + "rollup": "2.52.0", + "rollup-plugin-copy": "3.4.0", + "rollup-plugin-sourcemaps": "0.6.3", + "rollup-plugin-terser": "7.0.2", + "rollup-plugin-typescript2": "0.30.0", + "ts-jest": "27.0.3", + "ts-node": "10.0.0", + "typescript": "4.3.2" }, "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd" } diff --git a/packages/specs/package.json b/packages/specs/package.json index 547d5841ff..c876c70505 100644 --- a/packages/specs/package.json +++ b/packages/specs/package.json @@ -40,9 +40,9 @@ ], "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd", "devDependencies": { - "npm-watch": "^0.10.0", - "swagger-cli": "^4.0.4", - "swagger-ui-watcher": "^2.1.11" + "npm-watch": "0.10.0", + "swagger-cli": "4.0.4", + "swagger-ui-watcher": "2.1.11" }, "dependencies": { "openapi3-ts": "^2.0.1" From b663e581e647efd77961b0b6442f3e940a11ebb7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 09:59:18 -0400 Subject: [PATCH 06/30] chore(deps): update dependency globby to v11.0.4 (#6324) Co-authored-by: Renovate Bot --- package-lock.json | 63 +++++++++++++++++++++++++++++++++++++++++------ package.json | 2 +- 2 files changed, 57 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 04642115bf..d9ee8025c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "eslint-plugin-prettier": "3.4.0", "eslint-plugin-prettier-vue": "3.1.0", "eslint-plugin-vue": "7.11.1", - "globby": "11.0.3", + "globby": "11.0.4", "jest": "27.0.4", "knex": "0.95.6", "lerna": "4.0.0", @@ -3168,6 +3168,35 @@ "graphql": "^14.0.0 || ^15.0.0" } }, + "node_modules/@graphql-tools/load/node_modules/globby": { + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz", + "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==", + "peer": true, + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@graphql-tools/load/node_modules/ignore": { + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", + "peer": true, + "engines": { + "node": ">= 4" + } + }, "node_modules/@graphql-tools/load/node_modules/import-from": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz", @@ -24137,9 +24166,9 @@ } }, "node_modules/globby": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz", - "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==", + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", + "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", "dependencies": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", @@ -61404,6 +61433,26 @@ "valid-url": "1.0.9" }, "dependencies": { + "globby": { + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz", + "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==", + "peer": true, + "requires": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" + } + }, + "ignore": { + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", + "peer": true + }, "import-from": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz", @@ -78625,9 +78674,9 @@ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" }, "globby": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz", - "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==", + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", + "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", "requires": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", diff --git a/package.json b/package.json index dbc4bbf3b7..58d38324e6 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "eslint-plugin-prettier": "3.4.0", "eslint-plugin-prettier-vue": "3.1.0", "eslint-plugin-vue": "7.11.1", - "globby": "11.0.3", + "globby": "11.0.4", "jest": "27.0.4", "knex": "0.95.6", "lerna": "4.0.0", From e4b9bf06a06a4a691f4414db4affa19a31b7f2ba Mon Sep 17 00:00:00 2001 From: Thijs-Jan <13321277+MoltenCoffee@users.noreply.github.com> Date: Thu, 17 Jun 2021 16:56:52 +0200 Subject: [PATCH 07/30] Add support for `read` hooks on `items` (#6341) * Add emitter on item read * Add performance warning to docs * Make result instead of query the payload --- api/src/services/items.ts | 23 +++++++++++++++++++++++ docs/guides/api-hooks.md | 7 +++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/api/src/services/items.ts b/api/src/services/items.ts index 588945c1f0..4aa0258ee2 100644 --- a/api/src/services/items.ts +++ b/api/src/services/items.ts @@ -303,6 +303,17 @@ export class ItemsService implements AbstractSer throw new ForbiddenException(); } + emitAsyncSafe(`${this.eventScope}.read`, { + event: `${this.eventScope}.read`, + accountability: this.accountability, + collection: this.collection, + item: key, + action: 'read', + payload: results, + schema: this.schema, + database: getDatabase(), + }); + return results[0]; } @@ -329,6 +340,18 @@ export class ItemsService implements AbstractSer }; const results = await this.readByQuery(queryWithKeys, opts); + + emitAsyncSafe(`${this.eventScope}.read`, { + event: `${this.eventScope}.read`, + accountability: this.accountability, + collection: this.collection, + item: keys, + action: 'read', + payload: results, + schema: this.schema, + database: getDatabase(), + }); + return results; } diff --git a/docs/guides/api-hooks.md b/docs/guides/api-hooks.md index 6d9e226d2a..26f224a50b 100644 --- a/docs/guides/api-hooks.md +++ b/docs/guides/api-hooks.md @@ -85,7 +85,7 @@ module.exports = function registerHook({ exceptions }) { | `error` | | No | | `auth` | `login`, `logout`[1] and `refresh`[1] | Optional | | `oauth.:provider`[2] | `login` and `redirect` | Optional | -| `items` | `create`, `update` and `delete` | Optional | +| `items` | `read`[3], `create`, `update` and `delete` | Optional | | `activity` | `create`, `update` and `delete` | Optional | | `collections` | `create`, `update` and `delete` | Optional | | `fields` | `create`, `update` and `delete` | Optional | @@ -114,7 +114,7 @@ on day-of-month 1) or `cron(5 4 * * sun)` (at 04:05 on Sunday). See example belo module.exports = function registerHook() { return { 'cron(*/15 * * * *)': async function () { - await axios.post('http://example.com/webhook', { message: "Another 15 minutes passed..." }); + await axios.post('http://example.com/webhook', { message: 'Another 15 minutes passed...' }); }, }; }; @@ -136,6 +136,9 @@ module.exports = function registerHook() { ## 4. Develop your Custom Hook +> Hooks can impact performance when not carefully implemented. This is especially true for `before` hooks (as these are +> blocking) and hooks on `read` actions, as a single request can result in a large ammount of database reads. + ### Register Function The register function (eg: `module.exports = function registerHook()`) must return an object where the key is the event, From a8356302de99b9863bbb5a672aec3fc946b29b3c Mon Sep 17 00:00:00 2001 From: Rijk van Zanten Date: Thu, 17 Jun 2021 10:57:52 -0400 Subject: [PATCH 08/30] Redact tokens from logs (#6347) --- api/package.json | 2 +- api/src/app.ts | 5 ++--- api/src/logger.ts | 32 +++++++++++++++++++++++++++++++- api/src/types/shims.d.ts | 10 ++++++++++ package-lock.json | 20 ++------------------ 5 files changed, 46 insertions(+), 23 deletions(-) diff --git a/api/package.json b/api/package.json index b8f48edbf1..847f832a35 100644 --- a/api/package.json +++ b/api/package.json @@ -95,7 +95,6 @@ "execa": "^5.1.1", "exif-reader": "^1.0.3", "express": "^4.17.1", - "express-pino-logger": "^6.0.0", "express-session": "^1.17.2", "fs-extra": "^10.0.0", "grant": "^5.4.14", @@ -125,6 +124,7 @@ "otplib": "^12.0.1", "pino": "^6.11.3", "pino-colada": "^2.1.0", + "pino-http": "^5.5.0", "prettier": "^2.3.1", "qs": "^6.9.4", "rate-limiter-flexible": "^2.2.2", diff --git a/api/src/app.ts b/api/src/app.ts index d6a21961c8..58c4273a72 100644 --- a/api/src/app.ts +++ b/api/src/app.ts @@ -1,6 +1,5 @@ import cookieParser from 'cookie-parser'; import express, { RequestHandler } from 'express'; -import expressLogger from 'express-pino-logger'; import fse from 'fs-extra'; import path from 'path'; import qs from 'qs'; @@ -30,7 +29,7 @@ import { emitAsyncSafe } from './emitter'; import env from './env'; import { InvalidPayloadException } from './exceptions'; import { initializeExtensions, registerExtensionEndpoints, registerExtensionHooks } from './extensions'; -import logger from './logger'; +import logger, { expressLogger } from './logger'; import authenticate from './middleware/authenticate'; import cache from './middleware/cache'; import { checkIP } from './middleware/check-ip'; @@ -71,7 +70,7 @@ export default async function createApp(): Promise { await emitAsyncSafe('middlewares.init.before', { app }); - app.use(expressLogger({ logger }) as RequestHandler); + app.use(expressLogger); app.use((req, res, next) => { ( diff --git a/api/src/logger.ts b/api/src/logger.ts index 7fc3a887b5..d03bd7aa2d 100644 --- a/api/src/logger.ts +++ b/api/src/logger.ts @@ -1,7 +1,16 @@ +import { Request, RequestHandler } from 'express'; import pino, { LoggerOptions } from 'pino'; +import pinoHTTP, { stdSerializers } from 'pino-http'; +import { URL } from 'url'; import env from './env'; -const pinoOptions: LoggerOptions = { level: env.LOG_LEVEL || 'info' }; +const pinoOptions: LoggerOptions = { + level: env.LOG_LEVEL || 'info', + redact: { + paths: ['req.headers.authorization', 'req.cookies.directus_refresh_token'], + censor: '--redact--', + }, +}; if (env.LOG_STYLE !== 'raw') { pinoOptions.prettyPrint = true; @@ -10,4 +19,25 @@ if (env.LOG_STYLE !== 'raw') { const logger = pino(pinoOptions); +export const expressLogger = pinoHTTP({ + logger, + serializers: { + req(request: Request) { + const output = stdSerializers.req(request); + output.url = redactQuery(output.url); + return output; + }, + }, +}) as RequestHandler; + export default logger; + +function redactQuery(originalPath: string) { + const url = new URL(originalPath, 'http://example.com/'); + + if (url.searchParams.has('access_token')) { + url.searchParams.set('access_token', '--redacted--'); + } + + return url.pathname + url.search; +} diff --git a/api/src/types/shims.d.ts b/api/src/types/shims.d.ts index e6b2ea5b54..0ac4ebbd70 100644 --- a/api/src/types/shims.d.ts +++ b/api/src/types/shims.d.ts @@ -1,3 +1,5 @@ +import PinoHttp from '@types/pino-http'; + declare module 'grant' { const grant: any; export default grant; @@ -12,3 +14,11 @@ declare module 'exif-reader' { const exifReader: (buf: Buffer) => Record; export default exifReader; } + +declare module 'pino-http' { + const pinoHttp: PinoHttp; + export default pinoHttp; + export const stdSerializers: { + req: (req: any) => Record; + }; +} diff --git a/package-lock.json b/package-lock.json index d9ee8025c8..79899255d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -86,7 +86,6 @@ "execa": "^5.1.1", "exif-reader": "^1.0.3", "express": "^4.17.1", - "express-pino-logger": "^6.0.0", "express-session": "^1.17.2", "fs-extra": "^10.0.0", "grant": "^5.4.14", @@ -116,6 +115,7 @@ "otplib": "^12.0.1", "pino": "^6.11.3", "pino-colada": "^2.1.0", + "pino-http": "^5.5.0", "prettier": "^2.3.1", "qs": "^6.9.4", "rate-limiter-flexible": "^2.2.2", @@ -19386,14 +19386,6 @@ "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", "peer": true }, - "node_modules/express-pino-logger": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/express-pino-logger/-/express-pino-logger-6.0.0.tgz", - "integrity": "sha512-YjBnalqgsNylRnWEpQGf8YzBP54stpoqX/o+SnpGr04OB7dRIQlsC1qvutFOyRjhLhXIWCe43pYJcjp9zM1Ccg==", - "dependencies": { - "pino-http": "^5.3.0" - } - }, "node_modules/express-session": { "version": "1.17.2", "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.17.2.tgz", @@ -72863,7 +72855,6 @@ "execa": "^5.1.1", "exif-reader": "^1.0.3", "express": "^4.17.1", - "express-pino-logger": "^6.0.0", "express-session": "^1.17.2", "fs-extra": "^10.0.0", "grant": "^5.4.14", @@ -72900,6 +72891,7 @@ "pg": "^8.6.0", "pino": "^6.11.3", "pino-colada": "^2.1.0", + "pino-http": "*", "prettier": "^2.3.1", "qs": "^6.9.4", "rate-limiter-flexible": "^2.2.2", @@ -74953,14 +74945,6 @@ } } }, - "express-pino-logger": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/express-pino-logger/-/express-pino-logger-6.0.0.tgz", - "integrity": "sha512-YjBnalqgsNylRnWEpQGf8YzBP54stpoqX/o+SnpGr04OB7dRIQlsC1qvutFOyRjhLhXIWCe43pYJcjp9zM1Ccg==", - "requires": { - "pino-http": "^5.3.0" - } - }, "express-session": { "version": "1.17.2", "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.17.2.tgz", From 6d698d1a7b9cfbe91fa856a08f9cc39f400a539a Mon Sep 17 00:00:00 2001 From: Rijk van Zanten Date: Thu, 17 Jun 2021 11:02:13 -0400 Subject: [PATCH 09/30] Fixed issue that would cause uploads to the root folder of the file library to fail (#6348) fixes #6310 --- api/src/controllers/files.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api/src/controllers/files.ts b/api/src/controllers/files.ts index dc6cc256a3..3c1a93b530 100644 --- a/api/src/controllers/files.ts +++ b/api/src/controllers/files.ts @@ -37,6 +37,10 @@ const multipartHandler = asyncHandler(async (req, res, next) => { let fileCount = 0; busboy.on('field', (fieldname: keyof File, val) => { + if (val === 'null') val = null; + if (val === 'false') val = false; + if (val === 'true') val = true; + if (fieldname === 'storage') { disk = val; } From e033e173264600f9cc16e84fb4fc605d983f6b33 Mon Sep 17 00:00:00 2001 From: Rijk van Zanten Date: Thu, 17 Jun 2021 11:06:00 -0400 Subject: [PATCH 10/30] Use existing file extension as default (#6349) --- api/src/services/files.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/services/files.ts b/api/src/services/files.ts index d21d62d766..7eab80fd31 100644 --- a/api/src/services/files.ts +++ b/api/src/services/files.ts @@ -47,7 +47,7 @@ export class FilesService extends ItemsService { primaryKey = await this.createOne(payload, { emitEvents: false }); } - const fileExtension = (payload.type && extension(payload.type)) || path.extname(payload.filename_download); + const fileExtension = path.extname(payload.filename_download) || (payload.type && extension(payload.type)); payload.filename_disk = primaryKey + '.' + fileExtension; From e96c77a8193b4c93b2241625e8472ce12f8a2d75 Mon Sep 17 00:00:00 2001 From: Rijk van Zanten Date: Thu, 17 Jun 2021 11:13:31 -0400 Subject: [PATCH 11/30] Don't send sensitive data in webhooks (#6350) Fixes #6246 --- api/src/webhooks.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/api/src/webhooks.ts b/api/src/webhooks.ts index 219f89b2fb..d39d42be80 100644 --- a/api/src/webhooks.ts +++ b/api/src/webhooks.ts @@ -4,6 +4,7 @@ import getDatabase from './database'; import emitter from './emitter'; import logger from './logger'; import { Webhook } from './types'; +import { pick } from 'lodash'; let registered: { event: string; handler: ListenerFn }[] = []; @@ -44,11 +45,21 @@ function createHandler(webhook: Webhook): ListenerFn { const collectionAllowList = webhook.collections.split(','); if (collectionAllowList.includes('*') === false && collectionAllowList.includes(data.collection) === false) return; + const webhookPayload = pick(data, [ + 'event', + 'accountability.user', + 'accountability.role', + 'collection', + 'item', + 'action', + 'payload', + ]); + try { await axios({ url: webhook.url, method: webhook.method, - data: webhook.data ? data : null, + data: webhook.data ? webhookPayload : null, }); } catch (error) { logger.warn(`Webhook "${webhook.name}" (id: ${webhook.id}) failed`); From 95187e14cb7aaa0790f32df2598978a97654c52e Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Thu, 17 Jun 2021 11:20:56 -0400 Subject: [PATCH 12/30] Trim val before check h/t @aidenfoxx --- api/src/controllers/files.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/src/controllers/files.ts b/api/src/controllers/files.ts index 3c1a93b530..88982d5b55 100644 --- a/api/src/controllers/files.ts +++ b/api/src/controllers/files.ts @@ -37,9 +37,9 @@ const multipartHandler = asyncHandler(async (req, res, next) => { let fileCount = 0; busboy.on('field', (fieldname: keyof File, val) => { - if (val === 'null') val = null; - if (val === 'false') val = false; - if (val === 'true') val = true; + if (typeof val === 'string' && val.trim() === 'null') val = null; + if (typeof val === 'string' && val.trim() === 'false') val = false; + if (typeof val === 'string' && val.trim() === 'true') val = true; if (fieldname === 'storage') { disk = val; From cecadcb8d1ce277864cbd1413ac5a0bc77cc13da Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 11:25:11 -0400 Subject: [PATCH 13/30] chore(deps): update mariadb docker tag to v10.6 (#6332) Co-authored-by: Renovate Bot --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0fa0559953..9c2f9c8e01 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -69,7 +69,7 @@ services: - 5101:3306 maria: - image: mariadb:10.5 + image: mariadb:10.6 environment: MYSQL_ROOT_PASSWORD: secret MYSQL_DATABASE: directus From 78e830f795cfa1a798c643b19258e4b9c5944879 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 11:27:34 -0400 Subject: [PATCH 14/30] chore(deps): update node.js to v16 (#6336) Co-authored-by: Renovate Bot --- .../actions/build-images/rootfs/directus/images/main/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-images/rootfs/directus/images/main/Dockerfile b/.github/actions/build-images/rootfs/directus/images/main/Dockerfile index d020f43f44..42b6478af6 100644 --- a/.github/actions/build-images/rootfs/directus/images/main/Dockerfile +++ b/.github/actions/build-images/rootfs/directus/images/main/Dockerfile @@ -18,7 +18,7 @@ RUN apk add --no-cache jq \ directus-api-package.json > package.json # Directus image -FROM node:14-alpine +FROM node:16-alpine ARG VERSION ARG REPOSITORY=directus/directus From 482fe96e5b873ddc94285a7dc3ed1dd1b0ec9d7a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 11:34:37 -0400 Subject: [PATCH 15/30] chore(deps): update postgres docker tag to v13 (#6338) Co-authored-by: Renovate Bot --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9c2f9c8e01..9697cbccc4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -52,7 +52,7 @@ version: '3.1' services: postgres: - image: postgres:12-alpine + image: postgres:13-alpine environment: POSTGRES_PASSWORD: secret POSTGRES_DB: directus From fd8015b5b8ad6bf6374eb8e4e30851951d0b8872 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 11:42:18 -0400 Subject: [PATCH 16/30] chore(deps): update dependency rollup to v2.52.1 (#6337) Co-authored-by: Renovate Bot --- package-lock.json | 20 ++++++++++---------- packages/format-title/package.json | 2 +- packages/sdk/package.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 79899255d8..cc3cebe03a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40692,9 +40692,9 @@ } }, "node_modules/rollup": { - "version": "2.52.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.52.0.tgz", - "integrity": "sha512-lSkBDGsVoXjqaBf7dsHwxBJz+p+hJEP72P+LOitA0yVs+Nzxj76FidkZE2thrmhjwGqLYiJo39opi7mAfaQ/Vg==", + "version": "2.52.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.52.1.tgz", + "integrity": "sha512-/SPqz8UGnp4P1hq6wc9gdTqA2bXQXGx13TtoL03GBm6qGRI6Hm3p4Io7GeiHNLl0BsQAne1JNYY+q/apcY933w==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -51229,7 +51229,7 @@ "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.0.0", "rimraf": "3.0.2", - "rollup": "2.52.0", + "rollup": "2.52.1", "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", "rollup-plugin-typescript2": "0.30.0", @@ -55234,7 +55234,7 @@ "nock": "13.1.0", "npm-run-all": "4.1.5", "rimraf": "3.0.2", - "rollup": "2.52.0", + "rollup": "2.52.1", "rollup-plugin-copy": "3.4.0", "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", @@ -57808,7 +57808,7 @@ "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.0.0", "rimraf": "3.0.2", - "rollup": "2.52.0", + "rollup": "2.52.1", "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", "rollup-plugin-typescript2": "0.30.0", @@ -60768,7 +60768,7 @@ "nock": "13.1.0", "npm-run-all": "4.1.5", "rimraf": "3.0.2", - "rollup": "2.52.0", + "rollup": "2.52.1", "rollup-plugin-copy": "3.4.0", "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", @@ -91684,9 +91684,9 @@ } }, "rollup": { - "version": "2.52.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.52.0.tgz", - "integrity": "sha512-lSkBDGsVoXjqaBf7dsHwxBJz+p+hJEP72P+LOitA0yVs+Nzxj76FidkZE2thrmhjwGqLYiJo39opi7mAfaQ/Vg==", + "version": "2.52.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.52.1.tgz", + "integrity": "sha512-/SPqz8UGnp4P1hq6wc9gdTqA2bXQXGx13TtoL03GBm6qGRI6Hm3p4Io7GeiHNLl0BsQAne1JNYY+q/apcY933w==", "dev": true, "requires": { "fsevents": "~2.3.2" diff --git a/packages/format-title/package.json b/packages/format-title/package.json index 48babfe436..fc7ddd3af7 100644 --- a/packages/format-title/package.json +++ b/packages/format-title/package.json @@ -37,7 +37,7 @@ "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.0.0", "rimraf": "3.0.2", - "rollup": "2.52.0", + "rollup": "2.52.1", "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", "rollup-plugin-typescript2": "0.30.0", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index fc1b450803..551a18977c 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -59,7 +59,7 @@ "nock": "13.1.0", "npm-run-all": "4.1.5", "rimraf": "3.0.2", - "rollup": "2.52.0", + "rollup": "2.52.1", "rollup-plugin-copy": "3.4.0", "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", From 29c4f120cb89e359ae51e0bad632730636e3ea70 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 11:44:07 -0400 Subject: [PATCH 17/30] chore(deps): update dependency vue-router to v4.0.9 (#6327) Co-authored-by: Renovate Bot --- app/package.json | 2 +- package-lock.json | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/package.json b/app/package.json index efb1c2b86c..5998732c2c 100644 --- a/app/package.json +++ b/app/package.json @@ -85,7 +85,7 @@ "vite": "2.3.7", "vue": "3.1.1", "vue-i18n": "9.1.6", - "vue-router": "4.0.8", + "vue-router": "4.0.9", "vuedraggable": "4.0.3" } } diff --git a/package-lock.json b/package-lock.json index cc3cebe03a..5023a5ed68 100644 --- a/package-lock.json +++ b/package-lock.json @@ -506,7 +506,7 @@ "vite": "2.3.7", "vue": "3.1.1", "vue-i18n": "9.1.6", - "vue-router": "4.0.8", + "vue-router": "4.0.9", "vuedraggable": "4.0.3" } }, @@ -9650,9 +9650,9 @@ "dev": true }, "node_modules/@vue/devtools-api": { - "version": "6.0.0-beta.13", - "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.13.tgz", - "integrity": "sha512-oZ0n/N4UWpkMvbR1OrBtu+YhaVADo+bYX5lxo9tou7h10p0+v2K9yzzaZATVr0lqHb7iY1wALfO8yojwg0MTHw==", + "version": "6.0.0-beta.14", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.14.tgz", + "integrity": "sha512-44fPrrN1cqcs6bFkT0C+yxTM6PZXLbR+ESh1U1j8UD22yO04gXvxH62HApMjLbS3WqJO/iCNC+CYT+evPQh2EQ==", "dev": true }, "node_modules/@vue/preload-webpack-plugin": { @@ -47667,12 +47667,12 @@ "dev": true }, "node_modules/vue-router": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.8.tgz", - "integrity": "sha512-42mWSQaH7CCBQDspQTHv63f34VEnZC20g9QNK4WJ/zW8SdIUeT6TQ2i/78fjF/pVBUPLBWrGhvB7uDnaz7O/pA==", + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.9.tgz", + "integrity": "sha512-i3IaZJ57YeMbRHQlqKyXdUMr5NzTCcJkn3f8u38TsZjYWtGcd3IX2zRd3389SCOwuRf11mgfHAyngR6FVDE9og==", "dev": true, "dependencies": { - "@vue/devtools-api": "^6.0.0-beta.10" + "@vue/devtools-api": "^6.0.0-beta.14" }, "peerDependencies": { "vue": "^3.0.0" @@ -57264,7 +57264,7 @@ "vite": "2.3.7", "vue": "3.1.1", "vue-i18n": "9.1.6", - "vue-router": "4.0.8", + "vue-router": "4.0.9", "vuedraggable": "4.0.3" } }, @@ -66695,9 +66695,9 @@ } }, "@vue/devtools-api": { - "version": "6.0.0-beta.13", - "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.13.tgz", - "integrity": "sha512-oZ0n/N4UWpkMvbR1OrBtu+YhaVADo+bYX5lxo9tou7h10p0+v2K9yzzaZATVr0lqHb7iY1wALfO8yojwg0MTHw==", + "version": "6.0.0-beta.14", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.14.tgz", + "integrity": "sha512-44fPrrN1cqcs6bFkT0C+yxTM6PZXLbR+ESh1U1j8UD22yO04gXvxH62HApMjLbS3WqJO/iCNC+CYT+evPQh2EQ==", "dev": true }, "@vue/preload-webpack-plugin": { @@ -97209,12 +97209,12 @@ } }, "vue-router": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.8.tgz", - "integrity": "sha512-42mWSQaH7CCBQDspQTHv63f34VEnZC20g9QNK4WJ/zW8SdIUeT6TQ2i/78fjF/pVBUPLBWrGhvB7uDnaz7O/pA==", + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.9.tgz", + "integrity": "sha512-i3IaZJ57YeMbRHQlqKyXdUMr5NzTCcJkn3f8u38TsZjYWtGcd3IX2zRd3389SCOwuRf11mgfHAyngR6FVDE9og==", "dev": true, "requires": { - "@vue/devtools-api": "^6.0.0-beta.10" + "@vue/devtools-api": "^6.0.0-beta.14" } }, "vue-server-renderer": { From 998c1bafb84af2a5a5ab8e890a1863a24caca459 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 11:44:37 -0400 Subject: [PATCH 18/30] chore(deps): update dependency typescript to v4.3.3 (#6329) Co-authored-by: Renovate Bot --- api/package.json | 2 +- app/package.json | 2 +- package-lock.json | 52 +++++++++++++++--------------- packages/cli/package.json | 2 +- packages/drive-azure/package.json | 2 +- packages/drive-gcs/package.json | 2 +- packages/drive-s3/package.json | 2 +- packages/drive/package.json | 2 +- packages/format-title/package.json | 2 +- packages/schema/package.json | 2 +- packages/sdk/package.json | 2 +- 11 files changed, 36 insertions(+), 36 deletions(-) diff --git a/api/package.json b/api/package.json index 847f832a35..80f614663c 100644 --- a/api/package.json +++ b/api/package.json @@ -181,6 +181,6 @@ "copyfiles": "2.4.1", "cross-env": "7.0.3", "ts-node-dev": "1.1.6", - "typescript": "4.3.2" + "typescript": "4.3.3" } } diff --git a/app/package.json b/app/package.json index 5998732c2c..0d1f4b2412 100644 --- a/app/package.json +++ b/app/package.json @@ -81,7 +81,7 @@ "rimraf": "3.0.2", "sass": "1.35.1", "tinymce": "5.8.1", - "typescript": "4.3.2", + "typescript": "4.3.3", "vite": "2.3.7", "vue": "3.1.1", "vue-i18n": "9.1.6", diff --git a/package-lock.json b/package-lock.json index 5023a5ed68..59027c1b88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -159,7 +159,7 @@ "copyfiles": "2.4.1", "cross-env": "7.0.3", "ts-node-dev": "1.1.6", - "typescript": "4.3.2" + "typescript": "4.3.3" }, "optionalDependencies": { "@keyv/redis": "^2.1.2", @@ -502,7 +502,7 @@ "rimraf": "3.0.2", "sass": "1.35.1", "tinymce": "5.8.1", - "typescript": "4.3.2", + "typescript": "4.3.3", "vite": "2.3.7", "vue": "3.1.1", "vue-i18n": "9.1.6", @@ -46426,9 +46426,9 @@ } }, "node_modules/typescript": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz", - "integrity": "sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.3.tgz", + "integrity": "sha512-rUvLW0WtF7PF2b9yenwWUi9Da9euvDRhmH7BLyBG4DCFfOJ850LGNknmRpp8Z8kXNUPObdZQEfKOiHtXuQHHKA==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -50412,7 +50412,7 @@ "rimraf": "3.0.2", "ts-jest": "27.0.3", "ts-node": "10.0.0", - "typescript": "4.3.2" + "typescript": "4.3.3" } }, "packages/cli/node_modules/@types/yargs": { @@ -51012,7 +51012,7 @@ "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.2" + "typescript": "4.3.3" } }, "packages/drive-azure": { @@ -51034,7 +51034,7 @@ "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.2" + "typescript": "4.3.3" } }, "packages/drive-azure/node_modules/dotenv": { @@ -51100,7 +51100,7 @@ "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.2" + "typescript": "4.3.3" } }, "packages/drive-gcs/node_modules/dotenv": { @@ -51132,7 +51132,7 @@ "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.2" + "typescript": "4.3.3" } }, "packages/drive-s3/node_modules/dotenv": { @@ -51233,7 +51233,7 @@ "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", "rollup-plugin-typescript2": "0.30.0", - "typescript": "4.3.2" + "typescript": "4.3.3" }, "engines": { "node": ">=6.0.0" @@ -55211,7 +55211,7 @@ }, "devDependencies": { "npm-watch": "0.10.0", - "typescript": "4.3.2" + "typescript": "4.3.3" } }, "packages/sdk": { @@ -55241,7 +55241,7 @@ "rollup-plugin-typescript2": "0.30.0", "ts-jest": "27.0.3", "ts-node": "10.0.0", - "typescript": "4.3.2" + "typescript": "4.3.3" } }, "packages/sdk/node_modules/@jest/environment": { @@ -57260,7 +57260,7 @@ "rimraf": "3.0.2", "sass": "1.35.1", "tinymce": "5.8.1", - "typescript": "4.3.2", + "typescript": "4.3.3", "vite": "2.3.7", "vue": "3.1.1", "vue-i18n": "9.1.6", @@ -57314,7 +57314,7 @@ "strip-indent": "^4.0.0", "ts-jest": "27.0.3", "ts-node": "10.0.0", - "typescript": "4.3.2", + "typescript": "4.3.3", "yargs": "^17.0.1", "yargs-parser": "^20.2.7" }, @@ -57639,7 +57639,7 @@ "node-exceptions": "^4.0.1", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.2" + "typescript": "4.3.3" }, "dependencies": { "dotenv": { @@ -57688,7 +57688,7 @@ "normalize-path": "^3.0.0", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.2" + "typescript": "4.3.3" }, "dependencies": { "dotenv": { @@ -57739,7 +57739,7 @@ "normalize-path": "^3.0.0", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.2" + "typescript": "4.3.3" }, "dependencies": { "dotenv": { @@ -57765,7 +57765,7 @@ "normalize-path": "^3.0.0", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.2" + "typescript": "4.3.3" }, "dependencies": { "dotenv": { @@ -57812,7 +57812,7 @@ "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", "rollup-plugin-typescript2": "0.30.0", - "typescript": "4.3.2" + "typescript": "4.3.3" } }, "@directus/gatsby-source-directus": { @@ -60749,7 +60749,7 @@ "knex-schema-inspector": "^1.3.0", "lodash": "^4.17.21", "npm-watch": "0.10.0", - "typescript": "4.3.2" + "typescript": "4.3.3" } }, "@directus/sdk": { @@ -60775,7 +60775,7 @@ "rollup-plugin-typescript2": "0.30.0", "ts-jest": "27.0.3", "ts-node": "10.0.0", - "typescript": "4.3.2" + "typescript": "4.3.3" }, "dependencies": { "@jest/environment": { @@ -72901,7 +72901,7 @@ "stream-json": "^1.7.1", "tedious": "^11.0.8", "ts-node-dev": "1.1.6", - "typescript": "4.3.2", + "typescript": "4.3.3", "uuid": "^8.3.2", "uuid-validate": "0.0.3" }, @@ -96244,9 +96244,9 @@ } }, "typescript": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz", - "integrity": "sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==" + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.3.tgz", + "integrity": "sha512-rUvLW0WtF7PF2b9yenwWUi9Da9euvDRhmH7BLyBG4DCFfOJ850LGNknmRpp8Z8kXNUPObdZQEfKOiHtXuQHHKA==" }, "uc.micro": { "version": "1.0.6", diff --git a/packages/cli/package.json b/packages/cli/package.json index 0e9d71fef9..d6a824a116 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -88,7 +88,7 @@ "rimraf": "3.0.2", "ts-jest": "27.0.3", "ts-node": "10.0.0", - "typescript": "4.3.2" + "typescript": "4.3.3" }, "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd" } diff --git a/packages/drive-azure/package.json b/packages/drive-azure/package.json index 72a7322ce6..3ed19b99a3 100644 --- a/packages/drive-azure/package.json +++ b/packages/drive-azure/package.json @@ -48,7 +48,7 @@ "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.2" + "typescript": "4.3.3" }, "publishConfig": { "access": "public" diff --git a/packages/drive-gcs/package.json b/packages/drive-gcs/package.json index e69c696e74..eedd069489 100644 --- a/packages/drive-gcs/package.json +++ b/packages/drive-gcs/package.json @@ -47,7 +47,7 @@ "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.2" + "typescript": "4.3.3" }, "publishConfig": { "access": "public" diff --git a/packages/drive-s3/package.json b/packages/drive-s3/package.json index 08993af3a3..86b984b317 100644 --- a/packages/drive-s3/package.json +++ b/packages/drive-s3/package.json @@ -49,7 +49,7 @@ "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.2" + "typescript": "4.3.3" }, "publishConfig": { "access": "public" diff --git a/packages/drive/package.json b/packages/drive/package.json index 4e4dc0fcda..b60fdf813e 100644 --- a/packages/drive/package.json +++ b/packages/drive/package.json @@ -57,6 +57,6 @@ "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.2" + "typescript": "4.3.3" } } diff --git a/packages/format-title/package.json b/packages/format-title/package.json index fc7ddd3af7..850246ac46 100644 --- a/packages/format-title/package.json +++ b/packages/format-title/package.json @@ -41,7 +41,7 @@ "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", "rollup-plugin-typescript2": "0.30.0", - "typescript": "4.3.2" + "typescript": "4.3.3" }, "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd" } diff --git a/packages/schema/package.json b/packages/schema/package.json index 2165a20596..df691ee6de 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -40,7 +40,7 @@ "homepage": "https://github.com/directus/directus#readme", "devDependencies": { "npm-watch": "0.10.0", - "typescript": "4.3.2" + "typescript": "4.3.3" }, "dependencies": { "knex-schema-inspector": "^1.3.0", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 551a18977c..dd8587860a 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -66,7 +66,7 @@ "rollup-plugin-typescript2": "0.30.0", "ts-jest": "27.0.3", "ts-node": "10.0.0", - "typescript": "4.3.2" + "typescript": "4.3.3" }, "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd" } From 7e76eb4c7929146c517eda6d4a918568db5154fd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 11:45:31 -0400 Subject: [PATCH 19/30] fix(deps): update dependency ms to v2.1.3 (#6328) Co-authored-by: Renovate Bot --- package-lock.json | 4 ++-- packages/gatsby-source-directus/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 59027c1b88..a03c76f8e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51249,7 +51249,7 @@ "chalk": "2.4.2", "gatsby-source-filesystem": "3.7.1", "invariant": "2.2.4", - "ms": "2.1.2" + "ms": "2.1.3" } }, "packages/gatsby-source-directus/node_modules/@jest/types": { @@ -57823,7 +57823,7 @@ "chalk": "2.4.2", "gatsby-source-filesystem": "3.7.1", "invariant": "2.2.4", - "ms": "2.1.2" + "ms": "2.1.3" }, "dependencies": { "@jest/types": { diff --git a/packages/gatsby-source-directus/package.json b/packages/gatsby-source-directus/package.json index d8b73eec96..bb3fd63cce 100644 --- a/packages/gatsby-source-directus/package.json +++ b/packages/gatsby-source-directus/package.json @@ -15,7 +15,7 @@ "chalk": "2.4.2", "gatsby-source-filesystem": "3.7.1", "invariant": "2.2.4", - "ms": "2.1.2" + "ms": "2.1.3" }, "repository": { "type": "git", From 0854ad1fcb0da2c6762224b092ef107ca28936dc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 11:46:03 -0400 Subject: [PATCH 20/30] chore(deps): update dependency marked to v2.1.1 (#6330) Co-authored-by: Renovate Bot --- app/package.json | 2 +- package-lock.json | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/package.json b/app/package.json index 0d1f4b2412..89992103ca 100644 --- a/app/package.json +++ b/app/package.json @@ -69,7 +69,7 @@ "front-matter": "4.0.2", "html-entities": "2.3.2", "jsonlint-mod": "1.7.6", - "marked": "2.0.7", + "marked": "2.1.1", "micromustache": "8.0.3", "mime": "2.5.2", "mitt": "2.1.0", diff --git a/package-lock.json b/package-lock.json index a03c76f8e0..1611a5def8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -490,7 +490,7 @@ "front-matter": "4.0.2", "html-entities": "2.3.2", "jsonlint-mod": "1.7.6", - "marked": "2.0.7", + "marked": "2.1.1", "micromustache": "8.0.3", "mime": "2.5.2", "mitt": "2.1.0", @@ -32120,14 +32120,14 @@ "dev": true }, "node_modules/marked": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/marked/-/marked-2.0.7.tgz", - "integrity": "sha512-BJXxkuIfJchcXOJWTT2DOL+yFWifFv2yGYOUzvXg8Qz610QKw+sHCvTMYwA+qWGhlA2uivBezChZ/pBy1tWdkQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.1.tgz", + "integrity": "sha512-5XFS69o9CzDpQDSpUYC+AN2xvq8yl1EGa5SG/GI1hP78/uTeo3PDfiDNmsUyiahpyhToDDJhQk7fNtJsga+KVw==", "bin": { "marked": "bin/marked" }, "engines": { - "node": ">= 8.16.2" + "node": ">= 12" } }, "node_modules/marked-terminal": { @@ -57248,7 +57248,7 @@ "front-matter": "4.0.2", "html-entities": "2.3.2", "jsonlint-mod": "1.7.6", - "marked": "2.0.7", + "marked": "2.1.1", "micromustache": "8.0.3", "mime": "2.5.2", "mitt": "2.1.0", @@ -84763,9 +84763,9 @@ "dev": true }, "marked": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/marked/-/marked-2.0.7.tgz", - "integrity": "sha512-BJXxkuIfJchcXOJWTT2DOL+yFWifFv2yGYOUzvXg8Qz610QKw+sHCvTMYwA+qWGhlA2uivBezChZ/pBy1tWdkQ==" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.1.tgz", + "integrity": "sha512-5XFS69o9CzDpQDSpUYC+AN2xvq8yl1EGa5SG/GI1hP78/uTeo3PDfiDNmsUyiahpyhToDDJhQk7fNtJsga+KVw==" }, "marked-terminal": { "version": "4.1.1", From 2f8b52b84fa3562a85ce0c17fe3480efc82704de Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 11:46:43 -0400 Subject: [PATCH 21/30] chore(deps): update fullcalendar monorepo to v5.8.0 (#6331) Co-authored-by: Renovate Bot --- app/package.json | 10 +-- package-lock.json | 162 ++++++++++++++++++++++++++-------------------- 2 files changed, 97 insertions(+), 75 deletions(-) diff --git a/app/package.json b/app/package.json index 89992103ca..bead7bdb97 100644 --- a/app/package.json +++ b/app/package.json @@ -30,11 +30,11 @@ "devDependencies": { "@directus/docs": "9.0.0-rc.76", "@directus/format-title": "9.0.0-rc.76", - "@fullcalendar/core": "5.7.2", - "@fullcalendar/daygrid": "5.7.2", - "@fullcalendar/interaction": "5.7.2", - "@fullcalendar/list": "5.7.2", - "@fullcalendar/timegrid": "5.7.2", + "@fullcalendar/core": "5.8.0", + "@fullcalendar/daygrid": "5.8.0", + "@fullcalendar/interaction": "5.8.0", + "@fullcalendar/list": "5.8.0", + "@fullcalendar/timegrid": "5.8.0", "@popperjs/core": "2.9.2", "@rollup/plugin-yaml": "3.0.0", "@sindresorhus/slugify": "2.1.0", diff --git a/package-lock.json b/package-lock.json index 1611a5def8..ec6fb0378b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -451,11 +451,11 @@ "devDependencies": { "@directus/docs": "9.0.0-rc.76", "@directus/format-title": "9.0.0-rc.76", - "@fullcalendar/core": "5.7.2", - "@fullcalendar/daygrid": "5.7.2", - "@fullcalendar/interaction": "5.7.2", - "@fullcalendar/list": "5.7.2", - "@fullcalendar/timegrid": "5.7.2", + "@fullcalendar/core": "5.8.0", + "@fullcalendar/daygrid": "5.8.0", + "@fullcalendar/interaction": "5.8.0", + "@fullcalendar/list": "5.8.0", + "@fullcalendar/timegrid": "5.8.0", "@popperjs/core": "2.9.2", "@rollup/plugin-yaml": "3.0.0", "@sindresorhus/slugify": "2.1.0", @@ -510,6 +510,16 @@ "vuedraggable": "4.0.3" } }, + "app/node_modules/@fullcalendar/daygrid": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-5.8.0.tgz", + "integrity": "sha512-VrqwI97cewoUjFrKT67sS+f+JANI8xMx0g5bpM0XgV/KEEwvXpH5OmwkFSbXOnx1m4RXsvolQc6EBZpnJCf69Q==", + "dev": true, + "dependencies": { + "@fullcalendar/common": "~5.8.0", + "tslib": "^2.1.0" + } + }, "docs": { "name": "@directus/docs", "version": "9.0.0-rc.76", @@ -2749,64 +2759,64 @@ } }, "node_modules/@fullcalendar/common": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/@fullcalendar/common/-/common-5.7.2.tgz", - "integrity": "sha512-0EDKmZBvTUFLvnJ7n6Vo6xMaPVm0jpYq739aSjwFPPXKgbjKFTPbWvLkaDpjJf7YhVebVSOLHbUC1Ky5wXsKvQ==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@fullcalendar/common/-/common-5.8.0.tgz", + "integrity": "sha512-cKmXNgo/9auw86MOwXxA+5FRrgvbE93C9YDwic+Alfm3bUruDTzJDnuvRndrFVurpSBLm6/ZitaR+yoWKLIsgA==", "dev": true, "dependencies": { - "tslib": "^2.0.3" + "tslib": "^2.1.0" } }, "node_modules/@fullcalendar/core": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-5.7.2.tgz", - "integrity": "sha512-4yKLUnAEDDIePw9WJuT2sSvLWGrDGBhp20cjBmyxnJ/6eNN1RCex/OjSu7qDNHvzey+ncjlVWsY41bvZwhpfvg==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-5.8.0.tgz", + "integrity": "sha512-55Zwy4fwcxBqHjfjhV5eae4qOh9fMlpjGcyy4Zt39zA1NlgUW0JxCGOyIu2K2jm2JZn+27/P8b06JXy57DmtKg==", "dev": true, "dependencies": { - "@fullcalendar/common": "~5.7.2", + "@fullcalendar/common": "~5.8.0", "preact": "^10.0.5", - "tslib": "^2.0.3" + "tslib": "^2.1.0" } }, "node_modules/@fullcalendar/daygrid": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-5.7.2.tgz", - "integrity": "sha512-YHxOv3sLDwBWhb9+JBwQ/25VOJ0/22B6msRijIPbmJt5bljqYCIENQ4OLQ5UxZlkDC0Q9CSBg84oBtZYfW+kEg==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-5.8.0.tgz", + "integrity": "sha512-VrqwI97cewoUjFrKT67sS+f+JANI8xMx0g5bpM0XgV/KEEwvXpH5OmwkFSbXOnx1m4RXsvolQc6EBZpnJCf69Q==", "dev": true, "dependencies": { - "@fullcalendar/common": "~5.7.2", - "tslib": "^2.0.3" + "@fullcalendar/common": "~5.8.0", + "tslib": "^2.1.0" } }, "node_modules/@fullcalendar/interaction": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-5.7.2.tgz", - "integrity": "sha512-fnDcwE++0tie6wNVl/ZqUjgOQEekkdmbWH9hmcwE65y2aYMBX4IHE95MjMWVRAy2edahfAmy4xucQs2T0HYYSw==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-5.8.0.tgz", + "integrity": "sha512-ocOCS5g1AT06uR3OeKpN2WKJO4BLmnUZn/v2H/iPllbC7MwYBSy/obC4CoQqnK93FyJXUOFH1KfLwTK013C1+w==", "dev": true, "dependencies": { - "@fullcalendar/common": "~5.7.2", - "tslib": "^2.0.3" + "@fullcalendar/common": "~5.8.0", + "tslib": "^2.1.0" } }, "node_modules/@fullcalendar/list": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/@fullcalendar/list/-/list-5.7.2.tgz", - "integrity": "sha512-IV3SACoE02vheO3wEHjbaw1TGbjdjXHwD/+OtVOgoCNAxJVd0NI0d7kbIxVIniV2vrDPWkybCS1Abi2QANk3iQ==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@fullcalendar/list/-/list-5.8.0.tgz", + "integrity": "sha512-JlqXbWq8Gl2BMx1mOAeEWakW43xDYypBBjwKztnax5tOB5Sfty8chVmeG7ffz2NFtvg2c1nj6MP/zGrVCYY0RA==", "dev": true, "dependencies": { - "@fullcalendar/common": "~5.7.2", - "tslib": "^2.0.3" + "@fullcalendar/common": "~5.8.0", + "tslib": "^2.1.0" } }, "node_modules/@fullcalendar/timegrid": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-5.7.2.tgz", - "integrity": "sha512-FRZRwVtlahljSILexvmhLg2LnFbJVCpeuzAIgdURmRoSDCCDuxoA6Z3l66a/QFp3LcFVbZbg7VjKibyvvB9b9A==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-5.8.0.tgz", + "integrity": "sha512-N24TkOuRkxMDn02E8LPj4fKKgAxQxF6k/PONIwMVHnOih2v3SeiKOOemmrk6uoTwOS7R2fVblOJQGFWXobYu3g==", "dev": true, "dependencies": { - "@fullcalendar/common": "~5.7.2", - "@fullcalendar/daygrid": "~5.7.2", - "tslib": "^2.0.3" + "@fullcalendar/common": "~5.8.0", + "@fullcalendar/daygrid": "~5.8.0", + "tslib": "^2.1.0" } }, "node_modules/@gatsbyjs/reach-router": { @@ -57209,11 +57219,11 @@ "requires": { "@directus/docs": "9.0.0-rc.76", "@directus/format-title": "9.0.0-rc.76", - "@fullcalendar/core": "5.7.2", - "@fullcalendar/daygrid": "5.7.2", - "@fullcalendar/interaction": "5.7.2", - "@fullcalendar/list": "5.7.2", - "@fullcalendar/timegrid": "5.7.2", + "@fullcalendar/core": "5.8.0", + "@fullcalendar/daygrid": "5.8.0", + "@fullcalendar/interaction": "5.8.0", + "@fullcalendar/list": "5.8.0", + "@fullcalendar/timegrid": "5.8.0", "@popperjs/core": "2.9.2", "@rollup/plugin-yaml": "3.0.0", "@sindresorhus/slugify": "2.1.0", @@ -57266,6 +57276,18 @@ "vue-i18n": "9.1.6", "vue-router": "4.0.9", "vuedraggable": "4.0.3" + }, + "dependencies": { + "@fullcalendar/daygrid": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-5.8.0.tgz", + "integrity": "sha512-VrqwI97cewoUjFrKT67sS+f+JANI8xMx0g5bpM0XgV/KEEwvXpH5OmwkFSbXOnx1m4RXsvolQc6EBZpnJCf69Q==", + "dev": true, + "requires": { + "@fullcalendar/common": "~5.8.0", + "tslib": "^2.1.0" + } + } } }, "@directus/cli": { @@ -61061,64 +61083,64 @@ } }, "@fullcalendar/common": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/@fullcalendar/common/-/common-5.7.2.tgz", - "integrity": "sha512-0EDKmZBvTUFLvnJ7n6Vo6xMaPVm0jpYq739aSjwFPPXKgbjKFTPbWvLkaDpjJf7YhVebVSOLHbUC1Ky5wXsKvQ==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@fullcalendar/common/-/common-5.8.0.tgz", + "integrity": "sha512-cKmXNgo/9auw86MOwXxA+5FRrgvbE93C9YDwic+Alfm3bUruDTzJDnuvRndrFVurpSBLm6/ZitaR+yoWKLIsgA==", "dev": true, "requires": { - "tslib": "^2.0.3" + "tslib": "^2.1.0" } }, "@fullcalendar/core": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-5.7.2.tgz", - "integrity": "sha512-4yKLUnAEDDIePw9WJuT2sSvLWGrDGBhp20cjBmyxnJ/6eNN1RCex/OjSu7qDNHvzey+ncjlVWsY41bvZwhpfvg==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-5.8.0.tgz", + "integrity": "sha512-55Zwy4fwcxBqHjfjhV5eae4qOh9fMlpjGcyy4Zt39zA1NlgUW0JxCGOyIu2K2jm2JZn+27/P8b06JXy57DmtKg==", "dev": true, "requires": { - "@fullcalendar/common": "~5.7.2", + "@fullcalendar/common": "~5.8.0", "preact": "^10.0.5", - "tslib": "^2.0.3" + "tslib": "^2.1.0" } }, "@fullcalendar/daygrid": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-5.7.2.tgz", - "integrity": "sha512-YHxOv3sLDwBWhb9+JBwQ/25VOJ0/22B6msRijIPbmJt5bljqYCIENQ4OLQ5UxZlkDC0Q9CSBg84oBtZYfW+kEg==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-5.8.0.tgz", + "integrity": "sha512-VrqwI97cewoUjFrKT67sS+f+JANI8xMx0g5bpM0XgV/KEEwvXpH5OmwkFSbXOnx1m4RXsvolQc6EBZpnJCf69Q==", "dev": true, "requires": { - "@fullcalendar/common": "~5.7.2", - "tslib": "^2.0.3" + "@fullcalendar/common": "~5.8.0", + "tslib": "^2.1.0" } }, "@fullcalendar/interaction": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-5.7.2.tgz", - "integrity": "sha512-fnDcwE++0tie6wNVl/ZqUjgOQEekkdmbWH9hmcwE65y2aYMBX4IHE95MjMWVRAy2edahfAmy4xucQs2T0HYYSw==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-5.8.0.tgz", + "integrity": "sha512-ocOCS5g1AT06uR3OeKpN2WKJO4BLmnUZn/v2H/iPllbC7MwYBSy/obC4CoQqnK93FyJXUOFH1KfLwTK013C1+w==", "dev": true, "requires": { - "@fullcalendar/common": "~5.7.2", - "tslib": "^2.0.3" + "@fullcalendar/common": "~5.8.0", + "tslib": "^2.1.0" } }, "@fullcalendar/list": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/@fullcalendar/list/-/list-5.7.2.tgz", - "integrity": "sha512-IV3SACoE02vheO3wEHjbaw1TGbjdjXHwD/+OtVOgoCNAxJVd0NI0d7kbIxVIniV2vrDPWkybCS1Abi2QANk3iQ==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@fullcalendar/list/-/list-5.8.0.tgz", + "integrity": "sha512-JlqXbWq8Gl2BMx1mOAeEWakW43xDYypBBjwKztnax5tOB5Sfty8chVmeG7ffz2NFtvg2c1nj6MP/zGrVCYY0RA==", "dev": true, "requires": { - "@fullcalendar/common": "~5.7.2", - "tslib": "^2.0.3" + "@fullcalendar/common": "~5.8.0", + "tslib": "^2.1.0" } }, "@fullcalendar/timegrid": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-5.7.2.tgz", - "integrity": "sha512-FRZRwVtlahljSILexvmhLg2LnFbJVCpeuzAIgdURmRoSDCCDuxoA6Z3l66a/QFp3LcFVbZbg7VjKibyvvB9b9A==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-5.8.0.tgz", + "integrity": "sha512-N24TkOuRkxMDn02E8LPj4fKKgAxQxF6k/PONIwMVHnOih2v3SeiKOOemmrk6uoTwOS7R2fVblOJQGFWXobYu3g==", "dev": true, "requires": { - "@fullcalendar/common": "~5.7.2", - "@fullcalendar/daygrid": "~5.7.2", - "tslib": "^2.0.3" + "@fullcalendar/common": "~5.8.0", + "@fullcalendar/daygrid": "~5.8.0", + "tslib": "^2.1.0" } }, "@gatsbyjs/reach-router": { From 6008770a83181668b049895cfa0fcea5015963dc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 11:47:20 -0400 Subject: [PATCH 22/30] chore(deps): update dependency dotenv to v10 (#6333) Co-authored-by: Renovate Bot --- package-lock.json | 35 ++++++++++++++++++------------- packages/drive-azure/package.json | 2 +- packages/drive-gcs/package.json | 2 +- packages/drive-s3/package.json | 2 +- packages/drive/package.json | 2 +- packages/sdk/package.json | 2 +- 6 files changed, 25 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index ec6fb0378b..b25b495fa3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51018,7 +51018,7 @@ "@types/fs-extra": "9.0.11", "@types/jest": "26.0.23", "@types/node": "15.12.2", - "dotenv": "8.6.0", + "dotenv": "10.0.0", "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", @@ -51039,7 +51039,7 @@ "@types/jest": "26.0.23", "@types/node": "15.12.2", "@types/normalize-path": "3.0.0", - "dotenv": "8.6.0", + "dotenv": "10.0.0", "fs-extra": "7.0.1", "jest": "27.0.4", "npm-run-all": "4.1.5", @@ -51106,7 +51106,7 @@ "@types/jest": "26.0.23", "@types/node": "15.12.2", "@types/normalize-path": "3.0.0", - "dotenv": "8.6.0", + "dotenv": "10.0.0", "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", @@ -51137,7 +51137,7 @@ "@types/jest": "26.0.23", "@types/node": "15.12.2", "@types/normalize-path": "3.0.0", - "dotenv": "8.6.0", + "dotenv": "10.0.0", "fs-extra": "7.0.1", "jest": "27.0.4", "npm-run-all": "4.1.5", @@ -55237,7 +55237,7 @@ "@rollup/plugin-node-resolve": "13.0.0", "@types/jest": "26.0.23", "argon2": "0.28.2", - "dotenv": "8.6.0", + "dotenv": "10.0.0", "jest": "27.0.4", "jest-environment-jsdom-global": "2.0.4", "mockdate": "3.0.5", @@ -57655,7 +57655,7 @@ "@types/fs-extra": "9.0.11", "@types/jest": "26.0.23", "@types/node": "15.12.2", - "dotenv": "8.6.0", + "dotenv": "10.0.0", "fs-extra": "^10.0.0", "jest": "27.0.4", "node-exceptions": "^4.0.1", @@ -57665,7 +57665,8 @@ }, "dependencies": { "dotenv": { - "version": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", "dev": true }, @@ -57704,7 +57705,7 @@ "@types/jest": "26.0.23", "@types/node": "15.12.2", "@types/normalize-path": "3.0.0", - "dotenv": "8.6.0", + "dotenv": "10.0.0", "fs-extra": "7.0.1", "jest": "27.0.4", "normalize-path": "^3.0.0", @@ -57714,7 +57715,8 @@ }, "dependencies": { "dotenv": { - "version": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", "dev": true }, @@ -57756,7 +57758,7 @@ "@types/jest": "26.0.23", "@types/node": "15.12.2", "@types/normalize-path": "3.0.0", - "dotenv": "8.6.0", + "dotenv": "10.0.0", "jest": "27.0.4", "normalize-path": "^3.0.0", "npm-run-all": "4.1.5", @@ -57765,7 +57767,8 @@ }, "dependencies": { "dotenv": { - "version": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", "dev": true } @@ -57781,7 +57784,7 @@ "@types/node": "15.12.2", "@types/normalize-path": "3.0.0", "aws-sdk": "^2.928.0", - "dotenv": "8.6.0", + "dotenv": "10.0.0", "fs-extra": "7.0.1", "jest": "27.0.4", "normalize-path": "^3.0.0", @@ -57791,7 +57794,8 @@ }, "dependencies": { "dotenv": { - "version": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", "dev": true }, @@ -60783,7 +60787,7 @@ "@types/jest": "26.0.23", "argon2": "0.28.2", "axios": "^0.21.1", - "dotenv": "8.6.0", + "dotenv": "10.0.0", "jest": "27.0.4", "jest-environment-jsdom-global": "2.0.4", "mockdate": "3.0.5", @@ -60908,7 +60912,8 @@ "peer": true }, "dotenv": { - "version": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", "dev": true }, diff --git a/packages/drive-azure/package.json b/packages/drive-azure/package.json index 3ed19b99a3..2c522126a3 100644 --- a/packages/drive-azure/package.json +++ b/packages/drive-azure/package.json @@ -43,7 +43,7 @@ "@types/jest": "26.0.23", "@types/node": "15.12.2", "@types/normalize-path": "3.0.0", - "dotenv": "8.6.0", + "dotenv": "10.0.0", "fs-extra": "7.0.1", "jest": "27.0.4", "npm-run-all": "4.1.5", diff --git a/packages/drive-gcs/package.json b/packages/drive-gcs/package.json index eedd069489..06203fb598 100644 --- a/packages/drive-gcs/package.json +++ b/packages/drive-gcs/package.json @@ -43,7 +43,7 @@ "@types/jest": "26.0.23", "@types/node": "15.12.2", "@types/normalize-path": "3.0.0", - "dotenv": "8.6.0", + "dotenv": "10.0.0", "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", diff --git a/packages/drive-s3/package.json b/packages/drive-s3/package.json index 86b984b317..5298fc0413 100644 --- a/packages/drive-s3/package.json +++ b/packages/drive-s3/package.json @@ -44,7 +44,7 @@ "@types/jest": "26.0.23", "@types/node": "15.12.2", "@types/normalize-path": "3.0.0", - "dotenv": "8.6.0", + "dotenv": "10.0.0", "fs-extra": "7.0.1", "jest": "27.0.4", "npm-run-all": "4.1.5", diff --git a/packages/drive/package.json b/packages/drive/package.json index b60fdf813e..44fa88df83 100644 --- a/packages/drive/package.json +++ b/packages/drive/package.json @@ -53,7 +53,7 @@ "@types/fs-extra": "9.0.11", "@types/jest": "26.0.23", "@types/node": "15.12.2", - "dotenv": "8.6.0", + "dotenv": "10.0.0", "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index dd8587860a..225a2ea118 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -52,7 +52,7 @@ "@rollup/plugin-node-resolve": "13.0.0", "@types/jest": "26.0.23", "argon2": "0.28.2", - "dotenv": "8.6.0", + "dotenv": "10.0.0", "jest": "27.0.4", "jest-environment-jsdom-global": "2.0.4", "mockdate": "3.0.5", From 569cb273a1e7191e5d083fd2870c5a3b28336160 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 11:49:42 -0400 Subject: [PATCH 23/30] fix(deps): update dependency chalk to v4 (#6342) Co-authored-by: Renovate Bot --- package-lock.json | 4 ++-- packages/gatsby-source-directus/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b25b495fa3..a0d3e8daa1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51256,7 +51256,7 @@ "dependencies": { "@directus/sdk-js": "9.0.0-rc.53", "@lnfusion/gatsby-source-graphql": "0.0.4", - "chalk": "2.4.2", + "chalk": "4.1.1", "gatsby-source-filesystem": "3.7.1", "invariant": "2.2.4", "ms": "2.1.3" @@ -57846,7 +57846,7 @@ "requires": { "@directus/sdk-js": "9.0.0-rc.53", "@lnfusion/gatsby-source-graphql": "0.0.4", - "chalk": "2.4.2", + "chalk": "4.1.1", "gatsby-source-filesystem": "3.7.1", "invariant": "2.2.4", "ms": "2.1.3" diff --git a/packages/gatsby-source-directus/package.json b/packages/gatsby-source-directus/package.json index bb3fd63cce..0b509167b7 100644 --- a/packages/gatsby-source-directus/package.json +++ b/packages/gatsby-source-directus/package.json @@ -12,7 +12,7 @@ "dependencies": { "@directus/sdk-js": "9.0.0-rc.53", "@lnfusion/gatsby-source-graphql": "0.0.4", - "chalk": "2.4.2", + "chalk": "4.1.1", "gatsby-source-filesystem": "3.7.1", "invariant": "2.2.4", "ms": "2.1.3" From 411d259ed6100bc19fd018cdd96b4dc88e2e16c6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 16:02:26 +0000 Subject: [PATCH 24/30] chore(deps): update dependency fs-extra to v10 (#6334) Co-authored-by: Renovate Bot --- docs/package.json | 2 +- package-lock.json | 23 +++++++++++++---------- packages/drive-azure/package.json | 2 +- packages/drive-s3/package.json | 2 +- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/docs/package.json b/docs/package.json index 190fc93563..e606c156d5 100644 --- a/docs/package.json +++ b/docs/package.json @@ -31,7 +31,7 @@ "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd", "devDependencies": { "directory-tree": "2.2.9", - "fs-extra": "7.0.1", + "fs-extra": "10.0.0", "lodash.get": "4.4.2", "micromark": "2.11.4", "npm-watch": "0.10.0", diff --git a/package-lock.json b/package-lock.json index a0d3e8daa1..91dc4b55d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -526,7 +526,7 @@ "license": "ISC", "devDependencies": { "directory-tree": "2.2.9", - "fs-extra": "7.0.1", + "fs-extra": "10.0.0", "lodash.get": "4.4.2", "micromark": "2.11.4", "npm-watch": "0.10.0", @@ -51040,7 +51040,7 @@ "@types/node": "15.12.2", "@types/normalize-path": "3.0.0", "dotenv": "10.0.0", - "fs-extra": "7.0.1", + "fs-extra": "10.0.0", "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", @@ -51138,7 +51138,7 @@ "@types/node": "15.12.2", "@types/normalize-path": "3.0.0", "dotenv": "10.0.0", - "fs-extra": "7.0.1", + "fs-extra": "10.0.0", "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", @@ -57612,7 +57612,7 @@ "version": "file:docs", "requires": { "directory-tree": "2.2.9", - "fs-extra": "7.0.1", + "fs-extra": "10.0.0", "lodash.get": "4.4.2", "micromark": "2.11.4", "npm-watch": "0.10.0", @@ -57622,7 +57622,8 @@ }, "dependencies": { "fs-extra": { - "version": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", "dev": true, "requires": { @@ -57706,7 +57707,7 @@ "@types/node": "15.12.2", "@types/normalize-path": "3.0.0", "dotenv": "10.0.0", - "fs-extra": "7.0.1", + "fs-extra": "10.0.0", "jest": "27.0.4", "normalize-path": "^3.0.0", "npm-run-all": "4.1.5", @@ -57721,7 +57722,8 @@ "dev": true }, "fs-extra": { - "version": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", "dev": true, "requires": { @@ -57785,7 +57787,7 @@ "@types/normalize-path": "3.0.0", "aws-sdk": "^2.928.0", "dotenv": "10.0.0", - "fs-extra": "7.0.1", + "fs-extra": "10.0.0", "jest": "27.0.4", "normalize-path": "^3.0.0", "npm-run-all": "4.1.5", @@ -57800,7 +57802,8 @@ "dev": true }, "fs-extra": { - "version": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", "dev": true, "requires": { @@ -72918,7 +72921,7 @@ "pg": "^8.6.0", "pino": "^6.11.3", "pino-colada": "^2.1.0", - "pino-http": "*", + "pino-http": "^5.5.0", "prettier": "^2.3.1", "qs": "^6.9.4", "rate-limiter-flexible": "^2.2.2", diff --git a/packages/drive-azure/package.json b/packages/drive-azure/package.json index 2c522126a3..78e7d017ac 100644 --- a/packages/drive-azure/package.json +++ b/packages/drive-azure/package.json @@ -44,7 +44,7 @@ "@types/node": "15.12.2", "@types/normalize-path": "3.0.0", "dotenv": "10.0.0", - "fs-extra": "7.0.1", + "fs-extra": "10.0.0", "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", diff --git a/packages/drive-s3/package.json b/packages/drive-s3/package.json index 5298fc0413..ea8aa9d448 100644 --- a/packages/drive-s3/package.json +++ b/packages/drive-s3/package.json @@ -45,7 +45,7 @@ "@types/node": "15.12.2", "@types/normalize-path": "3.0.0", "dotenv": "10.0.0", - "fs-extra": "7.0.1", + "fs-extra": "10.0.0", "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", From 0b8fb9fae8793e3d136c30575c289a97be702823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Garc=C3=ADa?= Date: Thu, 17 Jun 2021 20:55:27 +0200 Subject: [PATCH 25/30] Change cache-control heeaders (#6355) --- api/src/middleware/cache.ts | 2 +- api/src/utils/get-cache-headers.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/src/middleware/cache.ts b/api/src/middleware/cache.ts index 0f47869b5c..134d6fc2fc 100644 --- a/api/src/middleware/cache.ts +++ b/api/src/middleware/cache.ts @@ -10,7 +10,7 @@ const checkCacheMiddleware: RequestHandler = asyncHandler(async (req, res, next) if (env.CACHE_ENABLED !== true) return next(); if (!cache) return next(); - if (req.headers['cache-control']?.includes('no-cache') || req.headers['Cache-Control']?.includes('no-cache')) { + if (req.headers['cache-control']?.includes('no-store') || req.headers['Cache-Control']?.includes('no-store')) { return next(); } diff --git a/api/src/utils/get-cache-headers.ts b/api/src/utils/get-cache-headers.ts index 8dad8ab3db..47115a77e3 100644 --- a/api/src/utils/get-cache-headers.ts +++ b/api/src/utils/get-cache-headers.ts @@ -15,10 +15,10 @@ export function getCacheControlHeader(req: Request, ttl: number | null): string if (env.CACHE_AUTO_PURGE === true) return 'no-cache'; const noCacheRequested = - req.headers['cache-control']?.includes('no-cache') || req.headers['Cache-Control']?.includes('no-cache'); + req.headers['cache-control']?.includes('no-store') || req.headers['Cache-Control']?.includes('no-store'); // When the user explicitly asked to skip the cache - if (noCacheRequested) return 'no-cache'; + if (noCacheRequested) return 'no-store'; // Cache control header uses seconds for everything const ttlSeconds = Math.round(ttl / 1000); From 9eb3a776895769ac216f510d3d3bf2993700f3f8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 15:00:05 -0400 Subject: [PATCH 26/30] chore(deps): update dependency typescript to v4.3.4 (#6357) Co-authored-by: Renovate Bot --- api/package.json | 2 +- app/package.json | 2 +- package-lock.json | 52 +++++++++++++++--------------- packages/cli/package.json | 2 +- packages/drive-azure/package.json | 2 +- packages/drive-gcs/package.json | 2 +- packages/drive-s3/package.json | 2 +- packages/drive/package.json | 2 +- packages/format-title/package.json | 2 +- packages/schema/package.json | 2 +- packages/sdk/package.json | 2 +- 11 files changed, 36 insertions(+), 36 deletions(-) diff --git a/api/package.json b/api/package.json index 80f614663c..764c7ff3c9 100644 --- a/api/package.json +++ b/api/package.json @@ -181,6 +181,6 @@ "copyfiles": "2.4.1", "cross-env": "7.0.3", "ts-node-dev": "1.1.6", - "typescript": "4.3.3" + "typescript": "4.3.4" } } diff --git a/app/package.json b/app/package.json index bead7bdb97..546e0ac12c 100644 --- a/app/package.json +++ b/app/package.json @@ -81,7 +81,7 @@ "rimraf": "3.0.2", "sass": "1.35.1", "tinymce": "5.8.1", - "typescript": "4.3.3", + "typescript": "4.3.4", "vite": "2.3.7", "vue": "3.1.1", "vue-i18n": "9.1.6", diff --git a/package-lock.json b/package-lock.json index 91dc4b55d6..a78fcdf517 100644 --- a/package-lock.json +++ b/package-lock.json @@ -159,7 +159,7 @@ "copyfiles": "2.4.1", "cross-env": "7.0.3", "ts-node-dev": "1.1.6", - "typescript": "4.3.3" + "typescript": "4.3.4" }, "optionalDependencies": { "@keyv/redis": "^2.1.2", @@ -502,7 +502,7 @@ "rimraf": "3.0.2", "sass": "1.35.1", "tinymce": "5.8.1", - "typescript": "4.3.3", + "typescript": "4.3.4", "vite": "2.3.7", "vue": "3.1.1", "vue-i18n": "9.1.6", @@ -46436,9 +46436,9 @@ } }, "node_modules/typescript": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.3.tgz", - "integrity": "sha512-rUvLW0WtF7PF2b9yenwWUi9Da9euvDRhmH7BLyBG4DCFfOJ850LGNknmRpp8Z8kXNUPObdZQEfKOiHtXuQHHKA==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz", + "integrity": "sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -50422,7 +50422,7 @@ "rimraf": "3.0.2", "ts-jest": "27.0.3", "ts-node": "10.0.0", - "typescript": "4.3.3" + "typescript": "4.3.4" } }, "packages/cli/node_modules/@types/yargs": { @@ -51022,7 +51022,7 @@ "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.3" + "typescript": "4.3.4" } }, "packages/drive-azure": { @@ -51044,7 +51044,7 @@ "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.3" + "typescript": "4.3.4" } }, "packages/drive-azure/node_modules/dotenv": { @@ -51110,7 +51110,7 @@ "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.3" + "typescript": "4.3.4" } }, "packages/drive-gcs/node_modules/dotenv": { @@ -51142,7 +51142,7 @@ "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.3" + "typescript": "4.3.4" } }, "packages/drive-s3/node_modules/dotenv": { @@ -51243,7 +51243,7 @@ "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", "rollup-plugin-typescript2": "0.30.0", - "typescript": "4.3.3" + "typescript": "4.3.4" }, "engines": { "node": ">=6.0.0" @@ -55221,7 +55221,7 @@ }, "devDependencies": { "npm-watch": "0.10.0", - "typescript": "4.3.3" + "typescript": "4.3.4" } }, "packages/sdk": { @@ -55251,7 +55251,7 @@ "rollup-plugin-typescript2": "0.30.0", "ts-jest": "27.0.3", "ts-node": "10.0.0", - "typescript": "4.3.3" + "typescript": "4.3.4" } }, "packages/sdk/node_modules/@jest/environment": { @@ -57270,7 +57270,7 @@ "rimraf": "3.0.2", "sass": "1.35.1", "tinymce": "5.8.1", - "typescript": "4.3.3", + "typescript": "4.3.4", "vite": "2.3.7", "vue": "3.1.1", "vue-i18n": "9.1.6", @@ -57336,7 +57336,7 @@ "strip-indent": "^4.0.0", "ts-jest": "27.0.3", "ts-node": "10.0.0", - "typescript": "4.3.3", + "typescript": "4.3.4", "yargs": "^17.0.1", "yargs-parser": "^20.2.7" }, @@ -57662,7 +57662,7 @@ "node-exceptions": "^4.0.1", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.3" + "typescript": "4.3.4" }, "dependencies": { "dotenv": { @@ -57712,7 +57712,7 @@ "normalize-path": "^3.0.0", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.3" + "typescript": "4.3.4" }, "dependencies": { "dotenv": { @@ -57765,7 +57765,7 @@ "normalize-path": "^3.0.0", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.3" + "typescript": "4.3.4" }, "dependencies": { "dotenv": { @@ -57792,7 +57792,7 @@ "normalize-path": "^3.0.0", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.3" + "typescript": "4.3.4" }, "dependencies": { "dotenv": { @@ -57841,7 +57841,7 @@ "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", "rollup-plugin-typescript2": "0.30.0", - "typescript": "4.3.3" + "typescript": "4.3.4" } }, "@directus/gatsby-source-directus": { @@ -60778,7 +60778,7 @@ "knex-schema-inspector": "^1.3.0", "lodash": "^4.17.21", "npm-watch": "0.10.0", - "typescript": "4.3.3" + "typescript": "4.3.4" } }, "@directus/sdk": { @@ -60804,7 +60804,7 @@ "rollup-plugin-typescript2": "0.30.0", "ts-jest": "27.0.3", "ts-node": "10.0.0", - "typescript": "4.3.3" + "typescript": "4.3.4" }, "dependencies": { "@jest/environment": { @@ -72931,7 +72931,7 @@ "stream-json": "^1.7.1", "tedious": "^11.0.8", "ts-node-dev": "1.1.6", - "typescript": "4.3.3", + "typescript": "4.3.4", "uuid": "^8.3.2", "uuid-validate": "0.0.3" }, @@ -96274,9 +96274,9 @@ } }, "typescript": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.3.tgz", - "integrity": "sha512-rUvLW0WtF7PF2b9yenwWUi9Da9euvDRhmH7BLyBG4DCFfOJ850LGNknmRpp8Z8kXNUPObdZQEfKOiHtXuQHHKA==" + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz", + "integrity": "sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew==" }, "uc.micro": { "version": "1.0.6", diff --git a/packages/cli/package.json b/packages/cli/package.json index d6a824a116..1bac0735c9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -88,7 +88,7 @@ "rimraf": "3.0.2", "ts-jest": "27.0.3", "ts-node": "10.0.0", - "typescript": "4.3.3" + "typescript": "4.3.4" }, "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd" } diff --git a/packages/drive-azure/package.json b/packages/drive-azure/package.json index 78e7d017ac..bf4ae7f8e5 100644 --- a/packages/drive-azure/package.json +++ b/packages/drive-azure/package.json @@ -48,7 +48,7 @@ "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.3" + "typescript": "4.3.4" }, "publishConfig": { "access": "public" diff --git a/packages/drive-gcs/package.json b/packages/drive-gcs/package.json index 06203fb598..119ab6a88a 100644 --- a/packages/drive-gcs/package.json +++ b/packages/drive-gcs/package.json @@ -47,7 +47,7 @@ "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.3" + "typescript": "4.3.4" }, "publishConfig": { "access": "public" diff --git a/packages/drive-s3/package.json b/packages/drive-s3/package.json index ea8aa9d448..0bdf5adfcf 100644 --- a/packages/drive-s3/package.json +++ b/packages/drive-s3/package.json @@ -49,7 +49,7 @@ "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.3" + "typescript": "4.3.4" }, "publishConfig": { "access": "public" diff --git a/packages/drive/package.json b/packages/drive/package.json index 44fa88df83..a582497d9a 100644 --- a/packages/drive/package.json +++ b/packages/drive/package.json @@ -57,6 +57,6 @@ "jest": "27.0.4", "npm-run-all": "4.1.5", "ts-jest": "27.0.3", - "typescript": "4.3.3" + "typescript": "4.3.4" } } diff --git a/packages/format-title/package.json b/packages/format-title/package.json index 850246ac46..d1adba7dfa 100644 --- a/packages/format-title/package.json +++ b/packages/format-title/package.json @@ -41,7 +41,7 @@ "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", "rollup-plugin-typescript2": "0.30.0", - "typescript": "4.3.3" + "typescript": "4.3.4" }, "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd" } diff --git a/packages/schema/package.json b/packages/schema/package.json index df691ee6de..97a1e3c5d8 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -40,7 +40,7 @@ "homepage": "https://github.com/directus/directus#readme", "devDependencies": { "npm-watch": "0.10.0", - "typescript": "4.3.3" + "typescript": "4.3.4" }, "dependencies": { "knex-schema-inspector": "^1.3.0", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 225a2ea118..a479c4e215 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -66,7 +66,7 @@ "rollup-plugin-typescript2": "0.30.0", "ts-jest": "27.0.3", "ts-node": "10.0.0", - "typescript": "4.3.3" + "typescript": "4.3.4" }, "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd" } From 980be7cb53a99403bd5f173069efb5cb11fcf8b2 Mon Sep 17 00:00:00 2001 From: Aiden Foxx Date: Thu, 17 Jun 2021 21:43:32 +0200 Subject: [PATCH 27/30] Fixed invalid onDelete constraint for some schemas (#6308) * Fixed invalid onDelete clause for some schemas * Ran prettier * Updated all onDelete statements to be Oracle friendly Co-authored-by: Aiden Foxx --- .../20210518A-add-foreign-key-constraints.ts | 14 +++++++------- api/src/services/relations.ts | 19 ++++++++++++------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/api/src/database/migrations/20210518A-add-foreign-key-constraints.ts b/api/src/database/migrations/20210518A-add-foreign-key-constraints.ts index 4456471531..d27efecc2e 100644 --- a/api/src/database/migrations/20210518A-add-foreign-key-constraints.ts +++ b/api/src/database/migrations/20210518A-add-foreign-key-constraints.ts @@ -83,9 +83,6 @@ export async function up(knex: Knex): Promise { } } - // Can't reliably have circular cascade - const action = constraint.many_collection === constraint.one_collection ? 'NO ACTION' : 'SET NULL'; - // MySQL doesn't accept FKs from `int` to `int unsigned`. `knex` defaults `.increments()` // to `unsigned`, but defaults `.integer()` to `int`. This means that created m2o fields // have the wrong type. This step will force the m2o `int` field into `unsigned`, but only @@ -104,12 +101,15 @@ export async function up(knex: Knex): Promise { } const indexName = getDefaultIndexName('foreign', constraint.many_collection, constraint.many_field); - - table + const builder = table .foreign(constraint.many_field, indexName) .references(relatedPrimaryKeyField) - .inTable(constraint.one_collection!) - .onDelete(action); + .inTable(constraint.one_collection!); + + // Can't reliably have circular cascade + if (constraint.many_collection !== constraint.one_collection) { + builder.onDelete('SET NULL'); + } }); } catch (err) { logger.warn( diff --git a/api/src/services/relations.ts b/api/src/services/relations.ts index 3ab3ffbe1d..c9a38c8463 100644 --- a/api/src/services/relations.ts +++ b/api/src/services/relations.ts @@ -161,13 +161,15 @@ export class RelationsService { this.alterType(table, relation); const constraintName: string = getDefaultIndexName('foreign', relation.collection!, relation.field!); - - table + const builder = table .foreign(relation.field!, constraintName) .references( `${relation.related_collection!}.${this.schema.collections[relation.related_collection!].primary}` - ) - .onDelete(relation.schema?.on_delete || 'NO ACTION'); + ); + + if (relation.schema?.on_delete) { + builder.onDelete(relation.schema.on_delete); + } }); } @@ -222,14 +224,17 @@ export class RelationsService { this.alterType(table, relation); - table + const builder = table .foreign(field, constraintName || undefined) .references( `${existingRelation.related_collection!}.${ this.schema.collections[existingRelation.related_collection!].primary }` - ) - .onDelete(relation.schema?.on_delete || 'NO ACTION'); + ); + + if (relation.schema?.on_delete) { + builder.onDelete(relation.schema.on_delete); + } }); } From 4a2ea9a03eda809c8ffdf0054d82015e40b8bb2a Mon Sep 17 00:00:00 2001 From: Pascal Jufer Date: Fri, 18 Jun 2021 15:28:12 +0200 Subject: [PATCH 28/30] Add "require('axios')" in API hooks examples (#6360) * Docs: Add "require('axios')" in API hooks examples * Move "require('axios')" to top --- docs/guides/api-hooks.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/guides/api-hooks.md b/docs/guides/api-hooks.md index 26f224a50b..176e0e2917 100644 --- a/docs/guides/api-hooks.md +++ b/docs/guides/api-hooks.md @@ -111,6 +111,8 @@ provide a cron statement in the event scope as follows: `cron()`, for on day-of-month 1) or `cron(5 4 * * sun)` (at 04:05 on Sunday). See example below: ```js +const axios = require('axios'); + module.exports = function registerHook() { return { 'cron(*/15 * * * *)': async function () { @@ -125,6 +127,8 @@ module.exports = function registerHook() { Each custom hook is registered to its event scope using a function with the following format: ```js +const axios = require('axios'); + module.exports = function registerHook() { return { 'items.create': function () { @@ -188,10 +192,12 @@ To deploy your hook, simply restart the API by running: npx directus start ``` -## Full Example: +## Full Example + +`extensions/hooks/sync-with-external/index.js`: ```js -// extensions/hooks/sync-with-external/index.js +const axios = require('axios'); module.exports = function registerHook({ services, exceptions }) { const { MailService } = services; From f99654ae188014dec168de53dc11d7f928921f58 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Jun 2021 09:28:29 -0400 Subject: [PATCH 29/30] chore(deps): update dependency @types/jsonwebtoken to v8.5.2 (#6363) Co-authored-by: Renovate Bot --- api/package.json | 2 +- package-lock.json | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/api/package.json b/api/package.json index 764c7ff3c9..2d78b2354c 100644 --- a/api/package.json +++ b/api/package.json @@ -165,7 +165,7 @@ "@types/inquirer": "7.3.1", "@types/js-yaml": "4.0.1", "@types/json2csv": "5.0.2", - "@types/jsonwebtoken": "8.5.1", + "@types/jsonwebtoken": "8.5.2", "@types/keyv": "3.1.1", "@types/lodash": "4.14.170", "@types/mime-types": "2.1.0", diff --git a/package-lock.json b/package-lock.json index a78fcdf517..58cd9d2272 100644 --- a/package-lock.json +++ b/package-lock.json @@ -143,7 +143,7 @@ "@types/inquirer": "7.3.1", "@types/js-yaml": "4.0.1", "@types/json2csv": "5.0.2", - "@types/jsonwebtoken": "8.5.1", + "@types/jsonwebtoken": "8.5.2", "@types/keyv": "3.1.1", "@types/lodash": "4.14.170", "@types/mime-types": "2.1.0", @@ -7956,9 +7956,9 @@ "peer": true }, "node_modules/@types/jsonwebtoken": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", - "integrity": "sha512-rNAPdomlIUX0i0cg2+I+Q1wOUr531zHBQ+cV/28PJ39bSPKjahatZZ2LMuhiguETkCgLVzfruw/ZvNMNkKoSzw==", + "version": "8.5.2", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.2.tgz", + "integrity": "sha512-X8BOCkp+WJVNYCYIBugREtVZa4Y09Or9HDx6xqRZem5F8jJV8FuJgNessXyMuv9+U8pjnvdezASwU28uw+1scw==", "dev": true, "dependencies": { "@types/node": "*" @@ -65306,9 +65306,9 @@ "peer": true }, "@types/jsonwebtoken": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", - "integrity": "sha512-rNAPdomlIUX0i0cg2+I+Q1wOUr531zHBQ+cV/28PJ39bSPKjahatZZ2LMuhiguETkCgLVzfruw/ZvNMNkKoSzw==", + "version": "8.5.2", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.2.tgz", + "integrity": "sha512-X8BOCkp+WJVNYCYIBugREtVZa4Y09Or9HDx6xqRZem5F8jJV8FuJgNessXyMuv9+U8pjnvdezASwU28uw+1scw==", "dev": true, "requires": { "@types/node": "*" @@ -72847,7 +72847,7 @@ "@types/inquirer": "7.3.1", "@types/js-yaml": "4.0.1", "@types/json2csv": "5.0.2", - "@types/jsonwebtoken": "8.5.1", + "@types/jsonwebtoken": "8.5.2", "@types/keyv": "3.1.1", "@types/lodash": "4.14.170", "@types/mime-types": "2.1.0", From 3850416863ae16c05a15f5305d4b57c1134d898b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Jun 2021 09:36:59 -0400 Subject: [PATCH 30/30] chore(deps): update dependency pinia to v2.0.0-beta.3 (#6371) Co-authored-by: Renovate Bot --- app/package.json | 2 +- package-lock.json | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/package.json b/app/package.json index 546e0ac12c..1e7035999c 100644 --- a/app/package.json +++ b/app/package.json @@ -74,7 +74,7 @@ "mime": "2.5.2", "mitt": "2.1.0", "nanoid": "3.1.23", - "pinia": "2.0.0-beta.2", + "pinia": "2.0.0-beta.3", "prettier": "2.3.1", "pretty-ms": "7.0.1", "qrcode": "1.4.4", diff --git a/package-lock.json b/package-lock.json index 58cd9d2272..fb43bfdcc0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -495,7 +495,7 @@ "mime": "2.5.2", "mitt": "2.1.0", "nanoid": "3.1.23", - "pinia": "2.0.0-beta.2", + "pinia": "2.0.0-beta.3", "prettier": "2.3.1", "pretty-ms": "7.0.1", "qrcode": "1.4.4", @@ -36843,12 +36843,12 @@ } }, "node_modules/pinia": { - "version": "2.0.0-beta.2", - "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.0-beta.2.tgz", - "integrity": "sha512-fzjzS5gaZyWNFfQBL60Bn967Jwy3nbYuVCjzpqCCbI/wzrIN/NqLRy9ACRaZvAf+T/VEv5+A0J87UkWalSJY0w==", + "version": "2.0.0-beta.3", + "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.0-beta.3.tgz", + "integrity": "sha512-4ygKhe9FrYD69tJ7nSdgHm9Ldb0aM/Nzyb8Qz/RZuzOyOr85jWHNmCAhCytWy0l9C4/ypGJYCEJ3vuZfyWjcZA==", "dev": true, "dependencies": { - "@vue/devtools-api": "^6.0.0-beta.12" + "@vue/devtools-api": "^6.0.0-beta.14" } }, "node_modules/pinkie": { @@ -57263,7 +57263,7 @@ "mime": "2.5.2", "mitt": "2.1.0", "nanoid": "3.1.23", - "pinia": "2.0.0-beta.2", + "pinia": "2.0.0-beta.3", "prettier": "2.3.1", "pretty-ms": "7.0.1", "qrcode": "1.4.4", @@ -88571,12 +88571,12 @@ "dev": true }, "pinia": { - "version": "2.0.0-beta.2", - "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.0-beta.2.tgz", - "integrity": "sha512-fzjzS5gaZyWNFfQBL60Bn967Jwy3nbYuVCjzpqCCbI/wzrIN/NqLRy9ACRaZvAf+T/VEv5+A0J87UkWalSJY0w==", + "version": "2.0.0-beta.3", + "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.0-beta.3.tgz", + "integrity": "sha512-4ygKhe9FrYD69tJ7nSdgHm9Ldb0aM/Nzyb8Qz/RZuzOyOr85jWHNmCAhCytWy0l9C4/ypGJYCEJ3vuZfyWjcZA==", "dev": true, "requires": { - "@vue/devtools-api": "^6.0.0-beta.12" + "@vue/devtools-api": "^6.0.0-beta.14" } }, "pinkie": {