@woodsportal/hubspot-kit 5.0.3-beta.2 → 5.0.3-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@woodsportal/hubspot-kit",
-  "version": "5.0.3-beta.2",
+  "version": "5.0.3-beta.3",
   "packageManager": "pnpm@10.12.1",
   "description": "WoodsCLI — HubSpot CMS dev kit by WoodsPortal. wp CLI, Vite presets, module-config overlay, and theme/module build pipelines.",
   "type": "module",
@@ -52,7 +52,7 @@
     "build": "tsup",
     "dev": "tsup --watch",
     "typecheck": "tsc --noEmit",
-    "test": "node --import tsx --test 'src/lib/**/*.test.ts' 'src/cli/**/*.test.ts' 'src/schema/**/*.test.ts' 'src/vite/**/*.test.ts' 'scripts/portal-build-id.test.mjs' 'scripts/resolve-consumer-dep.test.mjs' 'scripts/wp-cli-smoke.test.mjs' 'scripts/vite/ensure-dev-kit-shims.test.mjs' 'scripts/vite/consumer-react-aliases.test.mjs' 'scripts/vite/resolve-from-project-root.test.mjs' 'scripts/tailwind/prefix-plugin.test.mjs' && vitest run src/dev-module-config/__tests__/normalize-repeater-items.test.ts src/dev-module-config/__tests__/module-config-transform.test.ts src/dev-module-config/__tests__/flatten-visible-fields.test.ts src/dev-module-config/__tests__/drill-down-panels.test.ts",
+    "test": "node --import tsx --test 'src/lib/**/*.test.ts' 'src/cli/**/*.test.ts' 'src/schema/**/*.test.ts' 'src/vite/**/*.test.ts' 'scripts/portal-build-id.test.mjs' 'scripts/cdn-release-artifacts.test.mjs' 'scripts/hubspot-module-postbuild.test.mjs' 'scripts/resolve-consumer-dep.test.mjs' 'scripts/wp-cli-smoke.test.mjs' 'scripts/vite/ensure-dev-kit-shims.test.mjs' 'scripts/vite/consumer-react-aliases.test.mjs' 'scripts/vite/resolve-from-project-root.test.mjs' 'scripts/tailwind/prefix-plugin.test.mjs' && vitest run src/dev-module-config/__tests__/normalize-repeater-items.test.ts src/dev-module-config/__tests__/module-config-transform.test.ts src/dev-module-config/__tests__/flatten-visible-fields.test.ts src/dev-module-config/__tests__/drill-down-panels.test.ts",
     "test:examples": "node examples/smoke/run-matrix.mjs --tier static",
     "test:dist-pack": "node --test scripts/dist-cli-pack-smoke.test.mjs",
     "lint": "eslint src",

package/scripts/generate-cdn-manifest.mjs

@@ -2,7 +2,7 @@
 /**
  * Write dist/cdn/manifest.json after vendor + app builds.
  */
