bsmnt 0.4.2 → 0.5.0

package/src/templates/next-pagebuilder/app/(content)/layout.tsx

@@ -1,21 +1,12 @@
 import { JsonLd } from "@/components/layout/json-ld"
 import { Wrapper } from "@/components/layout/wrapper"
 import { SanityVisualEditing } from "@/components/sanity/visual-editing"
-import { getSiteLayoutData } from "@/lib/integrations/sanity/fetchers/layout"
-
-const Layout = async ({ children }: { children: React.ReactNode }) => {
-  const layoutData = await getSiteLayoutData()
 
+const Layout = ({ children }: { children: React.ReactNode }) => {
   return (
     <>
-      <JsonLd navbar={layoutData.navbar} companyData={layoutData.companyData} />
-      <Wrapper
-        navbar={layoutData.navbar}
-        footer={layoutData.footer}
-        companyData={layoutData.companyData}
-      >
-        {children}
-      </Wrapper>
+      <JsonLd />
+      <Wrapper>{children}</Wrapper>
       <SanityVisualEditing />
     </>
   )

package/src/templates/next-pagebuilder/components/layout/footer/index.tsx

@@ -1,21 +1,22 @@
 import { Link } from "@/components/ui/link"
 import { SanityImage } from "@/components/ui/sanity-image"
-import type {
-  CompanyData,
-  FooterData,
+import {
+  type CompanyData,
+  type FooterData,
+  getCompanyData,
+  getFooterData,
 } from "@/lib/integrations/sanity/fetchers/layout"
 
 type FooterLinkGroup = NonNullable<FooterData["links"]>[number]
 type FooterLinkItem = NonNullable<FooterLinkGroup["items"]>[number]
 type SocialLink = NonNullable<CompanyData["socialLinks"]>[number]
 
-export const Footer = ({
-  footer,
-  companyData,
-}: {
-  footer: FooterData | null
-  companyData: CompanyData | null
-}) => {
+export const Footer = async () => {
+  const [footer, companyData] = await Promise.all([
+    getFooterData(),
+    getCompanyData(),
+  ])
+
   const links = footer?.links ?? []
 
   return (

package/src/templates/next-pagebuilder/components/layout/header/index.tsx

@@ -1,6 +1,8 @@
-import type { NavbarData } from "@/lib/integrations/sanity/fetchers/layout"
+import { getNavbarData } from "@/lib/integrations/sanity/fetchers/layout"
 import { HeaderClient } from "./header-client"
 
-export const Header = ({ data }: { data: NavbarData | null }) => {
-  return <HeaderClient data={data} />
+export const Header = async () => {
+  const navbar = await getNavbarData()
+
+  return <HeaderClient data={navbar} />
 }

package/src/templates/next-pagebuilder/components/layout/json-ld/index.tsx

@@ -1,7 +1,7 @@
 import { stegaClean } from "next-sanity"
-import type {
-  CompanyData,
-  NavbarData,
+import {
+  getCompanyData,
+  getNavbarData,
 } from "@/lib/integrations/sanity/fetchers/layout"
 import {
   generateOrganizationJsonLd,
@@ -12,13 +12,12 @@ import {
 const APP_DESCRIPTION =
   "Basement is the AI-native platform for audit and advisory firms. Automate engagement workflows using AI agents trusted by 50% of top 100 firms."
 
-export const JsonLd = ({
-  navbar,
-  companyData,
-}: {
-  navbar: NavbarData | null
-  companyData: CompanyData | null
-}) => {
+export const JsonLd = async () => {
+  const [navbar, companyData] = await Promise.all([
+    getNavbarData(),
+    getCompanyData(),
+  ])
+
   const sameAs = companyData?.socialLinks
     ?.map((link) => stegaClean(link.url))
     .filter((url): url is string => Boolean(url))

package/src/templates/next-pagebuilder/components/layout/wrapper/index.tsx

@@ -1,13 +1,8 @@
 import Link from "next/link"
 import { Footer } from "@/components/layout/footer"
 import { Header } from "@/components/layout/header"
-import type { SiteLayoutData } from "@/lib/integrations/sanity/fetchers/layout"
 import { cn } from "@/lib/styles/cn"
 
-interface WrapperProps
-  extends React.HTMLAttributes<HTMLDivElement>,
-    SiteLayoutData {}
-
 const SkipToMainContent = () => (
   <Link
     href="#main-content"
@@ -20,14 +15,11 @@ const SkipToMainContent = () => (
 export const Wrapper = ({
   children,
   className,
-  navbar,
-  footer,
-  companyData,
   ...props
-}: WrapperProps) => (
+}: React.HTMLAttributes<HTMLDivElement>) => (
   <>
     <SkipToMainContent />
-    <Header data={navbar} />
+    <Header />
     <main
       id="main-content"
       className={cn("relative flex grow flex-col", className)}
@@ -35,6 +27,6 @@ export const Wrapper = ({
     >
       {children}
     </main>
-    <Footer footer={footer} companyData={companyData} />
+    <Footer />
   </>
 )

package/src/templates/next-pagebuilder/components/page-builder/components/content-collection/index.tsx

@@ -190,7 +190,7 @@ export async function ContentCollection({
     params: {
       category: canonicalCategory,
       offset: fetchOffset,
-      limit: fetchLimit,
+      end: fetchOffset + fetchLimit,
     },
     tags: ["blog-articles"],
   })

package/src/templates/next-pagebuilder/knip.json

@@ -0,0 +1,27 @@
+{
+  "$schema": "https://unpkg.com/knip@6/schema.json",
+  "entry": [
+    "lib/integrations/sanity/**/*.{ts,tsx}",
+    "lib/scripts/**/*.{ts,tsx}",
+    "lib/utils/**/*.{ts,tsx}",
+    "components/**/*.{ts,tsx}",
+    "app/actions/**/*.{ts,tsx}"
+  ],
+  "ignoreDependencies": [
+    "zod",
+    "react-use",
+    "@portabletext/types",
+    "@portabletext/react",
+    "@portabletext/markdown",
+    "@sanity/vision",
+    "@sanity/visual-editing",
+    "@sanity/ui",
+    "@svgr/webpack",
+    "postcss-functions",
+    "clsx",
+    "rxjs"
+  ],
+  "ignoreBinaries": [
+    "gh"
+  ]
+}

package/src/templates/next-pagebuilder/lefthook.yml

@@ -14,6 +14,11 @@ pre-commit:
       run: bunx tsgo --noEmit --incremental false
       stage_fixed: false
 
+pre-push:
+  commands:
+    knip:
+      run: bun run knip
+
 post-merge:
   commands:
     install-deps:

package/src/templates/next-pagebuilder/lib/scripts/setup-ci-secrets.ts

@@ -0,0 +1,117 @@
+/**
+ * Push CI environment to GitHub Actions for this repository.
+ *
+ * Reads values from `.env.local` and sets them on the current repo via the
+ * GitHub CLI (`gh`), matching the `build` step in `.github/workflows/ci.yml`:
+ * the public Sanity project ID and dataset become repository *variables*, and
+ * the read token becomes a *secret*.
+ *
+ * Run once the repo exists on GitHub:  `bun run ci:secrets`
+ * Requires the GitHub CLI, authenticated (`gh auth login`).
+ */
+import { execFileSync } from "node:child_process"
+import { existsSync, readFileSync } from "node:fs"
+import path from "node:path"
+
+const ENV_FILE = ".env.local"
+
+/** Public config — stored as GitHub Actions repository variables. */
+const VARIABLES = [
+  "NEXT_PUBLIC_SANITY_PROJECT_ID",
+  "NEXT_PUBLIC_SANITY_DATASET",
+] as const
+
+/** Sensitive config — stored as GitHub Actions secrets. */
+const SECRETS = ["SANITY_API_READ_TOKEN"] as const
+
+function parseEnvFile(file: string): Record<string, string> {
+  const env: Record<string, string> = {}
+  if (!existsSync(file)) return env
+
+  for (const rawLine of readFileSync(file, "utf8").split("\n")) {
+    const line = rawLine.trim()
+    if (!line || line.startsWith("#")) continue
+
+    const eq = line.indexOf("=")
+    if (eq === -1) continue
+
+    const key = line.slice(0, eq).trim()
+    let value = line.slice(eq + 1).trim()
+    if (
+      (value.startsWith('"') && value.endsWith('"')) ||
+      (value.startsWith("'") && value.endsWith("'"))
+    ) {
+      value = value.slice(1, -1)
+    }
+    env[key] = value
+  }
+
+  return env
+}
+
+function ensureGitHubRepo(): void {
+  try {
+    execFileSync("gh", ["--version"], { stdio: "pipe" })
+  } catch {
+    console.error(
+      "✖ GitHub CLI (gh) not found. Install it: https://cli.github.com",
+    )
+    process.exit(1)
+  }
+
+  try {
+    execFileSync("gh", ["repo", "view", "--json", "nameWithOwner"], {
+      stdio: "pipe",
+    })
+  } catch {
+    console.error("✖ No GitHub repository detected for this directory.")
+    console.error(
+      "  Create and push the repo first (e.g. `gh repo create`), then re-run.",
+    )
+    process.exit(1)
+  }
+}
+
+ensureGitHubRepo()
+
+const env = parseEnvFile(path.resolve(ENV_FILE))
+let pushed = 0
+let skipped = 0
+
+for (const name of VARIABLES) {
+  const value = env[name] ?? process.env[name]
+  if (!value) {
+    console.info(`- ${name}: not found in ${ENV_FILE}, skipping`)
+    skipped++
+    continue
+  }
+  // Public value — safe to pass on the command line.
+  execFileSync("gh", ["variable", "set", name, "--body", value], {
+    stdio: "pipe",
+  })
+  console.info(`✓ variable  ${name}`)
+  pushed++
+}
+
+for (const name of SECRETS) {
+  const value = env[name] ?? process.env[name]
+  if (!value) {
+    console.info(`- ${name}: not found in ${ENV_FILE}, skipping`)
+    skipped++
+    continue
+  }
+  // Sensitive — pipe via stdin so the token never appears in the process args.
+  execFileSync("gh", ["secret", "set", name], { input: value, stdio: "pipe" })
+  console.info(`✓ secret    ${name}`)
+  pushed++
+}
+
+if (pushed === 0) {
+  console.info(
+    `\nNothing to sync. Add your Sanity values to ${ENV_FILE} (or run Sanity setup) first.`,
+  )
+} else {
+  console.info(
+    `\nDone — ${String(pushed)} value(s) pushed to GitHub Actions${skipped ? `, ${String(skipped)} skipped` : ""}.`,
+  )
+}

package/src/templates/next-pagebuilder/package.json

@@ -3,14 +3,19 @@
   "description": "Basement Next.js starter template",
   "version": "0.1.0",
   "private": true,
+  "packageManager": "bun@1.3.14",
+  "engines": {
+    "node": ">=24"
+  },
   "scripts": {
     "analyze": "cross-env ANALYZE=true bun run build",
     "analyze:experimental": "next experimental-analyze",
     "build": "next build",
+    "ci:secrets": "bun ./lib/scripts/setup-ci-secrets.ts",
     "dev": "next dev",
     "format": "biome format --write .",
-    "knip": "bunx knip",
-    "knip:fix": "bunx knip --fix",
+    "knip": "knip",
+    "knip:fix": "knip --fix",
     "lighthouse": "bunx @unlighthouse/cli --site http://localhost:3000",
     "lint": "biome lint --max-diagnostics=200",
     "lint:fix": "biome check --write --unsafe --max-diagnostics=200",
@@ -37,12 +42,13 @@
     "@svgr/webpack": "^8.1.0",
     "@tailwindcss/postcss": "^4.2.2",
     "@types/bun": "^1.3.11",
-    "@types/node": "^25.5.0",
+    "@types/node": "^24.13.1",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "@typescript/native-preview": "^7.0.0-dev.20260323.1",
     "babel-plugin-react-compiler": "^1.0.0",
     "cross-env": "^10.1.0",
+    "knip": "^6.16.1",
     "lefthook": "^1.13.0",
     "postcss-functions": "^4.0.2",
     "postcss-preset-env": "^11.2.0",

package/src/templates/next-webgl/.github/workflows/ci.yml

@@ -0,0 +1,62 @@
+name: CI
+
+on:
+  pull_request:
+    branches:
+      - main
+  push:
+    branches:
+      - main
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # Node version is read from .nvmrc — the single source of truth.
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"
+
+      # Bun version is read from package.json's "packageManager" field — the
+      # single source of truth. Do NOT pin a version here, or the two can drift.
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
+      # Cache Bun's global install cache so dependencies aren't re-downloaded
+      # on every run. Keyed on the lockfile so it busts when deps change.
+      - name: Cache Bun dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.bun/install/cache
+          key: ${{ runner.os }}-bun-${{ hashFiles('bun.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-bun-
+
+      - name: Install dependencies
+        run: bun install --frozen-lockfile
+
+      - name: Type check
+        run: bun run typecheck:compare
+
+      - name: Lint
+        run: bun run lint
+
+      - name: Build
+        run: bun run build
+
+      # Runs your tests if any exist; a fresh project with none passes cleanly.
+      - name: Test
+        run: |
+          if git ls-files '*.test.*' '*.spec.*' '*_test.*' '*_spec.*' | grep -q .; then
+            bun test
+          else
+            echo "No test files found — skipping bun test."
+          fi
+
+      - name: Knip
+        run: bun run knip

package/src/templates/next-webgl/README.md

@@ -49,3 +49,25 @@ lib/
 - Edit `lib/styles/tokens.css` for theme variables, breakpoints, and custom Tailwind utilities.
 - Edit `lib/styles/global.css` for reset rules and app-wide global styles.
 - `lib/styles/fonts.ts` handles font variables.
+
+## Continuous Integration
+
+A GitHub Actions workflow (`.github/workflows/ci.yml`) runs on every pull request to `main` and on pushes to `main`. It runs type checking, linting, the production build, tests, and `knip`.
+
+The workflow takes its runtime versions from your manifests, so there's a single source of truth and nothing to keep in sync by hand:
+
+- **Node** comes from `.nvmrc`.
+- **Bun** comes from the `packageManager` field in `package.json`.
+
+It also caches Bun's install cache between runs, and the test step is a no-op until you add real test files.
+
+### Branch protection
+
+To block merges when CI fails, enable branch protection on `main`:
+
+1. Go to **Settings → Branches → Add branch ruleset** (or **Add rule**).
+2. Target the `main` branch.
+3. Enable **Require status checks to pass before merging** and select the **CI** check.
+4. (Recommended) Enable **Require a pull request before merging**.
+
+Pull requests then cannot be merged until the CI workflow passes.

package/src/templates/next-webgl/knip.json

@@ -0,0 +1,13 @@
+{
+  "$schema": "https://unpkg.com/knip@6/schema.json",
+  "entry": [
+    "lib/scripts/**/*.{ts,tsx}",
+    "lib/hooks/**/*.{ts,tsx}",
+    "lib/utils/**/*.{ts,tsx}",
+    "components/**/*.{ts,tsx}"
+  ],
+  "ignoreDependencies": [
+    "zod",
+    "@svgr/webpack"
+  ]
+}

package/src/templates/next-webgl/lefthook.yml

@@ -14,6 +14,11 @@ pre-commit:
       run: bunx tsgo --noEmit --incremental false
       stage_fixed: false
 
+pre-push:
+  commands:
+    knip:
+      run: bun run knip
+
 post-merge:
   commands:
     install-deps:

package/src/templates/next-webgl/package.json

@@ -3,7 +3,10 @@
   "description": "Basement Next.js starter template",
   "version": "0.1.0",
   "private": true,
-  "packageManager": "bun@1.3.5",
+  "packageManager": "bun@1.3.14",
+  "engines": {
+    "node": ">=24"
+  },
   "scripts": {
     "analyze": "cross-env ANALYZE=true bun run build",
     "analyze:experimental": "next experimental-analyze",
@@ -12,8 +15,8 @@
     "dev:https": "bun ./lib/scripts/dev.ts --https",
     "dev:inspect": "bun ./lib/scripts/dev.ts --inspect",
     "format": "biome format --write .",
-    "knip": "bunx knip",
-    "knip:fix": "bunx knip --fix",
+    "knip": "knip",
+    "knip:fix": "knip --fix",
     "lighthouse": "bunx @unlighthouse/cli --site http://localhost:3000",
     "lint": "biome lint --max-diagnostics=200",
     "lint:fix": "biome check --write --unsafe --max-diagnostics=200",
@@ -42,13 +45,14 @@
     "@svgr/webpack": "^8.1.0",
     "@tailwindcss/postcss": "^4",
     "@types/bun": "^1.3.6",
-    "@types/node": "^20.19.30",
+    "@types/node": "^24.13.1",
     "@types/react": "^19.2.9",
     "@types/react-dom": "^19.2.3",
     "@types/three": "^0.182.0",
     "@typescript/native-preview": "^7.0.0-dev.20260122.3",
     "babel-plugin-react-compiler": "^1.0.0",
     "cross-env": "^10.1.0",
+    "knip": "^6.16.1",
     "lefthook": "^1.13.0",
     "postcss-preset-env": "^10.6.1",
     "schema-dts": "^2.0.0",