eddev 2.0.0-beta.250 → 2.0.0-beta.251

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

@@ -0,0 +1,33 @@
+import { PropsWithChildren } from "react";
+import { ContentBlock } from "./ContentBlocks";
+type BlockPropsMutator = (block: ContentBlock) => void;
+type MutationContext = {
+    mutate?: BlockPropsMutator;
+};
+export declare const MutationContext: import("react").Context<MutationContext>;
+type Props = PropsWithChildren<{
+    /**
+     * Whether any parent mutators declared in ancestor components should continue to apply.
+     *
+     * If set to false, then this mutator will override any previous ones.
+     *
+     * @default false
+     */
+    inherit?: boolean;
+    /**
+     * A function which is called before rendering a block.
+     *
+     * If your mutation function depends on any local variables that may change over time, you should pass them into the `deps` prop (like `useEffect/useMemo`)
+     */
+    mutateProps: BlockPropsMutator;
+    /**
+     * An array of dependencies. When the value of these dependencies changes, the mutation will run again.
+     *
+     * @default `[]`
+     */
+    deps?: any[];
+}>;
+export declare function useBlockMutation(): MutationContext;
+export declare function BlockPropMutator(props: Props): import("react/jsx-runtime").JSX.Element;
+export {};
+//# sourceMappingURL=BlockPropMutator.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"BlockPropMutator.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/BlockPropMutator.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAiB,iBAAiB,EAAuB,MAAM,OAAO,CAAA;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAS9C,KAAK,iBAAiB,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;AAEtD,KAAK,eAAe,GAAG;IACrB,MAAM,CAAC,EAAE,iBAAiB,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,eAAe,0CAAqC,CAAA;AAEjE,KAAK,KAAK,GAAG,iBAAiB,CAAC;IAC7B;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;OAIG;IACH,WAAW,EAAE,iBAAiB,CAAA;IAC9B;;;;OAIG;IACH,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;CACb,CAAC,CAAA;AAEF,wBAAgB,gBAAgB,oBAE/B;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,2CAe5C"}

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

@@ -0,0 +1,20 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { createContext, useContext, useMemo } from "react";
+export const MutationContext = createContext({});
+export function useBlockMutation() {
+    return useContext(MutationContext);
+}
+export function BlockPropMutator(props) {
+    const parent = useContext(MutationContext);
+    const value = useMemo(() => {
+        return {
+            mutate: (block) => {
+                if (props.inherit) {
+                    parent.mutate?.(block);
+                }
+                props.mutateProps(block);
+            },
+        };
+    }, [parent, props.inherit, ...(props.deps ?? [])]);
+    return _jsx(MutationContext.Provider, { value: value, children: props.children });
+}

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

@@ -91,7 +91,7 @@ export function InnerBlocks(props) {
                     wp.data.dispatch(wp.blockEditor.store).replaceInnerBlocks(blockId, newBlocks);
                 }
             }, [
-                hash(inlineContext?.innerBlocks.map((b) => [b.blockName, b.clientId])),
+                hash(inlineContext?.innerBlocks.filter((b) => !!b).map((b) => [b.blockName, b.clientId])),
                 hash([props.template, props.defaultBlocks, props.headerTemplate, props.footerTemplate]),
                 blockId,
             ]);

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

@@ -1 +1 @@
-{"version":3,"file":"SlotBlocks.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/SlotBlocks.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAEhD,KAAK,SAAS,GAAG;IACf,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,GAAG,gBAAgB,CAAA;AAEpB,wBAAgB,UAAU,CAAC,KAAK,EAAE,SAAS,kDA+C1C"}
+{"version":3,"file":"SlotBlocks.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/SlotBlocks.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAEhD,KAAK,SAAS,GAAG;IACf,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,GAAG,gBAAgB,CAAA;AAEpB,wBAAgB,UAAU,CAAC,KAAK,EAAE,SAAS,kDAyD1C"}

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