-import { readdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { readdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { resolve } from 'node:path'
 import { gzipSync } from 'node:zlib'
 
@@ -52,8 +52,11 @@ const allJsRelPaths = readdirSync(cdnDir, { recursive: true })
 const staleJs = allJsRelPaths.filter((file) => !cdnArtifactMatchesBuildId(buildId, file))
 if (staleJs.length > 0) {
   console.warn(
-    `[cdn-manifest] ignoring ${staleJs.length} stale .js artifact(s) for buildId ${buildId}: ${staleJs.join(', ')}`,
+    `[cdn-manifest] removing ${staleJs.length} stale .js artifact(s) for buildId ${buildId}: ${staleJs.join(', ')}`,
   )
+  for (const file of staleJs) {
+    rmSync(resolve(cdnDir, file), { force: true })
+  }
 }
 
 const jsFiles = allJsRelPaths
@@ -72,8 +75,11 @@ const allCssFiles = readdirSync(cdnDir).filter((f) => f.endsWith('.css'))
 const staleCss = allCssFiles.filter((file) => !cdnArtifactMatchesBuildId(buildId, file))
 if (staleCss.length > 0) {
   console.warn(
-    `[cdn-manifest] ignoring ${staleCss.length} stale .css artifact(s) for buildId ${buildId}: ${staleCss.join(', ')}`,
+    `[cdn-manifest] removing ${staleCss.length} stale .css artifact(s) for buildId ${buildId}: ${staleCss.join(', ')}`,
   )
+  for (const file of staleCss) {
+    rmSync(resolve(cdnDir, file), { force: true })
+  }
 }
 
 const cssFiles = allCssFiles

package/scripts/hubspot-module-postbuild.mjs

@@ -55,14 +55,70 @@ export function assertValidJavaScriptSyntax(jsPath) {
   execSync(`node --check ${JSON.stringify(jsPath)}`, { stdio: 'pipe' })
 }
 
+/**
+ * CodeBuild sets MODULE_BUILD_ID; never let a leftover manifest.buildId win.
+ * @param {{ buildId?: string }} manifest
+ * @param {NodeJS.ProcessEnv} [env]
+ */
+export function resolveInjectBuildId(manifest, env = process.env) {
+  const envId = env.MODULE_BUILD_ID?.trim() || env.PORTAL_BUILD_ID?.trim()
+  const manifestId = manifest.buildId?.trim()
+  const buildId = envId || manifestId
+  if (!buildId) {
+    throw new Error('module.html inject needs manifest.buildId or MODULE_BUILD_ID')
+  }
+  return buildId
+}
+
+/**
+ * Pin HubL/JS CDN fields even when a stale worker already baked an older build id.
+ * @param {string} html
+ * @param {{ baseUrl: string, buildId: string, vendorFile: string, appFile: string, appCssFile: string }} pins
+ */
+export function pinModuleHtmlCdnUrls(html, pins) {
+  const { baseUrl, buildId, vendorFile, appFile, appCssFile } = pins
+  let out = html
+    .replaceAll('__PORTAL_CDN_BASE__', baseUrl)
+    .replaceAll('__PORTAL_BUILD_ID__', buildId)
+    .replaceAll('__PORTAL_VENDOR_FILE__', vendorFile)
+    .replaceAll('__PORTAL_APP_FILE__', appFile)
+    .replaceAll('__PORTAL_APP_CSS_FILE__', appCssFile)
+
+  out = out.replace(/assetBaseUrl:\s*"[^"]*"/g, `assetBaseUrl: "${baseUrl}"`)
+  out = out.replace(/buildId:\s*"[^"]*"/g, `buildId: "${buildId}"`)
+  out = out.replace(
+    /\{% set portal_cdn_base = "[^"]*" %\}/g,
+    `{% set portal_cdn_base = "${baseUrl}" %}`,
+  )
+  out = out.replace(
+    /\{% set portal_vendor_script = "[^"]*" %\}/g,
+    `{% set portal_vendor_script = "${vendorFile}" %}`,
+  )
+  out = out.replace(
+    /\{% set portal_app_script = "[^"]*" %\}/g,
+    `{% set portal_app_script = "${appFile}" %}`,
+  )
+
+  if (!out.includes(buildId) || !out.includes(vendorFile) || !out.includes(appFile)) {
+    throw new Error(
+      `module.html inject failed: expected ${vendorFile} and ${appFile} for buildId ${buildId}`,
+    )
+  }
+  if (out.includes('__PORTAL_')) {
+    throw new Error('module.html still has CDN placeholders after inject')
+  }
+  return out
+}
+
 /**
  * Replace CDN placeholders in module.html from dist/cdn/manifest.json.
  * @param {string} html
  * @param {string} manifestPath
+ * @param {NodeJS.ProcessEnv} [env]
  */
-export function injectCdnManifestIntoModuleHtml(html, manifestPath) {
+export function injectCdnManifestIntoModuleHtml(html, manifestPath, env = process.env) {
   if (!existsSync(manifestPath)) {
-    if (html.includes('__PORTAL_CDN_BASE__')) {
+    if (html.includes('__PORTAL_CDN_BASE__') || /vendor\.\d/.test(html) || html.includes('portal_vendor_script')) {
       throw new Error(
         `Missing ${manifestPath} — run yarn build:cdn:dev or yarn build:cdn:prod before hubspot post-build`,
       )
@@ -71,14 +127,16 @@ export function injectCdnManifestIntoModuleHtml(html, manifestPath) {
   }
 
   const manifest = JSON.parse(readFileSync(manifestPath, 'utf8'))
-  const { buildId, vendorFile, appFile, appCssFile } = resolveCdnPrimaryScripts(manifest)
-
-  return html
-    .replaceAll('__PORTAL_CDN_BASE__', manifest.baseUrl)
-    .replaceAll('__PORTAL_BUILD_ID__', buildId)
-    .replaceAll('__PORTAL_VENDOR_FILE__', vendorFile)
-    .replaceAll('__PORTAL_APP_FILE__', appFile)
-    .replaceAll('__PORTAL_APP_CSS_FILE__', appCssFile)
+  const buildId = resolveInjectBuildId(manifest, env)
+  const { vendorFile, appFile, appCssFile } = resolveCdnPrimaryScripts({ ...manifest, buildId })
+
+  return pinModuleHtmlCdnUrls(html, {
+    baseUrl: manifest.baseUrl,
+    buildId,
+    vendorFile,
+    appFile,
+    appCssFile,
+  })
 }
 
 /**
@@ -91,7 +149,8 @@ export function mergeCdnAppStylesIntoModuleCss(moduleDir, manifestPath) {
   }
 
   const manifest = JSON.parse(readFileSync(manifestPath, 'utf8'))
-  const { appCssFile } = resolveCdnPrimaryScripts(manifest)
+  const buildId = resolveInjectBuildId(manifest)
+  const { appCssFile } = resolveCdnPrimaryScripts({ ...manifest, buildId })
 
   const cdnCssPath = resolve(moduleDir, '../cdn', appCssFile)
   if (!existsSync(cdnCssPath)) {

package/scripts/hubspot-module-postbuild.test.mjs

@@ -0,0 +1,86 @@
+import assert from 'node:assert/strict'
+import { mkdtempSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { describe, it } from 'node:test'
+
+import {
+  injectCdnManifestIntoModuleHtml,
+  pinModuleHtmlCdnUrls,
+  resolveInjectBuildId,
+} from './hubspot-module-postbuild.mjs'
+
+const placeholders = `        assetBaseUrl: "__PORTAL_CDN_BASE__",
+        buildId: "__PORTAL_BUILD_ID__",
+{% set portal_cdn_base = "__PORTAL_CDN_BASE__" %}
+{% set portal_vendor_script = "__PORTAL_VENDOR_FILE__" %}
+{% set portal_app_script = "__PORTAL_APP_FILE__" %}
+`
+
+const baked800 = `        assetBaseUrl: "https://cdn.example/cdn",
+        buildId: "5.0.2-beta.800",
+{% set portal_cdn_base = "https://cdn.example/cdn" %}
+{% set portal_vendor_script = "vendor.5.0.2-beta.800.js" %}
+{% set portal_app_script = "app.5.0.2-beta.800.js" %}
+`
+
+describe('resolveInjectBuildId', () => {
+  it('prefers MODULE_BUILD_ID over a stale manifest.buildId', () => {
+    assert.equal(
+      resolveInjectBuildId({ buildId: '5.0.2-beta.800' }, { MODULE_BUILD_ID: '5.0.2-beta.804' }),
+      '5.0.2-beta.804',
+    )
+  })
+})
+
+describe('pinModuleHtmlCdnUrls', () => {
+  it('rewrites leftover baked 800 pins to the current build id', () => {
+    const out = pinModuleHtmlCdnUrls(baked800, {
+      baseUrl: 'https://cdn.example/cdn',
+      buildId: '5.0.2-beta.804',
+      vendorFile: 'vendor.5.0.2-beta.804.js',
+      appFile: 'app.5.0.2-beta.804.js',
+      appCssFile: 'app.5.0.2-beta.804.css',
+    })
+    assert.match(out, /buildId: "5\.0\.2-beta\.804"/)
+    assert.match(out, /vendor\.5\.0\.2-beta\.804\.js/)
+    assert.match(out, /app\.5\.0\.2-beta\.804\.js/)
+    assert.doesNotMatch(out, /5\.0\.2-beta\.800/)
+  })
+})
+
+describe('injectCdnManifestIntoModuleHtml', () => {
+  it('pins vendor/app from MODULE_BUILD_ID even when the manifest still lists 800 first', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'wp-mod-html-'))
+    const manifestPath = join(dir, 'manifest.json')
+    writeFileSync(
+      manifestPath,
+      JSON.stringify({
+        baseUrl: 'https://cdn.example/cdn',
+        buildId: '5.0.2-beta.800',
+        scripts: [
+          { name: 'vendor', file: 'vendor.5.0.2-beta.800.js' },
+          { name: 'vendor', file: 'vendor.5.0.2-beta.804.js' },
+          { name: 'app', file: 'app.5.0.2-beta.800.js' },
+          { name: 'app', file: 'app.5.0.2-beta.804.js' },
+        ],
+        styles: [
+          { name: 'app', file: 'app.5.0.2-beta.800.css' },
+          { name: 'app', file: 'app.5.0.2-beta.804.css' },
+        ],
+      }),
+    )
+
+    const fromPlaceholders = injectCdnManifestIntoModuleHtml(placeholders, manifestPath, {
+      MODULE_BUILD_ID: '5.0.2-beta.804',
+    })
+    assert.match(fromPlaceholders, /vendor\.5\.0\.2-beta\.804\.js/)
+    assert.doesNotMatch(fromPlaceholders, /5\.0\.2-beta\.800/)
+
+    const fromBaked = injectCdnManifestIntoModuleHtml(baked800, manifestPath, {
+      MODULE_BUILD_ID: '5.0.2-beta.804',
+    })
+    assert.match(fromBaked, /vendor\.5\.0\.2-beta\.804\.js/)
+    assert.doesNotMatch(fromBaked, /5\.0\.2-beta\.800/)
+  })
+})