directus-template-cli 0.7.0-beta.8 → 0.7.0-beta.9

package/dist/commands/apply.js

@@ -2,6 +2,7 @@ import { Command, Flags, ux } from '@oclif/core';
 import { text, select, password, log, intro } from '@clack/prompts';
 import * as path from 'pathe';
 import { animatedBunny } from '../lib/utils/animated-bunny.js';
+import { BSL_LICENSE_TEXT } from '../lib/constants.js';
 import * as customFlags from '../flags/common.js';
 import { DIRECTUS_PINK, DIRECTUS_PURPLE, SEPARATOR } from '../lib/constants.js';
 import { validateInteractiveFlags, validateProgrammaticFlags } from '../lib/load/apply-flags.js';
@@ -179,6 +180,7 @@ export default class ApplyCommand extends Command {
             await apply(template.directoryPath, validatedFlags);
             ux.action.stop();
             ux.stdout(SEPARATOR);
+            log.warn(BSL_LICENSE_TEXT);
             ux.stdout('Template applied successfully.');
             ux.exit(0);
         }

package/dist/commands/extract.js

@@ -1,11 +1,11 @@
-import { text, password, select, intro } from '@clack/prompts';
+import { text, password, select, intro, log } from '@clack/prompts';
 import { Command, ux } from '@oclif/core';
 import slugify from '@sindresorhus/slugify';
 import chalk from 'chalk';
 import fs from 'node:fs';
 import path from 'pathe';
 import * as customFlags from '../flags/common.js';
-import { DIRECTUS_PINK, DIRECTUS_PURPLE, SEPARATOR } from '../lib/constants.js';
+import { DIRECTUS_PINK, DIRECTUS_PURPLE, SEPARATOR, BSL_LICENSE_TEXT } from '../lib/constants.js';
 import { animatedBunny } from '../lib/utils/animated-bunny.js';
 import extract from '../lib/extract/index.js';
 import { getDirectusToken, getDirectusUrl, initializeDirectusApi, validateAuthFlags } from '../lib/utils/auth.js';
