eddev 0.2.60 → 0.2.62

package/admin/runWidgets.js

@@ -18,7 +18,7 @@ exports.runWidgets = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 // @ts-ignore
 var widgets_1 = __importDefault(require("@manifest/widgets"));
-var react_dom_1 = __importDefault(require("react-dom"));
+var client_1 = require("react-dom/client");
 function runWidgets() {
     var elements = document.querySelectorAll("[data-widget]");
     console.log("Running widgets", elements, widgets_1.default);
@@ -28,11 +28,27 @@ function runWidgets() {
             var name_1 = data["widget"];
             var type = widgets_1.default.find(function (item) { return item.name === name_1; });
             if (type) {
-                var props = {
+                var props_1 = {
                     element: el,
                     dataset: data,
                 };
-                react_dom_1.default.render((0, jsx_runtime_1.jsx)(type.component, __assign({}, props), void 0), el);
+                var root_1 = (0, client_1.createRoot)(el);
+                var renderWithComponent_1 = function (Component) {
+                    root_1.render((0, jsx_runtime_1.jsx)(Component, __assign({}, props_1), void 0));
+                };
+                renderWithComponent_1(type.component);
+                // @ts-ignore
+                if (import.meta.webpackHot) {
+                    // @ts-ignore
+                    import.meta.webpackHot.accept([require.resolve("@manifest/widgets")], function () {
+                        console.log("Widgets mani");
+                        var updateWidgets = require("@manifest/widgets").default;
+                        var type = updateWidgets.find(function (item) { return item.name === name_1; });
+                        if (type) {
+                            renderWithComponent_1(type.component);
+                        }
+                    });
+                }
             }
         }
     });

package/hooks/queryUtils.d.ts

@@ -20,7 +20,10 @@ declare type QueryHookReturn<TReturn, TVars> = {
     refresh: (vars?: TVars) => void;
 };
 declare type QueryHook<TReturn, TVars> = TVars extends undefined ? (vars?: TVars, opts?: QueryOptions) => QueryHookReturn<TReturn, TVars> : (vars: TVars, opts?: QueryOptions) => QueryHookReturn<TReturn, TVars>;
-export declare function createUseQuery<TReturn extends any, TVars extends MaybeVars>(init: CreateUseQueryOptions): QueryHook<TReturn, TVars>;
+declare type QueryFetcher<TReturn, TVars> = {
+    fetch: TVars extends undefined ? (vars?: TVars) => Promise<TReturn> : (vars: TVars) => Promise<TReturn>;
+};
+export declare function createUseQuery<TReturn extends any, TVars extends MaybeVars>(init: CreateUseQueryOptions): QueryHook<TReturn, TVars> & QueryFetcher<TReturn, TVars>;
 /** Infinite queries */
 declare type CreateUseInfiniteQueryOptions = {
     name: string;
@@ -53,5 +56,8 @@ declare type MutationHookReturn<TReturn, TVars> = {
     submit: (vars: TVars) => void;
 };
 declare type MutationHook<TReturn, TVars> = (opts?: QueryOptions) => MutationHookReturn<TReturn, TVars>;
-export declare function createUseMutation<TReturn extends any, TVars extends MaybeVars>(init: CreateUseQueryOptions): MutationHook<TReturn, TVars>;
+declare type MutationFetcher<TReturn, TVars> = {
+    mutate: (vars: TVars) => Promise<TReturn>;
+};
+export declare function createUseMutation<TReturn extends any, TVars extends MaybeVars>(init: CreateUseQueryOptions): MutationHook<TReturn, TVars> & MutationFetcher<TReturn, TVars>;
 export {};

package/hooks/queryUtils.js

@@ -95,6 +95,9 @@ function createUseQuery(init) {
             refresh: mutate,
         };
     };
+    hook.fetch = function (vars) {
+        return fetcherGET(init.name, JSON.stringify(vars)).then(function (payload) { return payload.data; });
+    };
     return hook;
 }
 exports.createUseQuery = createUseQuery;
@@ -233,6 +236,35 @@ function createUseMutation(init) {
             submit: submit,
         };
     };
+    hook.mutate = function (vars) { return __awaiter(_this, void 0, void 0, function () {
+        var url, result, payload;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    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",
+                            },
+                            credentials: "include",
+                            body: JSON.stringify(vars),
+                        })];
+                case 1:
+                    result = _a.sent();
+                    return [4 /*yield*/, result.json()];
+                case 2:
+                    payload = _a.sent();
+                    if (payload.errors) {
+                        throw payload.errors;
+                    }
+                    else {
+                        return [2 /*return*/, payload.data];
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    }); };
     return hook;
 }
 exports.createUseMutation = createUseMutation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.2.60",
+  "version": "0.2.62",
   "main": "./index.js",
   "license": "MIT",
   "bin": {
@@ -20,8 +20,8 @@
     "@types/inquirer": "^8.1.1",
     "@types/loadable__component": "^5.13.4",
     "@types/node": "^16.7.10",
-    "@types/react": "^17.0.36",
-    "@types/react-dom": "^18.0.6",
+    "@types/react": "^18.0.34",
+    "@types/react-dom": "^18.0.11",
     "@types/react-inspector": "^4.0.2",
     "@types/rimraf": "^3.0.2",
     "@types/url-parse": "^1.4.4",

package/serverless-template/pages/_document.tsx

@@ -9,9 +9,8 @@ const gtmID =
   settings?.tracking?.tagManagerID === "env" ? process.env.NEXT_PUBLIC_GTM_ID : settings?.tracking?.tagManagerID
 
 let analyticsID = settings?.tracking?.ga?.trackingID! || settings?.tracking?.analyticsID!
-
 if (analyticsID === "env") {
-  analyticsID = process.env.NEXT_PUBLIC_GA_ID! || process.env.NEXT_PUBLIC_GTM_ID
+  analyticsID = process.env.NEXT_PUBLIC_GA_ID!
 }
 
 export default class Document extends NextDocument {
@@ -20,7 +19,7 @@ export default class Document extends NextDocument {
       <Html lang="en">
         <Head>
           <style id="stitches" dangerouslySetInnerHTML={{ __html: getCssText() }} />
-          {settings.tracking?.tagManagerID ? (
+          {gtmID ? (
             <script
               dangerouslySetInnerHTML={{
                 __html: `(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':