@@ -2,7 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { hash } from "object-code";
 import { useEffect } from "react";
 import { ContentBlocks } from "./ContentBlocks";
-import { useBlockContext, useInnerBlocks } from "./inline-editing";
+import { InlineEditingContextProvider, useBlockContext, useInnerBlocks } from "./inline-editing";
 export function SlotBlocks(props) {
     if (env.admin) {
         const clientId = useBlockContext()?.block[1].clientId;
@@ -26,13 +26,12 @@ export function SlotBlocks(props) {
             else {
                 return;
             }
-            console.log("Changed");
             if (changed) {
                 wp.data.dispatch("core/block-editor").replaceInnerBlocks(clientId, blocks);
             }
         }, [block?.clientId, hash(props)]);
         if (block) {
-            return _jsx(wp.blockEditor.BlockEdit, { ...block });
+            return (_jsx(InlineEditingContextProvider, { values: {}, innerBlocks: block.innerBlocks, block: ["core/slot-group", block], index: -1, onChange: (attrs) => { }, insertBlocksAfter: () => { }, children: _jsx(wp.blockEditor.BlockEdit, { ...block }) }));
         }
         else {
             return null;

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

@@ -1 +1 @@
-{"version":3,"file":"block-utils.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/block-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD;;;GAGG;AACH,wBAAgB,kBAAkB;;EAEjC;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,GAAG,SAAS,GAAG,YAAY,EAAE,CAc1F;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM;;;;;;;;EAYjD"}
+{"version":3,"file":"block-utils.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/block-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD;;;GAGG;AACH,wBAAgB,kBAAkB;;EAEjC;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,GAAG,SAAS,GAAG,YAAY,EAAE,CA4B1F;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM;;;;;;;;EAYjD"}

package/dist/app/lib/blocks/block-utils.js

@@ -18,13 +18,28 @@ export function addBlockMetadata(blocks) {
     for (let block of out) {
         if (!block)
             continue;
-        const info = infos[block.blockName];
+        const info = infos[block.blockName ?? block.name];
         block.tags = info?.tags ?? [];
         block.flags = info?.flags ?? {};
         block.slug = (info?.slug ?? block.blockName);
         if (block.innerBlocks && block.innerBlocks.length) {
             addBlockMetadata(block.innerBlocks);
         }
+        if (env.admin) {
+            if (!Object.hasOwn(block, "props")) {
+                Object.defineProperty(block, "props", {
+                    // @ts-ignore
+                    get: () => block.attributes?.props || {},
+                    set: (value) => {
+                        // @ts-ignore
+                        if (!block.attributes)
+                            block.attributes = {};
+                        // @ts-ignore
+                        block.attributes.props = value;
+                    },
+                });
+            }
+        }
     }
     return out;
 }

package/dist/app/lib/blocks/editor/EditingContext.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=EditingContext.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"EditingContext.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/EditingContext.tsx"],"names":[],"mappings":""}

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

@@ -0,0 +1,31 @@
+export {};
+// type BlockAttributes = Record<string, unknown>
+// type EditableBlock = ContentBlock & {
+//   name: string
+//   slug: BlockTypeName | (string & {})
+//   attributes: BlockAttributes
+//   clientId: string
+//   rootClientId: string
+//   isRootBlock: boolean
+//   getParent: () => EditableBlock | null
+//   canMove: boolean
+//   canRemove: boolean
+//   isSelected: boolean
+//   isSelectionEnabled: boolean
+//   tags?: DefinedBlockTags
+//   flags?: DefinedBlockFlags
+// }
+// type EditingContext = {
+//   block: BlockEditingContext
+// }
+// type BlockEditingContext = {
+//   clientId: string
+//   attributes: BlockAttributes
+//   insertBlock: (block: BlockInstance) => void
+//   setAttributes: (attrs: BlockAttributes) => void
+//   block: ContentBlock & BlockInstance
+// }
+// const EditingContext = createContext<EditingContext>(undefined!)
+// export function useEditingContext() {
+//   return
+// }

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

