npm - @varlock/cloudflare-integration - Versions diffs - 1.1.2 → 1.1.3 - Mend

@varlock/cloudflare-integration 1.1.2 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/dist/index.js +145 -50
package/dist/index.js.map +1 -1
package/dist/sveltekit.js +119 -42
package/dist/sveltekit.js.map +1 -1
package/dist/varlock-wrangler.js +47 -10
package/dist/varlock-wrangler.js.map +1 -1
package/package.json +4 -4

package/dist/index.js CHANGED Viewed

@@ -1384,14 +1384,105 @@ function createReplacerTransformFn(opts) {
     return magicString;
   };
 }
+var ANSI_COLORS = {
+  30: "#45475a",
+  31: "#f38ba8",
+  32: "#a6e3a1",
+  33: "#f9e2af",
+  34: "#89b4fa",
+  35: "#f5c2e7",
+  36: "#94e2d5",
+  37: "#cdd6f4",
+  90: "#585b70",
+  91: "#f38ba8",
+  92: "#a6e3a1",
+  93: "#f9e2af",
+  94: "#89b4fa",
+  95: "#f5c2e7",
+  96: "#94e2d5",
+  97: "#cdd6f4"
+};
+var ANSI_RE = new RegExp(`${String.fromCharCode(27)}\\[([0-9;]*)m`, "g");
+function ansiToHtml(str) {
+  let bold = false;
+  let dim = false;
+  let italic = false;
+  let underline = false;
+  let strikethrough = false;
+  let color;
+  let isOpen = false;
+  function buildSpan() {
+    const styles = [];
+    if (bold) styles.push("font-weight:bold");
+    if (dim) styles.push("opacity:0.6");
+    if (italic) styles.push("font-style:italic");
+    if (underline) styles.push("text-decoration:underline");
+    if (strikethrough) styles.push("text-decoration:line-through");
+    if (color) styles.push(`color:${color}`);
+    if (!styles.length) return "";
+    isOpen = true;
+    return `<span style="${styles.join(";")}">`;
+  }
+  function closeIfOpen() {
+    if (!isOpen) return "";
+    isOpen = false;
+    return "</span>";
+  }
+  let html = str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+  html = html.replace(ANSI_RE, (_, codes) => {
+    const parts = codes.split(";").filter(Boolean).map(Number);
+    if (parts.length === 0 || parts.includes(0)) {
+      bold = false;
+      dim = false;
+      italic = false;
+      underline = false;
+      strikethrough = false;
+      color = void 0;
+      return closeIfOpen();
+    }
+    const close = closeIfOpen();
+    for (const code of parts) {
+      if (code === 1) bold = true;
+      else if (code === 2) dim = true;
+      else if (code === 3) italic = true;
+      else if (code === 4) underline = true;
+      else if (code === 9) strikethrough = true;
+      else if (code === 22) {
+        bold = false;
+        dim = false;
+      } else if (code === 23) italic = false;
+      else if (code === 24) underline = false;
+      else if (code === 29) strikethrough = false;
+      else if (code === 39) color = void 0;
+      else if (ANSI_COLORS[code]) color = ANSI_COLORS[code];
+    }
+    return close + buildSpan();
+  });
+  html += closeIfOpen();
+  return html;
+}
+function buildErrorPageHtml(ansiError) {
+  const errorContent = ansiError ? ansiToHtml(ansiError) : "Config is invalid \u2014 check your terminal for details.";
+  return `<!DOCTYPE html>
+<html><head><title>varlock - config error</title></head>
+<body style="font-family: monospace; background: #1e1e2e; color: #cdd6f4; margin: 0; padding: 2rem;">
+<div style="margin-bottom: 1.5rem;">
+  <h2 style="color: #f38ba8; margin: 0 0 0.5rem 0;">\u{1F512} Varlock \u2014 env config validation failed</h2>
+  <p style="color: #6c7086; margin: 0;">Your environment variables are loaded and validated by <a href="https://varlock.dev" style="color: #89b4fa;">varlock</a>. Fix the error(s) below and save to reload.</p>
+</div>
+<pre style="white-space: pre-wrap; word-wrap: break-word; line-height: 1.5; background: #181825; padding: 1rem; border-radius: 8px;">${errorContent}</pre>
+</body></html>`;
+}
 globalThis.__varlockThrowOnMissingKeys = true;
 var originalProcessEnv = { ...process.env };
 var debug = createDebug("varlock:vite-integration");
-var isFirstLoad = !process.__VARLOCK_ENV;
-debug("varlock vite plugin loaded. first load = ", isFirstLoad);
+debug("varlock vite plugin loaded");
 var isDevCommand;
 var configIsValid = true;
 var varlockLoadedEnv;
+var varlockLastError;
+var lastErrorAt = 0;
+var configHookCalled = false;
 var staticReplacements = {};
 var replacerFn;
 function resetStaticReplacements() {
@@ -1419,16 +1510,28 @@ function reloadConfig(cwd) {
     });
     process.env.__VARLOCK_ENV = stdout;
     varlockLoadedEnv = JSON.parse(stdout);
