@julien-lin/universal-pwa-core 1.2.4 → 1.2.6

package/dist/index.cjs

@@ -604,12 +604,8 @@ function generateManifest(options) {
   if (options.orientation) {
     manifest.orientation = options.orientation;
   }
-  if (options.themeColor) {
-    manifest.theme_color = options.themeColor;
-  }
-  if (options.backgroundColor) {
-    manifest.background_color = options.backgroundColor;
-  }
+  manifest.theme_color = options.themeColor ?? "#ffffff";
+  manifest.background_color = options.backgroundColor ?? "#ffffff";
   if (options.splashScreens && options.splashScreens.length > 0) {
     manifest.splash_screens = options.splashScreens;
   }
@@ -632,8 +628,9 @@ function generateManifest(options) {
 }
 function writeManifest(manifest, outputDir) {
   const manifestPath = (0, import_path4.join)(outputDir, "manifest.json");
-  const manifestJson = JSON.stringify(manifest, null, 2);
-  (0, import_fs5.writeFileSync)(manifestPath, manifestJson, "utf-8");
+  const validatedManifest = ManifestSchema.parse(manifest);
+  const manifestJson = JSON.stringify(validatedManifest, null, 2);
+  (0, import_fs5.writeFileSync)(manifestPath, manifestJson, { encoding: "utf8" });
   return manifestPath;
 }
 function generateAndWriteManifest(options, outputDir) {
@@ -1113,7 +1110,7 @@ function findElement(parsed, tagName, attribute) {
         if (!attribute) {
           return element;
         }
-        const attrValue = element.attributes?.find((attr) => attr.name.toLowerCase() === attribute.name.toLowerCase())?.value;
+        const attrValue = element.attribs?.[attribute.name.toLowerCase()];
         if (attrValue === attribute.value) {
           return element;
         }
@@ -1239,11 +1236,9 @@ function injectMetaTags(htmlContent, options = {}) {
     if (existingThemeColor) {
       updateMetaContent(existingThemeColor, options.themeColor);
       result.injected.push(`<meta name="theme-color" content="${options.themeColor}"> (updated)`);
-    } else if (!elementExists(parsed, "meta", { name: "theme-color", value: options.themeColor })) {
+    } else {
       injectMetaTag(head, "theme-color", options.themeColor);
       result.injected.push(`<meta name="theme-color" content="${options.themeColor}">`);
-    } else {
-      result.skipped.push("theme-color (already exists)");
     }
   }
   if (options.appleTouchIcon) {
@@ -1257,11 +1252,19 @@ function injectMetaTags(htmlContent, options = {}) {
   }
   if (options.appleMobileWebAppCapable !== void 0) {
     const content = options.appleMobileWebAppCapable ? "yes" : "no";
-    if (!elementExists(parsed, "meta", { name: "apple-mobile-web-app-capable", value: content })) {
-      injectMetaTag(head, "apple-mobile-web-app-capable", content);
-      result.injected.push(`<meta name="apple-mobile-web-app-capable" content="${content}">`);
+    const deprecatedMeta = findElement(parsed, "meta", { name: "name", value: "apple-mobile-web-app-capable" });
+    if (deprecatedMeta && deprecatedMeta.parent) {
+      const parent = deprecatedMeta.parent;
+      if (parent.children) {
+        parent.children = parent.children.filter((child) => child !== deprecatedMeta);
+        result.warnings.push('Removed deprecated <meta name="apple-mobile-web-app-capable">');
+      }
+    }
+    if (!elementExists(parsed, "meta", { name: "mobile-web-app-capable", value: content })) {
+      injectMetaTag(head, "mobile-web-app-capable", content);
+      result.injected.push(`<meta name="mobile-web-app-capable" content="${content}">`);
     } else {
-      result.skipped.push("apple-mobile-web-app-capable (already exists)");
+      result.skipped.push("mobile-web-app-capable (already exists)");
     }
   }
   if (options.appleMobileWebAppStatusBarStyle) {
@@ -1280,7 +1283,7 @@ function injectMetaTags(htmlContent, options = {}) {
       result.skipped.push("apple-mobile-web-app-title (already exists)");
     }
   }
-  const modifiedHtml = (0, import_dom_serializer.render)(parsed.document, { decodeEntities: false });
+  let modifiedHtml = (0, import_dom_serializer.render)(parsed.document, { decodeEntities: false });
   if (options.serviceWorkerPath) {
     const swPath = options.serviceWorkerPath.startsWith("/") ? options.serviceWorkerPath : `/${options.serviceWorkerPath}`;
     if (!htmlContent.includes("navigator.serviceWorker")) {
@@ -1295,10 +1298,13 @@ if ('serviceWorker' in navigator) {
   });
 }
 </script>`;
-      const finalHtml = modifiedHtml.replace("</body>", `${swScript}
+      if (modifiedHtml.includes("</body>")) {
+        modifiedHtml = modifiedHtml.replace("</body>", `${swScript}
 </body>`);
+      } else {
+        modifiedHtml = `${modifiedHtml}${swScript}`;
+      }
       result.injected.push("Service Worker registration script");
-      return { html: finalHtml, result };
     } else {
       result.skipped.push("Service Worker registration (already exists)");
     }

package/dist/index.js

@@ -538,12 +538,8 @@ function generateManifest(options) {
   if (options.orientation) {
     manifest.orientation = options.orientation;
   }
-  if (options.themeColor) {
-    manifest.theme_color = options.themeColor;
-  }
-  if (options.backgroundColor) {
-    manifest.background_color = options.backgroundColor;
-  }
+  manifest.theme_color = options.themeColor ?? "#ffffff";
+  manifest.background_color = options.backgroundColor ?? "#ffffff";
   if (options.splashScreens && options.splashScreens.length > 0) {
     manifest.splash_screens = options.splashScreens;
   }
@@ -566,8 +562,9 @@ function generateManifest(options) {
 }
 function writeManifest(manifest, outputDir) {
   const manifestPath = join4(outputDir, "manifest.json");
-  const manifestJson = JSON.stringify(manifest, null, 2);
-  writeFileSync(manifestPath, manifestJson, "utf-8");
+  const validatedManifest = ManifestSchema.parse(manifest);
+  const manifestJson = JSON.stringify(validatedManifest, null, 2);
+  writeFileSync(manifestPath, manifestJson, { encoding: "utf8" });
   return manifestPath;
 }
 function generateAndWriteManifest(options, outputDir) {
@@ -1047,7 +1044,7 @@ function findElement(parsed, tagName, attribute) {
         if (!attribute) {
           return element;
         }
-        const attrValue = element.attributes?.find((attr) => attr.name.toLowerCase() === attribute.name.toLowerCase())?.value;
+        const attrValue = element.attribs?.[attribute.name.toLowerCase()];
         if (attrValue === attribute.value) {
           return element;
         }
@@ -1173,11 +1170,9 @@ function injectMetaTags(htmlContent, options = {}) {
     if (existingThemeColor) {
       updateMetaContent(existingThemeColor, options.themeColor);
       result.injected.push(`<meta name="theme-color" content="${options.themeColor}"> (updated)`);
-    } else if (!elementExists(parsed, "meta", { name: "theme-color", value: options.themeColor })) {
+    } else {
       injectMetaTag(head, "theme-color", options.themeColor);
       result.injected.push(`<meta name="theme-color" content="${options.themeColor}">`);
-    } else {
-      result.skipped.push("theme-color (already exists)");
     }
   }
   if (options.appleTouchIcon) {
@@ -1191,11 +1186,19 @@ function injectMetaTags(htmlContent, options = {}) {
   }
   if (options.appleMobileWebAppCapable !== void 0) {
     const content = options.appleMobileWebAppCapable ? "yes" : "no";
-    if (!elementExists(parsed, "meta", { name: "apple-mobile-web-app-capable", value: content })) {
-      injectMetaTag(head, "apple-mobile-web-app-capable", content);
-      result.injected.push(`<meta name="apple-mobile-web-app-capable" content="${content}">`);
+    const deprecatedMeta = findElement(parsed, "meta", { name: "name", value: "apple-mobile-web-app-capable" });
+    if (deprecatedMeta && deprecatedMeta.parent) {
+      const parent = deprecatedMeta.parent;
+      if (parent.children) {
+        parent.children = parent.children.filter((child) => child !== deprecatedMeta);
+        result.warnings.push('Removed deprecated <meta name="apple-mobile-web-app-capable">');
+      }
+    }
+    if (!elementExists(parsed, "meta", { name: "mobile-web-app-capable", value: content })) {
+      injectMetaTag(head, "mobile-web-app-capable", content);
+      result.injected.push(`<meta name="mobile-web-app-capable" content="${content}">`);
     } else {
-      result.skipped.push("apple-mobile-web-app-capable (already exists)");
+      result.skipped.push("mobile-web-app-capable (already exists)");
     }
   }
   if (options.appleMobileWebAppStatusBarStyle) {
@@ -1214,7 +1217,7 @@ function injectMetaTags(htmlContent, options = {}) {
       result.skipped.push("apple-mobile-web-app-title (already exists)");
     }
   }
-  const modifiedHtml = render(parsed.document, { decodeEntities: false });
+  let modifiedHtml = render(parsed.document, { decodeEntities: false });
   if (options.serviceWorkerPath) {
     const swPath = options.serviceWorkerPath.startsWith("/") ? options.serviceWorkerPath : `/${options.serviceWorkerPath}`;
     if (!htmlContent.includes("navigator.serviceWorker")) {
@@ -1229,10 +1232,13 @@ if ('serviceWorker' in navigator) {
   });
 }
 </script>`;
-      const finalHtml = modifiedHtml.replace("</body>", `${swScript}
+      if (modifiedHtml.includes("</body>")) {
+        modifiedHtml = modifiedHtml.replace("</body>", `${swScript}
 </body>`);
+      } else {
+        modifiedHtml = `${modifiedHtml}${swScript}`;
+      }
       result.injected.push("Service Worker registration script");
-      return { html: finalHtml, result };
     } else {
       result.skipped.push("Service Worker registration (already exists)");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@julien-lin/universal-pwa-core",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "Core engine for scanning, generation, and injection for UniversalPWA",
   "keywords": [
     "pwa",
@@ -61,7 +61,7 @@
     "workbox-routing": "^7.4.0",
     "workbox-strategies": "^7.4.0",
     "zod": "^4.2.1",
-    "@julien-lin/universal-pwa-templates": "^1.2.4"
+    "@julien-lin/universal-pwa-templates": "^1.2.6"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^2.1.4",