eddev 0.3.33 → 0.3.35-alpha-1

package/gravityforms/types.d.ts

@@ -17,6 +17,7 @@ export declare type GravityFormData = {
     fields: GravityFormsField[];
     title: string;
     description?: string;
+    revisionId: number;
     button: {
         text: string;
     };

package/gravityforms/useGravityForm.js

@@ -185,7 +185,7 @@ function useGravityForm(opts) {
 }
 exports.useGravityForm = useGravityForm;
 function prepareValuesPayload(form, state, data) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     var _loop_1 = function (field) {
         var value = state.values[field.id];
         var key = "input_" + field.id;
@@ -198,22 +198,22 @@ function prepareValuesPayload(form, state, data) {
             data.append("".concat(key, "_1"), value ? "1" : "");
             data.append("".concat(key, ".1"), value ? "1" : "");
             data.append("".concat(key, ".2"), (_b = (_a = field === null || field === void 0 ? void 0 : field.consentText) !== null && _a !== void 0 ? _a : field === null || field === void 0 ? void 0 : field.checkboxLabel) !== null && _b !== void 0 ? _b : "");
-            data.append("".concat(key, ".3"), field.formId);
+            data.append("".concat(key, ".3"), String((_c = form.revisionId) !== null && _c !== void 0 ? _c : 1));
         }
         else if (field.type === "name") {
-            data.append("".concat(key, "_2"), (_c = value === null || value === void 0 ? void 0 : value.prefix) !== null && _c !== void 0 ? _c : "");
-            data.append("".concat(key, "_3"), (_d = value === null || value === void 0 ? void 0 : value.first) !== null && _d !== void 0 ? _d : "");
-            data.append("".concat(key, "_4"), (_e = value === null || value === void 0 ? void 0 : value.middle) !== null && _e !== void 0 ? _e : "");
-            data.append("".concat(key, "_6"), (_f = value === null || value === void 0 ? void 0 : value.last) !== null && _f !== void 0 ? _f : "");
-            data.append("".concat(key, "_8"), (_g = value === null || value === void 0 ? void 0 : value.suffix) !== null && _g !== void 0 ? _g : "");
+            data.append("".concat(key, "_2"), (_d = value === null || value === void 0 ? void 0 : value.prefix) !== null && _d !== void 0 ? _d : "");
+            data.append("".concat(key, "_3"), (_e = value === null || value === void 0 ? void 0 : value.first) !== null && _e !== void 0 ? _e : "");
+            data.append("".concat(key, "_4"), (_f = value === null || value === void 0 ? void 0 : value.middle) !== null && _f !== void 0 ? _f : "");
+            data.append("".concat(key, "_6"), (_g = value === null || value === void 0 ? void 0 : value.last) !== null && _g !== void 0 ? _g : "");
+            data.append("".concat(key, "_8"), (_h = value === null || value === void 0 ? void 0 : value.suffix) !== null && _h !== void 0 ? _h : "");
         }
         else if (field.type === "address") {
-            data.append("".concat(key, "_1"), (_h = value === null || value === void 0 ? void 0 : value.address1) !== null && _h !== void 0 ? _h : "");
-            data.append("".concat(key, "_2"), (_j = value === null || value === void 0 ? void 0 : value.address2) !== null && _j !== void 0 ? _j : "");
-            data.append("".concat(key, "_3"), (_k = value === null || value === void 0 ? void 0 : value.city) !== null && _k !== void 0 ? _k : "");
-            data.append("".concat(key, "_4"), (_l = value === null || value === void 0 ? void 0 : value.state) !== null && _l !== void 0 ? _l : "");
-            data.append("".concat(key, "_5"), (_m = value === null || value === void 0 ? void 0 : value.zip) !== null && _m !== void 0 ? _m : "");
-            data.append("".concat(key, "_6"), (_o = value === null || value === void 0 ? void 0 : value.country) !== null && _o !== void 0 ? _o : "");
+            data.append("".concat(key, "_1"), (_j = value === null || value === void 0 ? void 0 : value.address1) !== null && _j !== void 0 ? _j : "");
+            data.append("".concat(key, "_2"), (_k = value === null || value === void 0 ? void 0 : value.address2) !== null && _k !== void 0 ? _k : "");
+            data.append("".concat(key, "_3"), (_l = value === null || value === void 0 ? void 0 : value.city) !== null && _l !== void 0 ? _l : "");
+            data.append("".concat(key, "_4"), (_m = value === null || value === void 0 ? void 0 : value.state) !== null && _m !== void 0 ? _m : "");
+            data.append("".concat(key, "_5"), (_o = value === null || value === void 0 ? void 0 : value.zip) !== null && _o !== void 0 ? _o : "");
+            data.append("".concat(key, "_6"), (_p = value === null || value === void 0 ? void 0 : value.country) !== null && _p !== void 0 ? _p : "");
         }
         else if (field.type === "captcha") {
             data.append("g-recaptcha-response", value);
@@ -238,8 +238,8 @@ function prepareValuesPayload(form, state, data) {
             }
         }
     };
-    for (var _i = 0, _p = form.fields; _i < _p.length; _i++) {
-        var field = _p[_i];
+    for (var _i = 0, _q = form.fields; _i < _q.length; _i++) {
+        var field = _q[_i];
         _loop_1(field);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.3.33",
+  "version": "0.3.35-alpha-1",
   "main": "./index.js",
   "license": "MIT",
   "bin": {

package/serverless-template/next.config.js

@@ -10,6 +10,23 @@ module.exports = (() => {
   const REPO_NAME = getRepoName(cwd.replace(/\/\.serverless/, "")).repoName
 
   return withTM(["eddev"])({
+    async headers() {
+      return [
+        {
+          source: "/:path*",
+          headers: [
+            {
+              key: "x-frame-options",
+              value: "DENY",
+            },
+            {
+              key: "content-security-policy",
+              value: "frame-ancestors 'none'",
+            },
+          ],
+        },
+      ]
+    },
     rewrites() {
       return {
         afterFiles: [

package/serverless-template/pages/api/rest/[...method].ts

@@ -47,7 +47,7 @@ export default async function (req: NextApiRequest, res: NextApiResponse) {
   )
 
   if (response.cacheFor) {
-    res.setHeader("Cache-Control", `max-age=${response.cacheFor}, stale-while-revalidate=20`)
+    res.setHeader("Cache-Control", `public, s-maxage=${response.cacheFor}`)
   }
 
   res.status(200).json(response.payload)

package/serverless-template/pages/api/trpc/[...trpc].ts

@@ -1,11 +1,26 @@
 // @ts-ignore
 import { router, createContext } from "../../../apis/_rpc"
 import * as trpcNext from "@trpc/server/adapters/next"
+import { ResponseMetaFn } from "@trpc/server/dist/declarations/src/http/internals/types"
 import type { NextApiRequest, NextApiResponse } from "next"
 
 const handler = trpcNext.createNextApiHandler({
-  router: router,
+  router: router as any,
   createContext: createContext,
+  responseMeta({ ctx, paths, type, errors, data }) {
+    // checking that no procedures errored
+    const allOk = errors.length === 0
+    // checking we're doing a query request
+    const isQuery = type === "query"
+    if (allOk && isQuery) {
+      return {
+        headers: {
+          "cache-control": `public, s-maxage=${ctx?.cacheTime || 60}`,
+        },
+      }
+    }
+    return {}
+  },
 })
 
 export default function (req: NextApiRequest, res: NextApiResponse) {