@@ -1,6 +1,2 @@
-export declare const BlockContext: import("react").Context<{
-    name: string;
-    props: any;
-} | undefined>;
 export declare function EditableBlock({ payload }: any): import("react/jsx-runtime").JSX.Element | null;
 //# sourceMappingURL=EditorSupport.d.ts.map

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,kDA+B7C"}
+{"version":3,"file":"EditorSupport.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/EditorSupport.tsx"],"names":[],"mappings":"AAUA,wBAAgB,aAAa,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,kDAkC7C"}

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

@@ -1,26 +1,32 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { createContext, Suspense, useContext, useEffect } from "react";
+import { Suspense, useMemo } from "react";
 import { blockManifestReader } from "../../internal/read-block-manifest.js";
 import { APIProvider } from "../../../utils/APIProvider.js";
+import { useBlockMutation } from "../BlockPropMutator.js";
+import { useBlockContext } from "../inline-editing.js";
 import { ErrorBoundaryEditor } from "./ErrorBoundaryEditor.js";
-export const BlockContext = createContext(undefined);
+// export const BlockContext = createContext<{ name: string; props: any } | undefined>(undefined)
 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) {
-            // @ts-ignore
-            block.attributes.props = payload;
+    const info = useBlockContext();
+    const mutation = useBlockMutation();
+    const block = info?.editorBlock;
+    const props = useMemo(() => {
+        let props = payload ?? {};
+        if (!block)
+            return props;
+        props.blockStyle = info?.editorBlock?.attributes?.className?.replace("is-style-", "");
+        block.props = props;
+        if (mutation.mutate) {
+            mutation.mutate(block);
         }
-    }, [payload, info?.props.clientId]);
+        return block.props;
+    }, [block, payload, mutation.mutate]);
     if (!info)
         return null;
-    const BlockComponent = blockManifestReader.value[info.name];
+    const BlockComponent = blockManifestReader.value[info.editorBlock?.name ?? ""];
     if (!BlockComponent)
         return _jsx("div", { children: "Unable to load block component" });
-    return (_jsx(ErrorBoundaryEditor, { children: _jsx(APIProvider, { children: _jsx(Suspense, { children: _jsx(BlockComponent, { ...payload }) }) }) }));
+    return (_jsx(ErrorBoundaryEditor, { children: _jsx(APIProvider, { children: _jsx(Suspense, { children: _jsx(BlockComponent, { ...props }) }) }) }));
 }

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

@@ -32,7 +32,8 @@ type EditorBlock = {
     attributes: any;
     clientId: string;
     rootClientId: string;
-    isRootBlock: string;
+    isRootBlock: boolean;
+    getParent: () => EditorBlock | null;
     canMove: boolean;
     canRemove: boolean;
     isSelected: boolean;

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

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

@@ -1,12 +1,12 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useEffect, useState } from "react";
+import { useEffect } from "react";
 import { subscribe, useSnapshot } from "valtio";
 import { proxyMap } from "valtio/utils";
-import { getBlockMetadata } from "../block-utils.js";
+import { addBlockMetadata, 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";
+import { EditableBlock } from "./EditorSupport.js";
 import { resolveAcfBlockName } from "./block-templates.js";
 import { blocksByTag } from "./blocks-by-tag.js";
 import { editorConfigStore, getEditingPostInfo, watchEditorTemplate } from "./editor-config.js";
@@ -58,11 +58,64 @@ export function installEDGutenbergHooks() {
             const generateClass = useSnapshot(editorConfigStore).currentBlocksConfig?.generateBlockClassName;
             Object.assign(props, getBlockMetadata(props.name));
             props.isRootBlock = !props.rootClientId;
+            props.getParent = () => props.rootClientId ? wp.data.select("core/block-editor").getBlock(props.rootClientId) : null;
             let className = generateClass ? generateClass(props, getEditingPostInfo()) : "";
             return _jsx(BlockListBlock, { ...props, className: className });
         };
     }, "withClientIdClassName");
     wp.hooks.addFilter("editor.BlockListBlock", "ed", withClientIdClassName);
