eddev 2.0.0-beta.161 → 2.0.0-beta.163

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

@@ -1 +1 @@
-{"version":3,"file":"ContentBlocks.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/ContentBlocks.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA+B,YAAY,EAA4C,MAAM,OAAO,CAAA;AAM3G,KAAK,iBAAiB,CAAC,KAAK,EAAE,MAAM,IAAI;IACtC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,KAAK,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,GAAG,CAAA;IACV,WAAW,EAAE,YAAY,EAAE,CAAA;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,GAAG,CAAA;CACZ,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;AAE5B;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;KACxB,CAAC,IAAI,MAAM,UAAU,GAAG,iBAAiB,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CAC7D,CAAC,MAAM,UAAU,CAAC,CAAA;AAEnB;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,YAAY,EAAE,CAAA;IACzB,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB,IAAI,CAAC,EAAE,YAAY,CAAA;IACnB,IAAI,CAAC,EAAE,YAAY,CAAA;IACnB,OAAO,EAAE,YAAY,CAAA;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,eAAO,MAAM,aAAa,oDAAsD,CAAA;AAEhF,MAAM,MAAM,uBAAuB,GAAG;IACpC;;;;;;;;;;;;;;OAcG;IACH,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,EAAE,aAAa,KAAK,YAAY,CAAA;IACxE;;;;;;;;;;;;;OAaG;IACH,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE;QACb,SAAS,EAAE,YAAY,EAAE,CAAA;QACzB,MAAM,CAAC,EAAE,YAAY,CAAA;QACrB,IAAI,EAAE,YAAY,GAAG,IAAI,CAAA;QACzB,IAAI,EAAE,YAAY,GAAG,IAAI,CAAA;QACzB,KAAK,EAAE,MAAM,CAAA;KACd,KAAK,YAAY,GAAG,IAAI,CAAA;CAC1B,CAAA;AAED,KAAK,KAAK,GAAG;IACX,kDAAkD;IAClD,MAAM,CAAC,EAAE,YAAY,EAAE,CAAA;CACxB,GAAG,uBAAuB,CAAA;AAS3B;;GAEG;AACH,eAAO,MAAM,aAAa,8CAAgB,KAAK,oDA8E7C,CAAA;AAIF,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,YAAY,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,WAAW,kDAgCpD"}
+{"version":3,"file":"ContentBlocks.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/ContentBlocks.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA+B,YAAY,EAA4C,MAAM,OAAO,CAAA;AAM3G,KAAK,iBAAiB,CAAC,KAAK,EAAE,MAAM,IAAI;IACtC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,KAAK,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,GAAG,CAAA;IACV,WAAW,EAAE,YAAY,EAAE,CAAA;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,GAAG,CAAA;CACZ,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;AAE5B;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;KACxB,CAAC,IAAI,MAAM,UAAU,GAAG,iBAAiB,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CAC7D,CAAC,MAAM,UAAU,CAAC,CAAA;AAEnB;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,YAAY,EAAE,CAAA;IACzB,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB,IAAI,CAAC,EAAE,YAAY,CAAA;IACnB,IAAI,CAAC,EAAE,YAAY,CAAA;IACnB,OAAO,EAAE,YAAY,CAAA;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,eAAO,MAAM,aAAa,oDAAsD,CAAA;AAEhF,MAAM,MAAM,uBAAuB,GAAG;IACpC;;;;;;;;;;;;;;OAcG;IACH,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,EAAE,aAAa,KAAK,YAAY,CAAA;IACxE;;;;;;;;;;;;;OAaG;IACH,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE;QACb,SAAS,EAAE,YAAY,EAAE,CAAA;QACzB,MAAM,CAAC,EAAE,YAAY,CAAA;QACrB,IAAI,EAAE,YAAY,GAAG,IAAI,CAAA;QACzB,IAAI,EAAE,YAAY,GAAG,IAAI,CAAA;QACzB,KAAK,EAAE,MAAM,CAAA;KACd,KAAK,YAAY,GAAG,IAAI,CAAA;CAC1B,CAAA;AAED,KAAK,KAAK,GAAG;IACX,kDAAkD;IAClD,MAAM,CAAC,EAAE,YAAY,EAAE,CAAA;CACxB,GAAG,uBAAuB,CAAA;AAS3B;;GAEG;AACH,eAAO,MAAM,aAAa,8CAAgB,KAAK,oDA8E7C,CAAA;AAIF,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,YAAY,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,WAAW,kDAsCpD"}

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

@@ -84,6 +84,10 @@ export function SingleContentBlock(props) {
             return null;
         }
     }
+    block.props = block.props || {};
+    // Apply the block style class name
+    // @ts-ignore
+    block.props.blockStyle = block.class?.replace("is-style-", "");
     return (_jsx(InlineEditingContextProvider, { block: [block.blockName, block.props], values: block.inline, innerBlocks: block.innerBlocks, index: props.index ?? 0, children: _jsx(Component, { ...block.props, innerHTML: block.innerHTML, 
             // innerBlocks={block.innerBlocks}
             children: Array.isArray(block.innerBlocks) && block.innerBlocks.length ? (_jsx(ContentBlocks, { blocks: block.innerBlocks })) : null }) }));

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

@@ -28,14 +28,19 @@ type Props<T extends ElementType> = {
      */
     inlineToolbar?: boolean;
     /** Specify default content to use on the frontend if nothing has been entered */
-    defaultValue?: string;
+    defaultValue?: string | null | undefined;
     /**
      * Append a new block when the user hits 'Enter' while editing this text.
      * Specify 'true' to append a new paragraph block, or a string to specify a different block type.
      **/
     appendOnEnter?: boolean | string;
+    /**
+     * Remove this block when the user hits 'Backspace' at the start of the text.
+     * This is useful for blocks with a single text element
+     **/
+    removeOnDelete?: boolean;
     /** An optional placeholder to indicate a typable area */
-    placeholder?: string;
+    placeholder?: string | null;
 } & {
     /**
      * The 'key' of this editable text value.
@@ -50,12 +55,12 @@ type Props<T extends ElementType> = {
      * This can be combined with `useInlineEditableValue()`, `usePostTitleEditor()` or even `useState()`
      **/
     store: InlineTextValueStore | string;
-} & Omit<React.ComponentPropsWithoutRef<T>, "id"> & MaybeAsProp<React.ComponentPropsWithoutRef<T>>;
+} & Omit<React.ComponentPropsWithoutRef<T>, "id" | "defaultValue" | "placeholder"> & MaybeAsProp<React.ComponentPropsWithoutRef<T>>;
 type MaybeAsProp<T> = T extends {
     as?: infer U;
 } ? (U extends unknown ? {} : {
     asProp?: U;
 }) : {};