+    varlockLastError = void 0;
+    lastErrorAt = 0;
     configIsValid = true;
   } catch (err) {
     if (err instanceof VarlockExecError) {
       if (err.stdout) {
         try {
           varlockLoadedEnv = JSON.parse(err.stdout);
+          process.env.__VARLOCK_ENV = err.stdout;
         } catch {
         }
       }
-      if (err.stderr) console.error(err.stderr);
+      if (err.stderr) {
+        const now = Date.now();
+        const isDuplicate = err.stderr === varlockLastError && now - lastErrorAt < 5e3;
+        varlockLastError = err.stderr;
+        lastErrorAt = now;
+        if (!isDuplicate) {
+          console.error(err.stderr);
+          console.error("\n[varlock] \u26A0\uFE0F config is invalid \u2014 fix the error(s) above to continue\n");
+        }
+      }
     }
     configIsValid = false;
     resetStaticReplacements();
@@ -1483,7 +1586,7 @@ function varlockVitePlugin(vitePluginOptions) {
     },
     // hook to modify config before it is resolved
     async config(config, env) {
-      debug("vite plugin - config fn called");
+      debug("vite plugin - config fn called, loadCount =", loadCount, "command =", env.command);
       if (config.envDir) {
         console.warn(`
 [varlock] \u26A0\uFE0F  The \`envDir\` Vite option is not supported by varlock.
@@ -1503,8 +1606,8 @@ See https://varlock.dev/integrations/vite/ for more details.
       const rootDiffersFromCwd = !!(projectRoot && path2.relative(projectRoot, process.cwd()) !== "");
       if (rootDiffersFromCwd) {
         reloadConfig(projectRoot);
-      } else if (isFirstLoad) {
-        isFirstLoad = false;
+      } else if (!configHookCalled) {
+        configHookCalled = true;
       } else if (isDevCommand) {
         reloadConfig();
       }
@@ -1512,17 +1615,7 @@ See https://varlock.dev/integrations/vite/ for more details.
         if (isDevCommand) {
           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}`);
-            }
-          }
+          console.error("\n[varlock] config is invalid \u2014 cannot proceed with build\n");
           process.exit(1);
         }
       }
@@ -1541,19 +1634,13 @@ See https://varlock.dev/integrations/vite/ for more details.
     // hook to configure vite dev server
     async configureServer(server) {
       debug("vite plugin - configureServer fn called");
-      if (!configIsValid) {
-        server.middlewares.use((req, res, next) => {
-          server.hot.send({
-            type: "error",
-            err: {
-              plugin: "varlock",
-              message: "Your config is currently invalid - check your terminal for more details",
-              stack: ""
-            }
-          });
-          return next();
-        });
-      }
+      server.middlewares.use((req, res, next) => {
+        if (configIsValid) return next();
+        if (req.url?.startsWith("/@")) return next();
+        res.statusCode = 500;
+        res.setHeader("Content-Type", "text/html; charset=utf-8");
+        res.end(buildErrorPageHtml(varlockLastError));
+      });
     },
     transform(code, id, options) {
       let magicString = replacerFn(this, code, id);
@@ -1607,19 +1694,9 @@ See https://varlock.dev/integrations/vite/ for more details.
     // this enables replacing %ENV.xxx% constants in html entry-point files
     // see https://vite.dev/guide/env-and-mode.html#html-constant-replacement
     transformIndexHtml(html) {
+      debug("transformIndexHtml called, configIsValid =", configIsValid);
       if (!configIsValid) {
-        return `
-<html>
-<head>
-  <script type="module" src="/@vite/client"></script>
-  <title>Invalid config</title>
-</head>
-<body>
-  <h2>Your varlock config is currently invalid!</h2>
-  <p>Check your terminal for more details</p>
-</body>
-</html>
-        `;
+        return buildErrorPageHtml(varlockLastError);
       }
       const replacedHtml = html.replace(
         // look for "%ENV.xxx%"
@@ -1803,16 +1880,20 @@ function varlockCloudflareVitePlugin(cloudflareOptions) {
       userResult = userConfig;
     }
     if (!isDevMode) return userResult;
-    const { stdout: serializedGraph } = execSyncVarlock("load --format json-full --compact", { fullResult: true });
-    let graph;
-    try {
-      graph = JSON.parse(serializedGraph);
-    } catch (err) {
-      throw new Error(`[varlock] failed to parse config graph: ${err.message}`);
+    const serializedGraph = process.env.__VARLOCK_ENV;
+    if (!varlockLoadedEnv || !serializedGraph || varlockLoadedEnv.errors) {
+      return {
+        ...userResult,
+        vars: {
+          ...cfg.vars,
+          ...userResult?.vars,
+          ...serializedGraph && { __VARLOCK_ENV: serializedGraph }
+        }
+      };
     }
     const vars = {};
-    for (const key in graph.config) {
-      const { value } = graph.config[key];
+    for (const key in varlockLoadedEnv.config) {
+      const { value } = varlockLoadedEnv.config[key];
       if (value === void 0) continue;
       vars[key] = typeof value === "string" ? value : JSON.stringify(value);
     }
@@ -1826,6 +1907,19 @@ function varlockCloudflareVitePlugin(cloudflareOptions) {
       }
     };
   };
+  const errorPagePlugin = {
+    name: "varlock-cloudflare-error-page",
+    configureServer(server) {
+      return () => {
+        server.middlewares.use((req, res, next) => {
+          if (!varlockLoadedEnv?.errors) return next();
+          res.statusCode = 500;
+          res.setHeader("Content-Type", "text/html; charset=utf-8");
+          res.end(buildErrorPageHtml(varlockLastError));
+        });
+      };
+    }
+  };
   const varlockPlugin = varlockVitePlugin({
     ssrEntryModuleIds: ["\0virtual:cloudflare/worker-entry"],
     ssrEntryCode: [CLOUDFLARE_SSR_ENTRY_CODE]
@@ -1872,6 +1966,7 @@ function varlockCloudflareVitePlugin(cloudflareOptions) {
     conflictGuard,
     modeDetector,
     previewEnvInjector,
+    errorPagePlugin,
     varlockPlugin,
     // cloudflare() may return a single plugin or an array
     ...Array.isArray(cloudflarePlugin) ? cloudflarePlugin : [cloudflarePlugin]