Merge branch 'master' of github.com:pluginpal/strapi-webtools into feat/add-documentation

Author: boazpoolman

.changeset/gold-places-yawn.md

@@ -1,6 +1,6 @@
 name: 🐛 Bug Report
 description: Create a report to help improve this plugin
-title: "[Bug]: "
+title: "[Bug] "
 labels: ["bug"]
 body:
   - type: markdown
@@ -14,10 +14,10 @@ body:
       label: Addon
       description: Please select the addon related to this issue
       options:
-        - No specific addon – This bug report is related to Webtools Core
-        - Webtools Core: Sitemap Addon
-        - Webtools Pro: Redirects Addon
-        - Webtools Pro: Links Addon
+        - "No specific addon – This bug report is related to Webtools Core"
+        - "Webtools Core - Sitemap Addon"
+        - "Webtools Pro - Redirects Addon"
+        - "Webtools Pro - Links Addon"
     validations:
       required: true
 
@@ -76,11 +76,15 @@ body:
     validations:
       required: true
 
-  - type: input
-    id: npm-version
+  - type: dropdown
+    id: package-manager
     attributes:
-      label: NPM version
-      placeholder: e.g., 9.6.7
+      label: Package manager
+      description: Which package manager are you using?
+      options:
+        - NPM
+        - Yarn
+        - Pnpm
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,6 @@
 name: 🚀 Feature Request
 description: Suggest an idea to help make this plugin even better!
-title: "[Feature]: "
+title: "[Feature] "
 labels: ["enhancement"]
 body:
   - type: markdown
@@ -14,10 +14,10 @@ body:
       label: Addon
       description: Please select the addon related to this request
       options:
-        - No specific addon – This feature request is related to Webtools Core
-        - Webtools Core: Sitemap Addon
-        - Webtools Pro: Redirects Addon
-        - Webtools Pro: Links Addon
+        - "No specific addon – This feature request is related to Webtools Core"
+        - "Webtools Core - Sitemap Addon"
+        - "Webtools Pro - Redirects Addon"
+        - "Webtools Pro - Links Addon"
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,5 +1,11 @@
 # webtools-cli
 