-export declare function EditableText<T extends ElementType>({ id, as, appendOnEnter, plainText, store, ...props }: Props<T>): import("react/jsx-runtime").JSX.Element | null;
+export declare function EditableText<T extends ElementType>({ id, as, appendOnEnter, removeOnDelete, plainText, store, ...props }: Props<T>): import("react/jsx-runtime").JSX.Element | null;
 export {};
 //# sourceMappingURL=EditableText.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"EditableText.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/EditableText.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAiC,MAAM,OAAO,CAAA;AAElE,OAAO,EAAE,gBAAgB,EAAoD,MAAM,qBAAqB,CAAA;AAGxG,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAA;AAE3D,KAAK,cAAc,GACf,WAAW,GACX,WAAW,GACX,aAAa,GACb,WAAW,GACX,oBAAoB,GACpB,gBAAgB,GAChB,gBAAgB,GAChB,kBAAkB,GAClB,cAAc,GACd,yBAAyB,GACzB,eAAe,CAAA;AAEnB,KAAK,KAAK,CAAC,CAAC,SAAS,WAAW,IAAI;IAClC,4CAA4C;IAC5C,EAAE,CAAC,EAAE,CAAC,CAAA;IACN,uDAAuD;IACvD,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B;;;;;;;;QAQI;IACJ,cAAc,CAAC,EAAE,CAAC,cAAc,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,EAAE,CAAA;IACnD;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,iFAAiF;IACjF,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB;;;QAGI;IACJ,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAChC,yDAAyD;IACzD,WAAW,CAAC,EAAE,MAAM,CAAA;CAErB,GAAG;IACF;;;;QAII;IACJ,EAAE,CAAC,EAAE,MAAM,CAAA;IACX;;;;;QAKI;IACJ,KAAK,EAAE,oBAAoB,GAAG,MAAM,CAAA;CACrC,GAAG,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAC/C,WAAW,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAA;AAEhD,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,CAAC,CAAC,SAAS,OAAO,GAAG,EAAE,GAAG;IAAE,MAAM,CAAC,EAAE,CAAC,CAAA;CAAE,CAAC,GAAG,EAAE,CAAA;AAEjG,wBAAgB,YAAY,CAAC,CAAC,SAAS,WAAW,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,kDA4FlH"}
+{"version":3,"file":"EditableText.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/EditableText.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAiC,MAAM,OAAO,CAAA;AAElE,OAAO,EAAE,gBAAgB,EAAoD,MAAM,qBAAqB,CAAA;AAGxG,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAA;AAE3D,KAAK,cAAc,GACf,WAAW,GACX,WAAW,GACX,aAAa,GACb,WAAW,GACX,oBAAoB,GACpB,gBAAgB,GAChB,gBAAgB,GAChB,kBAAkB,GAClB,cAAc,GACd,yBAAyB,GACzB,eAAe,CAAA;AAEnB,KAAK,KAAK,CAAC,CAAC,SAAS,WAAW,IAAI;IAClC,4CAA4C;IAC5C,EAAE,CAAC,EAAE,CAAC,CAAA;IACN,uDAAuD;IACvD,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B;;;;;;;;QAQI;IACJ,cAAc,CAAC,EAAE,CAAC,cAAc,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,EAAE,CAAA;IACnD;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,iFAAiF;IACjF,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACxC;;;QAGI;IACJ,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAChC;;;QAGI;IACJ,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,yDAAyD;IACzD,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAE5B,GAAG;IACF;;;;QAII;IACJ,EAAE,CAAC,EAAE,MAAM,CAAA;IACX;;;;;QAKI;IACJ,KAAK,EAAE,oBAAoB,GAAG,MAAM,CAAA;CACrC,GAAG,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,IAAI,GAAG,cAAc,GAAG,aAAa,CAAC,GAChF,WAAW,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAA;AAEhD,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,CAAC,CAAC,SAAS,OAAO,GAAG,EAAE,GAAG;IAAE,MAAM,CAAC,EAAE,CAAC,CAAA;CAAE,CAAC,GAAG,EAAE,CAAA;AAEjG,wBAAgB,YAAY,CAAC,CAAC,SAAS,WAAW,EAAE,EAClD,EAAE,EACF,EAAE,EACF,aAAa,EACb,cAAc,EACd,SAAS,EACT,KAAK,EACL,GAAG,KAAK,EACT,EAAE,KAAK,CAAC,CAAC,CAAC,kDAkGV"}

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

@@ -3,7 +3,7 @@ import { useRef } from "react";
 import { useRouter } from "../routing/hooks/useRouter.js";
 import { useBlockAppender, useBlockContext, useValueStore } from "./inline-editing.js";
 import { resolveAcfBlockName } from "./editor/block-templates.js";
