eddev 0.2.2-beta.4 → 0.2.2-beta.7

package/blocks/ContentBlocks.js

@@ -48,7 +48,7 @@ function ContentBlocks(props) {
                 var Component = blocks_1.default[block.blockName];
                 if (!Component)
                     return (0, jsx_runtime_1.jsx)(react_1.Fragment, {}, void 0);
-                blockNode = ((0, jsx_runtime_1.jsx)(blockAttributes_1.InlineEditingContextProvider, __assign({ values: block.inline, innerBlocks: block.innerBlocks }, { children: (0, jsx_runtime_1.jsx)(Component, __assign({}, block.props, { innerHTML: block.innerHTML, 
+                blockNode = ((0, jsx_runtime_1.jsx)(blockAttributes_1.InlineEditingContextProvider, __assign({ block: [block.blockName, block.props], values: block.inline, innerBlocks: block.innerBlocks }, { children: (0, jsx_runtime_1.jsx)(Component, __assign({}, block.props, { innerHTML: block.innerHTML, 
                         // innerBlocks={block.innerBlocks}
                         children: Array.isArray(block.innerBlocks) && block.innerBlocks.length ? ((0, jsx_runtime_1.jsx)(ContentBlocks, { blocks: block.innerBlocks }, void 0)) : null }), void 0) }), void 0));
             }

package/blocks/blockAttributes.d.ts

@@ -6,6 +6,7 @@ interface Attributes {
 declare type ProviderProps = PropsWithChildren<{
     values: Attributes;
     innerBlocks: ContentBlock[];
+    block: [string, Attributes];
     onChange?: (attrs: Attributes) => void;
     insertBlocksAfter?: (block: any) => void;
 }>;
@@ -13,4 +14,5 @@ export declare function InlineEditingContextProvider(props: ProviderProps): JSX.
 export declare function useInlineEditableValue<T>(key: string, defaultValue?: T): [T, (value: T) => void];
 export declare function useBlockAppender(): ((block: any) => void) | undefined;
 export declare function useInnerBlocks(): ContentBlock[];
+export declare function useBlockParents(): [string, Attributes][];
 export {};

package/blocks/blockAttributes.js

@@ -10,15 +10,26 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useInnerBlocks = exports.useBlockAppender = exports.useInlineEditableValue = exports.InlineEditingContextProvider = void 0;
+exports.useBlockParents = exports.useInnerBlocks = exports.useBlockAppender = exports.useInlineEditableValue = exports.InlineEditingContextProvider = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
 var InlineEditingContext = (0, react_1.createContext)(undefined);
 function InlineEditingContextProvider(props) {
+    var parentContext = (0, react_1.useContext)(InlineEditingContext);
     return ((0, jsx_runtime_1.jsx)(InlineEditingContext.Provider, __assign({ value: {
             values: props.values,
             innerBlocks: props.innerBlocks,
+            parents: __spreadArray(__spreadArray([], ((parentContext === null || parentContext === void 0 ? void 0 : parentContext.parents) || []), true), [props.block], false).filter(Boolean),
             getValue: function (key) {
                 var _a;
                 return (_a = props.values) === null || _a === void 0 ? void 0 : _a[key];
@@ -52,11 +63,10 @@ exports.useBlockAppender = useBlockAppender;
 function useInnerBlocks() {
     var ctx = (0, react_1.useContext)(InlineEditingContext);
     return (ctx === null || ctx === void 0 ? void 0 : ctx.innerBlocks) || [];
-    // return [
-    //   attrs?.getValue(key),
-    //   (value: any) => {
-    //     attrs?.setValue(key, value)
-    //   },
-    // ] as [T, (value: T) => void]
 }
 exports.useInnerBlocks = useInnerBlocks;
+function useBlockParents() {
+    var ctx = (0, react_1.useContext)(InlineEditingContext);
+    return (ctx === null || ctx === void 0 ? void 0 : ctx.parents) || [];
+}
+exports.useBlockParents = useBlockParents;

package/blocks/inlineEditing.d.ts

@@ -1,4 +1,4 @@
-import { ElementType } from "react";
+import { ElementType, FunctionComponent } from "react";
 import { ContentBlocksSettings } from ".";
 declare type PropTypes<T extends ElementType> = {
     /** The 'key' of this editable text value */
@@ -14,13 +14,17 @@ declare type PropTypes<T extends ElementType> = {
     /** Append a new block when the user hits 'Enter' */
     appendOnEnter?: boolean;
 } & React.ComponentPropsWithoutRef<T>;
-export declare function EditableText<T extends ElementType>({ id, as, ...props }: PropTypes<T>): JSX.Element | null;
+export declare function EditableText<T extends ElementType>({ id, as, appendOnEnter, ...props }: PropTypes<T>): JSX.Element | null;
+declare type AppenderConfig = {
+    type: "default" | "button" | FunctionComponent<any>;
+    block?: boolean;
+};
 declare type InnerBlocksProps = {
     allowedBlocks?: string[];
     orientation?: "horizontal" | "vertical";
     templateLock?: any;
     template?: any;
-    renderAppender?: any;
+    appender?: AppenderConfig;
 } & ContentBlocksSettings;
 export declare function InnerBlocks(props: InnerBlocksProps): JSX.Element;
 export {};

package/blocks/inlineEditing.js

@@ -24,7 +24,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InnerBlocks = exports.EditableText = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
-// @ts-ignore
 var block_editor_1 = require("@wordpress/block-editor");
 // @ts-ignore
 var blocks_1 = require("@wordpress/blocks");
@@ -35,12 +34,12 @@ var react_2 = require("@stitches/react");
 var remoteProps_1 = require("../routing/remoteProps");
 var __1 = require("..");
 function EditableText(_a) {
-    var id = _a.id, as = _a.as, props = __rest(_a, ["id", "as"]);
+    var id = _a.id, as = _a.as, appendOnEnter = _a.appendOnEnter, props = __rest(_a, ["id", "as", "appendOnEnter"]);
     if (process.admin) {
         var _b = (0, blockAttributes_1.useInlineEditableValue)(id), value = _b[0], setValue = _b[1];
         var appendBlocks_1 = (0, blockAttributes_1.useBlockAppender)();
         return ((0, jsx_runtime_1.jsx)(block_editor_1.RichText, __assign({}, props, { tagName: as, value: value || "", onChange: setValue, disableLineBreaks: props.disableLineBreaks, onKeyDownCapture: function (e) {
-                if (e.key === "Enter" && props.appendOnEnter && appendBlocks_1) {
+                if (e.key === "Enter" && appendOnEnter && appendBlocks_1) {
                     appendBlocks_1([(0, blocks_1.createBlock)("core/paragraph")]);
                     e.preventDefault();
                     e.stopPropagation();
@@ -75,10 +74,23 @@ function EditableText(_a) {
     }
 }
 exports.EditableText = EditableText;
+var Appender = function (props) {
+    if (props.type === "button") {
+        return (0, jsx_runtime_1.jsx)(block_editor_1.ButtonBlockAppender, {}, void 0);
+    }
+    else if (typeof props.type === "function") {
+        return props.type({});
+    }
+    else {
+        return (0, jsx_runtime_1.jsx)(block_editor_1.DefaultBlockAppender, {}, void 0);
+    }
+};
 function InnerBlocks(props) {
     if (process.admin) {
         var allowedBlocks = props.allowedBlocks;
-        return ((0, jsx_runtime_1.jsx)(InnerBlocksAdminWrapper, __assign({ orientation: props.orientation || "vertical" }, { children: (0, jsx_runtime_1.jsx)(block_editor_1.InnerBlocks, { orientation: props.orientation, allowedBlocks: allowedBlocks, renderAppender: props.renderAppender, templateLock: props.templateLock, template: props.template }, void 0) }), void 0));
+        return ((0, jsx_runtime_1.jsx)(InnerBlocksAdminWrapper, __assign({ orientation: props.orientation || "vertical" }, { children: (0, jsx_runtime_1.jsx)(block_editor_1.InnerBlocks, { orientation: props.orientation, allowedBlocks: allowedBlocks, 
+                // renderAppender={() => <Appender {...props.appender} />}
+                templateLock: props.templateLock, template: props.template }, void 0) }), void 0));
     }
     else {
         var blocks = (0, blockAttributes_1.useInnerBlocks)();
@@ -95,6 +107,9 @@ var InnerBlocksAdminWrapper = (0, react_2.styled)("div", {
         // marginRight: "auto",
         maxWidth: "var(--grid-inner-width)",
     },
+    ".block-editor-block-list__block .block-list-appender:only-child": {
+        alignSelf: "auto !important",
+    },
     variants: {
         orientation: {
             vertical: {

package/blocks/installGutenbergHooks.js

@@ -97,7 +97,7 @@ function installEDGutenbergHooks() {
                     });
                     return children;
                 }, []);
-                return ((0, jsx_runtime_1.jsx)(BlockContext.Provider, __assign({ value: { name: name, props: props } }, { children: (0, jsx_runtime_1.jsx)(blockAttributes_1.InlineEditingContextProvider, __assign({ values: props.attributes.inline || {}, innerBlocks: children, onChange: function (attrs) {
+                return ((0, jsx_runtime_1.jsx)(BlockContext.Provider, __assign({ value: { name: name, props: props } }, { children: (0, jsx_runtime_1.jsx)(blockAttributes_1.InlineEditingContextProvider, __assign({ values: props.attributes.inline || {}, innerBlocks: children, block: [name, props], onChange: function (attrs) {
                             props.setAttributes(__assign(__assign({}, props.attributes), { inline: attrs }));
                         }, insertBlocksAfter: props.insertBlocksAfter }, { children: edit_1.call(self, props) }), void 0) }), void 0));
             };

package/build/workers/codegen-worker-script.js

@@ -181,7 +181,9 @@ function beginWork(opts) {
                             if (!endpoint) {
                                 sendSignal({
                                     code: "error",
-                                    errors: ["Could not find DEBUG_GRAPHQL_URL value in .env"],
+                                    errors: [
+                                        "Could not find DEBUG_GRAPHQL_URL value in .env. This will be automatically populated once you visit WP Admin first the first time!",
+                                    ],
                                 });
                                 regenerating = false;
                                 return [2 /*return*/];

package/cli/preinstall.js

@@ -1,14 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = void 0;
-var fs_1 = require("fs");
-var path_1 = require("path");
+var child_process_1 = require("child_process");
 function main() {
+    var _a, _b;
     if (process.env.VERCEL) {
-        var pkgFile = (0, path_1.join)(process.cwd(), "package.json");
-        var pkg = JSON.parse((0, fs_1.readFileSync)(pkgFile).toString());
-        pkg.devDependencies["next"] = "^12.1.0";
-        (0, fs_1.writeFile)(pkgFile, JSON.stringify(pkg, null, "  "), function () { });
+        // const pkgFile = join(process.cwd(), "package.json")
+        // const pkg = JSON.parse(readFileSync(pkgFile).toString()) as any
+        // pkg.devDependencies["next"] = "^12.1.0"
+        // writeFile(pkgFile, JSON.stringify(pkg, null, "  "), () => {})
+        var proc = (0, child_process_1.spawn)("yarn", ["add", "--dev", "next@^12.1.0"], {
+            cwd: process.cwd(),
+        });
+        (_a = proc.stdout) === null || _a === void 0 ? void 0 : _a.pipe(process.stdout);
+        (_b = proc.stderr) === null || _b === void 0 ? void 0 : _b.pipe(process.stderr);
     }
 }
 exports.main = main;

package/hooks/useAppData.js

@@ -22,6 +22,10 @@ function useAppData(selector) {
             return selector(value);
         return value;
     }
+    else if (process.admin) {
+        // @ts-ignore
+        return selector ? selector(__ED_APP_DATA.data) : __ED_APP_DATA.data;
+    }
     else {
         return useAppDataStore(function (store) {
             if (selector)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.2.2-beta.4",
+  "version": "0.2.2-beta.7",
   "main": "./index.js",
   "license": "MIT",
   "bin": {
@@ -48,8 +48,8 @@
     "@loadable/webpack-plugin": "^5.15.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
     "@soda/friendly-errors-webpack-plugin": "^1.8.0",
-    "@stitches/core": "^1.2.6",
-    "@stitches/react": "^1.2.6",
+    "@stitches/core": "^1.2.7",
+    "@stitches/react": "^1.2.7",
     "@trpc/client": "^9.19.0",
     "@trpc/next": "^9.19.0",
     "@trpc/react": "^9.19.0",

package/serverless-template/_utils/fetch-wp.ts

@@ -1,4 +1,5 @@
 import { Agent } from "https"
+import { fetch } from "cross-fetch"
 
 // Used to allow self-signed certificates
 const agent = new Agent({

package/serverless-template/pages/_app.tsx

@@ -26,7 +26,9 @@ function Root({ Component, pageProps }: AppProps) {
 
   if (!appData) return <div />
 
-  console.log(`Could not load view named "${pageProps.view}"`)
+  if (!View) {
+    console.log(`Could not load view named "${pageProps.view}"`)
+  }
 
   return (
     <ServerlessAppDataProvider value={appData}>