@@ -65,6 +65,7 @@ export default class ExtractCommand extends Command {
         ux.action.start(`Extracting template - ${ux.colorize(DIRECTUS_PINK, templateName)} from ${ux.colorize(DIRECTUS_PINK, flags.directusUrl)} to ${ux.colorize(DIRECTUS_PINK, directory)}`);
         await extract(directory);
         ux.action.stop();
+        log.warn(BSL_LICENSE_TEXT);
         ux.stdout(SEPARATOR);
         ux.stdout('Template extracted successfully.');
         this.exit(0);

package/dist/lib/constants.d.ts

@@ -15,3 +15,5 @@ export declare const DEFAULT_REPO: {
 export declare const POSTHOG_PUBLIC_KEY = "phc_STopE6gj6LDIjYonVF7493kQJK8S4v0Xrl6YPr2z9br";
 export declare const POSTHOG_HOST = "https://us.i.posthog.com";
 export declare const DEFAULT_BRANCH = "main";
+export declare const BSL_LICENSE_URL = "https://directus.io/bsl";
+export declare const BSL_LICENSE_TEXT: string;

package/dist/lib/constants.js

@@ -1,3 +1,4 @@
+import chalk from 'chalk';
 export const DIRECTUS_PURPLE = '#6644ff';
 export const DIRECTUS_PINK = '#FF99DD';
 export const SEPARATOR = '------------------';
@@ -8,10 +9,12 @@ export const COMMUNITY_TEMPLATE_REPO = {
 export const DEFAULT_REPO = {
     owner: 'directus-labs',
     path: '',
-    ref: 'cms-template',
+    ref: 'main',
     repo: 'starters',
     url: 'https://github.com/directus-labs/starters',
 };
 export const POSTHOG_PUBLIC_KEY = 'phc_STopE6gj6LDIjYonVF7493kQJK8S4v0Xrl6YPr2z9br';
 export const POSTHOG_HOST = 'https://us.i.posthog.com';
 export const DEFAULT_BRANCH = 'main';
+export const BSL_LICENSE_URL = 'https://directus.io/bsl';
+export const BSL_LICENSE_TEXT = `You REQUIRE a license to use Directus if your organisation has more than $5MM USD a year in revenue and/or funding. For all organizations and people with less than $5MM USD a year in revenue and funding, Directus is free for personal projects, hobby projects and in production. This second group does not require a license. \nDirectus is licensed under BSL1.1. Visit ${chalk.underline(chalk.cyan(BSL_LICENSE_URL))} for more information or reach out to us at ${chalk.underline(chalk.cyan('sales-demo-with-evil-sales@directus.io'))}.`;

package/dist/lib/init/config.js

@@ -6,7 +6,7 @@ export const DIRECTUS_CONFIG = {
 };
 export const DOCKER_CONFIG = {
     composeFile: 'docker-compose.yml',
-    healthCheckEndpoint: '/server/ping',
+    healthCheckEndpoint: '/server/info',
     interval: 3000,
     maxAttempts: 30,
 };

package/dist/lib/init/index.js

@@ -1,4 +1,4 @@
-import { note, outro, spinner } from '@clack/prompts';
+import { note, outro, spinner, log as clackLog } from '@clack/prompts';
 import { ux } from '@oclif/core';
 import chalk from 'chalk';
 import { execa } from 'execa';
@@ -14,6 +14,7 @@ import catchError from '../utils/catch-error.js';
 import { createGigetString, parseGitHubUrl } from '../utils/parse-github-url.js';
 import { readTemplateConfig } from '../utils/template-config.js';
 import { DOCKER_CONFIG } from './config.js';
+import { BSL_LICENSE_TEXT } from '../constants.js';
 export async function init({ dir, flags }) {
     // Check target directory
     const shouldForce = flags.overrideDir;
@@ -81,11 +82,15 @@ export async function init({ dir, flags }) {
         };
         // Find and copy all .env.example files
         const envFiles = glob.sync(path.join(dir, '**', '.env.example'));
+        // Process all env files first
         for (const file of envFiles) {
             const envFile = file.replace('.env.example', '.env');
             fs.copyFileSync(file, envFile);
-            // Read default Directus login info from .env
-            const parsedEnv = dotenv.parse(fs.readFileSync(file, 'utf8'));
+        }
+        // Then read Directus-specific info only from the Directus env file
+        const directusEnvFile = path.join(directusDir, '.env');
+        if (fs.existsSync(directusEnvFile)) {
+            const parsedEnv = dotenv.parse(fs.readFileSync(directusEnvFile, 'utf8'));
             directusInfo.email = parsedEnv.ADMIN_EMAIL;
             directusInfo.password = parsedEnv.ADMIN_PASSWORD;
             directusInfo.url = parsedEnv.PUBLIC_URL;
@@ -101,8 +106,12 @@ export async function init({ dir, flags }) {
             }
             try {
                 await dockerService.startContainers(directusDir);
-                const healthCheckUrl = `${directusInfo.url}${DOCKER_CONFIG.healthCheckEndpoint}`;
-                await dockerService.waitForHealthy(healthCheckUrl);
+                const healthCheckUrl = `${directusInfo.url || 'http://localhost:8055'}${DOCKER_CONFIG.healthCheckEndpoint}`;
+                // Wait for healthy before proceeding
+                const isHealthy = await dockerService.waitForHealthy(healthCheckUrl);
+                if (!isHealthy) {
+                    throw new Error('Directus failed to become healthy');
+                }
                 const templatePath = path.join(directusDir, 'template');
                 ux.stdout(`Attempting to apply template from: ${templatePath}`);
                 await ApplyCommand.run([
@@ -153,6 +162,7 @@ export async function init({ dir, flags }) {
         const readmeText = '- Review the \`./README.md\` file for more information and next steps.';
         const nextSteps = chalk.white(`${directusText}${projectText}${frontendText}${readmeText}`);
         note(nextSteps, 'Next Steps');
+        clackLog.warn(BSL_LICENSE_TEXT);
         outro(`Problems or questions? Hop into the community on Discord at ${chalk.underline(chalk.cyan('https://directus.chat'))}`);
     }
     catch (error) {

package/oclif.manifest.json

@@ -378,5 +378,5 @@
       ]
     }
   },
-  "version": "0.7.0-beta.8"
+  "version": "0.7.0-beta.9"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus-template-cli",
-  "version": "0.7.0-beta.8",
+  "version": "0.7.0-beta.9",
   "description": "CLI Utility for applying templates to a Directus instance.",
   "author": "bryantgillespie @bryantgillespie",
   "type": "module",