@server/next 0.20.24 → 0.20.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@server/next",
-  "version": "0.20.24",
+  "version": "0.20.26",
   "description": "An experimental reimplementation of server.js focused on the DX",
   "homepage": "https://node-server.com/",
   "repository": "https://github.com/franciscop/server-next.git",

package/src/helpers/handleRequest.js

@@ -12,11 +12,12 @@ export default async function handleRequest(handlers, ctx) {
     define(ctx.url, "params", () => match);
 
     for (let cb of cbs) {
-      validate(ctx, cb);
       if (typeof cb === "function") {
         const res = await cb(ctx);
         const out = await parseResponse(res, ctx);
         if (out) return out;
+      } else {
+        validate(ctx, cb);
       }
     }
 

package/src/helpers/validate.js

@@ -1,6 +1,6 @@
 import StatusError from "./StatusError.js";
 
-export default function (ctx, schema) {
+export default function validate(ctx, schema) {
   if (!schema || typeof schema !== "object") return;
 
   let base;
@@ -22,7 +22,7 @@ export default function (ctx, schema) {
       schema.query.parse(ctx.url.query || {});
     }
   } catch (error) {
-    if (error.constructor.name === "ZodError") {
+    if (error.name === "ZodError" || error.constructor.name === "ZodError") {
       const message = error.issues
         .map(({ path, message }) => `[${base}.${path.join(".")}]: ${message}`)
         .sort()

package/src/index.js

@@ -174,11 +174,8 @@ export default function server(options = {}) {
       options = validateOptions(options, Netlify.env.toObject());
       const ctx = await createWinterContext(request, options, this);
       extendWithDefaults(ctx);
-      const out = await handleRequest(this.handlers, ctx);
-      console.log(out);
-      return out;
+      return await handleRequest(this.handlers, ctx);
     } catch (error) {
-      console.error(error);
       return new Response(error.message, { status: error.status || 500 });
     }
   };

package/src/polyfill.js

@@ -4,3 +4,14 @@ if (typeof Response === "undefined") {
     return { body, ...other };
   };
 }
+
+// Polyfill Netlify's environment variables
+if (typeof Netlify !== "undefined") {
+  if (!global.process) {
+    global.process = {};
+  }
+  if (!global.process.env) {
+    global.process.env = {};
+  }
+  Object.assign(global.process.env, Netlify.env.toObject());
+}