@varlock/cloudflare-integration 1.1.0 → 1.1.1

package/dist/index.d.ts

@@ -10,6 +10,10 @@ import { PluginConfig } from '@cloudflare/vite-plugin';
  * `@cloudflare/vite-plugin` (which doesn't support SvelteKit) and uses an
  * SSR-entry-based env loader.
  *
+ * **Important:** Do not use a `.dev.vars` file alongside this plugin — varlock
+ * handles env injection automatically. The plugin will throw an error if a
+ * `.dev.vars` file is detected in your project root or build output.
+ *
  * @example
  * ```ts
  * import { varlockCloudflareVitePlugin } from '@varlock/cloudflare-integration';

package/dist/index.js

@@ -1,4 +1,6 @@
-import path from 'path';
+import path2 from 'path';
+import { existsSync, readdirSync, writeFileSync, unlinkSync } from 'fs';
+import { execSync, spawn } from 'child_process';
 import { initVarlockEnv } from 'varlock/env';
 import { patchGlobalConsole } from 'varlock/patch-console';
 import { patchGlobalServerResponse } from 'varlock/patch-server-response';
@@ -7,7 +9,7 @@ import { createDebug } from 'varlock';
 import { execSyncVarlock, VarlockExecError } from 'varlock/exec-sync-varlock';
 import { cloudflare } from '@cloudflare/vite-plugin';
 
-// ../vite/dist/index.js
+// src/index.ts
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -34,7 +36,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var require_ast_matcher = __commonJS({
-  "../../../node_modules/.bun/ast-matcher@1.2.0/node_modules/ast-matcher/index.js"(exports$1, module) {
+  "../../../node_modules/.bun/ast-matcher@1.2.0/node_modules/ast-matcher/index.js"(exports, module) {
     var STOP = false;
     var SKIP_BRANCH = 1;
     var IGNORED_KEYS = ["start", "end", "loc", "location", "locations", "line", "column", "range", "ranges", "raw", "extra"];
@@ -1439,10 +1441,46 @@ function reloadConfig(cwd) {
   resetStaticReplacements();
 }
 reloadConfig();
+var VARLOCK_INIT_MODULE_ID = "\0varlock-ssr-init";
 function varlockVitePlugin(vitePluginOptions) {
+  function buildInitModuleCode() {
+    const ssrInjectMode = vitePluginOptions?.ssrInjectMode ?? "init-only";
+    const lines = [
+      "// Virtual module generated by @varlock/vite-integration",
+      "// Runs before any user code to ensure ENV is available at module top-level",
+      "globalThis.__varlockThrowOnMissingKeys = true;"
+    ];
+    if (ssrInjectMode === "auto-load") {
+      lines.push("import 'varlock/auto-load';");
+    } else {
+      if (ssrInjectMode === "resolved-env") {
+        lines.push(`globalThis.__varlockLoadedEnv = ${JSON.stringify(varlockLoadedEnv)};`);
+      }
+      if (vitePluginOptions?.ssrEntryCode?.length) {
+        lines.push(...vitePluginOptions.ssrEntryCode);
+      }
+      lines.push(
+        "import { initVarlockEnv } from 'varlock/env';",
+        "import { patchGlobalConsole } from 'varlock/patch-console';",
+        "import { patchGlobalResponse } from 'varlock/patch-response';"
+      );
+      lines.push(
+        "initVarlockEnv();",
+        "patchGlobalConsole();"
+      );
+      lines.push("patchGlobalResponse();");
+    }
+    return lines.join("\n");
+  }
   return {
     name: "inject-varlock-config",
     enforce: "post",
+    resolveId(id) {
+      if (id === VARLOCK_INIT_MODULE_ID) return id;
+    },
+    load(id) {
+      if (id === VARLOCK_INIT_MODULE_ID) return buildInitModuleCode();
+    },
     // hook to modify config before it is resolved
     async config(config, env) {
       debug("vite plugin - config fn called");
@@ -1461,8 +1499,8 @@ See https://varlock.dev/integrations/vite/ for more details.
 `);
       }
       isDevCommand = env.command === "serve";
-      const projectRoot = config.root ? path.resolve(config.root) : void 0;
-      const rootDiffersFromCwd = !!(projectRoot && path.relative(projectRoot, process.cwd()) !== "");
+      const projectRoot = config.root ? path2.resolve(config.root) : void 0;
+      const rootDiffersFromCwd = !!(projectRoot && path2.relative(projectRoot, process.cwd()) !== "");
       if (rootDiffersFromCwd) {
         reloadConfig(projectRoot);
       } else if (isFirstLoad) {
@@ -1496,7 +1534,7 @@ See https://varlock.dev/integrations/vite/ for more details.
       for (const varlockSource of varlockLoadedEnv.sources) {
         if (!varlockSource.enabled) continue;
         if (varlockLoadedEnv.basePath && varlockSource.path) {
-          config.configFileDependencies.push(path.resolve(varlockLoadedEnv.basePath, varlockSource.path));
+          config.configFileDependencies.push(path2.resolve(varlockLoadedEnv.basePath, varlockSource.path));
         }
       }
     },