+    const withBlockContext = wp.compose.createHigherOrderComponent((BlockEdit) => {
+        return (props) => {
+            function getChildren() {
+                const { getBlock, getBlockOrder, getBlockIndex, getBlockRootClientId } = wp.data.select("core/block-editor");
+                const block = getBlock(props.clientId);
+                const rootClientId = getBlockRootClientId(props.clientId);
+                const index = getBlockIndex(props.clientId, rootClientId || undefined);
+                const innerBlockIDs = getBlockOrder(props.clientId);
+                if (block) {
+                    addBlockMetadata([block]);
+                }
+                const children = innerBlockIDs.map((id) => {
+                    return getBlock(id);
+                });
+                addBlockMetadata(children);
+                return {
+                    block,
+                    children,
+                    index,
+                };
+            }
+            const { block, children, index } = getChildren();
+            // const block = wp.data.useSelect(
+            //   (select) => {
+            //     // @ts-ignore
+            //     return select("block-editor").getBlock(props.clientId)
+            //   },
+            //   [props.clientId],
+            // )
+            // const [index, setIndex] = useState(getIndex)
+            // const [children, setChildren] = useState<any[]>(getChildren)
+            // useEffect(() => {
+            //   return wp.data.subscribe(() => {
+            //     setIndex(getIndex())
+            //     const children = getChildren()
+            //     setChildren((current) =>
+            //       current.length === children.length
+            //         ? current.every((item, i) => item === children[i])
+            //           ? current
+            //           : children
+            //         : children,
+            //     )
+            //   }, [])
+            // }, [props.clientId, props.attributes])
+            if (!block)
+                return null;
+            return (_jsx(InlineEditingContextProvider, { values: props.attributes.inline || {}, innerBlocks: children, block: [props.name, props], editorBlock: block, index: index ?? -1, onChange: (attrs) => {
+                    props.setAttributes({ ...props.attributes, inline: attrs });
+                }, insertBlocksAfter: props.insertBlocksAfter, clientId: props.clientId, children: _jsx(BlockEdit, { ...props }, "edit") }));
+        };
+    }, "withMyPluginControls");
+    wp.hooks.addFilter("editor.BlockEdit", "ed", withBlockContext);
     // if (wp.blocks) {
     // }
     // Manage custom rich text formats
@@ -142,34 +195,7 @@ export function installEDGutenbergHooks() {
                     ;
                     wp.data.dispatch("core/block-editor").setTemplateValidity(true);
                 }, []);
-                function getIndex() {
-                    const { getBlockIndex } = wp.data.select("core/block-editor");
-                    return getBlockIndex(props.clientId);
-                }
-                function getChildren() {
-                    const { getBlock, getBlockOrder } = wp.data.select("core/block-editor");
-                    const innerBlockIDs = getBlockOrder(props.clientId);
-                    const children = innerBlockIDs.map((id) => {
-                        return getBlock(id);
-                    });
-                    return children;
-                }
-                const [index, setIndex] = useState(getIndex);
-                const [children, setChildren] = useState(getChildren);
-                useEffect(() => {
-                    return wp.data.subscribe(() => {
-                        setIndex(getIndex());
-                        const children = getChildren();
-                        setChildren((current) => current.length === children.length
-                            ? current.every((item, i) => item === children[i])
-                                ? current
-                                : children
-                            : children);
-                    }, []);
-                }, [props.clientId, props.attributes]);
-                return (_jsx(BlockContext.Provider, { value: { name, props }, children: _jsx(InlineEditingContextProvider, { values: props.attributes.inline || {}, innerBlocks: children, block: [name, props], index: index ?? -1, onChange: (attrs) => {
-                            props.setAttributes({ ...props.attributes, inline: attrs });
-                        }, insertBlocksAfter: props.insertBlocksAfter, children: _jsx(EditorHighlights, { enabled: true, clientId: props.clientId, children: edit.call(self, props) }) }) }));
+                return (_jsx(EditorHighlights, { enabled: true, clientId: props.clientId, children: edit.call(self, props) }));
             };
         }
         // Find PHP-defined 'tags' for core blocks.

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

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

