@julien-lin/universal-pwa-cli 1.1.0 → 1.1.2

package/dist/index.cjs

@@ -26,6 +26,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 // src/index.ts
 var import_commander = require("commander");
 var import_chalk3 = __toESM(require("chalk"), 1);
+var import_fs3 = require("fs");
+var import_url = require("url");
+var import_path3 = require("path");
 
 // src/commands/init.ts
 var import_universal_pwa_core = require("@julien-lin/universal-pwa-core");
@@ -93,7 +96,7 @@ async function initCommand(options = {}) {
     const finalOutputDir = outputDir ?? (result.framework === "WordPress" ? (0, import_path.join)(result.projectPath, "public") : (0, import_path.join)(result.projectPath, "public"));
     console.log(import_chalk.default.blue("\u{1F4DD} Generating manifest.json..."));
     const appName = name ?? (result.framework ? `${result.framework} App` : "My PWA");
-    const appShortName = shortName ?? appName.substring(0, 12);
+    const appShortName = shortName && shortName.length > 0 && shortName.length <= 12 ? shortName : appName.substring(0, 12);
     let iconPaths = [];
     if (!skipIcons && iconSource) {
       const iconSourcePath = (0, import_fs.existsSync)(iconSource) ? iconSource : (0, import_path.join)(result.projectPath, iconSource);
@@ -106,7 +109,14 @@ async function initCommand(options = {}) {
           });
           iconPaths = iconResult.icons.map((icon) => icon.src);
           result.iconsGenerated = iconResult.icons.length;
+          const appleTouchIconPath = (0, import_path.join)(finalOutputDir, "apple-touch-icon.png");
+          if ((0, import_fs.existsSync)(appleTouchIconPath)) {
+            iconPaths.push("/apple-touch-icon.png");
+          }
           console.log(import_chalk.default.green(`\u2713 Generated ${result.iconsGenerated} icons`));
+          if ((0, import_fs.existsSync)(appleTouchIconPath)) {
+            console.log(import_chalk.default.green(`\u2713 Generated apple-touch-icon.png`));
+          }
         } catch (error) {
           const errorMessage = error instanceof Error ? error.message : String(error);
           result.errors.push(`Failed to generate icons: ${errorMessage}`);
@@ -116,6 +126,7 @@ async function initCommand(options = {}) {
         result.warnings.push(`Icon source not found: ${iconSourcePath}`);
       }
     }
+    let manifestPath;
     if (iconPaths.length > 0) {
       const manifestWithIcons = (0, import_universal_pwa_core2.generateManifest)({
         name: appName,
@@ -131,11 +142,30 @@ async function initCommand(options = {}) {
           type: "image/png"
         }))
       });
-      const manifestPath = (0, import_universal_pwa_core2.generateAndWriteManifest)(manifestWithIcons, finalOutputDir);
+      manifestPath = (0, import_universal_pwa_core2.generateAndWriteManifest)(manifestWithIcons, finalOutputDir);
       result.manifestPath = manifestPath;
