Merge branch 'main' into docs/data-flow-reference

.eslintrc.js

@@ -52,6 +52,7 @@ module.exports = {
 			],
 			rules: {
 				...defaultRules,
+				'vue/multi-word-component-names': 'off',
 				// It's recommended to turn off this rule on TypeScript projects
 				'no-undef': 'off',
 				// Allow ts-directive comments (used to suppress TypeScript compiler errors)

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,5 @@
 name: Bug Report
 description: Create a report to help us improve
-labels: 'Bug (Potential)'
 body:
   - type: markdown
     attributes:

.github/pull_request_template.md

@@ -0,0 +1,28 @@
+## Description
+
+<!--
+
+A summary of the changes and a reference to the Issue that was fixed / implemented.
+
+NOTE: All Pull Requests require a corresponding open Issue.
+
+-->
+
+Fixes #
+
+## Type of Change
+
+- [ ] Bugfix
+- [ ] New Feature
+- [ ] Refactor / codestyle updates
+- [ ] Other, please describe:
+
+## Requirements Checklist
+
+- [ ] New / updated tests are included
+- [ ] All tests are passing locally
+- [ ] Performed a self-review of the submitted code
+
+If adding a new feature:
+
+- [ ] Documentation was added/updated

.github/workflows/add-to-project.yml

@@ -0,0 +1,19 @@
+name: Add issues to Projects (beta)
+
+on:
+  issues:
+    types:
+      - opened
+  pull_request_target:
+    types:
+      - opened
+
+jobs:
+  add-to-project:
+    name: Add issue to project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/add-to-project@v0.0.3
+        with:
+          project-url: https://github.com/orgs/directus/projects/6
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}

.github/workflows/release.yml

@@ -8,6 +8,7 @@ on:
 env:
   GHCR_IMAGE: ghcr.io/${{ github.repository }}
   DOCKERHUB_IMAGE: ${{ github.repository }}
+  NODE_OPTIONS: --max_old_space_size=8192
 
 jobs:
   create-release:
@@ -40,13 +41,9 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '16.15'
           cache: npm
 
-      # See https://github.com/npm/cli/issues/3637
-      - name: Downgrade NPM
-        run: npm i -g npm@7.20.2
-
       - name: Setup NPM cache
         uses: c-hive/gha-npm-cache@v1
 
@@ -83,14 +80,10 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '16.15'
           registry-url: https://registry.npmjs.org
           cache: npm
 
-      # See https://github.com/npm/cli/issues/3637
-      - name: Downgrade NPM
-        run: npm i -g npm@7.20.2
-
       - name: Install dependencies
         run: npm ci
 

api/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.10.0",
+	"version": "9.12.1",
 	"license": "GPL-3.0-only",
 	"homepage": "https://github.com/directus/directus#readme",
 	"description": "Directus is a real-time API and App dashboard for managing SQL database content.",
@@ -73,21 +73,20 @@
 	"files": [
 		"dist",
 		"LICENSE",
-		"README.md",
-		"example.env"
+		"README.md"
 	],
 	"dependencies": {
 		"@aws-sdk/client-ses": "^3.40.0",
-		"@directus/app": "9.10.0",
-		"@directus/drive": "9.10.0",
-		"@directus/drive-azure": "9.10.0",
-		"@directus/drive-gcs": "9.10.0",
-		"@directus/drive-s3": "9.10.0",
-		"@directus/extensions-sdk": "9.10.0",
-		"@directus/format-title": "9.10.0",
-		"@directus/schema": "9.10.0",
-		"@directus/shared": "9.10.0",
-		"@directus/specs": "9.10.0",
+		"@directus/app": "9.12.1",
+		"@directus/drive": "9.12.1",
+		"@directus/drive-azure": "9.12.1",
+		"@directus/drive-gcs": "9.12.1",
+		"@directus/drive-s3": "9.12.1",
+		"@directus/extensions-sdk": "9.12.1",
+		"@directus/format-title": "9.12.1",
+		"@directus/schema": "9.12.1",
+		"@directus/shared": "9.12.1",
+		"@directus/specs": "9.12.1",
 		"@godaddy/terminus": "^4.9.0",
 		"@rollup/plugin-alias": "^3.1.9",
 		"@rollup/plugin-virtual": "^2.0.3",
@@ -112,12 +111,15 @@
 		"execa": "^5.1.1",
 		"exifr": "^7.1.2",
 		"express": "^4.17.1",
+		"fast-redact": "^3.1.1",
 		"flat": "^5.0.2",
 		"fs-extra": "^10.0.0",
+		"globby": "^11.0.4",
 		"graphql": "^15.5.0",
 		"graphql-compose": "^9.0.1",
 		"helmet": "^4.6.0",
 		"inquirer": "^8.1.1",
+		"ioredis": "^4.27.6",
 		"joi": "^17.3.0",
 		"js-yaml": "^4.1.0",
 		"js2xmlparser": "^4.0.1",
@@ -131,6 +133,7 @@
 		"lodash": "^4.17.21",
 		"macos-release": "^2.4.1",
 		"marked": "^4.0.3",
+		"micromustache": "^8.0.3",
 		"mime-types": "^2.1.31",
 		"ms": "^2.1.3",
 		"nanoid": "^3.1.23",
@@ -162,7 +165,6 @@
 	},
 	"optionalDependencies": {
 		"@keyv/redis": "^2.1.2",
-		"ioredis": "^4.27.6",
 		"keyv-memcache": "^1.2.5",
 		"memcached": "^2.2.2",
 		"mysql": "^2.18.1",
@@ -183,9 +185,11 @@
 		"@types/express": "4.17.13",
 		"@types/express-pino-logger": "4.0.3",
 		"@types/express-session": "1.17.4",
+		"@types/fast-redact": "^3.0.1",
 		"@types/flat": "5.0.2",
 		"@types/fs-extra": "9.0.13",
 		"@types/inquirer": "8.1.3",
+		"@types/ioredis": "^4.28.10",
 		"@types/jest": "27.4.1",
 		"@types/js-yaml": "4.0.5",
 		"@types/json2csv": "5.0.3",