@@ -1522,51 +1560,27 @@ See https://varlock.dev/integrations/vite/ for more details.
       const fileExt = id.split("?")[0].split("#")[0].split(".").pop() || "";
       let isEntry = false;
       if (SUPPORTED_FILES.includes(fileExt)) {
-        const moduleIds = Array.from(this.getModuleIds());
-        if (moduleIds[0] === id) isEntry = true;
+        try {
+          const moduleInfo = this.getModuleInfo(id);
+          if (moduleInfo?.isEntry) isEntry = true;
+        } catch {
+        }
+        if (!isEntry) {
+          const moduleIds = Array.from(this.getModuleIds());
+          if (moduleIds[0] === id) isEntry = true;
+        }
       }
       if (vitePluginOptions?.ssrEntryModuleIds?.includes(id)) isEntry = true;
       if (isEntry) {
         debug(`detected entry: ${id}`);
-        let isDevEnv = false;
-        if (this.environment) {
-          isDevEnv = this.environment.mode === "dev";
-        } else {
-          isDevEnv = isDevCommand;
-        }
-        const injectCode = [
-          "// INJECTED BY @varlock/vite-integration ----",
-          "globalThis.__varlockThrowOnMissingKeys = true;"
-        ];
+        const injectCode = ["// INJECTED BY @varlock/vite-integration ----"];
         if (options?.ssr) {
-          const ssrInjectMode = vitePluginOptions?.ssrInjectMode ?? "init-only";
-          debug("ssrInjectMode =", ssrInjectMode, "isDev =", isDevEnv);
-          if (ssrInjectMode === "auto-load") {
-            injectCode.push(
-              "import 'varlock/auto-load';"
-            );
-          } else {
-            if (ssrInjectMode === "resolved-env") {
-              injectCode.push(`globalThis.__varlockLoadedEnv = ${JSON.stringify(varlockLoadedEnv)};`);
-            }
-            if (vitePluginOptions?.ssrEntryCode?.length) {
-              injectCode.push(...vitePluginOptions.ssrEntryCode);
-            }
-            injectCode.push(
-              "import { initVarlockEnv } from 'varlock/env';",
-              "import { patchGlobalConsole } from 'varlock/patch-console';",
-              "import { patchGlobalResponse } from 'varlock/patch-response';"
-            );
-            injectCode.push(
-              "initVarlockEnv();",
-              "patchGlobalConsole();"
-            );
-            injectCode.push("patchGlobalResponse();");
-          }
+          injectCode.push(`import '${VARLOCK_INIT_MODULE_ID}';`);
         } else {
+          injectCode.push("globalThis.__varlockThrowOnMissingKeys = true;");
+          const isDevEnv = this.environment ? this.environment.mode === "dev" : isDevCommand;
           if (isDevEnv) {
             injectCode.push(
-              "// NOTE - __varlockValidKeys is only injected during development",
               `globalThis.__varlockValidKeys = ${JSON.stringify(Object.keys(varlockLoadedEnv?.config || {}))};`
             );
           }
@@ -1656,7 +1670,101 @@ if (typeof navigator !== 'undefined' && navigator.userAgent === 'Cloudflare-Work
 `;
 
 // src/index.ts
+var isWindows = process.platform === "win32";
 var CLOUDFLARE_PLUGIN_NAME = "vite-plugin-cloudflare";
+var CF_SECRET_MAX_BYTES = 5120;
+function findDevVarsPath(root) {
+  const distDir = path2.resolve(root, "dist");
+  if (!existsSync(distDir)) return void 0;
+  for (const entry of readdirSync(distDir, { withFileTypes: true })) {
+    if (!entry.isDirectory()) continue;
+    const wranglerPath = path2.join(distDir, entry.name, "wrangler.json");
+    if (existsSync(wranglerPath)) {
+      return path2.join(distDir, entry.name, ".dev.vars");
+    }
+  }
+  return void 0;
+}
+function cleanupFile(filePath) {
+  try {
+    unlinkSync(filePath);
+  } catch {
+  }
+}
+function chunkString(str, maxBytes) {
+  const chunks = [];
+  let current = "";
+  let currentBytes = 0;
+  for (const char of str) {
+    const charBytes = Buffer.byteLength(char);
+    if (currentBytes + charBytes > maxBytes && current) {
+      chunks.push(current);
+      current = "";
+      currentBytes = 0;
+    }
+    current += char;
+    currentBytes += charBytes;
+  }
+  if (current) chunks.push(current);
+  return chunks;
+}
+function formatEnvLine(key, value) {
+  if (!value.includes("'")) {
+    return `${key}='${value}'`;
+  }
+  const escaped = value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n");
+  return `${key}="${escaped}"`;
+}
+function formatDevVarsContent(graph, serializedGraph) {
+  const lines = [];
+  for (const key in graph.config) {
+    const item = graph.config[key];
+    if (item.value === void 0) continue;
+    const strValue = typeof item.value === "string" ? item.value : JSON.stringify(item.value);
+    lines.push(formatEnvLine(key, strValue));
+  }
+  if (Buffer.byteLength(serializedGraph) <= CF_SECRET_MAX_BYTES) {
+    lines.push(formatEnvLine("__VARLOCK_ENV", serializedGraph));
+  } else {
+    const chunks = chunkString(serializedGraph, CF_SECRET_MAX_BYTES);
+    lines.push(formatEnvLine("__VARLOCK_ENV_CHUNKS", String(chunks.length)));
+    for (let i = 0; i < chunks.length; i++) {
+      lines.push(formatEnvLine(`__VARLOCK_ENV_${i}`, chunks[i]));
+    }
+  }
+  return lines.join("\n");
+}
+function serveFifoOrFile(filePath, content) {
+  let fifoProcess;
+  if (isWindows) {
+    writeFileSync(filePath, content);
+  } else {
+    execSync(`mkfifo -m 0600 "${filePath}"`);
+    const encoded = Buffer.from(content).toString("base64");
+    const parentPid = process.pid;
+    fifoProcess = spawn(process.execPath, [
+      "-e",
+      `
+      const fs = require('fs');
+      const content = Buffer.from('${encoded}', 'base64').toString();
+      // Exit if the parent process dies (orphan protection).
+      setInterval(() => {
+        try { process.kill(${parentPid}, 0); }
+        catch { process.exit(); }
+      }, 2000);
+      (function serve() {
+        try { fs.writeFileSync(${JSON.stringify(filePath)}, content); setImmediate(serve); }
+        catch { process.exit(); }
+      })();
+    `
+    ], { stdio: ["ignore", "ignore", "ignore"] });
+  }
+  return {
+    stop() {
+      fifoProcess?.kill();
+    }
+  };
+}
 function varlockCloudflareVitePlugin(cloudflareOptions) {
   const conflictGuard = {
     name: "varlock-cloudflare-conflict-guard",
@@ -1675,8 +1783,15 @@ function varlockCloudflareVitePlugin(cloudflareOptions) {
   const modeDetector = {
     name: "varlock-cloudflare-mode",
     enforce: "pre",
-    config(_config, env) {
+    config(config, env) {
       isDevMode = env.command === "serve";
+      const root = config.root ? path2.resolve(config.root) : process.cwd();
+      const devVarsPath = path2.resolve(root, ".dev.vars");
+      if (existsSync(devVarsPath)) {
+        throw new Error(
+          "[varlock] A .dev.vars file was found in your project root, which conflicts with varlock's env management.\nRemove the .dev.vars file \u2014 varlock handles env injection automatically."
+        );
+      }
     }
   };
   const userConfig = cloudflareOptions?.config;
@@ -1719,9 +1834,44 @@ function varlockCloudflareVitePlugin(cloudflareOptions) {
     ...cloudflareOptions,
     config: mergedConfig
   });
+  let resolvedRoot = "";
+  const previewEnvInjector = {
+    name: "varlock-cloudflare-preview-env",
+    configResolved(config) {
+      resolvedRoot = config.root;
+    },
+    configurePreviewServer(server) {
+      if (!resolvedRoot) return;
+      const devVarsPath = findDevVarsPath(resolvedRoot);
+      if (!devVarsPath) return;
+      if (existsSync(devVarsPath)) {
+        throw new Error(
+          "[varlock] A .dev.vars file was found in the build output, which conflicts with varlock's env management.\nRemove your project-root .dev.vars file \u2014 varlock handles env injection automatically."
+        );
+      }
+      const serializedGraph = process.env.__VARLOCK_ENV;
+      if (!serializedGraph || !varlockLoadedEnv) return;
+      const content = formatDevVarsContent(varlockLoadedEnv, serializedGraph);
+      const fifo = serveFifoOrFile(devVarsPath, content);
+      const origClose = server.close.bind(server);
+      server.close = async () => {
+        fifo.stop();
+        cleanupFile(devVarsPath);
+        return origClose();
+      };
+      const onExit = () => {
+        fifo.stop();
+        cleanupFile(devVarsPath);
+      };
+      process.on("exit", onExit);
+      process.on("SIGINT", onExit);
+      process.on("SIGTERM", onExit);
+    }
+  };
   return [
     conflictGuard,
     modeDetector,
+    previewEnvInjector,
     varlockPlugin,
     // cloudflare() may return a single plugin or an array
     ...Array.isArray(cloudflarePlugin) ? cloudflarePlugin : [cloudflarePlugin]