package/dist/app/lib/blocks/inline-editing.d.ts

@@ -9,27 +9,32 @@ export type BlockInstance = {
     isValid: boolean;
     name: string;
     originalContent?: string | undefined;
+    props?: any;
 };
 type InlineEditingContext = {
     values: Attributes;
     innerBlocks: ContentBlock[];
     parents: [string, Attributes][];
     block: [string, Attributes];
+    editorBlock?: BlockInstance;
     index: number;
     setValue(key: string, value: any): any;
     getValue(key: string): any;
     insertBlocksAfter?: (block: any) => void;
     readonly?: boolean;
+    clientId?: string;
 };
-declare const InlineEditingContext: import("react").Context<InlineEditingContext | undefined>;
+export declare const InlineEditingContext: import("react").Context<InlineEditingContext | undefined>;
 type ProviderProps = PropsWithChildren<{
     values: Attributes;
     innerBlocks: ContentBlock[];
     block: [string, Attributes];
+    editorBlock?: BlockInstance;
     index: number;
     onChange?: (attrs: Attributes) => void;
     insertBlocksAfter?: (block: any) => void;
     readonly?: boolean;
+    clientId?: string;
 }>;
 export declare function InlineEditingContextProvider(props: ProviderProps): import("react/jsx-runtime").JSX.Element;
 export declare function ReadonlyInlineEditingProvider(props: PropsWithChildren<{}>): import("react/jsx-runtime").JSX.Element;

package/dist/app/lib/blocks/inline-editing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inline-editing.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/inline-editing.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAiB,iBAAiB,EAAuB,MAAM,OAAO,CAAA;AAK7E,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAErC,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC,CAAA;AAE1E,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,GAAG,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,aAAa,EAAE,CAAA;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACrC,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC1B,MAAM,EAAE,UAAU,CAAA;IAClB,WAAW,EAAE,YAAY,EAAE,CAAA;IAC3B,OAAO,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAA;IAC/B,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC3B,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,GAAG,CAAA;IACtC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;IAC1B,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAA;IACxC,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,QAAA,MAAM,oBAAoB,2DAA6D,CAAA;AAEvF,KAAK,aAAa,GAAG,iBAAiB,CAAC;IACrC,MAAM,EAAE,UAAU,CAAA;IAClB,WAAW,EAAE,YAAY,EAAE,CAAA;IAC3B,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC3B,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;IACtC,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAA;IACxC,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAC,CAAA;AAEF,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,aAAa,2CAmChE;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,iBAAiB,CAAC,EAAE,CAAC,2CAazE;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAQ5F;AAED;;;IAGI;AACJ,wBAAgB,aAAa,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAexG;AAED,wBAAgB,gBAAgB,aA3GF,GAAG,KAAK,IAAI,cA8GzC;AAED,wBAAgB,cAAc,IAAI,YAAY,EAAE,CAG/C;AAED,wBAAgB,eAAe,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAGxD;AAED,wBAAgB,eAAe,qCAE9B;AAED,wBAAgB,iBAAiB,QAOhC;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,IAAI,MAAM,SAAS,CAa7C"}
+{"version":3,"file":"inline-editing.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/inline-editing.tsx"],"names":[],"mappings":"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"}

package/dist/app/lib/blocks/inline-editing.js

@@ -3,7 +3,7 @@ import { createContext, useContext, useMemo } from "react";
 import { usePostEditor } from "./editor/usePostEditor.js";
 import { useRoute } from "../routing/index.js";
 import { addBlockMetadata } from "./block-utils.js";
