basebrick-bricklayer 1.2.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

package/bin/init.js

@@ -234,8 +234,9 @@ 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) {}
     }
 

package/bin/manage.js

@@ -129,12 +129,27 @@ export async function manageProject(cwd, options = {}) {
             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));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "basebrick-bricklayer",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "type": "module",
   "description": "BaseBrick static site generator (JamBrick)",
   "main": "index.js",