@varlock/cloudflare-integration 1.0.0 → 1.1.0

package/dist/index.js

@@ -4,7 +4,7 @@ import { patchGlobalConsole } from 'varlock/patch-console';
 import { patchGlobalServerResponse } from 'varlock/patch-server-response';
 import { patchGlobalResponse } from 'varlock/patch-response';
 import { createDebug } from 'varlock';
-import { execSyncVarlock } from 'varlock/exec-sync-varlock';
+import { execSyncVarlock, VarlockExecError } from 'varlock/exec-sync-varlock';
 import { cloudflare } from '@cloudflare/vite-plugin';
 
 // ../vite/dist/index.js
@@ -1410,23 +1410,24 @@ var loadCount = 0;
 function reloadConfig(cwd) {
   debug("loading config - count =", ++loadCount, cwd ? `(cwd: ${cwd})` : "");
   try {
-    const execResult = execSyncVarlock("load --format json-full --compact", {
+    const { stdout } = execSyncVarlock("load --format json-full --compact", {
+      fullResult: true,
       env: originalProcessEnv,
       ...cwd && { cwd }
     });
-    process.env.__VARLOCK_ENV = execResult;
-    varlockLoadedEnv = JSON.parse(process.env.__VARLOCK_ENV);
+    process.env.__VARLOCK_ENV = stdout;
+    varlockLoadedEnv = JSON.parse(stdout);
     configIsValid = true;
   } catch (err) {
-    const errAny = err;
-    const stdout = errAny?.stdout?.toString();
-    if (stdout) {
-      try {
-        varlockLoadedEnv = JSON.parse(stdout);
-      } catch {
+    if (err instanceof VarlockExecError) {
+      if (err.stdout) {
+        try {
+          varlockLoadedEnv = JSON.parse(err.stdout);
+        } catch {
+        }
       }
+      if (err.stderr) console.error(err.stderr);
     }
-    if (errAny?.stderr) console.error(errAny.stderr.toString());
     configIsValid = false;
     resetStaticReplacements();
     return;
@@ -1687,7 +1688,7 @@ function varlockCloudflareVitePlugin(cloudflareOptions) {
       userResult = userConfig;
     }
     if (!isDevMode) return userResult;
-    const serializedGraph = execSyncVarlock("load --format json-full --compact");
+    const { stdout: serializedGraph } = execSyncVarlock("load --format json-full --compact", { fullResult: true });
     let graph;
     try {
       graph = JSON.parse(serializedGraph);