-const InlineEditingContext = createContext(undefined);
+export const InlineEditingContext = createContext(undefined);
 export function InlineEditingContextProvider(props) {
     const parentContext = useContext(InlineEditingContext);
     useMemo(() => {
@@ -14,6 +14,7 @@ export function InlineEditingContextProvider(props) {
             innerBlocks: props.innerBlocks,
             block: props.block,
             index: props.index,
+            clientId: props.clientId,
             parents: [...(parentContext?.block ? [parentContext?.block] : []), ...(parentContext?.parents || [])].filter(Boolean),
             getValue(key) {
                 return props.values?.[key];
@@ -28,6 +29,7 @@ export function InlineEditingContextProvider(props) {
             },
             insertBlocksAfter: props.insertBlocksAfter,
             readonly: props.readonly || parentContext?.readonly,
+            editorBlock: props.editorBlock,
         }, children: props.children }));
 }
 export function ReadonlyInlineEditingProvider(props) {
@@ -81,6 +83,9 @@ export function useBlockAppender() {
 }
 export function useInnerBlocks() {
     const ctx = useContext(InlineEditingContext);
+    if (env.admin && ctx?.innerBlocks) {
+        addBlockMetadata(ctx?.innerBlocks);
+    }
     return ctx?.innerBlocks || [];
 }
 export function useBlockParents() {

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

@@ -1,28 +1,47 @@
 import { AnyProcedure } from "@trpc/server";
 import { FetchCreateContextFnOptions } from "@trpc/server/adapters/fetch";
-import superjson from "superjson";
 import { ServerContext } from "./server-context";
-export declare const rpcApi: import("@trpc/server").TRPCRootObject<RPCContext, object, {
-    transformer: typeof superjson;
-}, {
-    ctx: RPCContext;
-    meta: object;
-    errorShape: import("@trpc/server").TRPCDefaultErrorShape;
-    transformer: true;
-}>;
+export declare const rpcApi: {
+    _config: import("@trpc/server/unstable-core-do-not-import").RootConfig<{
+        ctx: RPCContext;
+        meta: object;
+        errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
+        transformer: true;
+    }>;
+    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>>;
+    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;
+        meta: object;
+        errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
+        transformer: true;
+    }, TRecord>, "_def">) => import("@trpc/server/unstable-core-do-not-import").RouterCaller<{
+        ctx: RPCContext;
+        meta: object;
+        errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
+        transformer: true;
+    }, TRecord>;
+};
 type RouterSchema = Record<string, Record<string, AnyProcedure> | AnyProcedure>;
 export declare const rpc: {
-    middleware: <$ContextOverrides>(fn: import("@trpc/server").TRPCMiddlewareFunction<RPCContext, object, object, $ContextOverrides, unknown>) => import("@trpc/server").TRPCMiddlewareBuilder<RPCContext, object, $ContextOverrides, unknown>;
-    procedure: import("@trpc/server").TRPCProcedureBuilder<RPCContext, object, object, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, 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>;
+    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>;
     router<T extends RouterSchema>(routes: T): T;
 };
 export declare function defineServerContext<T>(func: (opts: FetchCreateContextFnOptions) => T): (opts: FetchCreateContextFnOptions) => T;
