@varlock/cloudflare-integration 0.0.1 → 0.1.0

package/README.md

@@ -4,7 +4,7 @@ This package helps you integrate [varlock](https://varlock.dev) into a [Cloudfla
 
 It provides:
 
-- a Vite plugin (`varlockCloudflareVitePlugin`) that wraps `@cloudflare/vite-plugin` with automatic env var injection into miniflare bindings and Cloudflare's secret bindings at runtime
+- a Vite plugin (`varlockCloudflareVitePlugin`) that wraps `@cloudflare/vite-plugin` with automatic env var injection into miniflare bindings and Cloudflare's secret bindings at runtime, and auto-detects SvelteKit (projects using `@sveltejs/adapter-cloudflare`) to apply the right injection strategy without extra config
 - a `varlock-wrangler` CLI binary — a drop-in replacement for `wrangler` that injects env via named pipe in dev, uploads vars/secrets on deploy, and generates correct types
 - a standalone init module (`@varlock/cloudflare-integration/init`) for non-Vite workers
 - validation of your env vars against your `.env.schema`

package/dist/index.d.ts

@@ -1,8 +1,14 @@
 import { PluginConfig } from '@cloudflare/vite-plugin';
 
 /**
- * Varlock Cloudflare Vite plugin — wraps the Cloudflare Workers Vite plugin
- * with automatic env var injection.
+ * Varlock Cloudflare Vite plugin — wraps `@cloudflare/vite-plugin` with
+ * automatic env var injection.
+ *
+ * For SvelteKit projects deploying via `@sveltejs/adapter-cloudflare`, use
+ * `varlockSvelteKitCloudflarePlugin` from
+ * `@varlock/cloudflare-integration/sveltekit` instead — it skips
+ * `@cloudflare/vite-plugin` (which doesn't support SvelteKit) and uses an
+ * SSR-entry-based env loader.
  *
  * @example
  * ```ts

package/dist/index.js

@@ -1407,18 +1407,29 @@ function resetStaticReplacements() {
   });
 }
 var loadCount = 0;
-function reloadConfig() {
-  debug("loading config - count =", ++loadCount);
+function reloadConfig(cwd) {
+  debug("loading config - count =", ++loadCount, cwd ? `(cwd: ${cwd})` : "");
   try {
-    const execResult = execSyncVarlock("load --format json-full", {
+    const execResult = execSyncVarlock("load --format json-full --compact", {
       env: originalProcessEnv,
-      showLogsOnError: true
+      ...cwd && { cwd }
     });
     process.env.__VARLOCK_ENV = execResult;
     varlockLoadedEnv = JSON.parse(process.env.__VARLOCK_ENV);
     configIsValid = true;
   } catch (err) {
+    const errAny = err;
+    const stdout = errAny?.stdout?.toString();
+    if (stdout) {
+      try {
+        varlockLoadedEnv = JSON.parse(stdout);
+      } catch {
+      }
+    }
+    if (errAny?.stderr) console.error(errAny.stderr.toString());
     configIsValid = false;
+    resetStaticReplacements();
+    return;
   }
   initVarlockEnv();
   patchGlobalConsole();
@@ -1449,7 +1460,11 @@ See https://varlock.dev/integrations/vite/ for more details.
 `);
       }
       isDevCommand = env.command === "serve";
-      if (isFirstLoad) {
+      const projectRoot = config.root ? path.resolve(config.root) : void 0;
+      const rootDiffersFromCwd = !!(projectRoot && path.relative(projectRoot, process.cwd()) !== "");
+      if (rootDiffersFromCwd) {
+        reloadConfig(projectRoot);
+      } else if (isFirstLoad) {
         isFirstLoad = false;
       } else if (isDevCommand) {
         reloadConfig();
@@ -1459,6 +1474,16 @@ See https://varlock.dev/integrations/vite/ for more details.
           config.clearScreen = false;
         } else {
           console.log("\u{1F4A5} Varlock config validation failed \u{1F4A5}");
+          if (varlockLoadedEnv?.errors?.root) {
+            for (const msg of varlockLoadedEnv.errors.root) {
+              console.log(`  - ${msg}`);
+            }
+          }
+          if (varlockLoadedEnv?.errors?.configItems) {
+            for (const [key, msg] of Object.entries(varlockLoadedEnv.errors.configItems)) {
+              console.log(`  - ${key}: ${msg}`);
+            }
+          }
           process.exit(1);
         }
       }
@@ -1466,6 +1491,7 @@ See https://varlock.dev/integrations/vite/ for more details.
     // hook to observe/modify config after it is resolved
     configResolved(config) {
       debug("vite plugin - configResolved fn called");
+      if (!varlockLoadedEnv) return;
       for (const varlockSource of varlockLoadedEnv.sources) {
         if (!varlockSource.enabled) continue;
         if (varlockLoadedEnv.basePath && varlockSource.path) {
@@ -1597,7 +1623,53 @@ See https://varlock.dev/integrations/vite/ for more details.
     }
   };
 }
+
+// src/shared-ssr-entry-code.ts
+var CLOUDFLARE_SSR_ENTRY_CODE = `
+if (typeof navigator !== 'undefined' && navigator.userAgent === 'Cloudflare-Workers') {
+  const { env: __cfEnv } = await import('cloudflare:workers');
+  let __varlockEnvJson;
+  if (__cfEnv?.__VARLOCK_ENV) {
+    __varlockEnvJson = __cfEnv.__VARLOCK_ENV;
+  } else if (__cfEnv?.__VARLOCK_ENV_CHUNKS) {
+    const n = parseInt(__cfEnv.__VARLOCK_ENV_CHUNKS, 10);
+    if (!Number.isFinite(n) || n < 1 || n > 1000) {
+      throw new Error("[varlock] invalid __VARLOCK_ENV_CHUNKS: " + __cfEnv.__VARLOCK_ENV_CHUNKS);
+    }
+    const parts = [];
+    for (let i = 0; i < n; i++) {
+      const chunk = __cfEnv["__VARLOCK_ENV_" + i];
+      if (chunk == null) throw new Error("[varlock] missing chunk __VARLOCK_ENV_" + i);
+      parts.push(chunk);
+    }
+    __varlockEnvJson = parts.join("");
+  }
+  if (__varlockEnvJson) {
+    try {
+      globalThis.__varlockLoadedEnv = JSON.parse(__varlockEnvJson);
+    } catch (e) {
+      throw new Error("[varlock] failed to parse __VARLOCK_ENV: " + e.message);
+    }
+  }
+}
+`;
+
+// src/index.ts
+var CLOUDFLARE_PLUGIN_NAME = "vite-plugin-cloudflare";
 function varlockCloudflareVitePlugin(cloudflareOptions) {
+  const conflictGuard = {
+    name: "varlock-cloudflare-conflict-guard",
+    configResolved(config) {
+      const cfPluginCount = config.plugins.filter(
+        (p) => typeof p?.name === "string" && p.name === CLOUDFLARE_PLUGIN_NAME
+      ).length;
+      if (cfPluginCount > 1) {
+        throw new Error(
+          "[varlock] `@cloudflare/vite-plugin` is already present in your Vite plugins. Remove it \u2014 `varlockCloudflareVitePlugin` injects (and configures) it for you."
+        );
+      }
+    }
+  };
   let isDevMode = false;
   const modeDetector = {
     name: "varlock-cloudflare-mode",
@@ -1640,45 +1712,14 @@ function varlockCloudflareVitePlugin(cloudflareOptions) {
   };
   const varlockPlugin = varlockVitePlugin({
     ssrEntryModuleIds: ["\0virtual:cloudflare/worker-entry"],
-    ssrEntryCode: [
-      // read the resolved env from Cloudflare's secret bindings at runtime
-      // the __VARLOCK_ENV secret is uploaded via `varlock-wrangler deploy`
-      // it may be a single binding or split into chunks if >5KB
-      `
-import { env as __cfEnv } from 'cloudflare:workers';
-{
-  let __varlockEnvJson;
-  if (__cfEnv?.__VARLOCK_ENV) {
-    __varlockEnvJson = __cfEnv.__VARLOCK_ENV;
-  } else if (__cfEnv?.__VARLOCK_ENV_CHUNKS) {
-    const n = parseInt(__cfEnv.__VARLOCK_ENV_CHUNKS, 10);
-    if (!Number.isFinite(n) || n < 1 || n > 1000) {
-      throw new Error("[varlock] invalid __VARLOCK_ENV_CHUNKS: " + __cfEnv.__VARLOCK_ENV_CHUNKS);
-    }
-    const parts = [];
-    for (let i = 0; i < n; i++) {
-      const chunk = __cfEnv["__VARLOCK_ENV_" + i];
-      if (chunk == null) throw new Error("[varlock] missing chunk __VARLOCK_ENV_" + i);
-      parts.push(chunk);
-    }
-    __varlockEnvJson = parts.join("");
-  }
-  if (__varlockEnvJson) {
-    try {
-      globalThis.__varlockLoadedEnv = JSON.parse(__varlockEnvJson);
-    } catch (e) {
-      throw new Error("[varlock] failed to parse __VARLOCK_ENV: " + e.message);
-    }
-  }
-}
-`
-    ]
+    ssrEntryCode: [CLOUDFLARE_SSR_ENTRY_CODE]
   });
   const cloudflarePlugin = cloudflare({
     ...cloudflareOptions,
     config: mergedConfig
   });
   return [
+    conflictGuard,
     modeDetector,
     varlockPlugin,
     // cloudflare() may return a single plugin or an array