eddev 2.0.0-beta.152 → 2.0.0-beta.154

package/dist/app/lib/blocks/InnerBlocks.d.ts

@@ -15,7 +15,7 @@ export type CustomBlockAppender = FunctionComponent<{
 export declare function createAppender(comp: CustomBlockAppender): {
     type: CustomBlockAppender;
 };
-type InnerBlocksProps = {
+export type InnerBlocksProps = {
     /** A list of allowed blocks, and/or block tags. */
     allowedBlocks?: (ChildBlockTypeName | BlockTagName)[];
     /** Specify the block list as either horizontal or vertical */

package/dist/app/lib/blocks/InnerBlocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InnerBlocks.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/InnerBlocks.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAsB,MAAM,OAAO,CAAA;AAC7D,OAAO,EAAE,uBAAuB,EAAiB,MAAM,oBAAoB,CAAA;AAC3E,OAAO,EAAuB,aAAa,EAA0B,MAAM,6BAA6B,CAAA;AAKxG,KAAK,cAAc,GAAG;IACpB,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,mBAAmB,CAAA;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAwED,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;IAClD,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,QAAQ,EAAE,OAAO,CAAA;IACjB,MAAM,EAAE,OAAO,CAAA;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,kBAAkB,EAAE,OAAO,CAAA;CAC5B,CAAC,CAAA;AAEF,wBAAgB,cAAc,CAAC,IAAI,EAAE,mBAAmB;;EAIvD;AAED,KAAK,gBAAgB,GAAG;IACtB,mDAAmD;IACnD,aAAa,CAAC,EAAE,CAAC,kBAAkB,GAAG,YAAY,CAAC,EAAE,CAAA;IACrD,8DAA8D;IAC9D,WAAW,CAAC,EAAE,YAAY,GAAG,UAAU,CAAA;IACvC;;;;QAII;IACJ,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,4EAA4E;IAC5E,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,2DAA2D;IAC3D,cAAc,CAAC,EAAE,aAAa,CAAA;IAC9B,8DAA8D;IAC9D,cAAc,CAAC,EAAE,aAAa,CAAA;IAC9B,iCAAiC;IACjC,QAAQ,CAAC,EAAE,aAAa,CAAA;IACxB;;;;;;;;;;OAUG;IACH,YAAY,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,aAAa,GAAG,MAAM,GAAG,KAAK,CAAA;IAChE,QAAQ,CAAC,EAAE,cAAc,CAAA;IACzB,yBAAyB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CACjD,GAAG,uBAAuB,CAAA;AAE3B;;GAEG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,2CAgDlD"}
+{"version":3,"file":"InnerBlocks.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/InnerBlocks.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAsB,MAAM,OAAO,CAAA;AAC7D,OAAO,EAAE,uBAAuB,EAAiB,MAAM,oBAAoB,CAAA;AAC3E,OAAO,EAAuB,aAAa,EAA0B,MAAM,6BAA6B,CAAA;AAKxG,KAAK,cAAc,GAAG;IACpB,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,mBAAmB,CAAA;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAwED,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;IAClD,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,QAAQ,EAAE,OAAO,CAAA;IACjB,MAAM,EAAE,OAAO,CAAA;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,kBAAkB,EAAE,OAAO,CAAA;CAC5B,CAAC,CAAA;AAEF,wBAAgB,cAAc,CAAC,IAAI,EAAE,mBAAmB;;EAIvD;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,mDAAmD;IACnD,aAAa,CAAC,EAAE,CAAC,kBAAkB,GAAG,YAAY,CAAC,EAAE,CAAA;IACrD,8DAA8D;IAC9D,WAAW,CAAC,EAAE,YAAY,GAAG,UAAU,CAAA;IACvC;;;;QAII;IACJ,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,4EAA4E;IAC5E,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,2DAA2D;IAC3D,cAAc,CAAC,EAAE,aAAa,CAAA;IAC9B,8DAA8D;IAC9D,cAAc,CAAC,EAAE,aAAa,CAAA;IAC9B,iCAAiC;IACjC,QAAQ,CAAC,EAAE,aAAa,CAAA;IACxB;;;;;;;;;;OAUG;IACH,YAAY,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,aAAa,GAAG,MAAM,GAAG,KAAK,CAAA;IAChE,QAAQ,CAAC,EAAE,cAAc,CAAA;IACzB,yBAAyB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CACjD,GAAG,uBAAuB,CAAA;AAE3B;;GAEG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,2CAgDlD"}

package/dist/app/lib/blocks/InnerBlocks.js

@@ -75,7 +75,7 @@ export function InnerBlocks(props) {
                 allowedBlocks: props.allowedBlocks ? blocksByTag.expand(props.allowedBlocks) : undefined,
                 prioritizedInserterBlocks: props.prioritizedInserterBlocks,
                 renderAppender: appender,
-                templateLock: props.templateLock === "none" ? false : props.templateLock ?? false,
+                templateLock: props.templateLock === "none" ? false : (props.templateLock ?? false),
                 template: props.template ? transformBlockTemplate(props.template) : undefined,
             });
             /**

package/dist/app/lib/blocks/SlotBlocks.d.ts

@@ -0,0 +1,7 @@
+import { InnerBlocksProps } from "./InnerBlocks";
+type SlotProps = {
+    id: string;
+} & InnerBlocksProps;
+export declare function SlotBlocks(props: SlotProps): import("react/jsx-runtime").JSX.Element | null;
+export {};
+//# sourceMappingURL=SlotBlocks.d.ts.map

package/dist/app/lib/blocks/SlotBlocks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SlotBlocks.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/SlotBlocks.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAe,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAI7D,KAAK,SAAS,GAAG;IACf,EAAE,EAAE,MAAM,CAAA;CACX,GAAG,gBAAgB,CAAA;AAEpB,wBAAgB,UAAU,CAAC,KAAK,EAAE,SAAS,kDAsC1C"}

package/dist/app/lib/blocks/SlotBlocks.js

@@ -0,0 +1,39 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useEffect } from "react";
+import { useBlockContext, useInnerBlocks } from "./inline-editing";
+import { hash } from "object-code";
+import { ContentBlocks } from "./ContentBlocks";
+export function SlotBlocks(props) {
+    if (env.admin) {
+        const clientId = useBlockContext()?.block[1].clientId;
+        const block = wp.data.useSelect((select) => {
+            const { getBlocks } = select("core/block-editor");
+            return getBlocks(clientId).find((block) => block.name === "core/slot-group" && block.attributes?.props?.id === props.id);
+        }, [clientId, props.id]);
+        useEffect(() => {
+            const blocks = wp.data.select("core/block-editor").getBlocks(clientId);
+            const block = blocks.find((block) => block.name === "core/slot-group" && block.attributes?.props?.id === props.id);
+            if (block && hash(block.attributes.props) !== hash(props)) {
+                block.attributes.props = props;
+            }
+            else if (!block) {
+                blocks.push(wp.blocks.createBlock("core/slot-group", { props }, []));
+            }
+            else {
+                return;
+            }
+            wp.data.dispatch("core/block-editor").replaceInnerBlocks(clientId, blocks);
+        }, [block?.clientId, hash(props)]);
+        if (block) {
+            return _jsx(wp.blockEditor.BlockEdit, { ...block });
+        }
+        else {
+            return null;
+        }
+    }
+    else {
+        const blocks = useInnerBlocks();
+        const block = blocks.find((block) => block.blockName === "core/slot-group" && block.slotId === props.id);
+        return _jsx(ContentBlocks, { blocks: block?.innerBlocks });
+    }
+}

package/dist/app/lib/blocks/editor/installGutenbergHooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"installGutenbergHooks.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/installGutenbergHooks.tsx"],"names":[],"mappings":"AA2BA,eAAO,MAAM,oBAAoB;;CAAgC,CAAA;AAEjE,wBAAgB,iBAAiB,kBAsBhC;AAED,wBAAgB,uBAAuB,SAyMtC"}
+{"version":3,"file":"installGutenbergHooks.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/installGutenbergHooks.tsx"],"names":[],"mappings":"AA4BA,eAAO,MAAM,oBAAoB;;CAAgC,CAAA;AAEjE,wBAAgB,iBAAiB,kBAsBhC;AAED,wBAAgB,uBAAuB,SAiOtC"}

package/dist/app/lib/blocks/editor/installGutenbergHooks.js

@@ -10,6 +10,7 @@ import { resolveAcfBlockName } from "./block-templates.js";
 import { blocksByTag } from "./blocks-by-tag.js";
 import { editorConfigStore, getEditingPostInfo, watchEditorTemplate } from "./editor-config.js";
 import { rootBlocks } from "./root-blocks.js";
+import { InnerBlocks } from "../InnerBlocks.js";
 function listenForHandleResize() {
     let interval = setInterval(() => {
         let viewportTarget = document.querySelector(".interface-interface-skeleton__content");
@@ -61,6 +62,8 @@ export function installEDGutenbergHooks() {
         };
     }, "withClientIdClassName");
     wp.hooks.addFilter("editor.BlockListBlock", "ed", withClientIdClassName);
+    // if (wp.blocks) {
+    // }
     // Manage custom rich text formats
     setTimeout(() => {
         subscribe(editorConfigStore, () => {
@@ -103,10 +106,11 @@ export function installEDGutenbergHooks() {
     listenForHandleResize();
     // Remove unwanted formatting options
     // https://developer.wordpress.org/block-editor/how-to-guides/format-api/
-    wp.richText.unregisterFormatType("core/image");
-    wp.richText.unregisterFormatType("core/language");
-    wp.richText.unregisterFormatType("core/keyboard");
-    wp.richText.unregisterFormatType("core/text-color");
+    const { removeFormatTypes } = wp.data.dispatch("core/rich-text");
+    removeFormatTypes("core/image");
+    removeFormatTypes("core/language");
+    removeFormatTypes("core/keyboard");
+    removeFormatTypes("core/text-color");
     whenEditorIsReady().then(() => {
         watchEditorTemplate();
     });
@@ -166,7 +170,7 @@ export function installEDGutenbergHooks() {
         return {
             ...item,
             get parent() {
-                if (name === "core/block")
+                if (name === "core/block" || name === "core/slot-group")
                     return undefined;
                 return blocksByTag.expand([...(item.parent ?? []), ...(isRootBlock ? ["core/post-content"] : [])]);
             },
@@ -184,17 +188,36 @@ export function installEDGutenbergHooks() {
                 return result;
             },
             get ancestor() {
-                if (name === "core/block")
+                if (name === "core/block" || name === "core/slot-group")
                     return undefined;
                 return item.ancestor ? blocksByTag.expand(item.ancestor) : undefined;
             },
             get allowedBlocks() {
-                return item.allowedBlocks ? blocksByTag.expand(item.allowedBlocks) : undefined;
+                return item.allowedBlocks ? [...blocksByTag.expand(item.allowedBlocks), "core/slot-group"] : undefined;
             },
         };
     });
+    if (wp.blocks) {
+        wp.blocks.registerBlockType("core/slot-group", {
+            title: "Slot",
+            attributes: {
+                props: { type: "object" },
+            },
+            category: "text",
+            edit: (props) => {
+                const { id, ...innerProps } = props.attributes.props ?? {};
+                return _jsx(InnerBlocks, { appender: { type: "simple" }, ...innerProps });
+            },
+            save: () => _jsx(wp.blockEditor.InnerBlocks.Content, {}),
+            supports: {
+                inserter: false,
+                reusable: false,
+                className: false,
+                customClassName: false,
+            },
+        });
+    }
     const acf = "acf" in window ? window.acf : {};
-    const parseJSX = acf.parseJSX;
     acf.parseJSX = (html) => {
         let payload;
         try {

package/dist/app/lib/blocks/index.d.ts

@@ -8,4 +8,5 @@ export { defineEditorConfig } from "./editor/editor-config.js";
 export * from "./editor/usePostEditor.js";
 export { useBlockContext, useInlineEditableValue, useInnerBlocks, useTemplate } from "./inline-editing.js";
 export * from "./InnerBlocks.js";
+export * from "./SlotBlocks.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/app/lib/blocks/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,0BAA0B,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,cAAc,2BAA2B,CAAA;AACzC,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAC1G,cAAc,kBAAkB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,0BAA0B,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,cAAc,2BAA2B,CAAA;AACzC,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAC1G,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA"}

package/dist/app/lib/blocks/index.js

@@ -8,3 +8,4 @@ export { defineEditorConfig } from "./editor/editor-config.js";
 export * from "./editor/usePostEditor.js";
 export { useBlockContext, useInlineEditableValue, useInnerBlocks, useTemplate } from "./inline-editing.js";
 export * from "./InnerBlocks.js";
+export * from "./SlotBlocks.js";

package/dist/app/lib/devtools/hooks/useTailwind.d.ts

@@ -61,7 +61,7 @@ export declare function useTailwindConfig(): {
             readonly optimizeUniversalDefaults?: boolean | undefined;
             readonly matchVariant?: boolean | undefined;
         } | undefined;
-        readonly darkMode?: "media" | "class" | "selector" | readonly [("class" | undefined)?, (string | undefined)?] | readonly [("selector" | undefined)?, (string | undefined)?] | readonly [("variant" | undefined)?, (string | readonly string[] | undefined)?] | undefined;
+        readonly darkMode?: "media" | "selector" | "class" | readonly [("class" | undefined)?, (string | undefined)?] | readonly [("selector" | undefined)?, (string | undefined)?] | readonly [("variant" | undefined)?, (string | readonly string[] | undefined)?] | undefined;
         readonly theme?: {
             readonly [x: string]: any;
             readonly screens?: readonly string[] | ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").ScreensConfig) | {
@@ -915,8 +915,8 @@ export declare function useTailwindConfig(): {
             readonly flex?: boolean | undefined;
             readonly blur?: boolean | undefined;
             readonly resize?: boolean | undefined;
-            readonly columns?: boolean | undefined;
             readonly position?: boolean | undefined;
+            readonly columns?: boolean | undefined;
             readonly preflight?: boolean | undefined;
             readonly container?: boolean | undefined;
             readonly accessibility?: boolean | undefined;
@@ -1106,7 +1106,7 @@ export declare function useTailwindConfig(): {
                     readonly optimizeUniversalDefaults?: boolean | undefined;
                     readonly matchVariant?: boolean | undefined;
                 } | undefined;
-                readonly darkMode?: "media" | "class" | "selector" | readonly [("class" | undefined)?, (string | undefined)?] | readonly [("selector" | undefined)?, (string | undefined)?] | readonly [("variant" | undefined)?, (string | readonly string[] | undefined)?] | undefined;
+                readonly darkMode?: "media" | "selector" | "class" | readonly [("class" | undefined)?, (string | undefined)?] | readonly [("selector" | undefined)?, (string | undefined)?] | readonly [("variant" | undefined)?, (string | readonly string[] | undefined)?] | undefined;
                 readonly theme?: {
                     readonly [x: string]: any;
                     readonly screens?: readonly string[] | ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").ScreensConfig) | {
@@ -1960,8 +1960,8 @@ export declare function useTailwindConfig(): {
                     readonly flex?: boolean | undefined;
                     readonly blur?: boolean | undefined;
                     readonly resize?: boolean | undefined;
-                    readonly columns?: boolean | undefined;
                     readonly position?: boolean | undefined;
+                    readonly columns?: boolean | undefined;
                     readonly preflight?: boolean | undefined;
                     readonly container?: boolean | undefined;
                     readonly accessibility?: boolean | undefined;
@@ -2126,7 +2126,7 @@ export declare function useTailwindConfig(): {
         readonly optimizeUniversalDefaults?: boolean | undefined;
         readonly matchVariant?: boolean | undefined;
     } | undefined;
-    readonly darkMode?: "media" | "class" | "selector" | readonly [("class" | undefined)?, (string | undefined)?] | readonly [("selector" | undefined)?, (string | undefined)?] | readonly [("variant" | undefined)?, (string | readonly string[] | undefined)?] | undefined;
+    readonly darkMode?: "media" | "selector" | "class" | readonly [("class" | undefined)?, (string | undefined)?] | readonly [("selector" | undefined)?, (string | undefined)?] | readonly [("variant" | undefined)?, (string | readonly string[] | undefined)?] | undefined;
     readonly theme?: {
         readonly [x: string]: any;
         readonly screens?: readonly string[] | ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").ScreensConfig) | {
@@ -2980,8 +2980,8 @@ export declare function useTailwindConfig(): {
         readonly flex?: boolean | undefined;
         readonly blur?: boolean | undefined;
         readonly resize?: boolean | undefined;
-        readonly columns?: boolean | undefined;
         readonly position?: boolean | undefined;
+        readonly columns?: boolean | undefined;
         readonly preflight?: boolean | undefined;
         readonly container?: boolean | undefined;
         readonly accessibility?: boolean | undefined;
@@ -3197,7 +3197,7 @@ export declare function useTailwindConfig(): {
                     readonly optimizeUniversalDefaults?: boolean | undefined;
                     readonly matchVariant?: boolean | undefined;
                 } | undefined;
-                readonly darkMode?: "media" | "class" | "selector" | readonly [("class" | undefined)?, (string | undefined)?] | readonly [("selector" | undefined)?, (string | undefined)?] | readonly [("variant" | undefined)?, (string | readonly string[] | undefined)?] | undefined;
+                readonly darkMode?: "media" | "selector" | "class" | readonly [("class" | undefined)?, (string | undefined)?] | readonly [("selector" | undefined)?, (string | undefined)?] | readonly [("variant" | undefined)?, (string | readonly string[] | undefined)?] | undefined;
                 readonly theme?: {
                     readonly [x: string]: any;
                     readonly screens?: readonly string[] | ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").ScreensConfig) | {
@@ -4051,8 +4051,8 @@ export declare function useTailwindConfig(): {
                     readonly flex?: boolean | undefined;
                     readonly blur?: boolean | undefined;
                     readonly resize?: boolean | undefined;
-                    readonly columns?: boolean | undefined;
                     readonly position?: boolean | undefined;
+                    readonly columns?: boolean | undefined;
                     readonly preflight?: boolean | undefined;
                     readonly container?: boolean | undefined;
                     readonly accessibility?: boolean | undefined;
@@ -4215,7 +4215,7 @@ export declare function useTailwindConfig(): {
                 readonly optimizeUniversalDefaults?: boolean | undefined;
                 readonly matchVariant?: boolean | undefined;
             } | undefined;
-            readonly darkMode?: "media" | "class" | "selector" | readonly [("class" | undefined)?, (string | undefined)?] | readonly [("selector" | undefined)?, (string | undefined)?] | readonly [("variant" | undefined)?, (string | readonly string[] | undefined)?] | undefined;
+            readonly darkMode?: "media" | "selector" | "class" | readonly [("class" | undefined)?, (string | undefined)?] | readonly [("selector" | undefined)?, (string | undefined)?] | readonly [("variant" | undefined)?, (string | readonly string[] | undefined)?] | undefined;
             readonly theme?: {
                 readonly [x: string]: any;
                 readonly screens?: readonly string[] | ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").ScreensConfig) | {
@@ -5069,8 +5069,8 @@ export declare function useTailwindConfig(): {
                 readonly flex?: boolean | undefined;
                 readonly blur?: boolean | undefined;
                 readonly resize?: boolean | undefined;
-                readonly columns?: boolean | undefined;
                 readonly position?: boolean | undefined;
+                readonly columns?: boolean | undefined;
                 readonly preflight?: boolean | undefined;
                 readonly container?: boolean | undefined;
                 readonly accessibility?: boolean | undefined;

package/dist/app/lib/hooks/query-hooks.js

@@ -216,7 +216,7 @@ export function createUseMutation(init) {
 // @ts-ignore
 export function useRPCQuery(key, args, options) {
     return useQuery({
-        queryKey: ["rpcQuery", key, args],
+        queryKey: ["rpcQuery", key, args, options?.headers],
         queryFn: async (args) => {
             return getRPCClient().query(key, args.queryKey[2]);
         },

package/dist/app/lib/hooks/useRPC.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useRPC.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/hooks/useRPC.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,oBAAoB,GAAG,GAAG,CAAA;AACtC,MAAM,MAAM,iBAAiB,GAAG,GAAG,CAAA;AACnC,MAAM,MAAM,yBAAyB,GAAG,GAAG,CAAA;AAE3C,eAAO,MAAM,cAAc,MAAO,CAAA;AAClC,MAAM,MAAM,cAAc,GAAG,GAAG,CAAA"}
+{"version":3,"file":"useRPC.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/hooks/useRPC.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,oBAAoB,GAAG,GAAG,CAAA;AACtC,MAAM,MAAM,iBAAiB,GAAG,GAAG,CAAA;AACnC,MAAM,MAAM,yBAAyB,GAAG,GAAG,CAAA;AAE3C,eAAO,MAAM,cAAc,MAAO,CAAA;AAClC,MAAM,MAAM,cAAc,GAAG,GAAG,CAAA"}

package/dist/app/lib/hooks/useRPC.js

@@ -1,2 +1 @@
-// const trpc = {}
 export const RPCClientError = null;

package/dist/app/lib/routing/components/BrowserRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BrowserRouter.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/BrowserRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAuD,MAAM,OAAO,CAAA;AAK9F,OAAO,EAML,KAAK,SAAS,EAGf,MAAM,aAAa,CAAA;AAWpB,KAAK,KAAK,GAAG,iBAAiB,CAAC;IAC7B,SAAS,CAAC,EAAE,KAAK,CAAC,gBAAgB,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;IACpD,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CACrB,CAAC,CAAA;AAuEF,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,2CA2ZzC"}
+{"version":3,"file":"BrowserRouter.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/BrowserRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAuD,MAAM,OAAO,CAAA;AAK9F,OAAO,EAML,KAAK,SAAS,EAGf,MAAM,aAAa,CAAA;AAWpB,KAAK,KAAK,GAAG,iBAAiB,CAAC;IAC7B,SAAS,CAAC,EAAE,KAAK,CAAC,gBAAgB,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;IACpD,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CACrB,CAAC,CAAA;AAuEF,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,2CAyazC"}

package/dist/app/lib/routing/components/BrowserRouter.js

@@ -330,8 +330,22 @@ export function BrowserRouter(props) {
                 };
             },
             handleClickEvent(e, originalHref, preferBack) {
-                const { mode, href } = getLinkHandlerMode(e, originalHref, state.activeRoute);
-                if (mode === "ignore") {
+                const { mode, href, isSameUrl } = getLinkHandlerMode(e, originalHref, state.activeRoute);
+                let cancelled = false;
+                if (href) {
+                    emitEvent({
+                        type: "clicked",
+                        currentRoute: getActiveRoute(),
+                        link: parseRouteLink(href),
+                        mode,
+                        href,
+                        isSameUrl,
+                        cancel() {
+                            cancelled = true;
+                        },
+                    });
+                }
+                if (mode === "ignore" || cancelled) {
                     e.preventDefault();
                     return;
                 }

package/dist/app/lib/routing/types.d.ts

@@ -36,13 +36,12 @@ export type RouteLink = {
     query: Record<string, string | string[]>;
     hash: string;
 };
-export type RouterEvent = {
+export type RouterEvent = ({
     type: "clicked";
     link: RouteLink;
     currentRoute: RouteState;
-    href: string;
-    mode: LinkHandlerMode;
-} | {
+    cancel: () => void;
+} & LinkHandlerMode) | {
     type: "capture-restorable-state";
     state: RouteReturnState<Record<string, any>>;
 } | {

package/dist/app/lib/routing/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/routing/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/routing/types.ts"],"names":[],"mappings":"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"}

package/dist/app/lib/routing/utils.d.ts

@@ -6,6 +6,7 @@ export type PointerOrMouseEvent = MouseEvent | PointerEvent | ReactMouseEvent |
 export type LinkHandlerMode = {
     mode: "ignore" | "navigate" | "native";
     href?: string;
+    isSameUrl?: boolean;
 };
 export declare function getLinkHandlerMode(e?: PointerOrMouseEvent, href?: string, currentRoute?: RouteState): LinkHandlerMode;
 type Partialize<T, TKeys extends keyof T> = Partial<Pick<T, TKeys>> & Omit<T, TKeys>;

package/dist/app/lib/routing/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/routing/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,IAAI,eAAe,EAAE,YAAY,IAAI,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAExF,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAExE,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,WAQvC;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,WAIlD;AAED,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,YAAY,GAAG,eAAe,GAAG,iBAAiB,CAAA;AAEjG,MAAM,MAAM,eAAe,GAAG;IAAE,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAEvF,wBAAgB,kBAAkB,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,UAAU,GAAG,eAAe,CA+DrH;AAED,KAAK,UAAU,CAAC,CAAC,EAAE,KAAK,SAAS,MAAM,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;AAEpF,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,CAAC,UAAU,EAAE,KAAK,GAAG,aAAa,GAAG,KAAK,CAAC,GAAG,UAAU,CAavG;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,UAMlD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAI3E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,UAOxC;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,SAAS,CAKvD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,UAKpD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/routing/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,IAAI,eAAe,EAAE,YAAY,IAAI,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAExF,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAExE,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,WAQvC;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,WAIlD;AAED,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,YAAY,GAAG,eAAe,GAAG,iBAAiB,CAAA;AAEjG,MAAM,MAAM,eAAe,GAAG;IAAE,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AAE5G,wBAAgB,kBAAkB,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,UAAU,GAAG,eAAe,CA+DrH;AAED,KAAK,UAAU,CAAC,CAAC,EAAE,KAAK,SAAS,MAAM,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;AAEpF,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,CAAC,UAAU,EAAE,KAAK,GAAG,aAAa,GAAG,KAAK,CAAC,GAAG,UAAU,CAavG;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,UAMlD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAI3E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,UAOxC;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,SAAS,CAKvD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,UAKpD"}

package/dist/app/lib/routing/utils.js

@@ -69,7 +69,7 @@ export function getLinkHandlerMode(e, href, currentRoute) {
                 return { mode: "native", href };
             }
             else {
-                return { mode: "ignore", href };
+                return { mode: "ignore", href, isSameUrl: true };
             }
         }
         return { mode: "navigate", href };

package/dist/app/server/proxy-wp-admin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy-wp-admin.d.ts","sourceRoot":"","sources":["../../../src/app/server/proxy-wp-admin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAwD,OAAO,EAAE,MAAM,YAAY,CAAA;AAI/G,wBAAsB,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,mBAAmB,CAAC,qBA4GrE"}
+{"version":3,"file":"proxy-wp-admin.d.ts","sourceRoot":"","sources":["../../../src/app/server/proxy-wp-admin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAwD,OAAO,EAAE,MAAM,YAAY,CAAA;AAI/G,wBAAsB,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,mBAAmB,CAAC,qBA+GrE"}

package/dist/app/server/proxy-wp-admin.js

@@ -87,10 +87,13 @@ export async function proxyWpAdmin(event) {
                 children: "",
             });
             const encodeForJSON = (str) => JSON.stringify(str).slice(1, -1).replaceAll("/", "\\/");
-            body = body.replaceAll("<!---VITE_HEADER--->", getViteHeader());
-            body = body.replaceAll("<!---VITE_FOOTER--->", getViteFooter());
-            body = body.replaceAll("<script id='vite-iframe-header'><\\/script>", encodeForJSON(getViteHeader()));
-            body = body.replaceAll("<script id='vite-iframe-footer'><\\/script>", encodeForJSON(getViteFooter()));
+            const viteHeader = getViteHeader();
+            const viteFooter = getViteFooter();
+            const baseDirective = `<base href="${reqUrl.origin}">`;
+            body = body.replaceAll("<!---VITE_HEADER--->", viteHeader);
+            body = body.replaceAll("<!---VITE_FOOTER--->", viteFooter);
+            body = body.replaceAll("<script id='vite-iframe-header'><\\/script>", encodeForJSON(baseDirective + viteHeader));
+            body = body.replaceAll("<script id='vite-iframe-footer'><\\/script>", encodeForJSON(viteFooter));
         }
     }
     else {

package/dist/app/utils/trpc-client.js

@@ -11,7 +11,7 @@ export function getRPCClient() {
     if (env.rpcEnabled) {
         if (!client) {
             // @ts-ignore
-            const endpoint = env.serverless ? "/" : window.SERVERLESS_ENDPOINT ?? "/";
+            const endpoint = env.serverless ? "/" : (window.SERVERLESS_ENDPOINT ?? "/");
             client = createTRPCUntypedClient({
                 links: [
                     splitLink({

package/dist/node/cli/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.0.0-beta.152";
+export declare const VERSION = "2.0.0-beta.153";
 //# sourceMappingURL=version.d.ts.map

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.152";
+export const VERSION = "2.0.0-beta.153";

package/dist/node/compiler/dev-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/dev-server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAM/C,MAAM,MAAM,mBAAmB,GAAG;IAChC,aAAa,EAAE,MAAM,CAAA;IACrB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAID,eAAO,MAAM,aAAa,qEAAU,CAAA;AAEpC,KAAK,OAAO,GAAG,EAAE,CAAA;AAEjB,qBAAa,SAAS;IAOX,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,OAAO;IAPtB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,SAAO;gBAGF,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO;IAUhB,KAAK;CA4FZ"}
+{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/dev-server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAO/C,MAAM,MAAM,mBAAmB,GAAG;IAChC,aAAa,EAAE,MAAM,CAAA;IACrB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAID,eAAO,MAAM,aAAa,qEAAU,CAAA;AAEpC,KAAK,OAAO,GAAG,EAAE,CAAA;AAEjB,qBAAa,SAAS;IAOX,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,OAAO;IAPtB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,SAAO;gBAGF,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO;IAUhB,KAAK;CAmGZ"}

package/dist/node/compiler/dev-server.js

@@ -1,10 +1,11 @@
 import { parseURL } from "ufo";
 import { createDevServer } from "vinxi/dev-server";
 import { ProjectEnvUtils } from "../project/env.js";
-import { ensureSelfSignedCert } from "../utils/self-signed-cert.js";
+import { ensureSelfSignedCert, isCertificateTrusted } from "../utils/self-signed-cert.js";
 import { createConsole } from "../utils/stateful-log.js";
 import { createVinxiApp } from "./vinxi-app.js";
 import { createVinxiCodegen } from "./vinxi-codegen.js";
+import chalk from "chalk";
 const console = createConsole("Dev Server", "dev");
 export const serverlessLog = console;
 export class DevServer {
@@ -49,14 +50,18 @@ export class DevServer {
             process.env.NITRO_PRESET ??
             process.env.NITRO_TARGET ??
             (process.versions.bun !== undefined ? "bun" : "node-server");
-        // console.log("Ensuring self signed cert")
         const keys = await ensureSelfSignedCert(this.hostname, this.project.rootDir);
-        // console.log("Done")
         const httpsConfig = {
             cert: keys.certFile,
             key: keys.keyFile,
             domains: [this.hostname, "localhost"],
         };
+        isCertificateTrusted(keys.certFile).then((trusted) => {
+            if (!trusted) {
+                serverlessLog.warn(`The certificate for ${chalk.bold(this.hostname)} is not trusted.`);
+                serverlessLog.info(`- Please open Keychain\n- Search for ${chalk.bold(this.hostname)}\n- Double-click each entry\n- Select 'Always Trust'`);
+            }
+        });
         let devApp = null;
         app.hooks.addHooks({
             "app:dev:start": async ({ app, serveConfig }) => {

package/dist/node/compiler/get-vite-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-vite-config.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/get-vite-config.ts"],"names":[],"mappings":"AAKA,OAAO,EAAgB,YAAY,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEtD,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,UAAU,GAAG,KAAK,CAAA;IAC1B,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;IACzB,MAAM,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CA8BlD;AAED,KAAK,eAAe,GAAG;IACrB,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,wBAAgB,WAAW,CAAC,IAAI,GAAE,eAAoB,kBA4FrD;AAED;;GAEG;AACH,wBAAgB,SAAS,IAAI,YAAY,CA4CxC;AAwBD,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,EAAE,CAStD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,EAAE,CAE/D;AAED,wBAAgB,wBAAwB,IAAI,YAAY,CA8BvD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE;IAAE,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;CAAE,GAAG,YAAY,CA4B9E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CA8DtD"}
+{"version":3,"file":"get-vite-config.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/get-vite-config.ts"],"names":[],"mappings":"AAKA,OAAO,EAAgB,YAAY,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAGtD,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,UAAU,GAAG,KAAK,CAAA;IAC1B,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;IACzB,MAAM,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CAgDlD;AAED,KAAK,eAAe,GAAG;IACrB,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,wBAAgB,WAAW,CAAC,IAAI,GAAE,eAAoB,kBA4FrD;AAED;;GAEG;AACH,wBAAgB,SAAS,IAAI,YAAY,CA4CxC;AAwBD,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,EAAE,CAStD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,EAAE,CAE/D;AAED,wBAAgB,wBAAwB,IAAI,YAAY,CA8BvD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE;IAAE,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;CAAE,GAAG,YAAY,CA4B9E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CA8DtD"}

package/dist/node/compiler/get-vite-config.js

@@ -27,9 +27,26 @@ export function envPlugin(args) {
         }
         return result;
     };
+    const envVariables = {};
+    for (let key in process.env) {
+        if (key.startsWith("ED_PUBLIC_")) {
+            // Include all ED_PUBLIC_ variables
+            envVariables[key] = JSON.stringify(process.env[key]);
+        }
+        else if (key.startsWith("ED_")) {
+            if (!args.client) {
+                // Only include ED_ variables in non-client bundles
+                envVariables[key] = JSON.stringify(process.env[key]);
+            }
+        }
+    }
+    // const envFile = configDotenv()
+    // if (envFile.parsed) {
+    // }
     return replace({
         values: {
             ...expandDefines(envDefines, ["process.env.", "process.", "env."]),
+            ...expandDefines(envVariables, ["process.env.", "import.meta.env."]),
             "process.env.SITE_API_KEY": JSON.stringify(process.env.SITE_API_KEY),
         },
         preventAssignment: true,

package/dist/node/types/block-type.d.ts

@@ -41,21 +41,21 @@ export declare const BlockMetaSchema: z.ZodObject<{
     tags: string[];
     flags: Record<string, any>;
     category: string;
+    parent: string[];
+    inserter: boolean;
     acfName: string;
     fileName: string;
     graphqlFieldName: string;
     types: string[];
     childTags: string[];
     childBlocks: string[];
-    parent: string[];
     ancestors: string[];
     dynamic: boolean;
     cache: boolean;
     allowMultiple: boolean;
     frontendMode: "hidden" | "default" | "childrenOnly";
-    inserter: boolean;
-    description?: string | undefined;
     icon?: string | undefined;
+    description?: string | undefined;
     keywords?: string[] | undefined;
     templates?: string[] | null | undefined;
     postMetaBlock?: {
@@ -72,14 +72,15 @@ export declare const BlockMetaSchema: z.ZodObject<{
     mode?: "both" | "edit" | "preview" | undefined;
     tags?: string[] | undefined;
     flags?: Record<string, any> | undefined;
-    description?: string | undefined;
     icon?: string | undefined;
     category?: string | undefined;
+    description?: string | undefined;
     keywords?: string[] | undefined;
+    parent?: string[] | undefined;
+    inserter?: boolean | undefined;
     templates?: string[] | null | undefined;
     childTags?: string[] | undefined;
     childBlocks?: string[] | undefined;
-    parent?: string[] | undefined;
     ancestors?: string[] | undefined;
     dynamic?: boolean | undefined;
     cache?: boolean | undefined;
@@ -89,7 +90,6 @@ export declare const BlockMetaSchema: z.ZodObject<{
         fieldName: string;
     } | undefined;
     frontendMode?: "hidden" | "default" | "childrenOnly" | undefined;
-    inserter?: boolean | undefined;
 }>;
 export type BlockMetadata = z.infer<typeof BlockMetaSchema>;
 export type BlockMetadataConstructor = z.input<typeof BlockMetaSchema>;

package/dist/node/utils/self-signed-cert.d.ts

@@ -3,5 +3,7 @@ export declare function ensureSelfSignedCert(hostname: string, rootDir: string):
     keyFile: string;
     cert: string;
     key: string;
+    created: boolean;
 }>;
+export declare function isCertificateTrusted(cert: string): Promise<boolean>;
 //# sourceMappingURL=self-signed-cert.d.ts.map

package/dist/node/utils/self-signed-cert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"self-signed-cert.d.ts","sourceRoot":"","sources":["../../../src/node/utils/self-signed-cert.ts"],"names":[],"mappings":"AAIA,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;;;;;GAuC3E"}
+{"version":3,"file":"self-signed-cert.d.ts","sourceRoot":"","sources":["../../../src/node/utils/self-signed-cert.ts"],"names":[],"mappings":"AAKA,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;;;;;;GA6C3E;AAWD,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,oBAOtD"}

package/dist/node/utils/self-signed-cert.js

@@ -1,16 +1,20 @@
 import { serverlessLog } from "../compiler/dev-server.js";
 import { fs } from "./fs.js";
 import { createCA, createCert } from "mkcert";
+import { execa } from "execa";
 export async function ensureSelfSignedCert(hostname, rootDir) {
     const certFile = `${rootDir}/.eddev/certs/${hostname}.crt`;
     const keyFile = `${rootDir}/.eddev/certs/${hostname}.key`;
     if ((await fs.exists(certFile)) && (await fs.exists(keyFile))) {
-        return loadCert({
-            certFile,
-            keyFile,
-        });
+        return {
+            created: false,
+            ...(await loadCert({
+                certFile,
+                keyFile,
+            })),
+        };
     }
-    console.info("Creating a self-signed certificate for local development.");
+    console.info("Creating a self-signed certificate for local development...");
     const ca = await createCA({
         organization: "ED. Digital",
         countryCode: "AU",
@@ -26,12 +30,15 @@ export async function ensureSelfSignedCert(hostname, rootDir) {
     await fs.mkdirp(`${rootDir}/.eddev/certs`);
     await fs.writeFile(certFile, pems.cert);
     await fs.writeFile(keyFile, pems.key);
-    serverlessLog.help(`A new self-signed certificate has been created for ${hostname}! Please add the certificate to your keychain.`);
+    serverlessLog.warn(`A new self-signed certificate has been created for ${hostname}! Please add the certificate to your keychain.`);
     serverlessLog.help(`Certificate: ${certFile.replace(rootDir, "")}`);
-    return loadCert({
-        certFile,
-        keyFile,
-    });
+    return {
+        created: true,
+        ...(await loadCert({
+            certFile,
+            keyFile,
+        })),
+    };
 }
 async function loadCert({ certFile, keyFile }) {
     return {
@@ -41,3 +48,12 @@ async function loadCert({ certFile, keyFile }) {
         key: await fs.readFile(keyFile, "utf-8"),
     };
 }
+export async function isCertificateTrusted(cert) {
+    let { stdout, stderr } = await execa({ reject: false })(`security`, ["verify-cert", "-c", cert]);
+    if (stderr.includes("NOT_TRUSTED")) {
+        await execa({ reject: false })(`security`, ["add-certificates", cert]);
+    }
+    if (stdout.includes("success"))
+        return true;
+    return false;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.0.0-beta.152",
+  "version": "2.0.0-beta.154",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -108,6 +108,7 @@
     "content-security-policy-builder": "^2.2.0",
     "csstype": "^3.1.3",
     "dotenv": "^16.3.1",
+    "execa": "^9.5.2",
     "globby": "^14.0.2",
     "graphql": "^16.8.1",
     "ink": "^5.0.1",