-export function EditableText({ id, as, appendOnEnter, plainText, store, ...props }) {
+export function EditableText({ id, as, appendOnEnter, removeOnDelete, plainText, store, ...props }) {
     if (env.admin) {
         const readOnly = useBlockContext()?.readonly;
         if (!readOnly) {
@@ -29,7 +29,12 @@ export function EditableText({ id, as, appendOnEnter, plainText, store, ...props
             //   }
             // }, [value, plainText, props.allowedFormats])
             const appendBlocks = useBlockAppender();
-            return (_jsx(wp.blockEditor.RichText, { ...props, ref: ref, placeholder: props.placeholder ?? props.defaultValue, tagName: as, value: value || "", onChange: setValue, allowedFormats: props.inlineToolbar === false || plainText ? [] : props.allowedFormats, disableLineBreaks: props.disableLineBreaks, "data-allowed-formats": props.allowedFormats?.join(" "), onKeyDownCapture: (e) => {
+            return (_jsx(wp.blockEditor.RichText, { ...props, ref: ref, placeholder: props.defaultValue || props.placeholder, tagName: as, value: value || "", onChange: setValue, allowedFormats: props.inlineToolbar === false || plainText ? [] : props.allowedFormats, disableLineBreaks: props.disableLineBreaks, "data-allowed-formats": props.allowedFormats?.join(" "), onRemove: (forward) => {
+                    if (removeOnDelete && !forward) {
+                        const block = wp.data.select("core/block-editor").getSelectedBlock()?.clientId;
+                        wp.data.dispatch("core/block-editor").removeBlock(block);
+                    }
+                }, onKeyDownCapture: (e) => {
                     if (e.key === "Enter" && appendOnEnter && appendBlocks && !e.shiftKey) {
                         appendBlocks([
                             wp.blocks.createBlock(typeof appendOnEnter === "string" ? resolveAcfBlockName(appendOnEnter) : "core/paragraph"),

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

@@ -6,7 +6,7 @@ export function defineBlock(name, component) {
 defineBlock.meta = (name, meta) => {
     if (env.admin) {
         if (wp.blocks) {
-            blockMetaDescriptors.set(resolveAcfBlockName(name), meta);
+            blockMetaDescriptors.set(resolveAcfBlockName(name, false), meta);
         }
     }
 };

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

@@ -1 +1 @@
-{"version":3,"file":"EditorSupport.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/EditorSupport.tsx"],"names":[],"mappings":"AAMA,eAAO,MAAM,YAAY;UAAyB,MAAM;WAAS,GAAG;cAA0B,CAAA;AAE9F,wBAAgB,aAAa,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,kDA4B7C"}
+{"version":3,"file":"EditorSupport.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/EditorSupport.tsx"],"names":[],"mappings":"AAMA,eAAO,MAAM,YAAY;UAAyB,MAAM;WAAS,GAAG;cAA0B,CAAA;AAE9F,wBAAgB,aAAa,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,kDA+B7C"}

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

@@ -8,6 +8,8 @@ export function EditableBlock({ payload }) {
     if (!env.admin)
         throw new Error("`EditableBlock` can only be used in the admin environment");
     const info = useContext(BlockContext);
+    const props = payload ?? {};
+    props.blockStyle = info?.props?.attributes?.className?.replace("is-style-", "");
     useEffect(() => {
         const block = wp.data.select("core/block-editor").getBlock(info?.props.clientId);
         if (block && block.attributes) {

package/dist/app/lib/blocks/editor/block-templates.d.ts

@@ -1,5 +1,5 @@
 export type BlockTemplate = [name: ChildBlockTypeName, props: any, children?: BlockTemplate][];
-export declare function resolveAcfBlockName(name: string): string;
+export declare function resolveAcfBlockName(name: string, check?: boolean): string;
 export declare function transformBlockTemplate(template: BlockTemplate): BlockTemplate;
 export declare function applyTemplateBlocks(currentBlocks: any[], config: {
     defaultBlocks?: BlockTemplate;

package/dist/app/lib/blocks/editor/block-templates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block-templates.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/block-templates.tsx"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,aAAa,CAAC,EAAE,CAAA;AAE9F,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,UAG/C;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,CAI7E;AAED,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,GAAG,EAAE,EACpB,MAAM,EAAE;IACN,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,cAAc,CAAC,EAAE,aAAa,CAAA;IAC9B,cAAc,CAAC,EAAE,aAAa,CAAA;CAC/B,SA2CF;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,UAAO,EAAE,cAAc,UAAO,GAAG,GAAG,CAyB5G"}
+{"version":3,"file":"block-templates.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/block-templates.tsx"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,aAAa,CAAC,EAAE,CAAA;AAE9F,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,UAAO,UAO7D;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,CAI7E;AAED,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,GAAG,EAAE,EACpB,MAAM,EAAE;IACN,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,cAAc,CAAC,EAAE,aAAa,CAAA;IAC9B,cAAc,CAAC,EAAE,aAAa,CAAA;CAC/B,SA2CF;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,UAAO,EAAE,cAAc,UAAO,GAAG,GAAG,CAyB5G"}

package/dist/app/lib/blocks/editor/block-templates.js

@@ -1,6 +1,11 @@
-export function resolveAcfBlockName(name) {
+export function resolveAcfBlockName(name, check = true) {
     const acfName = "acf/" + name.replace("/", "-").replace("_", "");
-    return wp.blocks.getBlockType(acfName) ? acfName : name;
+    if (check) {
+        return wp.blocks.getBlockType(acfName) ? acfName : name;
+    }
+    else {
+        return acfName;
+    }
 }
 export function transformBlockTemplate(template) {
     return template.map(([name, props, children]) => {

package/dist/app/lib/blocks/editor/editor-config.d.ts

@@ -26,19 +26,21 @@ export type EditorConfigItem = {
     /** A full-page block template */
     template?: BlockTemplate;
 };
-type BlockWrapperClassGenerator = (block: {
+type EditorBlock = {
     name: string;
     slug: BlockTypeName | (string & {});
     attributes: any;
     clientId: string;
     rootClientId: string;
+    isRootBlock: string;
     canMove: boolean;
     canRemove: boolean;
     isSelected: boolean;
     isSelectionEnabled: boolean;
     tags?: DefinedBlockTags;
     flags?: DefinedBlockFlags;
-}, post: PostInfo) => string | void;
+};
+export type BlockWrapperClassGenerator = (block: EditorBlock, post: PostInfo) => string | void;
 export declare const editorConfigStore: {
     config: EditorConfig | null;
     currentBlocksConfig: EditorConfigItem;

package/dist/app/lib/blocks/editor/editor-config.d.ts.map

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

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":"AA6BA,eAAO,MAAM,oBAAoB;;CAAgC,CAAA;AAEjE,wBAAgB,iBAAiB,kBAsBhC;AAED,wBAAgB,uBAAuB,SAgNtC"}
+{"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,SAwNtC"}

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

@@ -3,6 +3,7 @@ import { useEffect } from "react";
 import { subscribe, useSnapshot } from "valtio";
 import { proxyMap } from "valtio/utils";
 import { getBlockMetadata } from "../block-utils.js";
+import { registerBuiltinBlocks } from "../builtin-blocks.js";
 import { InlineEditingContextProvider } from "../inline-editing.js";
 import { EditorHighlights } from "./EditorHighlights.js";
 import { BlockContext, EditableBlock } from "./EditorSupport.js";
@@ -10,7 +11,6 @@ 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 { registerBuiltinBlocks } from "../builtin-blocks.js";
 function listenForHandleResize() {
     let interval = setInterval(() => {
         let viewportTarget = document.querySelector(".interface-interface-skeleton__content");
@@ -57,6 +57,7 @@ export function installEDGutenbergHooks() {
         return (props) => {
             const generateClass = useSnapshot(editorConfigStore).currentBlocksConfig?.generateBlockClassName;
             Object.assign(props, getBlockMetadata(props.name));
+            props.isRootBlock = !props.rootClientId;
             let className = generateClass ? generateClass(props, getEditingPostInfo()) : "";
             return _jsx(BlockListBlock, { ...props, className: className });
         };
@@ -127,6 +128,12 @@ export function installEDGutenbergHooks() {
             // Add an 'inline' object attribute, which will hold all inline contents
             item.attributes.inline = { type: "object" };
             item.attributes.values = { type: "object" };
+            // Add className support to all ACF blocks
+            const defaultStyleName = item.styles?.find((s) => s.isDefault)?.name;
+            item.attributes.className = {
+                type: "string",
+                default: item.attributes?.className?.default ?? (defaultStyleName ? "is-style-" + defaultStyleName : undefined),
+            };
             item.attributes.isFromTemplate = { type: "boolean" };
             item.supports.customClassName = false;
             item.edit = function (props) {
@@ -180,7 +187,7 @@ export function installEDGutenbergHooks() {
                     to: item.transforms?.to ?? [],
                     ungroup: item.transforms?.ungroup,
                 };
-                const meta = blockMetaDescriptors.get(resolveAcfBlockName(name));
+                const meta = blockMetaDescriptors.get(resolveAcfBlockName(name, false));
                 if (meta?.transforms) {
                     result.from = [...(result.from ?? []), ...(meta.transforms.from ?? [])];
                     result.to = [...(result.to ?? []), ...(meta.transforms.to ?? [])];

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" | "selector" | "class" | readonly [("class" | undefined)?, (string | undefined)?] | readonly [("selector" | undefined)?, (string | undefined)?] | readonly [("variant" | undefined)?, (string | readonly string[] | 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 theme?: {
             readonly [x: string]: any;
             readonly screens?: readonly string[] | ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").ScreensConfig) | {
@@ -913,10 +913,10 @@ export declare function useTailwindConfig(): {
             readonly borderRadius?: boolean | undefined;
             readonly padding?: boolean | undefined;
             readonly flex?: boolean | undefined;
-            readonly blur?: boolean | undefined;
-            readonly resize?: boolean | undefined;
             readonly position?: boolean | undefined;
             readonly columns?: boolean | undefined;
+            readonly blur?: boolean | undefined;
+            readonly resize?: 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" | "selector" | "class" | readonly [("class" | undefined)?, (string | undefined)?] | readonly [("selector" | undefined)?, (string | undefined)?] | readonly [("variant" | undefined)?, (string | readonly string[] | 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 theme?: {
                     readonly [x: string]: any;
                     readonly screens?: readonly string[] | ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").ScreensConfig) | {
@@ -1958,10 +1958,10 @@ export declare function useTailwindConfig(): {
                     readonly borderRadius?: boolean | undefined;
                     readonly padding?: boolean | undefined;
                     readonly flex?: boolean | undefined;
-                    readonly blur?: boolean | undefined;
-                    readonly resize?: boolean | undefined;
                     readonly position?: boolean | undefined;
                     readonly columns?: boolean | undefined;
+                    readonly blur?: boolean | undefined;
+                    readonly resize?: 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" | "selector" | "class" | readonly [("class" | undefined)?, (string | undefined)?] | readonly [("selector" | undefined)?, (string | undefined)?] | readonly [("variant" | undefined)?, (string | readonly string[] | 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 theme?: {
         readonly [x: string]: any;
         readonly screens?: readonly string[] | ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").ScreensConfig) | {
@@ -2978,10 +2978,10 @@ export declare function useTailwindConfig(): {
         readonly borderRadius?: boolean | undefined;
         readonly padding?: boolean | undefined;
         readonly flex?: boolean | undefined;
-        readonly blur?: boolean | undefined;
-        readonly resize?: boolean | undefined;
         readonly position?: boolean | undefined;
         readonly columns?: boolean | undefined;
+        readonly blur?: boolean | undefined;
+        readonly resize?: 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" | "selector" | "class" | readonly [("class" | undefined)?, (string | undefined)?] | readonly [("selector" | undefined)?, (string | undefined)?] | readonly [("variant" | undefined)?, (string | readonly string[] | 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 theme?: {
                     readonly [x: string]: any;
                     readonly screens?: readonly string[] | ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").ScreensConfig) | {
@@ -4049,10 +4049,10 @@ export declare function useTailwindConfig(): {
                     readonly borderRadius?: boolean | undefined;
                     readonly padding?: boolean | undefined;
                     readonly flex?: boolean | undefined;
-                    readonly blur?: boolean | undefined;
-                    readonly resize?: boolean | undefined;
                     readonly position?: boolean | undefined;
                     readonly columns?: boolean | undefined;
+                    readonly blur?: boolean | undefined;
+                    readonly resize?: 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" | "selector" | "class" | readonly [("class" | undefined)?, (string | undefined)?] | readonly [("selector" | undefined)?, (string | undefined)?] | readonly [("variant" | undefined)?, (string | readonly string[] | 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 theme?: {
                 readonly [x: string]: any;
                 readonly screens?: readonly string[] | ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").ScreensConfig) | {
@@ -5067,10 +5067,10 @@ export declare function useTailwindConfig(): {
                 readonly borderRadius?: boolean | undefined;
                 readonly padding?: boolean | undefined;
                 readonly flex?: boolean | undefined;
-                readonly blur?: boolean | undefined;
-                readonly resize?: boolean | undefined;
                 readonly position?: boolean | undefined;
                 readonly columns?: boolean | undefined;
+                readonly blur?: boolean | undefined;
+                readonly resize?: boolean | undefined;
                 readonly preflight?: boolean | undefined;
                 readonly container?: boolean | undefined;
                 readonly accessibility?: boolean | undefined;

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,2CAobzC"}
+{"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,2CAmbzC"}

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

@@ -354,7 +354,6 @@ export function BrowserRouter(props) {
                         },
                     });
                 }
-                console.log(mode, href, isSameUrl);
                 if (mode === "ignore" || cancelled) {
                     e.preventDefault();
                     return;

package/dist/app/lib/routing/components/Link.d.ts

@@ -1,5 +1,5 @@
 import { ComponentPropsWithRef, ElementType, MouseEvent, ReactElement } from "react";
-type Props<T extends ElementType = "a"> = NoInfer<Omit<ComponentPropsWithRef<T>, "href">> & {
+type Props<T extends ElementType = "a"> = NoInfer<Omit<ComponentPropsWithRef<T>, "href" | "target">> & {
     href?: string | null;
     target?: string | null;
     as?: T;

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

@@ -1 +1 @@
-{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/Link.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAsC,MAAM,OAAO,CAAA;AASxH,KAAK,KAAK,CAAC,CAAC,SAAS,WAAW,GAAG,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG;IAC1F,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,EAAE,CAAC,EAAE,CAAC,CAAA;IACN,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAA;CAC/B,CAAA;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,WAAW,GAAG,GAAG,EACtD,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAC9B,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC;;;;iBAOjB,UAAU;;;;;;;;sBAgBP,UAAU;iBASf,UAAU;GAK1B;AAED,eAAO,MAAM,IAAI,EAIX,CAAC,CAAC,SAAS,WAAW,GAAG,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,YAAY,CAAA;AAKpE;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM;;;;;;;;;;;;EA6BxC"}
+{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/Link.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAsC,MAAM,OAAO,CAAA;AASxH,KAAK,KAAK,CAAC,CAAC,SAAS,WAAW,GAAG,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,GAAG;IACrG,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,EAAE,CAAC,EAAE,CAAC,CAAA;IACN,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAA;CAC/B,CAAA;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,WAAW,GAAG,GAAG,EACtD,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAC9B,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC;;;;iBAOjB,UAAU;;;;;;;;sBAgBP,UAAU;iBASf,UAAU;GAK1B;AAED,eAAO,MAAM,IAAI,EAIX,CAAC,CAAC,SAAS,WAAW,GAAG,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,YAAY,CAAA;AAKpE;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM;;;;;;;;;;;;EA6BxC"}

package/dist/app/server/rpc.d.ts

@@ -9,12 +9,20 @@ export declare const rpcApi: {
     }>;
     procedure: import("@trpc/server/unstable-core-do-not-import").ProcedureBuilder<RPCContext, object, object, typeof import("@trpc/server/unstable-core-do-not-import").unsetMarker, typeof import("@trpc/server/unstable-core-do-not-import").unsetMarker, typeof import("@trpc/server/unstable-core-do-not-import").unsetMarker, typeof import("@trpc/server/unstable-core-do-not-import").unsetMarker, false>;
     middleware: <$ContextOverrides>(fn: import("@trpc/server/unstable-core-do-not-import").MiddlewareFunction<RPCContext, object, object, $ContextOverrides, unknown>) => import("@trpc/server/unstable-core-do-not-import").MiddlewareBuilder<RPCContext, object, $ContextOverrides, unknown>;
-    router: <TInput extends import("@trpc/server/unstable-core-do-not-import").CreateRouterOptions>(input: TInput) => import("@trpc/server/unstable-core-do-not-import").BuiltRouter<{
-        ctx: RPCContext;
-        meta: object;
-        errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
-        transformer: true;
-    }, import("@trpc/server/unstable-core-do-not-import").DecorateCreateRouterOptions<TInput>>;
+    router: {
+        <TInput extends import("@trpc/server").RouterRecord>(input: TInput): import("@trpc/server/unstable-core-do-not-import").BuiltRouter<{
+            ctx: RPCContext;
+            meta: object;
+            errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
+            transformer: true;
+        }, TInput>;
+        <TInput extends import("@trpc/server/unstable-core-do-not-import").CreateRouterOptions>(input: TInput): import("@trpc/server/unstable-core-do-not-import").BuiltRouter<{
+            ctx: RPCContext;
+            meta: object;
+            errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
+            transformer: true;
+        }, import("@trpc/server/unstable-core-do-not-import").DecorateCreateRouterOptions<TInput>>;
+    };
     mergeRouters: typeof import("@trpc/server/unstable-core-do-not-import").mergeRouters;
     createCallerFactory: <TRecord extends import("@trpc/server").RouterRecord>(router: Pick<import("@trpc/server/unstable-core-do-not-import").Router<{
         ctx: RPCContext;
@@ -40,7 +48,7 @@ export declare function instantiateRouter<T extends RouterSchema>(routes: T): im
     meta: object;
     errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
     transformer: true;
-}, import("@trpc/server/unstable-core-do-not-import").DecorateCreateRouterOptions<T>>;
+}, T>;
 export type InferRPCServerContext<TFunc extends null | ((opts: FetchCreateContextFnOptions) => any)> = {
     req: Request;
     resHeaders: Headers;

package/dist/app/server/rpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../../src/app/server/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,MAAM,cAAc,CAAA;AACrD,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAA;AAGzE,eAAO,MAAM,MAAM;;;;;;;;;mCA4B04D,0CAAU;;;;;;;iDAAqwB,cAAU;;;;;;;;;;;CA1BprF,CAAA;AAEF,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,YAAY,CAAC,CAAA;AAE/E,eAAO,MAAM,GAAG;;;WAGP,CAAC,SAAS,YAAY,UAAU,CAAC,GAAG,CAAC;CAG7C,CAAA;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EACnC,IAAI,EAAE,CAAC,IAAI,EAAE,2BAA2B,KAAK,CAAC,GAC7C,CAAC,IAAI,EAAE,2BAA2B,KAAK,CAAC,CAE1C;AAED,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,YAAY,EAAE,MAAM,EAAE,CAAC;;;;;sFAElE;AAED,MAAM,MAAM,qBAAqB,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,2BAA2B,KAAK,GAAG,CAAC,IAAI;IACrG,GAAG,EAAE,OAAO,CAAA;IACZ,UAAU,EAAE,OAAO,CAAA;CACpB,GAAG,CAAC,KAAK,SAAS,CAAC,IAAI,EAAE,2BAA2B,KAAK,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAA"}
+{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../../src/app/server/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,MAAM,cAAc,CAAA;AACrD,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAA;AAGzE,eAAO,MAAM,MAAM;;;;;;;;;;+BA4Bw5D,cAAU;;;;;;+BAAoa,0CAAU;;;;;;;;iDAAkyB,cAAU;;;;;;;;;;;CA1B7oG,CAAA;AAEF,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,YAAY,CAAC,CAAA;AAE/E,eAAO,MAAM,GAAG;;;WAGP,CAAC,SAAS,YAAY,UAAU,CAAC,GAAG,CAAC;CAG7C,CAAA;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EACnC,IAAI,EAAE,CAAC,IAAI,EAAE,2BAA2B,KAAK,CAAC,GAC7C,CAAC,IAAI,EAAE,2BAA2B,KAAK,CAAC,CAE1C;AAED,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,YAAY,EAAE,MAAM,EAAE,CAAC;;;;;MAElE;AAED,MAAM,MAAM,qBAAqB,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,2BAA2B,KAAK,GAAG,CAAC,IAAI;IACrG,GAAG,EAAE,OAAO,CAAA;IACZ,UAAU,EAAE,OAAO,CAAA;CACpB,GAAG,CAAC,KAAK,SAAS,CAAC,IAAI,EAAE,2BAA2B,KAAK,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAA"}

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

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

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.161";
+export const VERSION = "2.0.0-beta.163";

package/dist/node/graphql/graphql-codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-codegen.d.ts","sourceRoot":"","sources":["../../../src/node/graphql/graphql-codegen.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAkB/C,eAAO,MAAM,UAAU,kEAAgE,CAAA;AA4CvF,KAAK,uBAAuB,GAAG;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,qBAAa,gBAAgB;IAiBlB,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,uBAAuB;IAjBtC,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,WAAW,CAAO;IAC1B,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,oBAAoB,CAAiB;IAC7C,OAAO,CAAC,YAAY,CAAQ;IAE5B,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,UAAU,CAAgC;IAElD,OAAO,CAAC,cAAc,CAAW;IAEjC,OAAO,CAAC,SAAS,CAAC,CAAgB;IAElC,OAAO,CAAC,UAAU,CAAC,CAAgB;gBAG1B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,uBAAuB;IA8DhC,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE;IAkBvE,KAAK;YA8BG,MAAM;IA+CpB,aAAa;IAOP,QAAQ;IA6Md,OAAO,CAAC,mBAAmB;IAwE3B;;OAEG;IACH,OAAO,CAAC,oBAAoB;YAoEd,UAAU;IAqDlB,iBAAiB;IAkFjB,gBAAgB;IAyCtB;;OAEG;YACW,eAAe;CAQ9B"}
+{"version":3,"file":"graphql-codegen.d.ts","sourceRoot":"","sources":["../../../src/node/graphql/graphql-codegen.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAkB/C,eAAO,MAAM,UAAU,kEAAgE,CAAA;AA4CvF,KAAK,uBAAuB,GAAG;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,qBAAa,gBAAgB;IAiBlB,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,uBAAuB;IAjBtC,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,WAAW,CAAO;IAC1B,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,oBAAoB,CAAiB;IAC7C,OAAO,CAAC,YAAY,CAAQ;IAE5B,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,UAAU,CAAgC;IAElD,OAAO,CAAC,cAAc,CAAW;IAEjC,OAAO,CAAC,SAAS,CAAC,CAAgB;IAElC,OAAO,CAAC,UAAU,CAAC,CAAgB;gBAG1B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,uBAAuB;IA8DhC,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE;IAkBvE,KAAK;YA8BG,MAAM;IA+CpB,aAAa;IAOP,QAAQ;IAsOd,OAAO,CAAC,mBAAmB;IAwE3B;;OAEG;IACH,OAAO,CAAC,oBAAoB;YAoEd,UAAU;IAqDlB,iBAAiB;IAkFjB,gBAAgB;IAyCtB;;OAEG;YACW,eAAe;CAQ9B"}

package/dist/node/graphql/graphql-codegen.js

@@ -17,7 +17,7 @@ import pluginFiles from "./plugins/gql-plugin-files.js";
 import pluginNoDuplicates from "./plugins/gql-plugin-no-duplicates.js";
 import pluginQueries from "./plugins/gql-plugin-queries.js";
 import { FSCodegen } from "../utils/fs-codegen.js";
-import { camelCase } from "change-case-all";
+import { camelCase, pascalCase } from "change-case-all";
 export const graphqlLog = createConsole("GraphQL Codegen", "graphql");
 const console = graphqlLog;
 class GraphQLValidationError {
@@ -247,6 +247,19 @@ export class GraphQLGenerator {
         this.writeSchemaFile(schemaResult.schema);
         // Get GraphQL files
         const graphQLFiles = await this.fileLoader.get();
+        // Fill in any missing operation names
+        for (let [key, entry] of Object.entries(graphQLFiles.blocks)) {
+            if (entry.ast) {
+                const main = entry.ast.definitions[0];
+                if (main?.kind === Kind.OPERATION_DEFINITION && !main.name) {
+                    // @ts-ignore
+                    main.name = {
+                        kind: Kind.NAME,
+                        value: pascalCase(key.replace(".graphql", "").split(/\//).join("-")),
+                    };
+                }
+            }
+        }
         // Validate them against the schema
         const validationErrors = this.validateGraphQLFiles(graphQLFiles, schemaResult.rawSchema);
         if (validationErrors.length > 0) {
@@ -288,7 +301,7 @@ export class GraphQLGenerator {
             this.generateTS("types.graphql.ts", schemaResult.rawSchema, {
                 documents: getDocuments(["queries", "views", "blocks", "fragments"]),
                 hasDocuments: true,
-                banner: `import { ContentBlock } from "eddev/blocks"`,
+                banner: [`import { ContentBlock } from "eddev/blocks"`, ...(wp.scalarTypeImports ?? [])].join("\n"),
                 footer: Object.keys(wp.scalarTypes)
                     .map((name) => `export type ${name.endsWith("Option") ? name : name + "Scalar"} = Scalars["${name}"]["output"]`)
                     .join("\n"),
@@ -357,7 +370,7 @@ export class GraphQLGenerator {
                     rootDir: this.project.rootDir,
                     globalName: "BlockProps",
                     folderName: "blocks",
-                    getType: (importedName, def) => {
+                    getType: (importedName, def, name) => {
                         // const queryKeyVals: any[] = []
                         let blockSelection = "";
                         let hasOthers = false;
@@ -379,6 +392,13 @@ export class GraphQLGenerator {
                             return {};
                         return type.join(" & ");
                     },
+                    additionalTypes: Object.fromEntries(Object.entries(blockManifest.blocks).map(([key, block]) => {
+                        const styleNames = new Set(block.blockStyles
+                            ?.map((s) => s.name)
+                            .filter(Boolean)
+                            .map((name) => JSON.stringify(name)) ?? []);
+                        return [key, styleNames.size > 0 ? `{ "blockStyle": ${[...styleNames].join("|")} }` : null];
+                    })),
                 },
             }),
             this.generateTS("hooks/queries.ts", schemaResult.rawSchema, {

package/dist/node/graphql/plugins/gql-plugin-files.d.ts

@@ -3,7 +3,7 @@ type PluginConfig = {
     rootDir: string;
     fallbackType: string;
     globalName: string;
-    getType?: (importedName: string, definition: any) => string;
+    getType?: (importedName: string, definition: any, name: string) => string;
     additionalTypes: {
         [key: string]: string;
     };

package/dist/node/graphql/plugins/gql-plugin-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gql-plugin-files.d.ts","sourceRoot":"","sources":["../../../../src/node/graphql/plugins/gql-plugin-files.ts"],"names":[],"mappings":"AAKA,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,MAAM,CAAA;IAC3D,eAAe,EAAE;QACf,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KACtB,CAAA;IACD,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;;qBAGkB,GAAG,aAAa,GAAG,UAAU,YAAY,QAAQ,GAAG;;AADvE,wBAkEC"}
+{"version":3,"file":"gql-plugin-files.d.ts","sourceRoot":"","sources":["../../../../src/node/graphql/plugins/gql-plugin-files.ts"],"names":[],"mappings":"AAKA,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IACzE,eAAe,EAAE;QACf,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KACtB,CAAA;IACD,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;;qBAGkB,GAAG,aAAa,GAAG,UAAU,YAAY,QAAQ,GAAG;;AADvE,wBAkEC"}

package/dist/node/graphql/plugins/gql-plugin-files.js

@@ -31,9 +31,9 @@ export default {
             filesFound[relative.replace(/\.graphql/, "")] = true;
             if (relative && doc.document.definitions.length) {
                 let importedName = doc.document.definitions[0].name.value + "Query";
-                let typeName = config.getType?.(importedName, doc.document.definitions[0]) || importedName;
-                imports.push(importedName);
                 const key = relative.replace(/\.graphql/, "");
+                let typeName = config.getType?.(importedName, doc.document.definitions[0], key) || importedName;
+                imports.push(importedName);
                 items.push(`${JSON.stringify(key)}: ${typeForFile(key, typeName)}`);
             }
         });

package/dist/node/project/eddev-build-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eddev-build-file.d.ts","sourceRoot":"","sources":["../../../src/node/project/eddev-build-file.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAG3C;;GAEG;AACH,qBAAa,eAAe;IACP,OAAO,EAAE,OAAO;gBAAhB,OAAO,EAAE,OAAO;IAEnC,KAAK;IAUC,KAAK;CA8DZ"}
+{"version":3,"file":"eddev-build-file.d.ts","sourceRoot":"","sources":["../../../src/node/project/eddev-build-file.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAG3C;;GAEG;AACH,qBAAa,eAAe;IACP,OAAO,EAAE,OAAO;gBAAhB,OAAO,EAAE,OAAO;IAEnC,KAAK;IAUC,KAAK;CAgEZ"}

package/dist/node/project/eddev-build-file.js

@@ -61,6 +61,8 @@ export class BuildInfoWriter {
                     canCache: block.cache,
                     frontendMode: block.frontendMode,
                     postmeta: block.postMetaBlock,
+                    blockStyles: block.blockStyles,
+                    defaultBlockStyle: block.blockStyles?.find((s) => s.isDefault)?.name,
                 };
             }),
             templates: Object.values(viewManifest.views)

package/dist/node/project/manifest/block-manifest.js

@@ -133,6 +133,7 @@ function readBlockDataAsJSONExport(file, contents) {
     result.mode = userData.editMode;
     result.inserter = userData.inserter;
     result.frontendMode = userData.frontendMode;
+    result.blockStyles = userData.blockStyles;
     if (userData.postMetaBlock) {
         result.postMetaBlock = {
             postTypes: userData.postMetaBlock.postTypes,

package/dist/node/project/project.d.ts

@@ -62,6 +62,7 @@ export declare class Project {
             isScalar: boolean;
             typeName: string;
         }[];
+        scalarTypeImports?: string[];
     }>;
     static create(args: ProjectArgs): Promise<Project>;
 }

package/dist/node/project/project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../src/node/project/project.ts"],"names":[],"mappings":"AAMA,OAAO,EAAgB,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEpD,OAAO,EAAE,sBAAsB,EAAqB,MAAM,8BAA8B,CAAA;AACxF,OAAO,EAAE,sBAAsB,EAAqB,MAAM,8BAA8B,CAAA;AACxF,OAAO,EAAE,sBAAsB,EAAqB,MAAM,+BAA+B,CAAA;AACzF,OAAO,EAAE,qBAAqB,EAAoB,MAAM,6BAA6B,CAAA;AACrF,OAAO,EAAE,uBAAuB,EAAsB,MAAM,+BAA+B,CAAA;AAO3F,eAAO,MAAM,UAAU,yDAAU,CAAA;AAEjC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,yBAAyB,CAAC,EAAE,OAAO,CAAA;CACpC,CAAA;AAED;;;GAGG;AACH,qBAAa,OAAO;IAClB,OAAO,SAAK;IACZ,SAAS,SAAK;IACd,SAAS,SAAK;IACd,OAAO,SAAK;IACZ,UAAU,SAAK;IACf,MAAM,SAAK;IAEX,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB,YAAY,SAAoB;IAChC,MAAM,EAAG,sBAAsB,CAAA;IAC/B,KAAK,EAAG,qBAAqB,CAAA;IAC7B,MAAM,EAAG,sBAAsB,CAAA;IAC/B,OAAO,EAAG,uBAAuB,CAAA;IACjC,YAAY,EAAG,sBAAsB,CAAA;IACrC,OAAO,CAAC,EAAE,CAAS;IAEnB,yBAAyB,UAAQ;IAEjC,OAAO;IAYD,kBAAkB,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,GAAG;QAAE,OAAO,EAAE,KAAK,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;YA4B9E,IAAI;IAmEZ,kBAAkB;IAUxB,iBAAiB;IAkBX,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;WAKT,MAAM,CAAC,IAAI,EAAE,WAAW;CAKtC"}
+{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../src/node/project/project.ts"],"names":[],"mappings":"AAMA,OAAO,EAAgB,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEpD,OAAO,EAAE,sBAAsB,EAAqB,MAAM,8BAA8B,CAAA;AACxF,OAAO,EAAE,sBAAsB,EAAqB,MAAM,8BAA8B,CAAA;AACxF,OAAO,EAAE,sBAAsB,EAAqB,MAAM,+BAA+B,CAAA;AACzF,OAAO,EAAE,qBAAqB,EAAoB,MAAM,6BAA6B,CAAA;AACrF,OAAO,EAAE,uBAAuB,EAAsB,MAAM,+BAA+B,CAAA;AAO3F,eAAO,MAAM,UAAU,yDAAU,CAAA;AAEjC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,yBAAyB,CAAC,EAAE,OAAO,CAAA;CACpC,CAAA;AAED;;;GAGG;AACH,qBAAa,OAAO;IAClB,OAAO,SAAK;IACZ,SAAS,SAAK;IACd,SAAS,SAAK;IACd,OAAO,SAAK;IACZ,UAAU,SAAK;IACf,MAAM,SAAK;IAEX,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB,YAAY,SAAoB;IAChC,MAAM,EAAG,sBAAsB,CAAA;IAC/B,KAAK,EAAG,qBAAqB,CAAA;IAC7B,MAAM,EAAG,sBAAsB,CAAA;IAC/B,OAAO,EAAG,uBAAuB,CAAA;IACjC,YAAY,EAAG,sBAAsB,CAAA;IACrC,OAAO,CAAC,EAAE,CAAS;IAEnB,yBAAyB,UAAQ;IAEjC,OAAO;IAYD,kBAAkB,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,GAAG;QAAE,OAAO,EAAE,KAAK,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;YA4B9E,IAAI;IAmEZ,kBAAkB;IAUxB,iBAAiB;IAkBX,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;WAKT,MAAM,CAAC,IAAI,EAAE,WAAW;CAKtC"}

package/dist/node/project/wp-info.d.ts

@@ -21,6 +21,7 @@ type WPInfoData = {
         isScalar: boolean;
         typeName: string;
     }[];
+    scalarTypeImports?: string[];
 };
 export declare class WPInfo {
     siteUrl: string;

package/dist/node/project/wp-info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wp-info.d.ts","sourceRoot":"","sources":["../../../src/node/project/wp-info.ts"],"names":[],"mappings":"AAGA,KAAK,UAAU,GAAG;IAChB,SAAS,EAAE;QACT,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,CAAA;QACb,UAAU,EAAE,OAAO,CAAA;QACnB,iBAAiB,EAAE,MAAM,CAAA;QACzB,iBAAiB,EAAE,MAAM,CAAA;QACzB,iBAAiB,EAAE,OAAO,CAAA;KAC3B,EAAE,CAAA;IACH,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAA;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,EAAE,MAAM,CAAA;QACf,GAAG,EAAE,MAAM,CAAA;KACZ,EAAE,CAAA;IACH,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,SAAS,EAAE,MAAM,EAAE,CAAA;IACnB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC,aAAa,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CACtE,CAAA;AAED,qBAAa,MAAM;IAEE,OAAO,EAAE,MAAM;IADlC,OAAO,CAAC,MAAM,CAAC,CAAY;gBACR,OAAO,EAAE,MAAM;IAE5B,IAAI;IASJ,OAAO,CAAC,KAAK,GAAE,OAAe;IAe9B,eAAe;CAetB"}
+{"version":3,"file":"wp-info.d.ts","sourceRoot":"","sources":["../../../src/node/project/wp-info.ts"],"names":[],"mappings":"AAGA,KAAK,UAAU,GAAG;IAChB,SAAS,EAAE;QACT,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,CAAA;QACb,UAAU,EAAE,OAAO,CAAA;QACnB,iBAAiB,EAAE,MAAM,CAAA;QACzB,iBAAiB,EAAE,MAAM,CAAA;QACzB,iBAAiB,EAAE,OAAO,CAAA;KAC3B,EAAE,CAAA;IACH,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAA;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,EAAE,MAAM,CAAA;QACf,GAAG,EAAE,MAAM,CAAA;KACZ,EAAE,CAAA;IACH,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,SAAS,EAAE,MAAM,EAAE,CAAA;IACnB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC,aAAa,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACrE,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAA;CAC7B,CAAA;AAED,qBAAa,MAAM;IAEE,OAAO,EAAE,MAAM;IADlC,OAAO,CAAC,MAAM,CAAC,CAAY;gBACR,OAAO,EAAE,MAAM;IAE5B,IAAI;IASJ,OAAO,CAAC,KAAK,GAAE,OAAe;IAe9B,eAAe;CAetB"}

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

@@ -9,7 +9,7 @@ export declare const BlockMetaSchema: z.ZodObject<{
     description: z.ZodOptional<z.ZodString>;
     category: z.ZodDefault<z.ZodString>;
     icon: z.ZodOptional<z.ZodString>;
-    keywords: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    keywords: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
     types: z.ZodArray<z.ZodString, "many">;
     templates: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString, "many">>>;
     mode: z.ZodDefault<z.ZodEnum<["preview", "edit", "both"]>>;
@@ -34,6 +34,19 @@ export declare const BlockMetaSchema: z.ZodObject<{
     }>>;
     frontendMode: z.ZodDefault<z.ZodEnum<["hidden", "childrenOnly", "default"]>>;
     inserter: z.ZodDefault<z.ZodBoolean>;
+    blockStyles: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        name: z.ZodString;
+        label: z.ZodString;
+        isDefault: z.ZodOptional<z.ZodBoolean>;
+    }, "strip", z.ZodTypeAny, {
+        label: string;
+        name: string;
+        isDefault?: boolean | undefined;
+    }, {
+        label: string;
+        name: string;
+        isDefault?: boolean | undefined;
+    }>, "many">>;
 }, "strip", z.ZodTypeAny, {
     title: string;
     mode: "both" | "edit" | "preview";
@@ -56,12 +69,17 @@ export declare const BlockMetaSchema: z.ZodObject<{
     frontendMode: "hidden" | "default" | "childrenOnly";
     icon?: string | undefined;
     description?: string | undefined;
-    keywords?: string[] | undefined;
+    keywords?: string | string[] | undefined;
     templates?: string[] | null | undefined;
     postMetaBlock?: {
         postTypes: string[];
         fieldName: string;
     } | undefined;
+    blockStyles?: {
+        label: string;
+        name: string;
+        isDefault?: boolean | undefined;
+    }[] | undefined;
 }, {
     title: string;
     slug: string;
@@ -75,7 +93,7 @@ export declare const BlockMetaSchema: z.ZodObject<{
     icon?: string | undefined;
     category?: string | undefined;
     description?: string | undefined;
-    keywords?: string[] | undefined;
+    keywords?: string | string[] | undefined;
     parent?: string[] | undefined;
     inserter?: boolean | undefined;
     templates?: string[] | null | undefined;
@@ -90,6 +108,11 @@ export declare const BlockMetaSchema: z.ZodObject<{
         fieldName: string;
     } | undefined;
     frontendMode?: "hidden" | "default" | "childrenOnly" | undefined;
+    blockStyles?: {
+        label: string;
+        name: string;
+        isDefault?: boolean | undefined;
+    }[] | undefined;
 }>;
 export type BlockMetadata = z.infer<typeof BlockMetaSchema>;
 export type BlockMetadataConstructor = z.input<typeof BlockMetaSchema>;

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

@@ -1 +1 @@
-{"version":3,"file":"block-type.d.ts","sourceRoot":"","sources":["../../../src/node/types/block-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAA;AAMrE,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8B1B,CAAA;AAEF,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAA;AAE3D,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAA;AAEtE,wBAAgB,aAAa,CAAC,KAAK,EAAE,aAAa,UAkBjD;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,UA6B5D"}
+{"version":3,"file":"block-type.d.ts","sourceRoot":"","sources":["../../../src/node/types/block-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAA;AAMrE,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+B1B,CAAA;AAEF,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAA;AAE3D,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAA;AAEtE,wBAAgB,aAAa,CAAC,KAAK,EAAE,aAAa,UAkBjD;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,UA6B5D"}

package/dist/node/types/block-type.js

@@ -12,7 +12,7 @@ export const BlockMetaSchema = z.object({
     description: z.string().optional(),
     category: z.string().default("common"),
     icon: z.string().optional(),
-    keywords: z.array(z.string()).optional(),
+    keywords: z.union([z.string(), z.array(z.string())]).optional(),
     types: z.array(z.string()),
     templates: z.array(z.string()).nullable().optional(),
     mode: z.enum(["preview", "edit", "both"]).default("preview"),
@@ -33,6 +33,7 @@ export const BlockMetaSchema = z.object({
         .optional(),
     frontendMode: z.enum(["hidden", "childrenOnly", "default"]).default("default"),
     inserter: z.boolean().default(true),
+    blockStyles: z.array(z.object({ name: z.string(), label: z.string(), isDefault: z.boolean().optional() })).optional(),
 });
 export function describeBlock(block) {
     let output = "";

package/dist/node/utils/fs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../../src/node/utils/fs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAGrC,eAAO,MAAM,EAAE;6BAEkB,MAAM,WAAW,MAAM;iCAWnB,MAAM,WAAW,GAAG;sBAW/B,MAAM,WAAW,GAAG;qBAGrB,MAAM;mBAIR,MAAM;mBAQN,MAAM;;;;;;;;;;;;iBAQgi1B,CAAC;;;;qBAAqkD,CAAC;iBAA8C,CAAC;;;;qBAAmjB,CAAC;iBAA8C,CAAC;;;qBAA+gB,CAAC;iBAA8C,CAAC;;;;iBAAkhB,CAAC;;;;;;;cAA65F,CAAC;;;;;;;cAAoe,CAAC;;;;;;;cAAif,CAAC;;;;;;;;;;;;;;;;;;;;8EAAg5S,OAAQ,eAAe,qBAAgC,OAAQ,eAAe,2BAAsC,OAAQ,eAAe;YAAuG,CAAC;YAAwC,CAAC;aAAoR,CAAC;;;aAAi2B,CAAC;;;gBAAosE,CAAC;YAAwC,CAAC;;;;YAA4nB,CAAC;;;YAAwrB,CAAC;;;;;;;;;sCAAy9I,OAAQ,aAAa;kFAA8G,OAAQ,aAAa;qFAAiH,OAAQ,aAAa;qEAAiG,OAAQ,aAAa;;CADh5pD,CAAA"}
+{"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../../src/node/utils/fs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAGrC,eAAO,MAAM,EAAE;6BAEkB,MAAM,WAAW,MAAM;iCAWnB,MAAM,WAAW,GAAG;sBAW/B,MAAM,WAAW,GAAG;qBAGrB,MAAM;mBAIR,MAAM;mBAQN,MAAM;;;;;;;;;;;;iBAQo80B,CAAC;;;;qBAAqkD,CAAC;iBAA8C,CAAC;;;;qBAAmjB,CAAC;iBAA8C,CAAC;;;qBAA+gB,CAAC;iBAA8C,CAAC;;;;iBAAkhB,CAAC;;;;;;;cAA65F,CAAC;;;;;;;cAAoe,CAAC;;;;;;;cAAif,CAAC;;;;;;;;;;;;;;;;;;;;8EAAg5S,OAAQ,eAAe,qBAAgC,OAAQ,eAAe,2BAAsC,OAAQ,eAAe;YAAuG,CAAC;YAAwC,CAAC;aAAoR,CAAC;;;aAAi2B,CAAC;;;gBAAosE,CAAC;YAAwC,CAAC;;;;YAA4nB,CAAC;;;YAAwrB,CAAC;;;;;;;;;sCAAy9I,OAAQ,aAAa;kFAA8G,OAAQ,aAAa;qFAAiH,OAAQ,aAAa;qEAAiG,OAAQ,aAAa;;CADpzpD,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.0.0-beta.161",
+  "version": "2.0.0-beta.163",
   "description": "",
   "main": "index.js",
   "type": "module",

package/types.meta.d.ts

@@ -47,7 +47,7 @@ declare global {
     /**
      * Keywords to help with searching for this block.
      */
-    keywords?: string[]
+    keywords?: string[] | string
 
     /**
      * Flags to store arbitrary values on a block type, which can be used at runtime.
@@ -172,6 +172,11 @@ declare global {
      * @default "preview"
      */
     editMode?: "preview" | "edit" | "both"
+
+    /**
+     * Block styles work like 'variants' for a block, allowing you to quickly switch between different styles of the same block.
+     */
+    blockStyles?: { name: string; label: string; isDefault?: boolean }[]
   }
 }
 type BlockIcon =