@directus/api 18.0.0 → 18.1.0

package/dist/database/migrations/20240204A-marketplace.js

@@ -6,7 +6,8 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
 export async function up(knex) {
     await knex.schema.alterTable('directus_extensions', (table) => {
         table.uuid('id').nullable();
-        table.string('source', 255);
+        table.string('folder');
+        table.string('source');
         table.uuid('bundle');
     });
     const installedExtensions = await knex.select('name').from('directus_extensions');
@@ -30,7 +31,7 @@ export async function up(knex) {
             catch {
                 source = 'local';
             }
-            await knex('directus_extensions').update({ id, source }).where({ name });
+            await knex('directus_extensions').update({ id, source, folder: name }).where({ name });
             idMap.set(name, id);
         }
     }
@@ -47,22 +48,41 @@ export async function up(knex) {
         if (!bundleParentId)
             continue;
         await knex('directus_extensions')
-            .update({ bundle: bundleParentId, name: name.substring(bundleParentName.length + 1) })
-            .where({ name });
+            .update({ bundle: bundleParentId, folder: name.substring(bundleParentName.length + 1) })
+            .where({ folder: name });
     }
     await knex.schema.alterTable('directus_extensions', (table) => {
-        table.dropPrimary();
+        table.dropColumn('name');
         table.uuid('id').alter().primary().notNullable();
-        table.string('source', 255).alter().notNullable().defaultTo('local');
-        table.renameColumn('name', 'folder');
+        table.string('source').alter().notNullable();
+        table.string('folder').alter().notNullable();
     });
 }
+/*
+ * Note: For local extensions having a different package & folder name,
+ * we aren't able to revert to the exact same state as before.
+ * But we still need to do the name convertion, in order for the migration to succeed.
+ */
 export async function down(knex) {
     await knex.schema.alterTable('directus_extensions', (table) => {
-        table.dropColumns('id', 'source', 'bundle');
-        table.renameColumn('folder', 'name');
+        table.string('name');
     });
+    const installedExtensions = await knex.select(['id', 'folder', 'bundle']).from('directus_extensions');
+    const idMap = new Map(installedExtensions.map((extension) => [extension.id, extension.folder]));
+    for (const { id, folder, bundle, source } of installedExtensions) {
+        if (source === 'registry') {
+            await knex('directus_extensions').delete().where({ id });
+            continue;
+        }
+        let name = folder;
+        if (bundle) {
+            const bundleParentName = idMap.get(bundle);
+            name = `${bundleParentName}/${name}`;
+        }
+        await knex('directus_extensions').update({ name }).where({ id });
+    }
     await knex.schema.alterTable('directus_extensions', (table) => {
-        table.string('name', 255).primary().alter();
+        table.dropColumns('id', 'folder', 'source', 'bundle');
+        table.string('name').alter().primary().notNullable();
     });
 }

package/dist/services/mail/index.js

@@ -5,7 +5,6 @@ import { Liquid } from 'liquidjs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import getDatabase from '../../database/index.js';
-import { getExtensionsPath } from '../../extensions/lib/get-extensions-path.js';
 import { useLogger } from '../../logger.js';
 import getMailer from '../../mailer.js';
 import { Url } from '../../utils/url.js';
@@ -13,7 +12,7 @@ const env = useEnv();
 const logger = useLogger();
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const liquidEngine = new Liquid({
-    root: [path.resolve(getExtensionsPath(), 'templates'), path.resolve(__dirname, 'templates')],
+    root: [path.resolve(env['EMAIL_TEMPLATES_PATH']), path.resolve(__dirname, 'templates')],
     extname: '.liquid',
 });
 export class MailService {
@@ -61,7 +60,7 @@ export class MailService {
         });
     }
     async renderTemplate(template, variables) {
-        const customTemplatePath = path.resolve(getExtensionsPath(), 'templates', template + '.liquid');
+        const customTemplatePath = path.resolve(env['EMAIL_TEMPLATES_PATH'], template + '.liquid');
         const systemTemplatePath = path.join(__dirname, 'templates', template + '.liquid');
         const templatePath = (await fse.pathExists(customTemplatePath)) ? customTemplatePath : systemTemplatePath;
         if ((await fse.pathExists(templatePath)) === false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "18.0.0",
+  "version": "18.1.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -144,28 +144,28 @@
     "ws": "8.16.0",
     "zod": "3.22.4",
     "zod-validation-error": "3.0.3",
-    "@directus/app": "11.0.0",
-    "@directus/constants": "11.0.3",
-    "@directus/env": "1.0.3",
+    "@directus/app": "11.0.1",
     "@directus/errors": "0.2.4",
-    "@directus/extensions-registry": "1.0.0",
-    "@directus/extensions": "1.0.0",
-    "@directus/extensions-sdk": "11.0.0",
+    "@directus/env": "1.0.4",
+    "@directus/constants": "11.0.3",
+    "@directus/extensions": "1.0.1",
     "@directus/memory": "1.0.4",
-    "@directus/pressure": "1.0.17",
+    "@directus/extensions-registry": "1.0.1",
+    "@directus/extensions-sdk": "11.0.1",
     "@directus/schema": "11.0.1",
-    "@directus/specs": "10.2.7",
+    "@directus/pressure": "1.0.17",
     "@directus/storage": "10.0.11",
+    "@directus/specs": "10.2.7",
     "@directus/storage-driver-azure": "10.0.18",
     "@directus/storage-driver-cloudinary": "10.0.18",
     "@directus/storage-driver-gcs": "10.0.18",
     "@directus/storage-driver-s3": "10.0.19",
     "@directus/storage-driver-local": "10.0.18",
-    "@directus/storage-driver-supabase": "1.0.10",
     "@directus/system-data": "1.0.1",
     "@directus/utils": "11.0.6",
-    "directus": "10.10.0",
-    "@directus/validation": "0.0.13"
+    "@directus/storage-driver-supabase": "1.0.10",
+    "@directus/validation": "0.0.13",
+    "directus": "10.10.1"
   },
   "devDependencies": {
     "@ngneat/falso": "7.2.0",
@@ -208,8 +208,8 @@
     "typescript": "5.3.3",
     "vitest": "1.3.1",
     "@directus/random": "0.2.7",
-    "@directus/tsconfig": "1.0.1",
-    "@directus/types": "11.0.7"
+    "@directus/types": "11.0.7",
+    "@directus/tsconfig": "1.0.1"
   },
   "optionalDependencies": {
     "@keyv/redis": "2.8.4",