@varlock/cloudflare-integration 1.0.0 → 1.1.1

package/dist/sveltekit.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';
 
 // ../vite/dist/index.js
 var __create = Object.create;
@@ -33,7 +33,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"];
@@ -1409,23 +1409,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;
@@ -1437,10 +1438,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");
@@ -1520,51 +1557,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 || {}))};`
             );
           }