@sonordev/site-kit 5.3.2 → 5.5.0

package/dist/cli/index.mjs

@@ -4,7 +4,7 @@ import { parse } from '../chunk-5YA6SI4Z.mjs';
 import { buildOgHtml, TITLE_MAX_PX, OG_REPORT_ATTR } from '../chunk-UJ6CHZAI.mjs';
 import { require_main } from '../chunk-NNZDWY3L.mjs';
 import { findAppDirForDiscovery, discoverNextJsRoutes } from '../chunk-XIJ4F6IE.mjs';
-import { SITE_KIT_VERSION } from '../chunk-OUERH2T4.mjs';
+import { SITE_KIT_VERSION } from '../chunk-WDBCXRTT.mjs';
 import { __commonJS, __require, __toESM, __export, __privateAdd, __publicField, __privateGet, __privateMethod, __privateSet, __privateWrapper } from '../chunk-BEXTDHO4.mjs';
 import { EventEmitter } from 'events';
 import childProcess, { execFile as execFile$1, execSync, spawnSync, spawn } from 'child_process';
@@ -21548,15 +21548,11 @@ function addToExistingImport(content, namedExport, modulePath) {
   }
   return content;
 }
-function insertManagedSchemaIntoJSX(content, pagePath, isTypeScript) {
+function insertManagedSchemaIntoJSX(content, pagePath) {
   if (content.includes("<ManagedSchema")) {
     return content;
   }
-  const projectIdSuffix = isTypeScript ? "!" : "";
-  const schemaComponent = `<ManagedSchema
-        projectId={process.env.SONOR_PROJECT_ID${projectIdSuffix}}
-        path="${pagePath}"
-      />`;
+  const schemaComponent = `<ManagedSchema path="${pagePath}" />`;
   const returnPatterns = [
     // return (<> ... - fragment
     /return\s*\(\s*<>/,
@@ -21866,7 +21862,7 @@ async function migrateWidget(filePath, widget, options) {
   const changes = [];
   if (options.dryRun) {
     changes.push(`[DRY RUN] Would remove ${widget.widgetType} script`);
-    changes.push("[DRY RUN] Would enable Engage in SiteKitProvider");
+    changes.push("[DRY RUN] Sonor Engage chat would come from SiteKitLayout (engage is on by default)");
     return { filePath, success: true, changes };
   }
   const fullPath = path10.resolve(process.cwd(), filePath);
@@ -21885,7 +21881,7 @@ async function migrateWidget(filePath, widget, options) {
   }
   await fs3.writeFile(fullPath, content, "utf-8");
   changes.push(`Removed ${widget.widgetType} script`);
-  changes.push("Enable Engage in SiteKitProvider to add chat widget");
+  changes.push("SiteKitLayout adds the Sonor Engage chat widget (engage is on by default)");
   return { filePath, success: true, changes };
 }
 function matchBalancedBraces(content, startIndex) {
@@ -21943,7 +21939,6 @@ async function migrateMetadata(filePath, metadata, options) {
 
 export async function generateMetadata() {
   return getManagedMetadata({
-    projectId: process.env.SONOR_PROJECT_ID${isTypeScript ? "!" : ""},
     path: '${pagePath}',
     fallback: {
       title: '${(metadata.title || "Page Title").replace(/'/g, "\\'")}',
@@ -21955,10 +21950,7 @@ export async function generateMetadata() {
 export default function ${layoutName}({ children }${isTypeScript ? ": { children: React.ReactNode }" : ""}) {
   return (
     <>
-      <ManagedSchema
-        projectId={process.env.SONOR_PROJECT_ID${isTypeScript ? "!" : ""}}
-        path="${pagePath}"
-      />
+      <ManagedSchema path="${pagePath}" />
       {children}
     </>
   )
@@ -21988,7 +21980,6 @@ export default function ${layoutName}({ children }${isTypeScript ? ": { children
     const generateMetadataCode = `
 export async function generateMetadata() {
   return getManagedMetadata({
-    projectId: process.env.SONOR_PROJECT_ID${isTypeScript ? "!" : ""},
     path: '${pagePath}',
     fallback: {
       title: '${(metadata.title || "Page Title").replace(/'/g, "\\'")}',
@@ -22010,7 +22001,7 @@ export async function generateMetadata() {
         content = generateMetadataCode + content;
       }
     }
-    content = insertManagedSchemaIntoJSX(content, pagePath, isTypeScript);
+    content = insertManagedSchemaIntoJSX(content, pagePath);
     changes.push("Added ManagedSchema component");
     await fs3.writeFile(fullPath, content, "utf-8");
     changes.push("Added generateMetadata function");
@@ -22030,7 +22021,6 @@ export async function generateMetadata() {
         }
         const generateMetadataCode = `export async function generateMetadata() {
   return getManagedMetadata({
-    projectId: process.env.SONOR_PROJECT_ID${isTypeScript ? "!" : ""},
     path: '${pagePath}',
     fallback: {
       title: '${(metadata.title || "Page Title").replace(/'/g, "\\'")}',
@@ -22040,7 +22030,7 @@ export async function generateMetadata() {
 }`;
         content = content.replace(fullMatch, generateMetadataCode);
         changes.push("Replaced static metadata with getManagedMetadata");
-        content = insertManagedSchemaIntoJSX(content, pagePath, isTypeScript);
+        content = insertManagedSchemaIntoJSX(content, pagePath);
         changes.push("Added ManagedSchema component");
       }
     }
@@ -22164,8 +22154,6 @@ async function migrateSchema(filePath, schema, options) {
     }
   }
   const alreadyHasManagedSchema = content.includes("<ManagedSchema");
-  const isTypeScript = filePath.endsWith(".tsx") || filePath.endsWith(".ts");
-  const projectIdSuffix = isTypeScript ? "!" : "";
   const jsonLdPattern = /<script\s+type=["']application\/ld\+json["'][^>]*>[\s\S]*?<\/script>/gi;
   const scriptPattern = /<Script\s+[^>]*type=["']application\/ld\+json["'][^>]*>[\s\S]*?<\/Script>/gi;
   const hasJsonLd = jsonLdPattern.test(content) || scriptPattern.test(content);
@@ -22185,14 +22173,8 @@ async function migrateSchema(filePath, schema, options) {
         }
         changes.push("Added ManagedSchema import");
       }
-      content = content.replace(jsonLdPattern, `<ManagedSchema 
-        projectId={process.env.SONOR_PROJECT_ID${projectIdSuffix}}
-        path="${pagePath}"
-      />`);
-      content = content.replace(scriptPattern, `<ManagedSchema 
-        projectId={process.env.SONOR_PROJECT_ID${projectIdSuffix}}
-        path="${pagePath}"
-      />`);
+      content = content.replace(jsonLdPattern, `<ManagedSchema path="${pagePath}" />`);
+      content = content.replace(scriptPattern, `<ManagedSchema path="${pagePath}" />`);
       changes.push("Replaced JSON-LD script with ManagedSchema component");
     }
   }
@@ -22296,12 +22278,7 @@ async function migrateFAQ(filePath, faq, options) {
     }
     changes.push("Added ManagedFAQ import");
   }
-  const isTypeScript = filePath.endsWith(".tsx") || filePath.endsWith(".ts");
-  const projectIdSuffix = isTypeScript ? "!" : "";
-  const managedFAQComponent = `<ManagedFAQ
-      projectId={process.env.SONOR_PROJECT_ID${projectIdSuffix}}
-      path="${pagePath}"
-    />`;
+  const managedFAQComponent = `<ManagedFAQ path="${pagePath}" />`;
   if (faq.componentName) {
     const componentPattern = new RegExp(`(<${faq.componentName}[^>]*>)`, "i");
     if (componentPattern.test(content)) {
@@ -22354,7 +22331,7 @@ async function migrateSitemap(filePath, sitemap, options) {
   }
   if (sitemap.type === "custom-sitemap" && filePath.includes("sitemap")) {
     changes.push("Custom sitemap detected - consider using Site-Kit's createSitemap helper");
-    changes.push("Import: import { createSitemap } from '@sonordev/site-kit/seo'");
+    changes.push("Import: import { createSitemap } from '@sonordev/site-kit/sitemap'");
   }
   return { filePath, success: true, changes };
 }
@@ -22362,11 +22339,11 @@ async function migrateAnalytics(filePath, analytics, options) {
   const changes = [];
   if (options.dryRun) {
     changes.push(`[DRY RUN] Detected ${analytics.type}${analytics.trackingId ? ` (${analytics.trackingId})` : ""}`);
-    changes.push("[DRY RUN] Would recommend moving to SiteKitProvider analytics");
+    changes.push("[DRY RUN] Would recommend Sonor analytics from SiteKitLayout (on by default)");
     return { filePath, success: true, changes };
   }
   changes.push(`Detected ${analytics.type}${analytics.trackingId ? ` (${analytics.trackingId})` : ""}`);
-  changes.push("SiteKitProvider supports analytics integration");
+  changes.push("SiteKitLayout already tracks Sonor analytics (on by default)");
   changes.push("Configure analytics in project settings to consolidate tracking");
   return { filePath, success: true, changes };
 }
@@ -25754,7 +25731,7 @@ async function syncCommand(options, config2) {
   if (codePaths.length === 0) {
     spinner.warn("No ManagedFAQ components found");
     console.log("");
-    console.log(source_default.gray('  Add <ManagedFAQ projectId={...} path="/your-page" /> to your pages, then run:'));
+    console.log(source_default.gray('  Add <ManagedFAQ path="/your-page" /> to your pages, then run:'));
     console.log(source_default.gray("    npx sonor-setup migrate  (to add the component)"));
     console.log(source_default.gray("    npx sonor-setup faqs sync  (to register paths in Portal)"));
     console.log("");
@@ -26458,6 +26435,13 @@ function checkOgWiring(cwd) {
   return judgeOgWiring(readOgWiring(cwd));
 }
 
+// src/cli/agent/ssr-bailout.ts
+var DEFERRED_SIBLING_SINCE = "3.0.2";
+var LAYOUT_ALREADY_DEFERS = `plain <SiteKitLayout>{children}</SiteKitLayout> already mounts analytics as a deferred, childless sibling on site-kit >=${DEFERRED_SIBLING_SINCE}`;
+var LEGACY_STOPGAP = `Only on site-kit <${DEFERRED_SIBLING_SINCE}: upgrade, or as a stopgap run SiteKitLayout with analytics={false} plus a deferred, childless analytics sibling.`;
+var SSR_BAILOUT_FIX = `Keep the layout: ${LAYOUT_ALREADY_DEFERS}, so it is not the cause. Find what else wraps {children}, usually a next/dynamic({ ssr: false }) component such as a site's own lazy Providers. Import it statically (a client component still server-renders; only ssr: false skips that) or mount it as a childless sibling. ${LEGACY_STOPGAP}`;
+var ANALYTICS_WRAPPER_FIX = `Remove the <AnalyticsProvider> wrapper: ${LAYOUT_ALREADY_DEFERS} (configure it with analytics={{ ... }}). Track custom events with trackEvent / trackConversion from @sonordev/site-kit/analytics, which need no provider, instead of useAnalytics(). ` + LEGACY_STOPGAP;
+
 // src/cli/agent/checks.ts
 var API_URL4 = process.env.SONOR_API_URL || "https://api.sonor.io";
 async function readFileOrNull(p) {
@@ -26940,7 +26924,7 @@ async function checkSsrRenderFromUrl(url, timeoutMs = 12e3) {
         level: "error",
         message: "Page bailed to client rendering",
         detail: `Only ${contentTags} content tags in the server HTML \u2014 the route ships an empty shell + RSC flight data.`,
-        fix: "Run SiteKitLayout with analytics={false} and mount analytics as a deferred, childless sibling (never wrap {children}).",
+        fix: SSR_BAILOUT_FIX,
         docs: "manifest#failureModes"
       };
     }
@@ -27000,7 +26984,7 @@ async function checkSsrRenderFromBuild(cwd) {
     title: "Server-side rendering",
     level: "error",
     message: `Prerendered HTML has only ${contentTags} content tags \u2014 likely CSR bailout`,
-    fix: "Run SiteKitLayout with analytics={false} + a deferred, childless analytics sibling.",
+    fix: SSR_BAILOUT_FIX,
     docs: "manifest#failureModes"
   };
 }
@@ -27461,7 +27445,7 @@ async function resolveRouteCopy(paths) {
   try {
     if (process.env.SONOR_API_KEY) {
       ;
-      ({ getSEOPageData } = await import('../api-NTHZ6PAW.mjs'));
+      ({ getSEOPageData } = await import('../api-D745LGGU.mjs'));
     }
   } catch {
     getSEOPageData = null;
@@ -30966,18 +30950,21 @@ var analyticsSibling = {
   appliesTo(filePath) {
     return LAYOUT_FILE.test(filePath.replace(/\\/g, "/"));
   },
-  // Deliberately detect-and-flag, never auto-rewrite: turning an arbitrary
-  // layout into the deferred-sibling shape can silently drop analytics or break
-  // the tree. We surface the exact fix + reference impls instead of guessing.
+  // Deliberately detect-and-flag, never auto-rewrite: removing a wrapper from
+  // an arbitrary layout can silently drop analytics or break the tree. We
+  // surface the exact fix instead of guessing.
+  //
+  // A plain <SiteKitLayout>{children}</SiteKitLayout> is NOT flagged: it is the
+  // blessed layout, and since 3.0.2 it mounts analytics as a deferred, childless
+  // sibling itself (see ssr-bailout.ts). Flagging it told every correct site to
+  // hand-roll the sibling the package already ships.
   run(source) {
     const flags = [];
-    const wrapsChildren = /\{\s*children\s*\}/.test(source);
-    const sitekitLayoutOn = /<SiteKitLayout(?![^>]*analytics\s*=\s*\{?\s*false)/.test(source) && /<SiteKitLayout[\s\S]*\{\s*children\s*\}[\s\S]*<\/SiteKitLayout>/.test(source);
     const rawAnalyticsWrapper = /<AnalyticsProvider[\s\S]*\{\s*children\s*\}[\s\S]*<\/AnalyticsProvider>/.test(source);
-    if (wrapsChildren && (sitekitLayoutOn || rawAnalyticsWrapper)) {
+    if (rawAnalyticsWrapper) {
       flags.push({
-        reason: rawAnalyticsWrapper ? "AnalyticsProvider wraps {children} \u2014 this de-opts the route to client rendering (SSR bailout)" : "SiteKitLayout wraps {children} with analytics enabled \u2014 analytics runs in the hydration path",
-        fix: "Run SiteKitLayout with analytics={false} and mount analytics as a deferred, lazy, CHILDLESS sibling (never wrap {children}). Reference: upforge-nextjs/app/deferred-analytics.tsx and true-power-systems-nextjs/src/components/DeferredAnalytics.tsx."
+        reason: "AnalyticsProvider wraps {children}: analytics joins the hydration path, and if the provider is lazy-loaded with next/dynamic({ ssr: false }) the whole route de-opts to client rendering (SSR bailout)",
+        fix: ANALYTICS_WRAPPER_FIX
       });
     }
     return { output: source, changes: [], flags };