hubspot-cms-sync 0.5.1 → 0.5.3

package/package.json

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

package/src/adapters/theme.mjs

@@ -95,7 +95,12 @@ const REF_BEARING = (relPath) => {
   return (
     p === 'js/hs-forms.js' ||
     p.endsWith('.module/fields.json') ||
-    p.endsWith('.module/module.html')
+    p.endsWith('.module/module.html') ||
+    // Page templates (incl. shared partials) may carry @asset refs to content
+    // assets (e.g. og:image, founder/product photos). Resolve them to the
+    // target's hosted URL on push, same as module.html — keeps content images
+    // (webp included, which the theme source rejects) out of the theme tree.
+    (p.startsWith('templates/') && p.endsWith('.html'))
   );
 };
 

package/src/lib/render.mjs

@@ -261,7 +261,10 @@ export function renderPost(post, { siteDir, site, baseUrl = '', assetBase = '/as
     nav_active: null,
     nav_hide_cta: false,
   };
-  return env.render(template, context);
+  // Resolve @asset refs that live in the TEMPLATE itself (not just content fields) —
+  // e.g. og:image or img src pointing at content assets. Idempotent: already-resolved
+  // content has no @asset tokens left.
+  return resolveStaticRefs(env.render(template, context), { assetBase });
 }
 
 // ---------------------------------------------------------------------------
@@ -292,7 +295,7 @@ export function renderPage(page, { siteDir, site, baseUrl = '', assetBase = '/as
     nav_active: null,
     nav_hide_cta: false,
   };
-  return env.render(page.template, context);
+  return resolveStaticRefs(env.render(page.template, context), { assetBase });
 }
 
 // ---------------------------------------------------------------------------
@@ -313,7 +316,7 @@ export function renderBlogListing(posts, { siteDir, site, baseUrl = '', assetBas
     nav_active: null,
     nav_hide_cta: false,
   };
-  return env.render('templates/blog.html', context);
+  return resolveStaticRefs(env.render('templates/blog.html', context), { assetBase });
 }
 
 export { postContent, pageContent, assetUrl, localizeDate, makeEnv };

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;
 }