+      console.log(import_chalk.default.green(`\u2713 Manifest generated: ${manifestPath}`));
     } else {
-      result.warnings.push("No icons provided. Manifest requires at least one icon. Please provide an icon source with --icon-source");
-      console.log(import_chalk.default.yellow("\u26A0 Manifest not generated: icons are required"));
+      result.warnings.push("No icons provided. Manifest generated with placeholder icon. Please provide an icon source with --icon-source for production.");
+      console.log(import_chalk.default.yellow("\u26A0 Generating manifest with placeholder icon"));
+      const manifestMinimal = (0, import_universal_pwa_core2.generateManifest)({
+        name: appName,
+        shortName: appShortName,
+        startUrl: "/",
+        scope: "/",
+        display: "standalone",
+        themeColor: themeColor ?? "#ffffff",
+        backgroundColor: backgroundColor ?? "#000000",
+        icons: [{
+          src: "/icon-192x192.png",
+          // Placeholder - l'utilisateur devra ajouter une vraie icône
+          sizes: "192x192",
+          type: "image/png"
+        }]
+      });
+      manifestPath = (0, import_universal_pwa_core2.generateAndWriteManifest)(manifestMinimal, finalOutputDir);
+      result.manifestPath = manifestPath;
+      console.log(import_chalk.default.green(`\u2713 Manifest generated: ${manifestPath}`));
     }
     if (!skipServiceWorker) {
       console.log(import_chalk.default.blue("\u2699\uFE0F Generating service worker..."));
@@ -168,22 +198,30 @@ async function initCommand(options = {}) {
         let injectedCount = 0;
         for (const htmlFile of htmlFiles.slice(0, 10)) {
           try {
-            const normalizePathForInjection = (fullPath, basePath, fallback) => {
+            const normalizePathForInjection = (fullPath, basePath, outputDir2, fallback) => {
               if (!fullPath) return fallback;
               try {
                 const rel = relativePath(fullPath, basePath);
-                return rel.startsWith("/") ? rel : `/${rel}`;
+                let normalized = rel.startsWith("/") ? rel : `/${rel}`;
+                const outputDirName = outputDir2.replace(basePath, "").replace(/^\/+|\/+$/g, "");
+                if (outputDirName && normalized.startsWith(`/${outputDirName}/`)) {
+                  normalized = normalized.replace(`/${outputDirName}/`, "/");
+                }
+                return normalized;
               } catch {
                 return fallback;
               }
             };
+            const appleTouchIconFullPath = (0, import_path.join)(finalOutputDir, "apple-touch-icon.png");
+            const appleTouchIconExists = (0, import_fs.existsSync)(appleTouchIconFullPath);
             const injectionResult = (0, import_universal_pwa_core5.injectMetaTagsInFile)(htmlFile, {
-              manifestPath: normalizePathForInjection(result.manifestPath, result.projectPath, "/manifest.json"),
+              manifestPath: normalizePathForInjection(result.manifestPath, result.projectPath, finalOutputDir, "/manifest.json"),
               themeColor: themeColor ?? "#ffffff",
               backgroundColor: backgroundColor ?? "#000000",
-              appleTouchIcon: iconPaths.find((p) => p.includes("180")) ?? "/apple-touch-icon.png",
+              appleTouchIcon: appleTouchIconExists ? normalizePathForInjection(appleTouchIconFullPath, result.projectPath, finalOutputDir, "/apple-touch-icon.png") : "/apple-touch-icon.png",
+              // Placeholder si non généré
               appleMobileWebAppCapable: true,
-              serviceWorkerPath: normalizePathForInjection(result.serviceWorkerPath, result.projectPath, "/sw.js")
+              serviceWorkerPath: normalizePathForInjection(result.serviceWorkerPath, result.projectPath, finalOutputDir, "/sw.js")
             });
             if (injectionResult.injected.length > 0) {
               injectedCount++;
@@ -290,8 +328,20 @@ function previewCommand(options = {}) {
 
 // src/index.ts
 var import_universal_pwa_core8 = require("@julien-lin/universal-pwa-core");
+var import_meta = {};
+var __filename = (0, import_url.fileURLToPath)(import_meta.url);
+var __dirname = (0, import_path3.dirname)(__filename);
+var packageJsonPath = (0, import_path3.join)(__dirname, "../package.json");
+var version = "0.0.0";
+try {
+  const packageJsonContent = (0, import_fs3.readFileSync)(packageJsonPath, "utf-8");
+  const packageJson = JSON.parse(packageJsonContent);
+  version = packageJson.version || "0.0.0";
+} catch {
+  version = "0.0.0";
+}
 var program = new import_commander.Command();
-program.name("universal-pwa").description("Transform any web project into a PWA with one click").version("0.0.0");
+program.name("universal-pwa").description("Transform any web project into a PWA with one click").version(version);
 program.command("init").description("Initialize PWA in your project").option("-p, --project-path <path>", "Project path", process.cwd()).option("-n, --name <name>", "App name").option("-s, --short-name <shortName>", "App short name (max 12 chars)").option("-i, --icon-source <path>", "Source image for icons").option("-t, --theme-color <color>", "Theme color (hex)").option("-b, --background-color <color>", "Background color (hex)").option("--skip-icons", "Skip icon generation").option("--skip-service-worker", "Skip service worker generation").option("--skip-injection", "Skip HTML meta-tag injection").option("-o, --output-dir <dir>", "Output directory", "public").action(async (options) => {
   try {
     const result = await initCommand({

package/dist/index.js

@@ -3,6 +3,9 @@
 // src/index.ts
 import { Command } from "commander";
 import chalk3 from "chalk";
+import { readFileSync } from "fs";
+import { fileURLToPath } from "url";
+import { dirname, join as join3 } from "path";
 
 // src/commands/init.ts
 import { scanProject } from "@julien-lin/universal-pwa-core";
@@ -70,7 +73,7 @@ async function initCommand(options = {}) {
     const finalOutputDir = outputDir ?? (result.framework === "WordPress" ? join(result.projectPath, "public") : join(result.projectPath, "public"));
     console.log(chalk.blue("\u{1F4DD} Generating manifest.json..."));
     const appName = name ?? (result.framework ? `${result.framework} App` : "My PWA");
-    const appShortName = shortName ?? appName.substring(0, 12);
+    const appShortName = shortName && shortName.length > 0 && shortName.length <= 12 ? shortName : appName.substring(0, 12);
     let iconPaths = [];
     if (!skipIcons && iconSource) {
       const iconSourcePath = existsSync(iconSource) ? iconSource : join(result.projectPath, iconSource);
@@ -83,7 +86,14 @@ async function initCommand(options = {}) {
           });
           iconPaths = iconResult.icons.map((icon) => icon.src);
           result.iconsGenerated = iconResult.icons.length;
+          const appleTouchIconPath = join(finalOutputDir, "apple-touch-icon.png");
+          if (existsSync(appleTouchIconPath)) {
+            iconPaths.push("/apple-touch-icon.png");
+          }
           console.log(chalk.green(`\u2713 Generated ${result.iconsGenerated} icons`));
+          if (existsSync(appleTouchIconPath)) {
+            console.log(chalk.green(`\u2713 Generated apple-touch-icon.png`));
+          }
         } catch (error) {
           const errorMessage = error instanceof Error ? error.message : String(error);
           result.errors.push(`Failed to generate icons: ${errorMessage}`);
@@ -93,6 +103,7 @@ async function initCommand(options = {}) {
         result.warnings.push(`Icon source not found: ${iconSourcePath}`);
       }
     }
+    let manifestPath;
     if (iconPaths.length > 0) {
       const manifestWithIcons = generateManifest({
         name: appName,
@@ -108,11 +119,30 @@ async function initCommand(options = {}) {
           type: "image/png"
         }))
       });
-      const manifestPath = generateAndWriteManifest(manifestWithIcons, finalOutputDir);
+      manifestPath = generateAndWriteManifest(manifestWithIcons, finalOutputDir);
       result.manifestPath = manifestPath;
+      console.log(chalk.green(`\u2713 Manifest generated: ${manifestPath}`));
     } else {
-      result.warnings.push("No icons provided. Manifest requires at least one icon. Please provide an icon source with --icon-source");
-      console.log(chalk.yellow("\u26A0 Manifest not generated: icons are required"));
+      result.warnings.push("No icons provided. Manifest generated with placeholder icon. Please provide an icon source with --icon-source for production.");
+      console.log(chalk.yellow("\u26A0 Generating manifest with placeholder icon"));
+      const manifestMinimal = generateManifest({
+        name: appName,
+        shortName: appShortName,
+        startUrl: "/",
+        scope: "/",
+        display: "standalone",
+        themeColor: themeColor ?? "#ffffff",
+        backgroundColor: backgroundColor ?? "#000000",
+        icons: [{
+          src: "/icon-192x192.png",
+          // Placeholder - l'utilisateur devra ajouter une vraie icône
+          sizes: "192x192",
+          type: "image/png"
+        }]
+      });
+      manifestPath = generateAndWriteManifest(manifestMinimal, finalOutputDir);
+      result.manifestPath = manifestPath;
+      console.log(chalk.green(`\u2713 Manifest generated: ${manifestPath}`));
     }
     if (!skipServiceWorker) {
       console.log(chalk.blue("\u2699\uFE0F Generating service worker..."));
@@ -145,22 +175,30 @@ async function initCommand(options = {}) {
         let injectedCount = 0;
         for (const htmlFile of htmlFiles.slice(0, 10)) {
           try {
-            const normalizePathForInjection = (fullPath, basePath, fallback) => {
+            const normalizePathForInjection = (fullPath, basePath, outputDir2, fallback) => {
               if (!fullPath) return fallback;
               try {
                 const rel = relativePath(fullPath, basePath);
-                return rel.startsWith("/") ? rel : `/${rel}`;
+                let normalized = rel.startsWith("/") ? rel : `/${rel}`;
+                const outputDirName = outputDir2.replace(basePath, "").replace(/^\/+|\/+$/g, "");
+                if (outputDirName && normalized.startsWith(`/${outputDirName}/`)) {
+                  normalized = normalized.replace(`/${outputDirName}/`, "/");
+                }
+                return normalized;
               } catch {
                 return fallback;
               }
             };
+            const appleTouchIconFullPath = join(finalOutputDir, "apple-touch-icon.png");
+            const appleTouchIconExists = existsSync(appleTouchIconFullPath);
             const injectionResult = injectMetaTagsInFile(htmlFile, {
-              manifestPath: normalizePathForInjection(result.manifestPath, result.projectPath, "/manifest.json"),
+              manifestPath: normalizePathForInjection(result.manifestPath, result.projectPath, finalOutputDir, "/manifest.json"),
               themeColor: themeColor ?? "#ffffff",
               backgroundColor: backgroundColor ?? "#000000",
-              appleTouchIcon: iconPaths.find((p) => p.includes("180")) ?? "/apple-touch-icon.png",
+              appleTouchIcon: appleTouchIconExists ? normalizePathForInjection(appleTouchIconFullPath, result.projectPath, finalOutputDir, "/apple-touch-icon.png") : "/apple-touch-icon.png",
+              // Placeholder si non généré
               appleMobileWebAppCapable: true,
-              serviceWorkerPath: normalizePathForInjection(result.serviceWorkerPath, result.projectPath, "/sw.js")
+              serviceWorkerPath: normalizePathForInjection(result.serviceWorkerPath, result.projectPath, finalOutputDir, "/sw.js")
             });
             if (injectionResult.injected.length > 0) {
               injectedCount++;
@@ -267,8 +305,19 @@ function previewCommand(options = {}) {
 
 // src/index.ts
 import { scanProject as scanProject2 } from "@julien-lin/universal-pwa-core";
+var __filename = fileURLToPath(import.meta.url);
+var __dirname = dirname(__filename);
+var packageJsonPath = join3(__dirname, "../package.json");
+var version = "0.0.0";
+try {
+  const packageJsonContent = readFileSync(packageJsonPath, "utf-8");
+  const packageJson = JSON.parse(packageJsonContent);
+  version = packageJson.version || "0.0.0";
+} catch {
+  version = "0.0.0";
+}
 var program = new Command();
-program.name("universal-pwa").description("Transform any web project into a PWA with one click").version("0.0.0");
+program.name("universal-pwa").description("Transform any web project into a PWA with one click").version(version);
 program.command("init").description("Initialize PWA in your project").option("-p, --project-path <path>", "Project path", process.cwd()).option("-n, --name <name>", "App name").option("-s, --short-name <shortName>", "App short name (max 12 chars)").option("-i, --icon-source <path>", "Source image for icons").option("-t, --theme-color <color>", "Theme color (hex)").option("-b, --background-color <color>", "Background color (hex)").option("--skip-icons", "Skip icon generation").option("--skip-service-worker", "Skip service worker generation").option("--skip-injection", "Skip HTML meta-tag injection").option("-o, --output-dir <dir>", "Output directory", "public").action(async (options) => {
   try {
     const result = await initCommand({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@julien-lin/universal-pwa-cli",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "CLI pour transformer n'importe quel projet web en PWA",
   "keywords": [
     "pwa",
@@ -44,7 +44,7 @@
     "glob": "^13.0.0",
     "pino": "^9.14.0",
     "zod": "^4.2.1",
-    "@julien-lin/universal-pwa-core": "^1.1.0"
+    "@julien-lin/universal-pwa-core": "^1.1.2"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^2.1.4",