eddev 2.0.0-beta.68 → 2.0.0-beta.69

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

@@ -7,7 +7,7 @@ export function EditableText({ id, as, appendOnEnter, store, ...props }) {
         if (!readOnly) {
             const [value, setValue] = useValueStore(store ?? id);
             const appendBlocks = useBlockAppender();
-            return (_jsx(wp.blockEditor.RichText, { ...props, tagName: as, value: value || "", onChange: setValue, inlineToolbar: props.inlineToolbar, disableLineBreaks: props.disableLineBreaks, onKeyDownCapture: (e) => {
+            return (_jsx(wp.blockEditor.RichText, { ...props, placeholder: props.placeholder ?? props.defaultValue, tagName: as, value: value || "", onChange: setValue, inlineToolbar: props.inlineToolbar, disableLineBreaks: props.disableLineBreaks, onKeyDownCapture: (e) => {
                     if (e.key === "Enter" && appendOnEnter && appendBlocks) {
                         appendBlocks([
                             wp.blocks.createBlock(typeof appendOnEnter === "string" ? appendOnEnter : "core/paragraph"),

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

@@ -0,0 +1,7 @@
+import { PropsWithChildren } from "react";
+type Props = PropsWithChildren<{
+    enabled: boolean;
+    clientId: string;
+}>;
+export declare function EditorHighlights(props: Props): import("react/jsx-runtime").JSX.Element;
+export {};

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

@@ -0,0 +1,130 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useEffect, useRef, useState } from "react";
+export function EditorHighlights(props) {
+    const ref = useRef(null);
+    const [controller, setController] = useState(null);
+    // wp.data.select('core/editor').isBlockSelected
+    // const isSelected = wp.data.useSelect(
+    //   (select) => (select("core/editor") as any).isBlockSelected(props.clientId),
+    //   [props.clientId]
+    // )
+    useEffect(() => {
+        if (!props.enabled)
+            return;
+        const controller = new HighlightController(ref.current);
+        setController(controller);
+        return () => controller.teardown();
+    }, [props.enabled]);
+    useEffect(() => {
+        if (controller) {
+            controller.isSelected = false;
+            controller.updateClasses();
+            controller.update();
+        }
+    }, [controller, false]);
+    return (_jsx("div", { ref: ref, style: { display: "contents" }, onPointerEnter: () => controller?.enable(), onPointerLeave: () => controller?.disable(), children: props.children }));
+}
+class HighlightController {
+    root;
+    enabled = false;
+    disposers = [];
+    elements = new Map();
+    block = null;
+    isSelected = false;
+    constructor(root) {
+        this.root = root;
+    }
+    setup() {
+        this.teardown();
+        const updateElements = () => {
+            let editables = Array.from(this.root.querySelectorAll("[contenteditable=true], .editable-slot"));
+            let childBlocks = Array.from(this.root.querySelectorAll(".wp-block"));
+            const childIsSelected = this.root.querySelectorAll(".editor-highlighter-root-selected").length > 0;
+            this.block = childBlocks[0];
+            childBlocks = childBlocks.slice(1);
+            editables = childIsSelected
+                ? []
+                : editables.filter((element) => !childBlocks.some((block) => block.contains(element)));
+            let changed = false;
+            for (const [el, item] of this.elements) {
+                if (!editables.includes(el)) {
+                    item.observer.disconnect();
+                    item.overlay.remove();
+                    this.elements.delete(el);
+                    changed = true;
+                }
+            }
+            for (let el of editables) {
+                if (!this.elements.has(el)) {
+                    const observer = new ResizeObserver(() => this.update());
+                    observer.observe(el);
+                    this.elements.set(el, {
+                        observer,
+                        bounds: el.getBoundingClientRect(),
+                        overlay: this.createOverlay(el),
+                    });
+                    changed = true;
+                }
+            }
+            if (changed) {
+                this.update();
+                this.updateClasses();
+            }
+        };
+        const mutationObserver = new MutationObserver(() => {
+            updateElements();
+        });
+        updateElements();
+        mutationObserver.observe(this.root, { childList: true, subtree: true });
+        this.disposers.push(() => {
+            mutationObserver.disconnect();
+            for (const item of this.elements.values()) {
+                item.observer.disconnect();
+                item.overlay.remove();
+            }
+            this.elements = new Map();
+        });
+    }
+    updateClasses() {
+        for (const item of this.elements.values()) {
+            item.overlay.classList.toggle("editor-highlight-selected", this.isSelected);
+        }
+        this.root.classList.toggle("editor-highlighter-root-selected", this.enabled);
+    }
+    createOverlay(target) {
+        const el = document.createElement("div");
+        el.style.position = "absolute";
+        el.style.pointerEvents = "none";
+        el.style.zIndex = "20";
+        el.className = "editor-highlight";
+        this.block.appendChild(el);
+        return el;
+    }
+    teardown() {
+        this.disposers.forEach((dispose) => dispose());
+    }
+    enable() {
+        this.enabled = true;
+        this.setup();
+        this.update();
+        this.updateClasses();
+    }
+    disable() {
+        this.enabled = false;
+        this.teardown();
+        this.update();
+        this.updateClasses();
+    }
+    update() {
+        if (!this.block)
+            return;
+        const rootBounds = this.block.getBoundingClientRect();
+        for (const [el, item] of this.elements) {
+            const bounds = el.getBoundingClientRect();
+            item.overlay.style.left = bounds.left - rootBounds.left + "px";
+            item.overlay.style.top = bounds.top - rootBounds.top + "px";
+            item.overlay.style.width = bounds.width + "px";
+            item.overlay.style.height = bounds.height + "px";
+        }
+    }
+}

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

@@ -7,6 +7,7 @@ import { BlockContext, EditableBlock } from "./EditorSupport.js";
 import { blocksByTag } from "./blocks-by-tag.js";
 import { editorConfigStore, getEditingPostInfo, watchEditorTemplate } from "./editor-config.js";
 import { rootBlocks } from "./root-blocks.js";
+import { EditorHighlights } from "./EditorHighlights.js";
 function listenForHandleResize() {
     let interval = setInterval(() => {
         let viewportTarget = document.querySelector(".interface-interface-skeleton__content");
@@ -66,6 +67,7 @@ export function installEDGutenbergHooks() {
             };
             // Add an 'inline' object attribute, which will hold all inline contents
             item.attributes.inline = { type: "object" };
+            item.attributes.values = { type: "object" };
             item.attributes.isFromTemplate = { type: "boolean" };
             item.supports.customClassName = false;
             item.edit = function (props) {
@@ -87,7 +89,7 @@ export function installEDGutenbergHooks() {
                 }, []);
                 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: edit.call(self, props) }) }));
+                        }, insertBlocksAfter: props.insertBlocksAfter, children: _jsx(EditorHighlights, { enabled: true, clientId: props.clientId, children: edit.call(self, props) }) }) }));
             };
         }
         // Find PHP-defined 'tags' for core blocks.

package/dist/app/lib/devtools/components/GridIndicator.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useEffect } from "react";
+import { useEffect, useLayoutEffect } from "react";
 import { usePersistState } from "../hooks/usePersistState.js";
 export function GridIndicator() {
     const [enabled, setEnabled] = usePersistState("gridOverlayEnabled", false);
@@ -18,7 +18,10 @@ export function GridIndicator() {
     for (let i = 0; i < 12; i++) {
         cols.push(_jsx("div", { style: { height: "100%", backgroundColor: "rgba(255,0,0,0.1)" } }));
     }
+    useLayoutEffect(() => {
+        document.documentElement.classList.toggle("debug-grid", enabled);
+    }, [enabled]);
     if (!enabled)
         return null;
-    return (_jsx("div", { style: { position: "fixed", inset: 0, zIndex: 999999999, pointerEvents: "none" }, children: _jsx("div", { className: "grid-auto", style: { height: "100%" }, children: cols }) }));
+    return (_jsx("div", { style: { position: "fixed", inset: 0, zIndex: 999999999, pointerEvents: "none" }, children: _jsx("div", { className: "grid-auto debug-display", style: { height: "100%" }, children: cols }) }));
 }

package/dist/node/cli/cli-worker.js

@@ -86,7 +86,6 @@ if (!isMainThread) {
     }
     function pipeLog(log) {
         log.subscribe((log) => {
-            // We ignore SSL errors in dev mode.
             parentPort?.postMessage(JSON.stringify({ type: "log", log: serializeLogData(log) }));
         });
     }

package/dist/node/cli/cli.js

@@ -33,6 +33,13 @@ program
     .option("--fast", "Shorthand for --mode graphql,serverless", false)
     .option("--verbose", "Show extra debugging info", false)
     .action(async (options) => {
+    console.error = (...args) => { };
+    console.log = (...args) => { };
+    console.info = (...args) => { };
+    console.warn = (...args) => { };
+    // if (typeof args[0] === "string" && args[0].includes("NODE_TLS_REJECT_UNAUTHORIZED")) return
+    // serverlessLog.error(...args)
+    // }
     process.env["NODE_ENV"] = "development";
     /** Ignore self-signed certificate errors in dev mode */
     process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0";

package/dist/node/cli/display/boot-cli-app.js

@@ -5,6 +5,6 @@ export function bootCLIUI(props) {
     console.clear();
     render(_jsx(CLIApp, { ...props }), {
         exitOnCtrlC: true,
-        patchConsole: true,
+        patchConsole: false,
     });
 }

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

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.68";
+export declare const VERSION = "2.0.0-beta.69";

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.68";
+export const VERSION = "2.0.0-beta.69";

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

@@ -290,7 +290,7 @@ export class GraphQLGenerator {
                 hasDocuments: true,
                 banner: `import { ContentBlock } from "eddev/blocks"`,
                 footer: Object.keys(wp.scalarTypes)
-                    .map((name) => `export type ${name}Scalar = Scalars["${name}"]["output"]`)
+                    .map((name) => `export type ${name.endsWith("Option") ? name : name + "Scalar"} = Scalars["${name}"]["output"]`)
                     .join("\n"),
                 plugins: {
                     typescript: [typescriptPlugin, {}],

package/dist/node/project/config.js

@@ -125,7 +125,7 @@ export class Configurator {
             this.config = undefined;
             if (exitOnError) {
                 console.flush();
-                process.exit(0);
+                process.exit(1);
             }
         }
     }

package/dist/node/utils/stateful-log.js

@@ -133,6 +133,8 @@ export class StatefulLog {
         this.notifySubscribers();
     }
     addLogEntry(kind, ...messages) {
+        // We ignore SSL errors in dev mode.
+        // if (typeof messages[0] === "string" && messages[0].includes("NODE_TLS_REJECT_UNAUTHORIZED")) return
         if (cliMode.interactive) {
             const entry = {
                 id: getID(),

package/package.json

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