+## 1.1.0
+
+### Minor Changes
+
+- [#317](https://github.com/pluginpal/strapi-webtools/pull/317) [`e913598`](https://github.com/pluginpal/strapi-webtools/commit/e91359874df631fddd8c8ea3ef958805a511f4c8) Thanks [@boazpoolman](https://github.com/boazpoolman)! - feat: add license key setup to the cli
+
 ## 1.0.1
 
 ### Patch Changes

packages/cli/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "webtools-cli",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "CLI installer for Strapi Webtools",
   "exports": {
     ".": {

packages/cli/package.json

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
-import { checkbox } from '@inquirer/prompts';
 import { checkStrapiProject } from '../utils/strapi';
-import { getContentTypes, enableWebtoolsForContentType } from '../utils/content-types';
+import { getContentTypes } from '../utils/content-types';
+import { enableContentTypes } from './subcommands/enable-content-types';
 
 export async function enable() {
   // Check if we're in a Strapi project
@@ -14,40 +14,8 @@ export async function enable() {
   // Get available content types
   const contentTypes = getContentTypes();
 
-  if (contentTypes.length === 0) {
-    console.log(chalk.yellow('No content types found in your Strapi project.'));
-    return;
-  }
-
-  // Let user select content types
-  const selectedContentTypes = await checkbox({
-    message: 'Select content types to enable Webtools for:',
-    choices: contentTypes.map((type) => ({
-      name: type,
-      value: type,
-    })),
-  });
-
-  // Enable Webtools for selected content types
-  if (selectedContentTypes.length > 0) {
-    console.log(chalk.blue('\nEnabling Webtools for selected content types...'));
-
-    const results = selectedContentTypes.map((contentType) => {
-      const success = enableWebtoolsForContentType(contentType);
-      if (success) {
-        console.log(chalk.green(`✓ Enabled Webtools for ${contentType}`));
-        return true;
-      }
-
-      console.log(chalk.red(`✗ Failed to enable Webtools for ${contentType}`));
-      return false;
-    });
-
-    const successCount = results.filter(Boolean).length;
-    console.log(chalk.blue(`\nEnabled Webtools for ${successCount} of ${selectedContentTypes.length} content types.`));
-  } else {
-    console.log(chalk.yellow('No content types selected. Nothing to do.'));
-  }
+  // Enable Webtools for content types
+  await enableContentTypes(contentTypes);
 
   console.log(chalk.yellow('\nYou may need to restart your Strapi server for changes to take effect.'));
 }

packages/cli/src/commands/enable.ts

@@ -1,10 +1,11 @@
 import chalk from 'chalk';
-import { checkbox, confirm, input } from '@inquirer/prompts';
+import { checkbox } from '@inquirer/prompts';
 import { checkStrapiProject } from '../utils/strapi';
-import { getContentTypes, enableWebtoolsForContentType } from '../utils/content-types';
+import { getContentTypes } from '../utils/content-types';
 import { getAvailableAddons, getPremiumAddons } from '../utils/addons';
 import { installPackage } from '../utils/package-manager';
-import { createLicenseFiles } from '../utils/license';
+import { logger } from '../utils/logger';
+import { enableContentTypes } from './subcommands/enable-content-types';
 
 export async function install() {
   // Check if we're in a Strapi project
@@ -14,67 +15,22 @@ export async function install() {
     return;
   }
 
-  // Ask about license key
-  const hasLicense = await confirm({
-    message: 'Do you have a license key for Webtools?',
-    default: false,
-  });
+  logger.title(
+    'Webtools',
+    `${chalk.bold('🚀 Let\'s build your new website with Strapi')}\n`,
+  );
 
-  let licenseKey: string | null = null;
-  if (hasLicense) {
-    licenseKey = await input({
-      message: 'Please enter your license key:',
-      validate: (value) => {
-        if (!value || value.trim().length === 0) {
-          return 'License key cannot be empty';
-        }
-        return true;
-      },
-    });
-
-    // Create license files
-    console.log(chalk.blue('\nSetting up license configuration...'));
-    const success = await createLicenseFiles(licenseKey);
-    if (!success) {
-      console.log(chalk.red('Failed to setup license configuration. Continuing without the license.'));
-      licenseKey = null;
-    }
-  }
+  // console.log('🚀 Get more out of Webtools with premium add-ons!\n');
+
+  // const { licenseKey } = await licenseSetup();
+
+  const licenseKey = null;
 
   // Get available content types
   const contentTypes = getContentTypes();
 
-  if (contentTypes.length === 0) {
-    console.log(chalk.yellow('No content types found in your Strapi project, skipping Webtools setup step. You can enable Webtools later using the "enable" command.'));
-  } else {
-    // Let user select content types
-    const selectedContentTypes = await checkbox({
-      message: 'Select content types to enable Webtools for:',
-      choices: contentTypes.map((type) => ({
-        name: type,
-        value: type,
-      })),
-    });
-
-    // Enable Webtools for selected content types
-    if (selectedContentTypes.length > 0) {
-      console.log(chalk.blue('\nEnabling Webtools for selected content types...'));
-
-      const results = selectedContentTypes.map((contentType) => {
-        const success = enableWebtoolsForContentType(contentType);
-        if (success) {
-          console.log(chalk.green(`✓ Enabled Webtools for ${contentType}`));
-          return true;
-        }
-
-        console.log(chalk.red(`✗ Failed to enable Webtools for ${contentType}`));
-        return false;
-      });
-
-      const successCount = results.filter(Boolean).length;
-      console.log(chalk.blue(`\nEnabled Webtools for ${successCount} of ${selectedContentTypes.length} content types.`));
-    }
-  }
+  // Enable Webtools for content types
+  await enableContentTypes(contentTypes);
 
   // Get available addons
   const availableAddons = getAvailableAddons();
@@ -86,6 +42,9 @@ export async function install() {
     allAddons = [...availableAddons, ...premiumAddons];
   }
 
+  // New line
+  console.log('');
+
   // Let user select addons
   const selectedAddons = await checkbox({
     message: 'Select addons to install:',
@@ -109,13 +68,13 @@ export async function install() {
 
   // Install all packages at once
   if (packagesToInstall.length > 0) {
-    console.log(chalk.blue('\nInstalling packages...'));
+    console.log(`\n${chalk.cyan('●')} Installing packages...\n`);
 
     const success = installPackage(packagesToInstall.join(' '));
     if (success) {
-      console.log(chalk.green(`✓ Installed ${packagesToInstall.length} packages successfully`));
+      console.log(chalk.green(`\n✓ Installed ${packagesToInstall.length} packages successfully`));
     } else {
-      console.log(chalk.red('✗ Failed to install packages. Aborting installation.'));
+      console.log(chalk.red('\n✗ Failed to install packages. Aborting installation.'));
       return;
     }
   }

packages/cli/src/commands/install.ts

@@ -0,0 +1,22 @@
+import chalk from 'chalk';
+import { checkStrapiProject } from '../utils/strapi';
+import { logger } from '../utils/logger';
+import { licenseSetup } from './subcommands/license-setup';
+
+export async function setupLicense() {
+  // Check if we're in a Strapi project
+  const isStrapiProject = await checkStrapiProject();
+  if (!isStrapiProject) {
+    console.log(chalk.red('Error: This command must be run in a Strapi project directory.'));
+    return;
+  }
+
+  logger.title(
+    'Webtools',
+    `${chalk.bold('🚀 Let\'s build your new website with Strapi')}\n`,
+  );
+
+  await licenseSetup();
+
+  console.log(chalk.green('\nLicense setup complete!'));
+}

packages/cli/src/commands/license-setup.ts

@@ -0,0 +1,37 @@
+import { checkbox } from '@inquirer/prompts';
+import chalk from 'chalk';
+import { enableWebtoolsForContentType } from '../../utils/content-types';
+
+export const enableContentTypes = async (contentTypes: string[]) => {
+  if (contentTypes.length === 0) {
+    console.log(chalk.yellow('No content types found in your Strapi project.'));
+    return;
+  }
+
+  // Let user select content types
+  const selectedContentTypes = await checkbox({
+    message: 'Select content types to enable Webtools for:',
+    choices: contentTypes.map((type) => ({
+      name: type,
+      value: type,
+    })),
+  });
+
+  // Enable Webtools for selected content types
+  if (selectedContentTypes.length > 0) {
+    console.log(`\n${chalk.cyan('●')} Enabling Webtools for selected content types...`);
+
+    selectedContentTypes.map((contentType) => {
+      const success = enableWebtoolsForContentType(contentType);
+      if (success) {
+        console.log(chalk.green(`✓ Enabled Webtools for ${contentType}`));
+        return true;
+      }
+
+      console.log(chalk.red(`✗ Failed to enable Webtools for ${contentType}`));
+      return false;
+    });
+  } else {
+    console.log(chalk.yellow('No content types selected. Nothing to do.'));
+  }
+};