eddev 0.3.20 → 0.3.22-hotfix

package/admin/runWidgets.js

@@ -21,7 +21,6 @@ var widgets_1 = __importDefault(require("@manifest/widgets"));
 var client_1 = require("react-dom/client");
 function runWidgets() {
     var elements = document.querySelectorAll("[data-widget]");
-    console.log("Running widgets", elements, widgets_1.default);
     elements.forEach(function (el) {
         if (el instanceof HTMLElement) {
             var data = el.dataset;

package/cli/build.dev.js

@@ -66,7 +66,7 @@ function devCommand(opts) {
                 case 0:
                     version = require(path_1.default.join(__dirname, "../package.json")).version;
                     requiredVersion = require(path_1.default.join(process.cwd(), "package.json")).devDependencies.eddev;
-                    if ((0, compare_versions_1.default)(version, requiredVersion) < 0) {
+                    if (!version.includes("*") && !version.includes("workspace:") && (0, compare_versions_1.default)(version, requiredVersion) < 0) {
                         console.log(chalk_1.default.red("\uD83D\uDEA8 Incorrect 'eddev' version installed!\n\uD83D\uDEA8 Your package.json requires ".concat(chalk_1.default.yellow(requiredVersion), ", but you have ").concat(chalk_1.default.yellow(version), ".\n\uD83D\uDEA8 Do you need to run 'yarn'?")));
                         process.exit(1);
                     }

package/dev-ui/loader.d.ts

@@ -1 +1,2 @@
+export declare const DevUI: import("@loadable/component").LoadableComponent<unknown>;
 export declare function DevUILoader(): import("react/jsx-runtime").JSX.Element | null;

package/dev-ui/loader.js

@@ -1,12 +1,73 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DevUILoader = void 0;
+exports.DevUILoader = exports.DevUI = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
+var dynamic_1 = require("../dynamic");
 var usePersistState_1 = require("./hooks/usePersistState");
 // Defined as a webpack dynamic module
 // @ts-ignore
-var _devtools_1 = require("@devtools");
+exports.DevUI = (0, dynamic_1.dynamic)(function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+    switch (_a.label) {
+        case 0: return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require("./components/DevUI")); })];
+        case 1: return [2 /*return*/, _a.sent()];
+    }
+}); }); }, { ssr: false });
 function DevUILoader() {
     var _a = (0, usePersistState_1.usePersistState)("enable_devui", process.dev || (typeof window !== "undefined" && window["ENABLE_DEV_UI"])), render = _a[0], setRender = _a[1];
     (0, react_1.useEffect)(function () {
@@ -15,7 +76,7 @@ function DevUILoader() {
         }
     }, []);
     if (render) {
-        return (0, jsx_runtime_1.jsx)(_devtools_1.DevUI, {}, void 0);
+        return (0, jsx_runtime_1.jsx)(exports.DevUI, {}, void 0);
     }
     else {
         return null;

package/hooks/queryUtils.js

@@ -62,6 +62,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createUseMutation = exports.createUseInfiniteQuery = exports.createUseQuery = void 0;
 var react_1 = require("react");
 var swr_1 = __importDefault(require("swr"));
+function getNonceHeader() {
+    var _a;
+    // @ts-ignore
+    if ((_a = window === null || window === void 0 ? void 0 : window.wpApiSettings) === null || _a === void 0 ? void 0 : _a.nonce) {
+        return {
+            // @ts-ignore
+            "X-WP-Nonce": window.wpApiSettings.nonce,
+        };
+    }
+    else {
+        return {};
+    }
+}
 /** Generic fetcher functions */
 var fetcherGET = function (name, params) { return __awaiter(void 0, void 0, void 0, function () {
     var url, result, payload;
@@ -71,7 +84,9 @@ var fetcherGET = function (name, params) { return __awaiter(void 0, void 0, void
                 url = process.serverless ? "/api/rest/query/".concat(name) : "/wp-json/ed/v1/query/".concat(name);
                 if (params)
                     url += "?params=" + encodeURIComponent(params);
-                return [4 /*yield*/, fetch(url, {})];
+                return [4 /*yield*/, fetch(url, {
+                        headers: getNonceHeader(),
+                    })];
             case 1:
                 result = _a.sent();
                 return [4 /*yield*/, result.json()];
@@ -198,9 +213,7 @@ function createUseMutation(init) {
                         _a.trys.push([1, 4, , 5]);
                         return [4 /*yield*/, fetch(url, {
                                 method: "POST",
-                                headers: {
-                                    "Content-type": "application/json",
-                                },
+                                headers: __assign({ "Content-type": "application/json" }, getNonceHeader()),
                                 credentials: "include",
                                 body: JSON.stringify(params),
                             })];
@@ -244,9 +257,7 @@ function createUseMutation(init) {
                     url = process.serverless ? "/api/rest/mutation/".concat(init.name) : "/wp-json/ed/v1/mutation/".concat(init.name);
                     return [4 /*yield*/, fetch(url, {
                             method: "POST",
-                            headers: {
-                                "Content-type": "application/json",
-                            },
+                            headers: __assign({ "Content-type": "application/json" }, getNonceHeader()),
                             credentials: "include",
                             body: JSON.stringify(vars),
                         })];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.3.20",
+  "version": "0.3.22-hotfix",
   "main": "./index.js",
   "license": "MIT",
   "bin": {

package/routing/routing.d.ts

@@ -59,7 +59,11 @@ export declare type RouterScrollHandler = {
 export declare const customRouterScrollHandler: {
     handler: RouterScrollHandler | null;
 };
+export declare const customShouldNavigateFunction: {
+    handler: ((href: string) => boolean) | null;
+};
 export declare function useCustomRouterScrollHandler(handler: RouterScrollHandler): void;
+export declare function useShouldNavigateFunction(handler: (href: string) => boolean): void;
 export declare type RouteProps = RouteContextConfig & {
     children: ReactNode;
 };

package/routing/routing.js

@@ -50,11 +50,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RouteItemContext = exports.Switch = exports.Link = exports.urlDescendentsMatch = exports.urlPathsMatch = exports.isInternalPageLink = exports.RouterRoot = exports.createRouteItem = exports.Route = exports.useCustomRouterScrollHandler = exports.customRouterScrollHandler = exports.useRouter = exports.useRoute = void 0;
+exports.RouteItemContext = exports.Switch = exports.Link = exports.urlDescendentsMatch = exports.urlPathsMatch = exports.isInternalPageLink = exports.RouterRoot = exports.createRouteItem = exports.Route = exports.useShouldNavigateFunction = exports.useCustomRouterScrollHandler = exports.customShouldNavigateFunction = exports.customRouterScrollHandler = exports.useRouter = exports.useRoute = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
-var react_merge_refs_1 = require("react-merge-refs");
 var url_parse_1 = __importDefault(require("url-parse"));
+var mergeRefs_1 = require("../utils/mergeRefs");
 // const logger = (...args: any[]) => console.log(...args)
 var logger = function () {
     var args = [];
@@ -239,6 +239,9 @@ exports.useRouter = useRouter;
 exports.customRouterScrollHandler = {
     handler: null,
 };
+exports.customShouldNavigateFunction = {
+    handler: null,
+};
 function useCustomRouterScrollHandler(handler) {
     exports.customRouterScrollHandler.handler = handler;
     (0, react_1.useEffect)(function () {
@@ -248,6 +251,15 @@ function useCustomRouterScrollHandler(handler) {
     }, []);
 }
 exports.useCustomRouterScrollHandler = useCustomRouterScrollHandler;
+function useShouldNavigateFunction(handler) {
+    exports.customShouldNavigateFunction.handler = handler;
+    (0, react_1.useEffect)(function () {
+        return function () {
+            exports.customShouldNavigateFunction.handler = null;
+        };
+    }, []);
+}
+exports.useShouldNavigateFunction = useShouldNavigateFunction;
 function Route(props) {
     var ctx = useForkedRouter({
         match: props.match,
@@ -331,6 +343,9 @@ function RouterRoot(props) {
 exports.RouterRoot = RouterRoot;
 var isInternalPageLink = function (href) {
     var url = (0, url_parse_1.default)(href, true);
+    if (exports.customShouldNavigateFunction.handler) {
+        return exports.customShouldNavigateFunction.handler(href);
+    }
     if (url &&
         url.origin === document.location.origin &&
         !url.pathname.match(/\./) &&
@@ -379,7 +394,7 @@ exports.Link = (0, react_1.forwardRef)(function (props, ref) {
             return false;
         return (0, exports.urlDescendentsMatch)(router === null || router === void 0 ? void 0 : router.item.pathname, props.href);
     }, [router === null || router === void 0 ? void 0 : router.item.pathname, props.href]);
-    return ((0, jsx_runtime_1.jsx)("a", __assign({ ref: (0, react_merge_refs_1.mergeRefs)([localRef, ref]) }, props, { target: typeof props.target === "string" ? props.target : undefined, "data-active": isActive ? true : undefined, "data-child-active": isDescendentActive ? true : undefined, onMouseEnter: function (e) {
+    return ((0, jsx_runtime_1.jsx)("a", __assign({ ref: (0, mergeRefs_1.mergeRefs)([localRef, ref]) }, props, { target: typeof props.target === "string" ? props.target : undefined, "data-active": isActive ? true : undefined, "data-child-active": isDescendentActive ? true : undefined, onMouseEnter: function (e) {
             if (props.onMouseEnter) {
                 props.onMouseEnter(e);
             }

package/serverless-template/pages/api/robots.ts

@@ -2,26 +2,16 @@ import config from "../../_utils/ed-config"
 import type { NextApiRequest, NextApiResponse } from "next"
 import { fetchWP } from "../../_utils/fetch-wp"
 
-const validProxyPaths = {
-  "form-submit": {
-    path: "/wp-json/ed/v1/gf/submit",
-    method: "POST",
-  },
-  query: {
-    path: "/wp-json/ed/v1/query/*",
-    method: "GET",
-  },
-  mutation: {
-    path: "/wp-json/ed/v1/mutation/*",
-    method: "POST",
-  },
-}
-
 export default async function (req: NextApiRequest, res: NextApiResponse) {
   const name = "?robots=1"
 
+  if (req.query.debug) {
+    res.status(200).json({ url: process.env.SITE_URL?.replace(/\/$/, "") + "/" + name })
+    return
+  }
+
   const response = await fetchWP(
-    process.env.SITE_URL + "/" + name,
+    process.env.SITE_URL?.replace(/\/$/, "") + "/" + name,
     {
       method: "GET",
     },

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

@@ -18,7 +18,7 @@ const validProxyPaths = {
 }
 
 export default async function (req: NextApiRequest, res: NextApiResponse) {
-  const name = req.query.sitemap[0] as string
+  const name = req.query.sitemap![0] as string
   if (name === "sitemap.xml") {
     res.status(301).redirect("/sitemap_index.xml")
     return

package/utils/mergeRefs.d.ts

@@ -0,0 +1,2 @@
+import type * as React from "react";
+export declare function mergeRefs<T = any>(refs: Array<React.MutableRefObject<T> | React.LegacyRef<T> | undefined | null>): React.RefCallback<T>;

package/utils/mergeRefs.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeRefs = void 0;
+function mergeRefs(refs) {
+    return function (value) {
+        refs.forEach(function (ref) {
+            if (typeof ref === "function") {
+                ref(value);
+            }
+            else if (ref != null) {
+                ;
+                ref.current = value;
+            }
+        });
+    };
+}
+exports.mergeRefs = mergeRefs;