basebrick-bricklayer 1.1.0 → 1.2.2

package/README.md

@@ -23,6 +23,18 @@ npx bricklayer init
 
 This interactive setup will create the default folder structure and ask if you'd like to scaffold a demo site with starter templates, as well as configure Sonic JS CMS integration automatically.
 
+## Automated Deployment (GitHub Actions)
+
+If you chose to generate a `deploy.yml` workflow during initialization, Bricklayer will automatically deploy your site to Cloudflare on every push to the `main` branch. 
+
+For Wrangler to authenticate correctly in a non-interactive CI/CD environment, you **must** configure your repository secrets.
+
+1. Go to [Cloudflare API Tokens](https://developers.cloudflare.com/fundamentals/api/get-started/create-token/) and create an API Token with `Edit Cloudflare Workers` permissions.
+2. In your GitHub repository, navigate to **Settings > Secrets and variables > Actions**.
+3. Create two new Repository Secrets:
+   - `CLOUDFLARE_API_TOKEN`: Your newly created API token.
+   - `CLOUDFLARE_ACCOUNT_ID`: Your Cloudflare Account ID (found on your Cloudflare dashboard overview).
+
 Alternatively, if you are working within the BaseBrick ecosystem locally, you can link it:
 
 ```bash
@@ -99,6 +111,23 @@ Bricklayer natively supports reading `.env` and `.dev.vars` (Cloudflare Pages) f
 - **Nunjucks Templates:** Variables are automatically passed to Nunjucks templates under the global `env` object. E.g., `{{ env.MY_API_KEY }}`.
 - **CMS Configuration:** Environment variables can be directly interpolated in `generic.json` strings using the `${VARIABLE_NAME}` syntax.
 
+## Bricklayer Manager
+
+Bricklayer includes a centralized dashboard to help you track and administer all your statically generated sites.
+
+The **Bricklayer Manager** allows you to:
+- View all deployed Bricklayer sites via an elegant web UI.
+- Automatically track and store Cloudflare Worker endpoints.
+- Access deep links directly to Cloudflare Dashboards for easy debugging.
+
+You can find the source code and instructions for deploying your own manager instance in the `manager/` directory of the core [BrickLayer GitHub Repository](https://github.com/cryptoskillz/BrickLayer/tree/main/manager).
+
+Once your manager is deployed, use the CLI command to securely sync any of your projects:
+
+```bash
+bricklayer manage
+```
+
 ## Directory Structure
 
 Bricklayer expects the following default structure (overridable via options):

package/bin/bricklayer.js

@@ -15,6 +15,7 @@ Commands:
   (empty)     Run a standard development build
   init        Scaffold a new project (Demo, CMS, Cloudflare API)
   manage      Register this project with a Bricklayer Manager
+  deploy      Deploy the project to Cloudflare and register its URL
   help        Show this help message
 
 Options:
@@ -36,8 +37,21 @@ Generated NPM Scripts (after init):
 
 if (args.includes('init')) {
     initProject(process.cwd()).catch(console.error);
+} else if (args.includes('deploy')) {
+    const preview = args.includes('--preview');
+    import('./deploy.js').then(m => m.deployProject(process.cwd(), { preview })).catch(console.error);
 } else if (args.includes('manage')) {
-    import('./manage.js').then(m => m.manageProject(process.cwd())).catch(console.error);
+    const reconfigure = args.includes('-c') || args.includes('--config');
+    let url = null;
+    let token = null;
+    
+    const uIndex = args.findIndex(a => a === '-u' || a === '--url');
+    if (uIndex !== -1 && args[uIndex + 1]) url = args[uIndex + 1];
+    
+    const tIndex = args.findIndex(a => a === '-t' || a === '--token');
+    if (tIndex !== -1 && args[tIndex + 1]) token = args[tIndex + 1];
+
+    import('./manage.js').then(m => m.manageProject(process.cwd(), { reconfigure, url, token })).catch(console.error);
 } else {
     const isProd = args.includes('--prod');
     buildSite({ isProd, cwd: process.cwd() })

package/bin/deploy.js

@@ -0,0 +1,93 @@
+import fs from 'fs';
+import path from 'path';
+import { spawn } from 'child_process';
+
+export async function deployProject(cwd, options = {}) {
+    const isPreview = options.preview || false;
+    
+    console.log(`\n🚀 Deploying to Cloudflare ${isPreview ? 'Preview' : 'Production'}...\n`);
+    
+    const args = ['deploy'];
+    if (isPreview) {
+        args.push('--env', 'preview');
+    }
+    
+    const tmpLog = path.join(cwd, '.wrangler-deploy.log');
+    
+    let commandStr;
+    if (process.platform === 'darwin') {
+        commandStr = `script -q ${tmpLog} npx wrangler ${args.join(' ')}`;
+    } else if (process.platform === 'linux') {
+        commandStr = `script -q -c "npx wrangler ${args.join(' ')}" ${tmpLog}`;
+    } else {
+        // Windows fallback
+        commandStr = `npx wrangler ${args.join(' ')} > ${tmpLog} 2>&1`;
+    }
+
+    const child = spawn(commandStr, { 
+        cwd, 
+        stdio: 'inherit',
+        shell: true 
+    });
+    
+    child.on('close', async (code) => {
+        let outputData = '';
+        if (fs.existsSync(tmpLog)) {
+            outputData = fs.readFileSync(tmpLog, 'utf8');
+            // Remove ANSI color codes
+            outputData = outputData.replace(/\x1B\[[0-9;]*[a-zA-Z]/g, '');
+            // Clean up the log file
+            try { fs.unlinkSync(tmpLog); } catch (e) {}
+        }
+
+        if (code === 0) {
+            // Try to extract URL from wrangler output
+            const urlMatch = outputData.match(/https:\/\/[a-zA-Z0-9-]+\.[a-zA-Z0-9-]+\.workers\.dev/i) || 
+                             outputData.match(/https:\/\/[a-zA-Z0-9-]+\.[a-zA-Z0-9-]+\.pages\.dev/i) ||
+                             outputData.match(/https:\/\/[a-zA-Z0-9-]+\.[a-zA-Z0-9-]+\.cloudflare\.com/i) ||
+                             outputData.match(/(https:\/\/[^\s"]+)/i);
+
+            let deployedUrl = null;
+            const lines = outputData.split('\n');
+            for (const line of lines) {
+                if (line.includes('workers.dev') || line.includes('pages.dev')) {
+                    const match = line.match(/(https:\/\/[^\s"]+)/i);
+                    if (match) deployedUrl = match[1];
+                }
+            }
+            
+            // Fallback to the first URL we found if we didn't find a worker specific one
+            if (!deployedUrl && urlMatch) {
+                deployedUrl = urlMatch[1] || urlMatch[0];
+            }
+            
+            if (deployedUrl) {
+                console.log(`\n✅ Deployed successfully to: ${deployedUrl}`);
+                
+                const localConfigPath = path.join(cwd, '.basebrick.config');
+                if (fs.existsSync(localConfigPath)) {
+                    try {
+                        const projectConfig = JSON.parse(fs.readFileSync(localConfigPath, 'utf8'));
+                        projectConfig.url = deployedUrl;
+                        projectConfig.environment = isPreview ? 'Preview' : 'Production';
+                        
+                        fs.writeFileSync(localConfigPath, JSON.stringify(projectConfig, null, 2));
+                        console.log('✅ Added deployed URL to .basebrick.config');
+                        
+                        // Automatically push the new config to the manager
+                        console.log('\n🔄 Automatically registering new URL with Bricklayer Manager...');
+                        const manageModule = await import('./manage.js');
+                        await manageModule.manageProject(cwd, {});
+                    } catch(e) {
+                        console.error('❌ Failed to update .basebrick.config with URL:', e);
+                    }
+                }
+            } else {
+                console.log('\n✅ Deployed successfully (Could not extract URL automatically)');
+            }
+        } else {
+            console.error(`\n❌ Deployment failed with exit code ${code}`);
+            process.exit(1);
+        }
+    });
+}

package/bin/init.js

@@ -35,6 +35,9 @@ export async function initProject(cwd) {
     const projectNameRaw = await question('What is the name of your project? (bricklayer-site) ');
     const projectName = projectNameRaw.trim() || 'bricklayer-site';
 
+    const projectDescriptionRaw = await question('Project description (optional): ');
+    const projectDescription = projectDescriptionRaw.trim() || '';
+
     const githubRepoRaw = await question('What is the GitHub repository URL? (leave blank for none) ');
     const githubRepo = githubRepoRaw.trim();
 
@@ -100,7 +103,7 @@ export async function initProject(cwd) {
     // 2. Create base CSS
     const cssPath = path.join(cwd, 'src/assets/tailwind/input.css');
     if (!fs.existsSync(cssPath)) {
-        fs.writeFileSync(cssPath, `@tailwind base;\n@tailwind components;\n@tailwind utilities;\n`);
+        fs.writeFileSync(cssPath, `@import "tailwindcss";\n\n@source "../../**/*.njk";\n`);
         console.log(' Created src/assets/tailwind/input.css');
     }
 
@@ -209,11 +212,13 @@ url: post.title
     const pkgPath = path.join(cwd, 'package.json');
     let pkg = {
         name: projectName,
+        description: projectDescription,
         version: "1.0.0",
         type: "module",
         scripts: {
             build: "bricklayer",
-            "build:prod": "bricklayer --prod"
+            "build:prod": "bricklayer --prod",
+            manage: "bricklayer manage"
         },
         dependencies: {},
         devDependencies: {
@@ -229,16 +234,17 @@ url: post.title
         try {
             const existing = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
             pkg = { ...pkg, ...existing };
-            pkg.dependencies = { ...pkg.dependencies, ...existing.dependencies };
-            pkg.devDependencies = { ...pkg.devDependencies, ...existing.devDependencies };
+            pkg.scripts = { ...(existing.scripts || {}), ...pkg.scripts };
+            pkg.dependencies = { ...(existing.dependencies || {}), ...pkg.dependencies };
+            pkg.devDependencies = { ...(existing.devDependencies || {}), ...pkg.devDependencies };
         } catch(e) {}
     }
 
     if (includeCloudflare) {
         console.log('\nConfiguring Cloudflare...');
         pkg.scripts.start = "wrangler dev";
-        pkg.scripts["deploy:preview"] = "npm run build:prod && wrangler deploy --env preview";
-        pkg.scripts["deploy:prod"] = "npm run build:prod && wrangler deploy";
+        pkg.scripts["deploy:preview"] = "npm run build:prod && bricklayer deploy --preview";
+        pkg.scripts["deploy:prod"] = "npm run build:prod && bricklayer deploy";
         pkg.devDependencies.wrangler = "^3.0.0";
         
         const wranglerPath = path.join(cwd, 'wrangler.toml');
@@ -365,8 +371,9 @@ ${deploySteps}`;
 
     const basebrickConfigPath = path.join(cwd, '.basebrick.config');
     const basebrickConfig = {
-        projectName,
-        githubRepo,
+        name: projectName,
+        description: projectDescription,
+        githubUrl: githubRepo,
         includeDemo,
         includeSonic,
         pullSonic,

package/bin/manage.js

@@ -10,7 +10,8 @@ const rl = readline.createInterface({
 
 const question = (query) => new Promise((resolve) => rl.question(query, resolve));
 
-export async function manageProject(cwd) {
+export async function manageProject(cwd, options = {}) {
+    const { reconfigure = false, url = null, token = null } = options;
     const localConfigPath = path.join(cwd, '.basebrick.config');
     
     if (!fs.existsSync(localConfigPath)) {
@@ -30,9 +31,28 @@ export async function manageProject(cwd) {
         }
     }
 
+    if (reconfigure) {
+        managerConfig = {};
+    }
+
+    if (url) {
+        managerConfig.url = url;
+    }
+    if (token) {
+        managerConfig.token = token;
+    }
+
+    if (managerConfig.url && !managerConfig.url.endsWith('/api/sites')) {
+        managerConfig.url = managerConfig.url.replace(/\/+$/, '') + '/api/sites';
+    }
+
     if (!managerConfig.url) {
         const urlRaw = await question('What is your Bricklayer Manager URL? ');
-        managerConfig.url = urlRaw.trim();
+        let url = urlRaw.trim();
+        if (!url.endsWith('/api/sites')) {
+            url = url.replace(/\/+$/, '') + '/api/sites';
+        }
+        managerConfig.url = url;
     }
 
     if (!managerConfig.token) {
@@ -58,6 +78,81 @@ export async function manageProject(cwd) {
         return;
     }
 
+    // Consolidate legacy keys to prefer user edits
+    if (projectConfig.projectName && projectConfig.projectName !== projectConfig.name) {
+        projectConfig.name = projectConfig.projectName;
+    }
+    if (projectConfig.projectDescription && projectConfig.projectDescription !== projectConfig.description) {
+        projectConfig.description = projectConfig.projectDescription;
+    }
+    if (projectConfig.githubRepo && projectConfig.githubRepo !== projectConfig.githubUrl) {
+        projectConfig.githubUrl = projectConfig.githubRepo;
+    }
+    
+    // Clean up duplicate legacy keys
+    delete projectConfig.projectName;
+    delete projectConfig.projectDescription;
+    delete projectConfig.githubRepo;
+
+    // Normalize githubUrl
+    if (projectConfig.githubUrl) {
+        projectConfig.githubUrl = projectConfig.githubUrl.replace(/^git\+/, '').replace(/\.git$/, '');
+    }
+
+    // Extract description from package.json if not explicitly set
+    const pkgPath = path.join(cwd, 'package.json');
+    if (fs.existsSync(pkgPath)) {
+        try {
+            const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+            if (pkg.description && !projectConfig.description) {
+                projectConfig.description = pkg.description;
+            }
+            if (pkg.repository && pkg.repository.url && !projectConfig.githubUrl) {
+                let repoUrl = pkg.repository.url.replace(/^git\+/, '').replace(/\.git$/, '');
+                projectConfig.githubUrl = repoUrl;
+            }
+        } catch (e) {
+            console.error('Warning: Could not parse package.json');
+        }
+    }
+
+    // Extract name and account_id from wrangler.toml
+    const wranglerPath = path.join(cwd, 'wrangler.toml');
+    if (fs.existsSync(wranglerPath)) {
+        try {
+            const wranglerContent = fs.readFileSync(wranglerPath, 'utf8');
+            const nameMatch = wranglerContent.match(/^name\s*=\s*"([^"]+)"/m);
+            if (nameMatch && nameMatch[1] && !projectConfig.name) {
+                projectConfig.name = nameMatch[1];
+            }
+            
+            const accountMatch = wranglerContent.match(/^account_id\s*=\s*"([^"]+)"/m);
+            if (accountMatch && accountMatch[1]) {
+                projectConfig.accountId = accountMatch[1];
+            } else if (process.env.CLOUDFLARE_ACCOUNT_ID) {
+                projectConfig.accountId = process.env.CLOUDFLARE_ACCOUNT_ID;
+            }
+        } catch (e) {
+            console.error('Warning: Could not parse wrangler.toml');
+        }
+    }
+
+    if (!projectConfig.accountId) {
+        try {
+            const { execSync } = await import('child_process');
+            const whoamiOutput = execSync('npx wrangler whoami', { stdio: 'pipe', encoding: 'utf8' });
+            const match = whoamiOutput.match(/Account ID[^\n]*?([a-f0-9]{32})/i);
+            if (match && match[1]) {
+                projectConfig.accountId = match[1];
+            }
+        } catch (e) {
+            // Ignore if whoami fails
+        }
+    }
+
+    // Save cleaned config back to .basebrick.config
+    fs.writeFileSync(localConfigPath, JSON.stringify(projectConfig, null, 2));
+
     console.log(`\nSending project configuration to ${managerConfig.url}...`);
 
     let endpoint = managerConfig.url;

package/history.md

@@ -1,5 +1,12 @@
 # Version History
 
+## 1.2.0 (May 2026)
+
+- **CLI Deployment Wrapper**: Introduced `bricklayer deploy` command using a pseudo-TTY to seamlessly wrap `wrangler deploy` across environments, automatically intercepting and capturing live Cloudflare URLs.
+- **Automated Config Sync**: The `bricklayer manage` tool now seamlessly parses Cloudflare `account_id` from `wrangler.toml` and syncs it with your central configuration.
+- **Manager Dashboard Upgrades**: Added real-time, silent dashboard polling and integrated direct Cloudflare Worker dashboard deep links for registered sites.
+- **Site Management**: Implemented site deletion functionality within the manager UI and securely moved the API Configuration Token into an isolated Settings page.
+
 ## 1.1.0 (May 2026)
 
 - **Interactive Scaffolding**: Added `bricklayer init` command to scaffold new projects via an interactive wizard, generating `.gitignore` and `.basebrick.config` automatically.

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "basebrick-bricklayer",
-  "version": "1.1.0",
+  "version": "1.2.2",
   "type": "module",
   "description": "BaseBrick static site generator (JamBrick)",
   "main": "index.js",
   "bin": {
-    "bricklayer": "./bin/bricklayer.js"
+    "bricklayer": "bin/bricklayer.js"
   },
   "keywords": [
     "jamstack",
@@ -21,4 +21,4 @@
     "gray-matter": "^4.0.3",
     "nunjucks": "^3.2.4"
   }
-}
+}