@marvalt/digivalt-core 0.1.4 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marvalt/digivalt-core",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "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

@@ -10,39 +10,42 @@ import { execSync } from 'child_process';
  * using Wrangler bulk secret injection.
  */
 
-const envPath = path.resolve(process.cwd(), '.env.local');
-
-if (!fs.existsSync(envPath)) {
-  console.error("❌ No .env.local file found in the root directory!");
-  console.log("👉 Please create a .env.local file with your production secrets.");
-  process.exit(1);
-}
-
-console.log("🔍 Parsing .env.local secrets...");
-const rawEnv = fs.readFileSync(envPath, 'utf8');
 const secrets = {};
 
-rawEnv.split('\n').forEach(line => {
-  const trimmed = line.trim();
-  // Ignore comments and empty lines
-  if (!trimmed || trimmed.startsWith('#')) return;
+const parseEnvFile = (filePath) => {
+  if (!fs.existsSync(filePath)) return;
   
-  const match = trimmed.match(/^([^=]+)=(.*)$/);
-  if (match) {
-    const key = match[1].trim();
-    let value = match[2].trim();
-    
-    // Strip surrounding quotes if present
-    if (value.startsWith('"') && value.endsWith('"')) value = value.slice(1, -1);
-    if (value.startsWith("'") && value.endsWith("'")) value = value.slice(1, -1);
+  console.log(`🔍 Parsing ${path.basename(filePath)} secrets...`);
+  const rawEnv = fs.readFileSync(filePath, 'utf8');
+  
+  rawEnv.split('\n').forEach(line => {
+    const trimmed = line.trim();
+    // Ignore comments and empty lines
+    if (!trimmed || trimmed.startsWith('#')) return;
     
-    secrets[key] = value;
-  }
-});
+    const match = trimmed.match(/^([^=]+)=(.*)$/);
+    if (match) {
+      const key = match[1].trim();
+      let value = match[2].trim();
+      
+      // Strip surrounding quotes if present
+      if (value.startsWith('"') && value.endsWith('"')) value = value.slice(1, -1);
+      if (value.startsWith("'") && value.endsWith("'")) value = value.slice(1, -1);
+      
+      secrets[key] = value;
+    }
+  });
+};
+
+const defaultEnvPath = path.resolve(process.cwd(), '.env');
+const localEnvPath = path.resolve(process.cwd(), '.env.local');
+
+parseEnvFile(defaultEnvPath);
+parseEnvFile(localEnvPath);
 
 const secretCount = Object.keys(secrets).length;
 if (secretCount === 0) {
-  console.log("⚠️ No valid SECRETS found in .env.local. Exiting.");
+  console.log("⚠️ No valid SECRETS found in .env or .env.local. Exiting.");
   process.exit(0);
 }
 
@@ -73,10 +76,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) {