-export declare function instantiateRouter<T extends RouterSchema>(routes: T): import("@trpc/server").TRPCBuiltRouter<{
+export declare function instantiateRouter<T extends RouterSchema>(routes: T): import("@trpc/server/unstable-core-do-not-import").BuiltRouter<{
     ctx: RPCContext;
     meta: object;
-    errorShape: import("@trpc/server").TRPCDefaultErrorShape;
+    errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
     transformer: true;
-}, import("@trpc/server").TRPCDecorateCreateRouterOptions<T>>;
+}, import("@trpc/server/unstable-core-do-not-import").DecorateCreateRouterOptions<T>>;
 export type InferRPCServerContext<TFunc extends null | ((opts: FetchCreateContextFnOptions) => any)> = {
     req: Request;
     searchParams: URLSearchParams;

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;AACzE,OAAO,SAAS,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,eAAO,MAAM,MAAM;;;;;;;EAEjB,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;;;;;8DAElE;AAED,MAAM,MAAM,qBAAqB,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,2BAA2B,KAAK,GAAG,CAAC,IAAI;IACrG,GAAG,EAAE,OAAO,CAAA;IACZ,YAAY,EAAE,eAAe,CAAA;IAC7B,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,aAAa,CAAA;CACtB,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;AAEzE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;CAEjB,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,YAAY,EAAE,eAAe,CAAA;IAC7B,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,aAAa,CAAA;CACtB,GAAG,CAAC,KAAK,SAAS,CAAC,IAAI,EAAE,2BAA2B,KAAK,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAA"}

package/dist/app/server/server-context.d.ts

@@ -50,7 +50,7 @@ export declare class ServerContext {
         bypass?: boolean;
         newOrigin?: string;
     }): Promise<ServerAppData>;
-    extractRequestHeaders(req?: RequestHeaders): Partial<Record<import("h3").HTTPHeaderName, string | undefined>>;
+    extractRequestHeaders(req?: RequestHeaders): Partial<Record<import("vinxi/http").HTTPHeaderName, string | undefined>>;
     fetchNamedQuery(req: {
         name: string;
         bypass: boolean;

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

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

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.250";
+export const VERSION = "2.0.0-beta.251";

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

@@ -37,11 +37,6 @@ export declare const fs: {
         withFileTypes: true;
         recursive?: boolean | undefined;
     }): Promise<import("fs").Dirent[]>;
-    readdir(path: import("fs").PathLike, options: {
-        encoding: "buffer";
-        withFileTypes: true;
-        recursive?: boolean | undefined;
-    }): Promise<import("fs").Dirent<Buffer>[]>;
     readlink(path: import("fs").PathLike, options?: import("fs").ObjectEncodingOptions | BufferEncoding | null): Promise<string>;
     readlink(path: import("fs").PathLike, options: import("fs").BufferEncodingOption): Promise<Buffer>;
     readlink(path: import("fs").PathLike, options?: import("fs").ObjectEncodingOptions | string | null): Promise<string | Buffer>;

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;;;;;;;;;;;;iBAQ61zB,CAAC;;;;qBAAqkD,CAAC;iBAA8C,CAAC;;;;qBAAmjB,CAAC;iBAA8C,CAAC;;;qBAA+gB,CAAC;iBAA8C,CAAC;;;;iBAAkhB,CAAC;;;;;iBAA2c,CAAC;;;;;;;cAAq6F,CAAC;;;;;;;cAAoe,CAAC;;;;;;;cAAif,CAAC;;;;;;;;;;;;;;;;;;;;;YAAkoT,CAAC;YAAwC,CAAC;aAAoR,CAAC;;;aAAi2B,CAAC;;;gBAAosE,CAAC;YAAwC,CAAC;;;;YAA4nB,CAAC;;;YAAwrB,CAAC;;;;;;;;;;;;;;CADpz/C,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;;;;;;;;;;;;iBAQgw0B,CAAC;;;;qBAAqkD,CAAC;iBAA8C,CAAC;;;;qBAAmjB,CAAC;iBAA8C,CAAC;;;qBAA+gB,CAAC;iBAA8C,CAAC;;;;iBAAkhB,CAAC;;;;;;;cAA65F,CAAC;;;;;;;cAAoe,CAAC;;;;;;;cAAif,CAAC;;;;;;;;;;;;;;;;;;;;;YAAkoT,CAAC;YAAwC,CAAC;aAAoR,CAAC;;;aAAi2B,CAAC;;;gBAAosE,CAAC;YAAwC,CAAC;;;;YAA4nB,CAAC;;;YAAwrB,CAAC;;;;;;;;;;;;;;CADnw/C,CAAA"}

package/package.json

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