blocks-dusted 0.1.8 → 0.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blocks-dusted",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Manifest-driven CLI for installing reusable Payload CMS blocks.",
   "type": "module",
   "bin": {

package/src/commands/header.js

@@ -1,4 +1,3 @@
-import { writeFile } from 'node:fs/promises'
 import { copySharedFiles, copyTemplateFiles, backupExistingDestination, plannedBackupPath } from '../installers/copyTemplateFiles.js'
 import { checkDependencies } from '../installers/installDependencies.js'
 import { checkRequirements } from '../installers/checkRequirements.js'
@@ -9,11 +8,7 @@ import { packageRoot } from '../utils/paths.js'
 import { fileExists, validateTargetProject } from '../utils/project.js'
 
 const SUPPORTED_HEADERS = new Set(['HeaderDD02'])
-const ACTIVE_HEADER_FILES = [
-  'src/Header/config.ts',
-  'src/Header/Nav/index.tsx',
-  'src/Header/RowLabel.tsx',
-]
+const ACTIVE_HEADER_DIRECTORY = 'src/Header'
 
 export async function addHeader({ headerName, targetDirectory = process.cwd(), dryRun = false }) {
   if (!headerName) throw new Error('A header name is required. Example: blocks-dusted header add HeaderDD02 --dry-run')
@@ -31,30 +26,17 @@ export async function addHeader({ headerName, targetDirectory = process.cwd(), d
     throw new Error(`Required project files are missing:\n${missingRequired.map(formatMissingRequirement).join('\n')}`)
   }
 
-  const activeFileChecks = await Promise.all(
-    ACTIVE_HEADER_FILES.map(async (path) => ({ path, exists: await fileExists(`${targetDirectory}/${path}`) })),
-  )
-  const missingActive = activeFileChecks.filter((check) => !check.exists)
-  if (missingActive.length > 0) {
-    throw new Error(`Active Header files are missing:\n${missingActive.map((check) => `- ${check.path}`).join('\n')}`)
-  }
-
-  const destinationBackupPath = checks.collisions.destinationExists
-    ? await plannedBackupPath({ destinationPath: checks.collisions.destinationPath, targetDirectory })
+  const activeHeaderExists = await fileExists(`${targetDirectory}/${ACTIVE_HEADER_DIRECTORY}`)
+  const activeHeaderBackupPath = activeHeaderExists
+    ? await plannedBackupPath({ destinationPath: ACTIVE_HEADER_DIRECTORY, targetDirectory })
     : null
-  const activeBackups = await Promise.all(
-    ACTIVE_HEADER_FILES.map(async (path) => ({
-      path,
-      backupPath: await plannedBackupPath({ destinationPath: path, targetDirectory }),
-    })),
-  )
 
   heading('Header workflow')
   info(`Name: ${manifest.name}`)
   info(`Target directory: ${targetDirectory}`)
   info(`Payload config: ${project.payloadConfigPath}`)
   info(`Source template path: ${templateDirectory}`)
-  info(`Target install path: ${checks.collisions.destinationPath}`)
+  info(`Active Header path: ${ACTIVE_HEADER_DIRECTORY}`)
 
   heading(dryRun ? 'Files that would be installed' : 'Files to install')
   for (const file of manifest.files) item(`${file.from} -> ${file.to}`)
@@ -73,17 +55,13 @@ export async function addHeader({ headerName, targetDirectory = process.cwd(), d
   }
   if (dependencyChecks.missing.length > 0) item(`Install command: ${installCommandText(dependencyChecks.packageManager, dependencyChecks.missing)}`)
 
-  heading('Active Header backups')
-  for (const backup of activeBackups) {
-    item(dryRun ? `Would back up ${backup.path} to ${backup.backupPath}` : `Will back up ${backup.path} to ${backup.backupPath}`)
-  }
-  if (destinationBackupPath) {
-    item(dryRun ? `Would back up ${checks.collisions.destinationPath} to ${destinationBackupPath}` : `Will back up ${checks.collisions.destinationPath} to ${destinationBackupPath}`)
-  }
+  heading('Active Header backup')
+  if (activeHeaderBackupPath) item(dryRun ? `Would back up ${ACTIVE_HEADER_DIRECTORY} to ${activeHeaderBackupPath}` : `Will back up ${ACTIVE_HEADER_DIRECTORY} to ${activeHeaderBackupPath}`)
+  else item('No existing src/Header directory found; a new active Header will be installed.')
 
-  heading('Activation patches')
-  item('Patch src/Header/Nav/index.tsx to render HeaderDD02')
-  item('Patch src/Header/config.ts to expose HeaderDD02 fields and preserve legacy navItems as hidden data')
+  heading('Activation')
+  item('Install a complete active src/Header replacement wired to HeaderDD02.')
+  item('The previous Header folder is preserved as src/Header.bak, src/Header.bak.1, or the next available backup path.')
 
   if (dryRun) {
     const sharedResults = await copySharedFiles({ manifest, packageRoot, targetDirectory, dryRun: true })
@@ -95,17 +73,8 @@ export async function addHeader({ headerName, targetDirectory = process.cwd(), d
   }
 
   const sharedResults = await copySharedFiles({ manifest, packageRoot, targetDirectory })
-
-  if (checks.collisions.destinationExists) {
-    await backupExistingDestination({ destinationPath: checks.collisions.destinationPath, targetDirectory })
-  }
-  for (const file of ACTIVE_HEADER_FILES) {
-    await backupExistingDestination({ destinationPath: file, targetDirectory })
-  }
-
+  if (activeHeaderExists) await backupExistingDestination({ destinationPath: ACTIVE_HEADER_DIRECTORY, targetDirectory })
   const copiedFiles = await copyTemplateFiles({ manifest, templateDirectory, targetDirectory })
-  await writeFile(`${targetDirectory}/src/Header/Nav/index.tsx`, renderHeaderNav())
-  await writeFile(`${targetDirectory}/src/Header/config.ts`, renderHeaderConfig())
 
   heading('Copied files')
   copiedFiles.forEach((file) => item(file))
@@ -122,14 +91,6 @@ export async function addHeader({ headerName, targetDirectory = process.cwd(), d
   info('Header workflow complete.')
 }
 
-function renderHeaderNav() {
-  return `import React from 'react'\n\nimport type { Header as HeaderType } from '@/payload-types'\n\nimport HeaderDD02 from '@/Header/variants/HeaderDD02'\n\nexport const HeaderNav: React.FC<{ data: HeaderType }> = ({ data }) => {\n  return <HeaderDD02 data={data} />\n}\n`
-}
-
-function renderHeaderConfig() {
-  return `import type { GlobalConfig } from 'payload'\n\nimport { iconPicker } from '@/fields/lucide-icon-picker/field'\nimport { link } from '@/fields/link'\nimport { HeaderDD02 } from '@/Header/variants/HeaderDD02/config'\nimport { revalidateHeader } from './hooks/revalidateHeader'\n\nexport const Header: GlobalConfig = {\n  slug: 'header',\n  access: {\n    read: () => true,\n    update: () => true,\n  },\n  fields: [\n    {\n      name: 'variant',\n      label: 'Variant',\n      type: 'select',\n      defaultValue: 'header02',\n      options: [{ label: 'Header DD 02', value: 'header02' }],\n      admin: {\n        position: 'sidebar',\n      },\n    },\n    {\n      name: 'header02',\n      type: 'group',\n      fields: HeaderDD02,\n    },\n    {\n      name: 'navItems',\n      type: 'array',\n      admin: {\n        hidden: true,\n        description: 'Legacy starter Header navItems retained so existing stored header data is not discarded.',\n      },\n      fields: [\n        link({ appearances: false }),\n        iconPicker({\n          name: 'icon',\n          required: false,\n          description: 'Legacy optional icon to display with the navigation item',\n        }),\n      ],\n    },\n  ],\n  hooks: {\n    afterChange: [revalidateHeader],\n  },\n}\n`
-}
-
 function formatMissingRequirement(check) {
   const resolution = check.resolution ? `\n  Resolve: ${check.resolution}` : ''
   return `- ${check.path}: ${check.reason}${resolution}`
@@ -142,4 +103,4 @@ function formatDependency(dependency) {
 function installCommandText(packageManager, dependencies) {
   const command = packageManager === 'yarn' ? ['yarn', 'add'] : packageManager === 'bun' ? ['bun', 'add'] : packageManager === 'npm' ? ['npm', 'install'] : ['pnpm', 'add']
   return [...command, ...dependencies.map(formatDependency)].join(' ')
-}
+}

package/templates/components/HeaderDD02/Component.client.tsx

@@ -0,0 +1,9 @@
+'use client'
+
+import type { Header as HeaderType } from '@/payload-types'
+
+import { HeaderNav } from './Nav'
+
+export const HeaderClient: React.FC<{ data: HeaderType }> = ({ data }) => {
+  return <HeaderNav data={data} />
+}

package/templates/components/HeaderDD02/Component.tsx

@@ -0,0 +1,10 @@
+import type { Header as HeaderType } from '@/payload-types'
+import { getCachedGlobal } from '@/utilities/getGlobals'
+
+import { HeaderClient } from './Component.client'
+
+export async function Header() {
+  const headerData = (await getCachedGlobal('header', 1)()) as HeaderType | null
+
+  return <HeaderClient data={headerData ?? ({} as HeaderType)} />
+}

package/templates/components/HeaderDD02/Header.config.ts

@@ -0,0 +1,33 @@
+import type { GlobalConfig } from 'payload'
+
+import { HeaderDD02 } from '@/Header/variants/HeaderDD02/config'
+
+import { revalidateHeader } from './hooks/revalidateHeader'
+
+export const Header: GlobalConfig = {
+  slug: 'header',
+  access: {
+    read: () => true,
+    update: () => true,
+  },
+  fields: [
+    {
+      name: 'variant',
+      label: 'Variant',
+      type: 'select',
+      defaultValue: 'header02',
+      options: [{ label: 'Header DD 02', value: 'header02' }],
+      admin: {
+        position: 'sidebar',
+      },
+    },
+    {
+      name: 'header02',
+      type: 'group',
+      fields: HeaderDD02,
+    },
+  ],
+  hooks: {
+    afterChange: [revalidateHeader],
+  },
+}