eddev 2.0.0-beta.50 → 2.0.0-beta.52

package/dist/app/entry/boot-admin.js

@@ -2,7 +2,13 @@ import { installFieldTypes } from "../lib/admin/installFieldTypes.js";
 import { runWidgets } from "../lib/admin/runWidgets.js";
 import { installEDGutenbergHooks } from "../lib/blocks/editor/installGutenbergHooks.js";
 export default function bootAdmin() {
-    installEDGutenbergHooks();
-    installFieldTypes();
-    runWidgets();
+    console.log("Booting admin");
+    if (window.name === "editor-canvas") {
+        console.log("In canvas");
+    }
+    else {
+        installEDGutenbergHooks();
+        installFieldTypes();
+        runWidgets();
+    }
 }

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

@@ -1,7 +1,20 @@
 import { BlockTemplate } from "./block-templates.js";
 export type EditorConfigItem = {
-    /** Optionally indicate that the post title field should be hidden. Use then when your header template includes a post title editor already. */
+    /**
+     * Optionally indicate that the post title field should be hidden. Use then when your header template includes a post title editor already.
+     * @default false
+     **/
     hideTitle?: boolean;
+    /**
+     * Override the blocks which are allowed to be added to the root of this post-type/template combination.
+     *
+     * You can specify one or more block names, or block tags.
+     *
+     * The default is "root".
+     *
+     * @default ["root"]
+     **/
+    rootBlocks?: (ChildBlockTypeName | BlockTagName)[];
     /** Allows you to add additional class names to blocks, depending on their type and state */
     generateBlockClassName?: BlockWrapperClassGenerator;
     /** The default blocks to insert when there are no (non-templated) blocks */
@@ -28,7 +41,7 @@ type BlockWrapperClassGenerator = (block: {
 }, post: PostInfo) => string | void;
 export declare const editorConfigStore: {
     config: EditorConfig | null;
-    currentBlocksConfig: EditorConfigItem | null;
+    currentBlocksConfig: EditorConfigItem;
 };
 export declare function configureEditorBlocks(config: EditorConfigItem): void;
 export declare function transformTemplateToBlocks(template: BlockTemplate, locked?: boolean): any;

package/dist/app/lib/blocks/editor/editor-config.js

@@ -2,7 +2,7 @@ import { proxy } from "valtio";
 import { resolveAcfBlockName, transformBlockTemplate } from "./block-templates.js";
 export const editorConfigStore = proxy({
     config: null,
-    currentBlocksConfig: null,
+    currentBlocksConfig: {},
 });
 export function configureEditorBlocks(config) {
     const wp = window.wp;
@@ -34,7 +34,6 @@ export function configureEditorBlocks(config) {
         blocks = transformTemplateToBlocks(config.defaultBlocks, false);
     }
     let newBlocks = [...header, ...blocks, ...footer];
-    // console.log("Configuring", newBlocks)
     wp.data.dispatch("core/block-editor").resetBlocks(newBlocks);
     function syncBlocks(blocks) {
         return blocks.map((block) => {
@@ -174,7 +173,6 @@ function setWrapperBlock(blockName, blocks) {
 }
 function setTemplate(template) {
     const wp = window.wp;
-    // console.log("Setting template", template)
     let currentBlocks = wp.data.select("core/block-editor").getBlocks();
     wp.data.dispatch("core/block-editor").updateSettings({
         templateLock: "all",

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

@@ -1,11 +1,12 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect } from "react";
+import { useSnapshot } from "valtio";
+import { getBlockMetadata } from "../block-utils.js";
 import { InlineEditingContextProvider } from "../inline-editing.js";
 import { BlockContext, EditableBlock } from "./EditorSupport.js";
 import { blocksByTag } from "./blocks-by-tag.js";
 import { editorConfigStore, getEditingPostInfo, watchEditorTemplate } from "./editor-config.js";
-import { useSnapshot } from "valtio";
-import { getBlockMetadata } from "../block-utils.js";
+import { rootBlocks } from "./root-blocks.js";
 function listenForHandleResize() {
     let interval = setInterval(() => {
         let viewportTarget = document.querySelector(".interface-interface-skeleton__content");
@@ -53,6 +54,8 @@ export function installEDGutenbergHooks() {
     wp.richText.unregisterFormatType("core/keyboard");
     wp.richText.unregisterFormatType("core/text-color");
     whenEditorIsReady().then(() => watchEditorTemplate());
+    // Recalculate registered blocks when rootBlocks change
+    rootBlocks.listen();
     wp.hooks.addFilter("blocks.registerBlockType", "ed", (item, name) => {
         // Hook into ACF blocks, customising the edit mode.
         if (name.startsWith("acf/")) {
@@ -99,13 +102,11 @@ export function installEDGutenbergHooks() {
             item.tags = [];
         }
         blocksByTag.add(item.name, item.tags);
+        const isRootBlock = rootBlocks.isRootBlock(name, item.tags);
         return {
             ...item,
             get parent() {
-                return blocksByTag.expand([
-                    ...(item.parent ?? []),
-                    ...(item.tags.includes("root") ? ["core/post-content"] : []),
-                ]);
+                return blocksByTag.expand([...(item.parent ?? []), ...(isRootBlock ? ["core/post-content"] : [])]);
             },
             get ancestor() {
                 return item.ancestor ? blocksByTag.expand(item.ancestor) : undefined;

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

@@ -0,0 +1,6 @@
+export declare const rootBlocks: {
+    listen(): void;
+    update(): void;
+    getRootBlocks(): Set<string>;
+    isRootBlock(blockName: string, tags?: string[]): boolean | undefined;
+};

package/dist/app/lib/blocks/editor/root-blocks.js

@@ -0,0 +1,30 @@
+import { hash } from "object-code";
+import { subscribe, snapshot } from "valtio";
+import { editorConfigStore } from "./editor-config";
+import { blocksByTag } from "./blocks-by-tag";
+let constraint = ["root"];
+let rootBlockList = new Set(["root"]);
+export const rootBlocks = {
+    listen() {
+        let key = hash(rootBlocks);
+        subscribe(editorConfigStore, () => {
+            constraint = snapshot(editorConfigStore.currentBlocksConfig).rootBlocks ?? ["root"];
+            let newKey = hash(constraint);
+            if (key === newKey)
+                return;
+            // The root blocks config have changed, so we need to recalculate the registered blocks
+            key = newKey;
+            rootBlocks.update();
+        });
+    },
+    update() {
+        rootBlockList = new Set(blocksByTag.expand(constraint));
+        wp.data.dispatch("core/blocks").reapplyBlockTypeFilters();
+    },
+    getRootBlocks() {
+        return rootBlockList;
+    },
+    isRootBlock(blockName, tags) {
+        return rootBlockList.has(blockName) || (tags && tags.some((tag) => rootBlockList.has(tag)));
+    },
+};

package/dist/app/lib/hooks/apiConfig.d.ts

@@ -11,9 +11,9 @@ export type APIConfigStore = {
      */
     customQueryFetchOptions?: (type: "query" | "mutation", queryName: string, queryArgs: any, url: string, opts: RequestInit) => RequestInit | Promise<RequestInit>;
     /**
-     * Update aspects of the API client
+     * Allows you to hook into the response of a query or mutation.
      */
-    onResponse?: (response: Response) => void;
+    onResponse?: (response: Response, type: "query" | "mutation", queryName: string, queryArgs: any, url: string, opts: RequestInit) => void;
     set: (config: Partial<APIConfigStore>) => void;
 };
 export declare const apiConfig: APIConfigStore;

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

@@ -31,7 +31,7 @@ const fetchGETQuery = async (name, params, opts) => {
     }
     const response = await fetch(url, options);
     if (apiConfig.onResponse)
-        apiConfig.onResponse(response);
+        apiConfig.onResponse(response, "query", name, params, url, options);
     const payload = await response.json();
     if (payload.errors?.length > 0) {
         throw createQueryError(payload.errors.map((e) => e.message), response.status);
@@ -156,7 +156,7 @@ const fetchMutation = async (name, params, opts) => {
     }
     const response = await fetch(url, options);
     if (apiConfig.onResponse)
-        apiConfig.onResponse(response);
+        apiConfig.onResponse(response, "mutation", name, params, url, options);
     const payload = await response.json();
     if (payload.errors?.length > 0) {
         throw createQueryError(payload.errors.map((e) => e.message), response.status);

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

@@ -52,15 +52,20 @@ export async function proxyWpAdmin(event, serverContext) {
         if (contentType.startsWith("text/html")) {
             const clientManifest = serverContext.runtime.getManifest("admin");
             const assets = await clientManifest.inputs[clientManifest.handler].assets();
-            body = body.replace("<!---VITE_HEADER--->", () => assets.map((asset) => renderAsset(asset)).join("\n"));
-            body = body.replace("<!---VITE_FOOTER--->", () => renderAsset({
+            const getViteHeader = () => assets.map((asset) => renderAsset(asset)).join("\n");
+            const getViteFooter = () => renderAsset({
                 tag: "script",
                 attrs: {
                     type: "module",
                     src: clientManifest.inputs[clientManifest.handler].output.path,
                 },
                 children: "",
-            }));
+            });
+            const encodeForJSON = (str) => JSON.stringify(str).slice(1, -1).replace(/\"/g, "'");
+            body = body.replace(/<!---VITE_HEADER--->/g, getViteHeader);
+            body = body.replace(/<!---VITE_FOOTER--->/g, getViteFooter);
+            body = body.replace(/<!---VITE_HEADER_ENCODED--->/g, encodeForJSON(getViteHeader()));
+            body = body.replace(/<!---VITE_FOOTER_ENCODED--->/g, encodeForJSON(getViteFooter()));
         }
     }
     else {

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

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.50";
+export declare const VERSION = "2.0.0-beta.52";

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.50";
+export const VERSION = "2.0.0-beta.52";

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

@@ -134,6 +134,7 @@ function readBlockDataAsJSONExport(file, contents) {
     result.frontendMode = userData.frontendMode;
     if (userData.postMetaBlock) {
         result.postMetaBlock = {
+            postTypes: userData.postMetaBlock.postTypes,
             fieldName: userData.postMetaBlock.fieldName,
         };
         result.types = userData.postMetaBlock.postTypes;

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

@@ -23,10 +23,13 @@ export declare const BlockMetaSchema: z.ZodObject<{
     cache: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     allowMultiple: z.ZodDefault<z.ZodBoolean>;
     postMetaBlock: z.ZodOptional<z.ZodObject<{
+        postTypes: z.ZodArray<z.ZodString, "many">;
         fieldName: z.ZodString;
     }, "strip", z.ZodTypeAny, {
+        postTypes: string[];
         fieldName: string;
     }, {
+        postTypes: string[];
         fieldName: string;
     }>>;
     frontendMode: z.ZodDefault<z.ZodEnum<["hidden", "childrenOnly", "default"]>>;
@@ -56,6 +59,7 @@ export declare const BlockMetaSchema: z.ZodObject<{
     keywords?: string[] | undefined;
     templates?: string[] | null | undefined;
     postMetaBlock?: {
+        postTypes: string[];
         fieldName: string;
     } | undefined;
 }, {
@@ -81,6 +85,7 @@ export declare const BlockMetaSchema: z.ZodObject<{
     dynamic?: boolean | undefined;
     allowMultiple?: boolean | undefined;
     postMetaBlock?: {
+        postTypes: string[];
         fieldName: string;
     } | undefined;
     frontendMode?: "hidden" | "childrenOnly" | "default" | undefined;

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

@@ -27,6 +27,7 @@ export const BlockMetaSchema = z.object({
     allowMultiple: z.boolean().default(true),
     postMetaBlock: z
         .object({
+        postTypes: z.array(z.string()),
         fieldName: z.string(),
     })
         .optional(),

package/package.json

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