directus-template-cli 0.7.0-beta.4 → 0.7.0-beta.5

package/dist/lib/utils/validate-url.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const protected_domains_1 = require("./protected-domains");
-function validateUrl(url) {
+import { protectedDomains } from './protected-domains.js';
+export default function validateUrl(url) {
     try {
         const parsedUrl = new URL(url);
-        return !protected_domains_1.protectedDomains.includes(parsedUrl.hostname);
+        return !protectedDomains.includes(parsedUrl.hostname);
     }
     catch {
         return false;
     }
 }
-exports.default = validateUrl;

package/dist/lib/utils/wait.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.waitFor = void 0;
-async function waitFor(checkFn, options = {}) {
+export async function waitFor(checkFn, options = {}) {
     const { errorMessage = 'Operation timed out', interval = 2000, maxAttempts = 30, } = options;
     for (let i = 0; i < maxAttempts; i++) {
         if (await checkFn())
@@ -10,4 +7,3 @@ async function waitFor(checkFn, options = {}) {
     }
     throw new Error(errorMessage);
 }
-exports.waitFor = waitFor;

package/dist/lib/utils/write-to-file.js

@@ -1,23 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
-exports.default = async (fileName, data, dir) => {
+import fs from 'node:fs';
+import path from 'pathe';
+export default async (fileName, data, dir) => {
     const folders = fileName.split('/');
     const endFileName = folders.pop();
     const folderPath = folders.join('/');
     // Generate the full path where you want to write the file
-    const fullPath = node_path_1.default.join(dir, folderPath);
+    const fullPath = path.join(dir, folderPath);
     // Check if the directory exists. Create if it doesn't.
-    if (!node_fs_1.default.existsSync(fullPath)) {
-        node_fs_1.default.mkdirSync(fullPath, { recursive: true });
+    if (!fs.existsSync(fullPath)) {
+        fs.mkdirSync(fullPath, { recursive: true });
     }
     // Construct the full file path
-    const fullFilePath = node_path_1.default.join(fullPath, `${endFileName}.json`);
+    const fullFilePath = path.join(fullPath, `${endFileName}.json`);
     try {
         // Write the file
-        await node_fs_1.default.promises.writeFile(fullFilePath, JSON.stringify(data, null, 2));
+        await fs.promises.writeFile(fullFilePath, JSON.stringify(data, null, 2));
         // console.log(`Wrote ${fullFilePath}`);
     }
     catch (error) {

package/dist/services/docker.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDocker = void 0;
-const tslib_1 = require("tslib");
-const prompts_1 = require("@clack/prompts");
-const catch_error_1 = tslib_1.__importDefault(require("../lib/utils/catch-error"));
-const wait_1 = require("../lib/utils/wait");
+import { spinner } from '@clack/prompts';
+import { execa } from 'execa';
+import catchError from '../lib/utils/catch-error.js';
+import { waitFor } from '../lib/utils/wait.js';
 /**
  * Check if Docker is installed and running
  * @returns {Promise<DockerCheckResult>} Docker installation and running status
@@ -12,7 +9,6 @@ const wait_1 = require("../lib/utils/wait");
 async function checkDocker() {
     try {
         // Check if Docker is installed
-        const { execa } = await Promise.resolve().then(() => tslib_1.__importStar(require('execa')));
         const versionResult = await execa('docker', ['--version']);
         const isInstalled = versionResult.exitCode === 0;
         if (!isInstalled) {
@@ -43,9 +39,8 @@ async function checkDocker() {
  */
 async function startContainers(cwd) {
     try {
-        const { execa } = await Promise.resolve().then(() => tslib_1.__importStar(require('execa')));
         // ux.action.start('Starting Docker containers')
-        const s = (0, prompts_1.spinner)();
+        const s = spinner();
         s.start('Starting Docker containers');
         return execa('docker-compose', ['up', '-d'], {
             cwd,
@@ -55,7 +50,7 @@ async function startContainers(cwd) {
         });
     }
     catch (error) {
-        (0, catch_error_1.default)(error, {
+        catchError(error, {
             context: { cwd, function: 'startContainers' },
             fatal: true,
             logToFile: true,
@@ -70,14 +65,13 @@ async function startContainers(cwd) {
  */
 async function stopContainers(cwd) {
     try {
-        const { execa } = await Promise.resolve().then(() => tslib_1.__importStar(require('execa')));
         return execa('docker-compose', ['down'], {
             cwd,
             // stdio: 'inherit',
         }).then(() => { });
     }
     catch (error) {
-        (0, catch_error_1.default)(error, {
+        catchError(error, {
             context: { cwd, function: 'stopContainers' },
             fatal: false,
             logToFile: true,
@@ -92,10 +86,10 @@ async function stopContainers(cwd) {
  */
 function createWaitForHealthy(config) {
     async function waitForHealthy(healthCheckUrl) {
-        const s = (0, prompts_1.spinner)();
+        const s = spinner();
         s.start('Waiting for Directus to be ready.');
         try {
-            await (0, wait_1.waitFor)(async () => {
+            await waitFor(async () => {
                 try {
                     const response = await fetch(healthCheckUrl);
                     return response.ok;
@@ -113,7 +107,7 @@ function createWaitForHealthy(config) {
         }
         catch (error) {
             s.stop('');
-            (0, catch_error_1.default)(error, {
+            catchError(error, {
                 context: { function: 'waitForHealthy', url: healthCheckUrl },
                 fatal: true,
                 logToFile: true,
@@ -128,7 +122,7 @@ function createWaitForHealthy(config) {
  * @param {DockerConfig} config - The Docker configuration
  * @returns {DockerService} - Returns a Docker service instance
  */
-function createDocker(config) {
+export function createDocker(config) {
     return {
         checkDocker,
         startContainers,
@@ -136,4 +130,3 @@ function createDocker(config) {
         waitForHealthy: createWaitForHealthy(config),
     };
 }
-exports.createDocker = createDocker;

package/dist/services/github.d.ts

@@ -1,4 +1,4 @@
-import { parseGitHubUrl } from '../lib/utils/parse-github-url';
+import { parseGitHubUrl } from '../lib/utils/parse-github-url.js';
 interface GitHubUrlParts {
     owner: string;
     path?: string;

package/dist/services/github.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createGitHub = void 0;
-const rest_1 = require("@octokit/rest");
-const constants_1 = require("../lib/constants");
-const parse_github_url_1 = require("../lib/utils/parse-github-url");
-function createGitHub(token) {
-    const octokit = new rest_1.Octokit({
+import { Octokit } from '@octokit/rest';
+import { DEFAULT_REPO } from '../lib/constants.js';
+import { parseGitHubUrl } from '../lib/utils/parse-github-url.js';
+export function createGitHub(token) {
+    const octokit = new Octokit({
         auth: token,
     });
     /**
@@ -15,7 +12,7 @@ function createGitHub(token) {
      * @returns The directories for the template.
      */
     async function getTemplateDirectories(template, customUrl) {
-        const repo = customUrl ? (0, parse_github_url_1.parseGitHubUrl)(customUrl) : constants_1.DEFAULT_REPO;
+        const repo = customUrl ? parseGitHubUrl(customUrl) : DEFAULT_REPO;
         const templatePath = repo.path ? `${repo.path}/${template}` : template;
         const { data } = await octokit.rest.repos.getContent({
             owner: repo.owner,
@@ -35,7 +32,7 @@ function createGitHub(token) {
      * @returns The templates for the repository.
      */
     async function getTemplates(customUrl) {
-        const repo = customUrl ? (0, parse_github_url_1.parseGitHubUrl)(customUrl) : constants_1.DEFAULT_REPO;
+        const repo = customUrl ? parseGitHubUrl(customUrl) : DEFAULT_REPO;
         const { data } = await octokit.rest.repos.getContent({
             owner: repo.owner,
             path: repo.path || '',
@@ -51,7 +48,6 @@ function createGitHub(token) {
     return {
         getTemplateDirectories,
         getTemplates,
-        parseGitHubUrl: parse_github_url_1.parseGitHubUrl,
+        parseGitHubUrl,
     };
 }
-exports.createGitHub = createGitHub;

package/oclif.manifest.json

@@ -169,7 +169,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -272,7 +272,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -351,7 +351,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
-      "isESM": false,
+      "isESM": true,
       "relativePath": [
         "dist",
         "commands",
@@ -359,5 +359,5 @@
       ]
     }
   },
-  "version": "0.7.0-beta.4"
+  "version": "0.7.0-beta.5"
 }

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "directus-template-cli",
-  "version": "0.7.0-beta.4",
+  "version": "0.7.0-beta.5",
   "description": "CLI Utility for applying templates to a Directus instance.",
   "author": "bryantgillespie @bryantgillespie",
+  "type": "module",
   "bin": {
-    "directus-template-cli": "./bin/run"
+    "directus-template-cli": "./bin/run.js"
   },
   "homepage": "https://github.com/directus-community/directus-template-cli",
   "license": "MIT",
@@ -18,42 +19,45 @@
   ],
   "dependencies": {
     "@clack/prompts": "^0.10.0",
-    "@directus/sdk": "^17.0.1",
-    "@oclif/core": "^3.18.1",
-    "@oclif/plugin-help": "^6.0.12",
-    "@oclif/plugin-plugins": "^4.1.22",
+    "@directus/sdk": "^19.0.1",
+    "@inquirer/prompts": "^7.3.3",
+    "@oclif/core": "^4.2.9",
+    "@oclif/plugin-help": "^6.2.26",
+    "@oclif/plugin-plugins": "^5.4.34",
     "@octokit/rest": "^21.1.1",
+    "@sindresorhus/slugify": "^2.2.1",
     "bottleneck": "^2.19.5",
-    "chalk": "4.1.2",
+    "chalk": "5.4.1",
+    "cli-progress": "^3.12.0",
     "defu": "^6.1.4",
-    "dotenv": "^16.4.1",
-    "execa": "^9.5.2",
+    "dotenv": "^16.4.7",
+    "execa": "9.5.2",
     "formdata-node": "^6.0.3",
-    "giget": "^1.2.1",
+    "giget": "^2.0.0",
     "glob": "^11.0.1",
-    "inquirer": "^8.2.5",
     "log-update": "^6.1.0",
-    "nypm": "^0.5.2",
-    "picocolors": "^1.1.1",
-    "pkg-types": "^1.3.1",
-    "slugify": "^1.6.6"
+    "nypm": "^0.6.0",
+    "pathe": "^2.0.3",
+    "posthog-node": "^4.10.1"
   },
   "devDependencies": {
-    "@directus/types": "^12.0.1",
-    "@oclif/test": "^3.1.13",
-    "@types/chai": "^4.3.11",
-    "@types/mocha": "^10.0.6",
-    "@types/node": "^20.11.10",
-    "chai": "^5.0.3",
-    "eslint": "^8.56.0",
-    "eslint-config-oclif": "^5.0.0",
-    "eslint-config-oclif-typescript": "^3.0.41",
-    "mocha": "^10.2.0",
-    "oclif": "^4.4.2",
+    "@oclif/prettier-config": "^0.2.1",
+    "@directus/types": "^13.0.0",
+    "@oclif/test": "^4",
+    "@types/chai": "^5.2.0",
+    "@types/mocha": "^10",
+    "@types/node": "^18",
+    "chai": "^5.2.0",
+    "eslint": "^9",
+    "eslint-config-oclif": "^5",
+    "eslint-config-oclif-typescript": "^3",
+    "eslint-config-prettier": "^9",
+    "mocha": "^10",
+    "oclif": "^4",
     "shx": "^0.3.3",
-    "ts-node": "^10.9.2",
-    "tslib": "^2.6.2",
-    "typescript": "^5.3.3"
+    "ts-node": "^10",
+    "tslib": "^2.8.1",
+    "typescript": "^5.8.2"
   },
   "oclif": {
     "bin": "directus-template-cli",
@@ -70,11 +74,11 @@
     "build": "shx rm -rf dist && tsc -b",
     "lint": "eslint . --ext .ts --config .eslintrc",
     "postpack": "shx rm -f oclif.manifest.json",
-    "posttest": "npm run lint",
-    "prepack": "npm run build && oclif manifest && oclif readme",
+    "posttest": "pnpm run lint",
+    "prepack": "pnpm run build && oclif manifest && oclif readme",
     "test": "mocha --forbid-only \"test/**/*.test.ts\"",
     "version": "oclif readme && git add README.md",
-    "run": "./bin/run"
+    "run": "./bin/run.js"
   },
   "engines": {
     "node": ">=18.0.0"