@julien-lin/universal-pwa-cli 1.3.2 → 1.3.4

package/dist/index.js

@@ -5,7 +5,7 @@ import {
 
 // src/index.ts
 import { Command } from "commander";
-import chalk6 from "chalk";
+import chalk7 from "chalk";
 
 // src/commands/init.ts
 import { scanProject, optimizeProject } from "@julien-lin/universal-pwa-core";
@@ -510,7 +510,8 @@ async function initCommand(options = {}) {
     }
     let finalOutputDir;
     if (outputDir) {
-      finalOutputDir = resolve(outputDir);
+      finalOutputDir = outputDir.startsWith("/") || process.platform === "win32" && /^[A-Z]:/.test(outputDir) ? resolve(outputDir) : join2(result.projectPath, outputDir);
+      console.log(chalk2.gray(`  Using output directory: ${finalOutputDir}`));
     } else {
       const distDir = join2(result.projectPath, "dist");
       const publicDir = join2(result.projectPath, "public");
@@ -748,9 +749,9 @@ async function initCommand(options = {}) {
     if (!skipInjection) {
       console.log(chalk2.blue("\u{1F489} Injecting meta-tags..."));
       try {
-        const htmlFiles = await glob("**/*.html", {
+        const htmlFiles = await glob("**/*.{html,twig,html.twig,blade.php}", {
           cwd: result.projectPath,
-          ignore: ["**/node_modules/**", "**/.next/**", "**/.nuxt/**"],
+          ignore: ["**/node_modules/**", "**/.next/**", "**/.nuxt/**", "**/vendor/**"],
           absolute: true
         });
         htmlFiles.sort((a, b) => {
@@ -766,7 +767,15 @@ async function initCommand(options = {}) {
         });
         const htmlFilesToProcess = maxHtmlFiles && maxHtmlFiles > 0 ? htmlFiles.slice(0, maxHtmlFiles) : htmlFiles;
         if (htmlFiles.length > 0) {
-          console.log(chalk2.gray(`  Found ${htmlFiles.length} HTML file(s)${maxHtmlFiles && maxHtmlFiles > 0 ? ` (processing ${htmlFilesToProcess.length})` : ""}`));
+          const htmlCount = htmlFiles.filter((f) => f.endsWith(".html") && !f.endsWith(".html.twig")).length;
+          const twigCount = htmlFiles.filter((f) => f.endsWith(".twig") || f.endsWith(".html.twig")).length;
+          const bladeCount = htmlFiles.filter((f) => f.endsWith(".blade.php")).length;
+          const fileTypes = [];
+          if (htmlCount > 0) fileTypes.push(`${htmlCount} HTML`);
+          if (twigCount > 0) fileTypes.push(`${twigCount} Twig`);
+          if (bladeCount > 0) fileTypes.push(`${bladeCount} Blade`);
+          const typeSummary = fileTypes.length > 0 ? ` (${fileTypes.join(", ")})` : "";
+          console.log(chalk2.gray(`  Found ${htmlFiles.length} template file(s)${typeSummary}${maxHtmlFiles && maxHtmlFiles > 0 ? ` (processing ${htmlFilesToProcess.length})` : ""}`));
         }
         for (const htmlFile of htmlFilesToProcess) {
           const htmlRelativePath = relative(result.projectPath, htmlFile);
@@ -834,7 +843,8 @@ async function initCommand(options = {}) {
           }
         }
         result.htmlFilesInjected = injectedCount;
-        console.log(chalk2.green(`\u2713 Injected meta-tags in ${injectedCount} HTML file(s)`));
+        const fileTypeLabel = htmlFilesToProcess.some((f) => f.endsWith(".twig") || f.endsWith(".html.twig") || f.endsWith(".blade.php")) ? "template file(s)" : "HTML file(s)";
+        console.log(chalk2.green(`\u2713 Injected meta-tags in ${injectedCount} ${fileTypeLabel}`));
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
         const errorCode = detectErrorCode(error);
@@ -1150,24 +1160,253 @@ async function verifyCommand(options = {}) {
   }
 }
 
+// src/commands/remove.ts
+import { scanProject as scanProject2, parseHTML } from "@julien-lin/universal-pwa-core";
+import chalk5 from "chalk";
+import { existsSync as existsSync5, readFileSync as readFileSync3, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "fs";
+import { glob as glob3 } from "glob";
+import { join as join5, resolve as resolve4, relative as relative2 } from "path";
+var PWA_FILES_TO_REMOVE = [
+  "manifest.json",
+  "sw.js",
+  "apple-touch-icon.png",
+  "icon-72x72.png",
+  "icon-96x96.png",
+  "icon-128x128.png",
+  "icon-144x144.png",
+  "icon-152x152.png",
+  "icon-192x192.png",
+  "icon-384x384.png",
+  "icon-512x512.png"
+];
+function isPWAScript(content) {
+  const lowerContent = content.toLowerCase();
+  return lowerContent.includes("serviceworker") || lowerContent.includes("navigator.serviceworker") || lowerContent.includes("register") && lowerContent.includes("sw") || lowerContent.includes("sw.js") || lowerContent.includes("beforeinstallprompt") || lowerContent.includes("window.installpwa") || lowerContent.includes("ispwainstalled") || lowerContent.includes("ispwainstallable") || lowerContent.includes("deferredprompt");
+}
+async function removeMetaTags(htmlContent) {
+  const parsed = parseHTML(htmlContent);
+  const removed = [];
+  if (!parsed.head) {
+    return { html: htmlContent, removed: [] };
+  }
+  const head = parsed.head;
+  if (!head.children) {
+    head.children = [];
+  }
+  const tagsToRemove = [
+    { type: "link", attr: "rel", value: "manifest", name: "manifest link" },
+    { type: "meta", attr: "name", value: "theme-color", name: "theme-color meta tag" },
+    { type: "link", attr: "rel", value: "apple-touch-icon", name: "apple-touch-icon link" },
+    { type: "meta", attr: "name", value: "mobile-web-app-capable", name: "mobile-web-app-capable meta tag" }
+  ];
+  for (const tag of tagsToRemove) {
+    const index = head.children.findIndex((child) => {
+      return child.type === "tag" && child.tagName === tag.type && child.attribs?.[tag.attr] === tag.value;
+    });
+    if (index !== -1) {
+      head.children.splice(index, 1);
+      removed.push(tag.name);
+    }
+  }
+  const findAndRemoveScripts = (node) => {
+    if (!node?.children) return;
+    for (let i = node.children.length - 1; i >= 0; i--) {
+      const child = node.children[i];
+      if (child.type === "tag" && child.tagName === "script") {
+        const content = child.children?.[0]?.data || "";
+        if (isPWAScript(content)) {
+          node.children.splice(i, 1);
+          removed.push("service worker registration script");
+        }
+      } else if (child.children) {
+        findAndRemoveScripts(child);
+      }
+    }
+  };
+  if (parsed.document) {
+    findAndRemoveScripts(parsed.document);
+  }
+  const { render } = await import("./esm-BSZHJOVR.js");
+  const html = render(parsed.document);
+  return { html, removed };
+}
+async function removeCommand(options = {}) {
+  const {
+    projectPath = process.cwd(),
+    outputDir,
+    skipHtmlRestore = false,
+    skipFiles = false
+  } = options;
+  const result = {
+    success: false,
+    projectPath: resolve4(projectPath),
+    outputDir: "",
+    filesRemoved: [],
+    htmlFilesRestored: 0,
+    warnings: [],
+    errors: []
+  };
+  let transaction = null;
+  try {
+    if (!existsSync5(result.projectPath)) {
+      const errorCode = "E1001" /* PROJECT_PATH_NOT_FOUND */;
+      const errorMessage = formatError(errorCode, result.projectPath);
+      result.errors.push(errorMessage);
+      console.log(chalk5.red(`\u2717 ${errorMessage}`));
+      return result;
+    }
+    console.log(chalk5.blue("\u{1F50D} Scanning project for PWA files..."));
+    const scanResult = await scanProject2({
+      projectPath: result.projectPath,
+      includeAssets: false,
+      includeArchitecture: false
+    });
+    let finalOutputDir;
+    if (outputDir) {
+      finalOutputDir = outputDir.startsWith("/") || process.platform === "win32" && /^[A-Z]:/.test(outputDir) ? resolve4(outputDir) : join5(result.projectPath, outputDir);
+    } else {
+      const envDetection = detectEnvironment(result.projectPath, scanResult.framework.framework);
+      const distDir = join5(result.projectPath, "dist");
+      const publicDir = join5(result.projectPath, "public");
+      if (envDetection.suggestedOutputDir === "dist" && existsSync5(distDir)) {
+        finalOutputDir = distDir;
+      } else if (envDetection.suggestedOutputDir === "build" && existsSync5(join5(result.projectPath, "build"))) {
+        finalOutputDir = join5(result.projectPath, "build");
+      } else if (existsSync5(publicDir)) {
+        finalOutputDir = publicDir;
+      } else if (existsSync5(distDir)) {
+        finalOutputDir = distDir;
+      } else {
+        finalOutputDir = publicDir;
+      }
+    }
+    result.outputDir = finalOutputDir;
+    console.log(chalk5.gray(`  Output directory: ${finalOutputDir}`));
+    transaction = new Transaction({
+      projectPath: result.projectPath,
+      outputDir: relative2(result.projectPath, finalOutputDir) || void 0,
+      verbose: false
+    });
+    const pwaFiles = [...PWA_FILES_TO_REMOVE];
+    if (existsSync5(finalOutputDir)) {
+      const workboxFiles = await glob3("workbox-*.js", {
+        cwd: finalOutputDir,
+        absolute: true
+      });
+      pwaFiles.push(...workboxFiles.map((f) => relative2(finalOutputDir, f)));
+    }
+    if (!skipFiles) {
+      console.log(chalk5.blue("\u{1F5D1}\uFE0F  Removing PWA files..."));
+      for (const file of pwaFiles) {
+        const filePath = join5(finalOutputDir, file);
+        if (existsSync5(filePath)) {
+          try {
+            const fileRelative = relative2(result.projectPath, filePath);
+            if (fileRelative && !fileRelative.startsWith("..")) {
+              transaction.backupFile(fileRelative);
+            }
+            rmSync2(filePath, { force: true });
+            result.filesRemoved.push(file);
+            console.log(chalk5.green(`  \u2713 Removed ${file}`));
+          } catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            result.warnings.push(`Failed to remove ${file}: ${errorMessage}`);
+            console.log(chalk5.yellow(`  \u26A0 Failed to remove ${file}: ${errorMessage}`));
+          }
+        }
+      }
+      if (result.filesRemoved.length === 0) {
+        console.log(chalk5.gray("  No PWA files found to remove"));
+      } else {
+        console.log(chalk5.green(`\u2713 Removed ${result.filesRemoved.length} file(s)`));
+      }
+    }
+    if (!skipHtmlRestore) {
+      console.log(chalk5.blue("\u{1F489} Restoring HTML files..."));
+      const htmlFiles = await glob3("**/*.html", {
+        cwd: result.projectPath,
+        ignore: ["**/node_modules/**", "**/.next/**", "**/.nuxt/**"],
+        absolute: true
+      });
+      if (htmlFiles.length > 0) {
+        console.log(chalk5.gray(`  Found ${htmlFiles.length} HTML file(s)`));
+        for (const htmlFile of htmlFiles) {
+          try {
+            const htmlRelative = relative2(result.projectPath, htmlFile);
+            if (htmlRelative && !htmlRelative.startsWith("..")) {
+              transaction.backupFile(htmlRelative);
+            }
+            const htmlContent = readFileSync3(htmlFile, "utf-8");
+            const { html: restoredHtml, removed } = await removeMetaTags(htmlContent);
+            if (removed.length > 0) {
+              writeFileSync2(htmlFile, restoredHtml, "utf-8");
+              result.htmlFilesRestored++;
+              console.log(chalk5.green(`  \u2713 Restored ${htmlRelative} (removed ${removed.length} PWA element(s))`));
+            }
+          } catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            result.warnings.push(`Failed to restore ${htmlFile}: ${errorMessage}`);
+            console.log(chalk5.yellow(`  \u26A0 Failed to restore ${htmlFile}: ${errorMessage}`));
+          }
+        }
+        if (result.htmlFilesRestored > 0) {
+          console.log(chalk5.green(`\u2713 Restored ${result.htmlFilesRestored} HTML file(s)`));
+        } else {
+          console.log(chalk5.gray("  No PWA meta-tags found in HTML files"));
+        }
+      } else {
+        console.log(chalk5.gray("  No HTML files found"));
+      }
+    }
+    result.success = result.errors.length === 0;
+    if (result.success) {
+      if (transaction) {
+        transaction.commit();
+      }
+      console.log(chalk5.green("\n\u2705 PWA removal completed successfully!"));
+      console.log(chalk5.gray(`  Files removed: ${result.filesRemoved.length}`));
+      console.log(chalk5.gray(`  HTML files restored: ${result.htmlFilesRestored}`));
+    } else {
+      if (transaction) {
+        console.log(chalk5.yellow("\n\u{1F504} Rolling back changes due to errors..."));
+        transaction.rollback();
+      }
+      console.log(chalk5.red(`
+\u274C PWA removal completed with ${result.errors.length} error(s)`));
+    }
+    return result;
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    const errorCode = "E9001" /* UNEXPECTED_ERROR */;
+    const formattedError = formatError(errorCode, errorMessage);
+    result.errors.push(formattedError);
+    console.log(chalk5.red(`\u2717 ${formattedError}`));
+    if (transaction) {
+      console.log(chalk5.yellow("\n\u{1F504} Rolling back changes due to unexpected error..."));
+      transaction.rollback();
+    }
+    return result;
+  }
+}
+
 // src/index.ts
-import { scanProject as scanProject2 } from "@julien-lin/universal-pwa-core";
+import { scanProject as scanProject3 } from "@julien-lin/universal-pwa-core";
 
 // src/prompts.ts
 import inquirer from "inquirer";
-import { existsSync as existsSync6 } from "fs";
-import { join as join6, extname } from "path";
-import chalk5 from "chalk";
+import { existsSync as existsSync7 } from "fs";
+import { join as join7, extname } from "path";
+import chalk6 from "chalk";
 
 // src/utils/suggestions.ts
-import { existsSync as existsSync5, readFileSync as readFileSync3 } from "fs";
-import { join as join5 } from "path";
+import { existsSync as existsSync6, readFileSync as readFileSync4 } from "fs";
+import { join as join6 } from "path";
 import { globSync } from "glob";
 function suggestAppName(projectPath, _framework) {
-  const packageJsonPath = join5(projectPath, "package.json");
-  if (existsSync5(packageJsonPath)) {
+  const packageJsonPath = join6(projectPath, "package.json");
+  if (existsSync6(packageJsonPath)) {
     try {
-      const packageContent = JSON.parse(readFileSync3(packageJsonPath, "utf-8"));
+      const packageContent = JSON.parse(readFileSync4(packageJsonPath, "utf-8"));
       const name = packageContent.displayName || packageContent.productName || packageContent.name;
       if (name && typeof name === "string" && name.trim().length > 0) {
         const cleanName = name.trim();
@@ -1183,10 +1422,10 @@ function suggestAppName(projectPath, _framework) {
     } catch {
     }
   }
-  const composerJsonPath = join5(projectPath, "composer.json");
-  if (existsSync5(composerJsonPath)) {
+  const composerJsonPath = join6(projectPath, "composer.json");
+  if (existsSync6(composerJsonPath)) {
     try {
-      const composerContent = JSON.parse(readFileSync3(composerJsonPath, "utf-8"));
+      const composerContent = JSON.parse(readFileSync4(composerJsonPath, "utf-8"));
       if (composerContent.name && typeof composerContent.name === "string") {
         const parts = composerContent.name.split("/");
         const packageName = parts[parts.length - 1] || composerContent.name;
@@ -1234,8 +1473,8 @@ function suggestIconPath(projectPath) {
     "static/icon.png"
   ];
   for (const iconPath of commonIconPaths) {
-    const fullPath = join5(projectPath, iconPath);
-    if (existsSync5(fullPath)) {
+    const fullPath = join6(projectPath, iconPath);
+    if (existsSync6(fullPath)) {
       suggestions.push({
         path: iconPath,
         confidence: "high",
@@ -1302,18 +1541,18 @@ function suggestColors(_projectPath, framework, _iconPath) {
   };
 }
 function suggestConfiguration(projectPath, framework, _architecture) {
-  const distDir = join5(projectPath, "dist");
-  const buildDir = join5(projectPath, "build");
-  const publicDir = join5(projectPath, "public");
+  const distDir = join6(projectPath, "dist");
+  const buildDir = join6(projectPath, "build");
+  const publicDir = join6(projectPath, "public");
   let outputDir = "public";
   let reason = "Default output directory";
-  if (existsSync5(distDir)) {
+  if (existsSync6(distDir)) {
     outputDir = "dist";
     reason = "dist/ directory detected (production build)";
-  } else if (existsSync5(buildDir)) {
+  } else if (existsSync6(buildDir)) {
     outputDir = "build";
     reason = "build/ directory detected (production build)";
-  } else if (existsSync5(publicDir)) {
+  } else if (existsSync6(publicDir)) {
     outputDir = "public";
     reason = "public/ directory detected";
   } else if (framework === "wordpress" || framework === "drupal" || framework === "joomla") {
@@ -1339,21 +1578,81 @@ function generateSuggestions(projectPath, framework, architecture, iconPath) {
 }
 
 // src/prompts.ts
+function validateName(input) {
+  if (!input || input.trim().length === 0) {
+    return "Le nom de l'application est requis";
+  }
+  if (input.length > 50) {
+    return "Le nom doit faire moins de 50 caract\xE8res";
+  }
+  return true;
+}
+function validateShortName(input) {
+  if (!input || input.trim().length === 0) {
+    return "Le nom court est requis";
+  }
+  if (input.length > 12) {
+    return "Le nom court doit faire maximum 12 caract\xE8res";
+  }
+  return true;
+}
+function filterShortName(input) {
+  return input.trim().substring(0, 12);
+}
+function validateIconSource(input, projectPath) {
+  if (!input || input.trim().length === 0) {
+    return true;
+  }
+  const fullPath = existsSync7(input) ? input : join7(projectPath, input);
+  if (!existsSync7(fullPath)) {
+    const suggestions = [
+      "public/logo.png",
+      "src/assets/icon.png",
+      "assets/logo.png",
+      "logo.png"
+    ].join(", ");
+    return `Le fichier n'existe pas: ${input}
+Suggestions: ${suggestions}`;
+  }
+  const ext = extname(fullPath).toLowerCase();
+  const supportedFormats = [".png", ".jpg", ".jpeg", ".svg", ".webp"];
+  if (!supportedFormats.includes(ext)) {
+    return `Format non support\xE9: ${ext}. Utilisez PNG, JPG, SVG ou WebP`;
+  }
+  return true;
+}
+function validateHexColor(input, fieldName) {
+  if (!input || input.trim().length === 0) {
+    return true;
+  }
+  const trimmed = input.trim();
+  if (!/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/.test(trimmed)) {
+    return `Format hex invalide (ex: ${fieldName === "themeColor" ? "#ffffff ou #fff" : "#000000 ou #000"})`;
+  }
+  return true;
+}
+function filterHexColor(input) {
+  const trimmed = input.trim();
+  if (/^#[A-Fa-f0-9]{3}$/.test(trimmed)) {
+    return `#${trimmed[1]}${trimmed[1]}${trimmed[2]}${trimmed[2]}${trimmed[3]}${trimmed[3]}`;
+  }
+  return trimmed;
+}
 async function promptInitOptions(projectPath, framework, architecture = null) {
   const suggestions = generateSuggestions(projectPath, framework, architecture);
   const defaultName = suggestions.name.name;
   const defaultShortName = suggestions.name.shortName;
   const defaultIconSource = suggestions.icons.length > 0 ? suggestions.icons[0].path : void 0;
   const envDetection = detectEnvironment(projectPath, framework);
-  console.log(chalk5.blue("\n\u{1F4CB} Configuration PWA\n"));
+  console.log(chalk6.blue("\n\u{1F4CB} Configuration PWA\n"));
   if (suggestions.name.confidence === "high") {
-    console.log(chalk5.gray(`\u{1F4A1} Suggestion: Nom "${suggestions.name.name}" (${suggestions.name.source})`));
+    console.log(chalk6.gray(`\u{1F4A1} Suggestion: Nom "${suggestions.name.name}" (${suggestions.name.source})`));
   }
   if (suggestions.icons.length > 0) {
-    console.log(chalk5.gray(`\u{1F4A1} Suggestion: ${suggestions.icons.length} ic\xF4ne(s) trouv\xE9e(s)`));
+    console.log(chalk6.gray(`\u{1F4A1} Suggestion: ${suggestions.icons.length} ic\xF4ne(s) trouv\xE9e(s)`));
   }
   if (suggestions.colors.confidence === "high") {
-    console.log(chalk5.gray(`\u{1F4A1} Suggestion: Couleurs bas\xE9es sur ${framework}`));
+    console.log(chalk6.gray(`\u{1F4A1} Suggestion: Couleurs bas\xE9es sur ${framework}`));
   }
   const environmentAnswer = await inquirer.prompt([
     {
@@ -1376,7 +1675,7 @@ async function promptInitOptions(projectPath, framework, architecture = null) {
     }
   ]);
   if (envDetection.indicators.length > 0) {
-    console.log(chalk5.gray(`  ${envDetection.indicators.join(", ")}`));
+    console.log(chalk6.gray(`  ${envDetection.indicators.join(", ")}`));
   }
   const configAnswers = await inquirer.prompt([
     {
@@ -1384,15 +1683,7 @@ async function promptInitOptions(projectPath, framework, architecture = null) {
       name: "name",
       message: "Nom de l'application:",
       default: defaultName,
-      validate: (input) => {
-        if (!input || input.trim().length === 0) {
-          return "Le nom de l'application est requis";
-        }
-        if (input.length > 50) {
-          return "Le nom doit faire moins de 50 caract\xE8res";
-        }
-        return true;
-      }
+      validate: validateName
     },
     {
       type: "input",
@@ -1401,44 +1692,15 @@ async function promptInitOptions(projectPath, framework, architecture = null) {
       default: (answers) => {
         return answers.name ? answers.name.substring(0, 12) : defaultShortName;
       },
-      validate: (input) => {
-        if (!input || input.trim().length === 0) {
-          return "Le nom court est requis";
-        }
-        if (input.length > 12) {
-          return "Le nom court doit faire maximum 12 caract\xE8res";
-        }
-        return true;
-      },
-      filter: (input) => input.trim().substring(0, 12)
+      validate: validateShortName,
+      filter: filterShortName
     },
     {
       type: "input",
       name: "iconSource",
       message: "Chemin vers l'image source pour les ic\xF4nes:",
       default: defaultIconSource,
-      validate: (input) => {
-        if (!input || input.trim().length === 0) {
-          return true;
-        }
-        const fullPath = existsSync6(input) ? input : join6(projectPath, input);
-        if (!existsSync6(fullPath)) {
-          const suggestions2 = [
-            "public/logo.png",
-            "src/assets/icon.png",
-            "assets/logo.png",
-            "logo.png"
-          ].join(", ");
-          return `Le fichier n'existe pas: ${input}
-Suggestions: ${suggestions2}`;
-        }
-        const ext = extname(fullPath).toLowerCase();
-        const supportedFormats = [".png", ".jpg", ".jpeg", ".svg", ".webp"];
-        if (!supportedFormats.includes(ext)) {
-          return `Format non support\xE9: ${ext}. Utilisez PNG, JPG, SVG ou WebP`;
-        }
-        return true;
-      }
+      validate: (input) => validateIconSource(input, projectPath)
     },
     {
       type: "confirm",
@@ -1454,46 +1716,16 @@ Suggestions: ${suggestions2}`;
       name: "themeColor",
       message: "Couleur du th\xE8me (hex, ex: #ffffff):",
       default: suggestions.colors.themeColor,
-      validate: (input) => {
-        if (!input || input.trim().length === 0) {
-          return true;
-        }
-        const trimmed = input.trim();
-        if (!/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/.test(trimmed)) {
-          return "Format hex invalide (ex: #ffffff ou #fff)";
-        }
-        return true;
-      },
-      filter: (input) => {
-        const trimmed = input.trim();
-        if (/^#[A-Fa-f0-9]{3}$/.test(trimmed)) {
-          return `#${trimmed[1]}${trimmed[1]}${trimmed[2]}${trimmed[2]}${trimmed[3]}${trimmed[3]}`;
-        }
-        return trimmed;
-      }
+      validate: (input) => validateHexColor(input, "themeColor"),
+      filter: filterHexColor
     },
     {
       type: "input",
       name: "backgroundColor",
       message: "Couleur de fond (hex, ex: #000000):",
       default: suggestions.colors.backgroundColor,
-      validate: (input) => {
-        if (!input || input.trim().length === 0) {
-          return true;
-        }
-        const trimmed = input.trim();
-        if (!/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/.test(trimmed)) {
-          return "Format hex invalide (ex: #000000 ou #000)";
-        }
-        return true;
-      },
-      filter: (input) => {
-        const trimmed = input.trim();
-        if (/^#[A-Fa-f0-9]{3}$/.test(trimmed)) {
-          return `#${trimmed[1]}${trimmed[1]}${trimmed[2]}${trimmed[2]}${trimmed[3]}${trimmed[3]}`;
-        }
-        return trimmed;
-      }
+      validate: (input) => validateHexColor(input, "backgroundColor"),
+      filter: filterHexColor
     }
   ]);
   configAnswers.skipIcons = !configAnswers.skipIcons;
@@ -1515,7 +1747,7 @@ Suggestions: ${suggestions2}`;
 // package.json
 var package_default = {
   name: "@julien-lin/universal-pwa-cli",
-  version: "1.3.2",
+  version: "1.3.4",
   description: "CLI to transform any web project into a PWA",
   keywords: [
     "pwa",
@@ -1604,14 +1836,14 @@ program.command("init").description("Initialize PWA in your project").option("-p
     const hasOptions = options.name || options.shortName || options.iconSource || options.themeColor || options.backgroundColor || options.skipIcons !== void 0;
     let finalOptions = { ...options };
     if (!hasOptions) {
-      console.log(chalk6.blue("\u{1F50D} Scanning project..."));
-      const scanResult = await scanProject2({
+      console.log(chalk7.blue("\u{1F50D} Scanning project..."));
+      const scanResult = await scanProject3({
         projectPath,
         includeAssets: false,
         includeArchitecture: false
       });
-      console.log(chalk6.green(`\u2713 Framework detected: ${scanResult.framework.framework ?? "Unknown"}`));
-      console.log(chalk6.green(`\u2713 Architecture: ${scanResult.architecture.architecture}`));
+      console.log(chalk7.green(`\u2713 Framework detected: ${scanResult.framework.framework ?? "Unknown"}`));
+      console.log(chalk7.green(`\u2713 Architecture: ${scanResult.architecture.architecture}`));
       const promptAnswers = await promptInitOptions(
         projectPath,
         scanResult.framework.framework,
@@ -1626,10 +1858,10 @@ program.command("init").description("Initialize PWA in your project").option("-p
           finalOptions.outputDir = "build";
         } else {
           finalOptions.outputDir = "dist";
-          console.log(chalk6.yellow("\u26A0 dist/ directory not found. Run build first:"));
-          console.log(chalk6.gray("  npm run build"));
-          console.log(chalk6.gray("  or"));
-          console.log(chalk6.gray("  pnpm build"));
+          console.log(chalk7.yellow("\u26A0 dist/ directory not found. Run build first:"));
+          console.log(chalk7.gray("  npm run build"));
+          console.log(chalk7.gray("  or"));
+          console.log(chalk7.gray("  pnpm build"));
         }
       } else {
         finalOptions.outputDir = "public";
@@ -1661,7 +1893,7 @@ program.command("init").description("Initialize PWA in your project").option("-p
     });
     process.exit(result.success ? 0 : 1);
   } catch (error) {
-    console.error(chalk6.red(`Error: ${error instanceof Error ? error.message : String(error)}`));
+    console.error(chalk7.red(`Error: ${error instanceof Error ? error.message : String(error)}`));
     process.exit(1);
   }
 });
@@ -1674,31 +1906,31 @@ program.command("preview").description("Preview PWA setup").option("-p, --projec
     });
     process.exit(result.success ? 0 : 1);
   } catch (error) {
-    console.error(chalk6.red(`Error: ${error instanceof Error ? error.message : String(error)}`));
+    console.error(chalk7.red(`Error: ${error instanceof Error ? error.message : String(error)}`));
     process.exit(1);
   }
 });
 program.command("scan").description("Scan project and detect framework/architecture").option("-p, --project-path <path>", "Project path", process.cwd()).action(async (options) => {
   try {
-    console.log(chalk6.blue("\u{1F50D} Scanning project..."));
-    const result = await scanProject2({
+    console.log(chalk7.blue("\u{1F50D} Scanning project..."));
+    const result = await scanProject3({
       projectPath: options.projectPath ?? process.cwd(),
       includeAssets: true,
       includeArchitecture: true
     });
-    console.log(chalk6.green(`
+    console.log(chalk7.green(`
 \u2713 Framework: ${result.framework.framework ?? "Unknown"}`));
-    console.log(chalk6.green(`\u2713 Architecture: ${result.architecture.architecture}`));
-    console.log(chalk6.green(`\u2713 Build Tool: ${result.architecture.buildTool ?? "Unknown"}`));
-    console.log(chalk6.gray(`
+    console.log(chalk7.green(`\u2713 Architecture: ${result.architecture.architecture}`));
+    console.log(chalk7.green(`\u2713 Build Tool: ${result.architecture.buildTool ?? "Unknown"}`));
+    console.log(chalk7.gray(`
 Assets found:`));
-    console.log(chalk6.gray(`  - JavaScript: ${result.assets.javascript.length} files`));
-    console.log(chalk6.gray(`  - CSS: ${result.assets.css.length} files`));
-    console.log(chalk6.gray(`  - Images: ${result.assets.images.length} files`));
-    console.log(chalk6.gray(`  - Fonts: ${result.assets.fonts.length} files`));
+    console.log(chalk7.gray(`  - JavaScript: ${result.assets.javascript.length} files`));
+    console.log(chalk7.gray(`  - CSS: ${result.assets.css.length} files`));
+    console.log(chalk7.gray(`  - Images: ${result.assets.images.length} files`));
+    console.log(chalk7.gray(`  - Fonts: ${result.assets.fonts.length} files`));
     process.exit(0);
   } catch (error) {
-    console.error(chalk6.red(`Error: ${error instanceof Error ? error.message : String(error)}`));
+    console.error(chalk7.red(`Error: ${error instanceof Error ? error.message : String(error)}`));
     process.exit(1);
   }
 });
@@ -1711,7 +1943,22 @@ program.command("verify").description("Verify PWA setup and check for missing fi
     });
     process.exit(result.success ? 0 : 1);
   } catch (error) {
-    console.error(chalk6.red(`Error: ${error instanceof Error ? error.message : String(error)}`));
+    console.error(chalk7.red(`Error: ${error instanceof Error ? error.message : String(error)}`));
+    process.exit(1);
+  }
+});
+program.command("remove").description("Remove PWA files and restore HTML files").option("-p, --project-path <path>", "Project path", process.cwd()).option("-o, --output-dir <dir>", "Output directory (auto-detected if not specified)").option("--skip-html-restore", "Skip HTML file restoration").option("--skip-files", "Skip PWA file removal").option("--force", "Force removal without confirmation").action(async (options) => {
+  try {
+    const result = await removeCommand({
+      projectPath: options.projectPath,
+      outputDir: options.outputDir,
+      skipHtmlRestore: options.skipHtmlRestore,
+      skipFiles: options.skipFiles,
+      force: options.force
+    });
+    process.exit(result.success ? 0 : 1);
+  } catch (error) {
+    console.error(chalk7.red(`Error: ${error instanceof Error ? error.message : String(error)}`));
     process.exit(1);
   }
 });