hubspot-cms-sync 0.5.2 → 0.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hubspot-cms-sync",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Git-backed bidirectional sync for HubSpot CMS themes, content, blogs, forms, and assets.",
   "type": "module",
   "license": "MIT",

package/src/build-static.mjs

@@ -41,7 +41,7 @@ async function loadTagSlugs(siteDir) {
  * trackingPortalId, if set, injects the HubSpot tracking script into the footer so
  * forms keep de-anonymizing (`standard_footer_includes`). Returns counts.
  */
-export async function buildStatic({ siteDir, outDir, baseUrl = '', assetBase = '/assets', trackingPortalId } = {}) {
+export async function buildStatic({ siteDir, outDir, baseUrl = '', assetBase = '/assets', trackingPortalId, blogPageSize = 20 } = {}) {
   const tagMap = await loadTagSlugs(siteDir);
   const tagSlugFor = (name) => tagMap[name] || slugify(name);
   const footerIncludes = trackingPortalId
@@ -76,7 +76,17 @@ export async function buildStatic({ siteDir, outDir, baseUrl = '', assetBase = '
     fileCount++;
   }
 
-  await emit('/blog', renderBlogListing(posts, { ...opts, route: '/blog' }));
+  // Paginate listings to match HubSpot (20 posts/page; page 1 = base, page N = base/page/N).
+  // Without this the static listing renders every post on one page.
+  async function emitListing(basePath, items) {
+    const totalPages = Math.max(1, Math.ceil(items.length / blogPageSize));
+    for (let pageNum = 1; pageNum <= totalPages; pageNum += 1) {
+      const route = pageNum === 1 ? basePath : `${basePath}/page/${pageNum}`;
+      await emit(route, renderBlogListing(items, { ...opts, route, basePath, pageNum, pageSize: blogPageSize }));
+    }
+  }
+
+  await emitListing('/blog', posts);
 
   // One listing per tag, posts grouped by tag slug (preserves newest-first order).
   const byTag = new Map();
@@ -88,7 +98,7 @@ export async function buildStatic({ siteDir, outDir, baseUrl = '', assetBase = '
     }
   }
   for (const [slug, tagPosts] of byTag) {
-    await emit(`/blog/tag/${slug}`, renderBlogListing(tagPosts, { ...opts, route: `/blog/tag/${slug}` }));
+    await emitListing(`/blog/tag/${slug}`, tagPosts);
   }
 
   // Assets. get_asset_url maps ../css|js|images -> /css|js|images; @asset:<p> -> /assets/<p>.

package/src/lib/render.mjs

@@ -306,13 +306,23 @@ export function renderPage(page, { siteDir, site, baseUrl = '', assetBase = '/as
 // by contents.total_page_count > 1) is inert.
 // ---------------------------------------------------------------------------
 export function renderBlogListing(posts, { siteDir, site, baseUrl = '', assetBase = '/assets', lang = 'en',
-  headerIncludes = '', footerIncludes = '', tagSlugFor, route = '/blog' } = {}) {
+  headerIncludes = '', footerIncludes = '', tagSlugFor, route = '/blog',
+  basePath = null, pageNum = 1, pageSize = 0 } = {}) {
   const opts = { baseUrl, assetBase, lang, headerIncludes, footerIncludes, tagSlugFor };
   const env = makeEnv(siteDir, { site, opts });
+  // Pagination: pageSize <= 0 keeps the whole list on one page (back-compat). Otherwise
+  // slice to the page window. blog_page_link mirrors HubSpot — page 1 is the listing
+  // base (e.g. /blog), page N is <base>/page/N — and drives the template's paginator.
+  const base = basePath || route;
+  const totalPages = pageSize > 0 ? Math.max(1, Math.ceil(posts.length / pageSize)) : 1;
+  const pageItems = pageSize > 0 ? posts.slice((pageNum - 1) * pageSize, pageNum * pageSize) : posts;
+  env.addGlobal('blog_page_link', (n) => (Number(n) <= 1 ? base : `${base}/page/${n}`));
+  const contents = pageItems.map((p) => postContent(p, opts));
+  contents.total_page_count = totalPages;
   const context = {
-    contents: posts.map((p) => postContent(p, opts)),
+    contents,
     content: { absolute_url: baseUrl + route, canonical_url: baseUrl + route },
-    current_page_num: 1,
+    current_page_num: pageNum,
     nav_active: null,
     nav_hide_cta: false,
   };

package/src/republish.mjs

@@ -73,10 +73,17 @@ async function republish(argv = process.argv.slice(2), opts = {}) {
   const fut = future();
   let ok = 0;
   let fail = 0;
+  let skipped = 0;
   async function schedule(kind, id, publishDate) {
     const body = { id: String(id), publishDate: publishDate || fut };
     const { status } = await hub('POST', `/cms/v3/${kind}/schedule`, body);
-    status === 204 ? ok++ : (fail++, console.error(`  ${kind} ${id} -> ${status}`));
+    // 409 = the page already has a scheduled publish (e.g. just published by a
+    // `push --publish`, or an orphan portal page) — the desired end state, not a
+    // failure. `--all` legitimately touches pages outside our manifest; don't let
+    // their conflicts fail the deploy. Log for visibility.
+    if (status === 204) ok++;
+    else if (status === 409) { skipped++; console.error(`  ${kind} ${id} -> 409 already scheduled (skip)`); }
+    else { fail++; console.error(`  ${kind} ${id} -> ${status}`); }
   }
 
   const pages = await getAll('/cms/v3/pages/site-pages?property=id,slug,state');
@@ -91,7 +98,7 @@ async function republish(argv = process.argv.slice(2), opts = {}) {
     console.log(`republishing ${posts.length} blog post(s) (preserving publishDate)`);
     for (const p of posts) await schedule('blogs/posts', p.id, p.publishDate);
   }
-  console.log(`scheduled ${ok} | failed ${fail} (live in ~90s)`);
+  console.log(`scheduled ${ok} | already-scheduled ${skipped} | failed ${fail} (live in ~90s)`);
   return fail ? 1 : 0;
 }