@marvalt/digivalt-core 0.1.3 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marvalt/digivalt-core",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Core glue logic and shared context for DigiVAlt frontend applications",
   "license": "GPL-3.0-or-later",
   "main": "dist/index.cjs",

package/template/scripts/deploy-secrets.js

@@ -52,10 +52,12 @@ fs.writeFileSync(tmpJsonPath, JSON.stringify(secrets, null, 2));
 try {
   console.log(`🚀 Uploading ${secretCount} secrets to Cloudflare Pages...`);
   
-  // Try to read the Cloudflare project name and account ID from wrangler.toml
+  // Extract Cloudflare Account ID directly from the parsed environment variables!
+  const accountId = secrets['CLOUDFLARE_ACCOUNT_ID'] || secrets['VITE_CLOUDFLARE_ACCOUNT_ID'] || '';
+  
+  // Try to read the Cloudflare project name from wrangler.toml
   const tomlPath = path.resolve(process.cwd(), 'wrangler.toml');
   let projectName = '';
-  let accountId = '';
   
   if (fs.existsSync(tomlPath)) {
     const tomlContent = fs.readFileSync(tomlPath, 'utf8');
@@ -64,10 +66,6 @@ try {
     const nameMatch = tomlContent.match(/^name\s*=\s*"([^"]+)"/m);
     if (nameMatch) projectName = nameMatch[1];
     
-    // Parse Account ID
-    const accountMatch = tomlContent.match(/^account_id\s*=\s*"([^"]+)"/m);
-    if (accountMatch) accountId = accountMatch[1];
-    
     if (projectName) console.log(`📦 Targeted Cloudflare Project: ${projectName}`);
     if (accountId) console.log(`🏢 Targeted Cloudflare Account: ${accountId}`);
   }
@@ -75,10 +73,14 @@ try {
   // Construct the command string tightly bound to the exact workspace
   let cmd = `npx wrangler pages secret bulk .tmp-cloudflare-secrets.json`;
   if (projectName) cmd += ` --project-name ${projectName}`;
-  if (accountId) cmd += ` --account-id ${accountId}`;
     
-  // Execute Wrangler natively
-  execSync(cmd, { stdio: 'inherit' });
+  // Execute Wrangler natively with the Account ID passed through the strict environment scope
+  const env = { ...process.env };
+  if (accountId) {
+    env.CLOUDFLARE_ACCOUNT_ID = accountId;
+  }
+  
+  execSync(cmd, { stdio: 'inherit', env });
   console.log("✅ All secrets deployed successfully to Cloudflare!");
   
 } catch (error) {