eddev 0.1.32 → 0.1.33-beta-4

package/blocks/ContentBlocks.js

@@ -29,6 +29,7 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var blocks_1 = __importDefault(require("@manifest/blocks"));
 var blockAttributes_1 = require("./blockAttributes");
 var react_1 = require("react");
+var ErrorBoundaryFrontend_1 = require("./ErrorBoundaryFrontend");
 exports.BlocksContext = (0, react_1.createContext)(undefined);
 function ContentBlocks(props) {
     if (!Array.isArray(props.blocks))
@@ -81,7 +82,7 @@ function ContentBlocks(props) {
                 }
             }
             // Attempt to wrap the block
-            return ((0, jsx_runtime_1.jsxs)(react_1.Fragment, { children: [spaceBefore, blockNode, spaceAfter] }, index));
+            return ((0, jsx_runtime_1.jsxs)(react_1.Fragment, { children: [spaceBefore, (0, jsx_runtime_1.jsx)(ErrorBoundaryFrontend_1.ErrorBoundaryFrontend, { children: blockNode }, void 0), spaceAfter] }, index));
         });
     }, [blocks, props.wrapBlock, props.spacer]);
     return (0, jsx_runtime_1.jsx)(react_1.Fragment, { children: layout }, void 0);

package/blocks/{EditorErrorBoundary.d.ts → ErrorBoundaryEditor.d.ts}

@@ -6,7 +6,7 @@ interface State {
     hasError: boolean;
     error?: Error;
 }
-export declare class EditorErrorBoundary extends Component<Props, State> {
+export declare class ErrorBoundaryEditor extends Component<Props, State> {
     state: State;
     static getDerivedStateFromError(err: Error): State;
     componentDidCatch(error: Error, errorInfo: ErrorInfo): void;

package/blocks/{EditorErrorBoundary.js → ErrorBoundaryEditor.js}

@@ -26,26 +26,26 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EditorErrorBoundary = void 0;
+exports.ErrorBoundaryEditor = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
-var EditorErrorBoundary = /** @class */ (function (_super) {
-    __extends(EditorErrorBoundary, _super);
-    function EditorErrorBoundary() {
+var ErrorBoundaryEditor = /** @class */ (function (_super) {
+    __extends(ErrorBoundaryEditor, _super);
+    function ErrorBoundaryEditor() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.state = {
             hasError: false,
         };
         return _this;
     }
-    EditorErrorBoundary.getDerivedStateFromError = function (err) {
+    ErrorBoundaryEditor.getDerivedStateFromError = function (err) {
         // Update state so the next render will show the fallback UI.
         return { hasError: true, error: err };
     };
-    EditorErrorBoundary.prototype.componentDidCatch = function (error, errorInfo) {
+    ErrorBoundaryEditor.prototype.componentDidCatch = function (error, errorInfo) {
         console.error("Uncaught error:", error, errorInfo);
     };
-    EditorErrorBoundary.prototype.render = function () {
+    ErrorBoundaryEditor.prototype.render = function () {
         if (this.state.hasError) {
             var err = this.state.error;
             return ((0, jsx_runtime_1.jsx)("pre", __assign({ style: {
@@ -59,6 +59,6 @@ var EditorErrorBoundary = /** @class */ (function (_super) {
         }
         return this.props.children;
     };
-    return EditorErrorBoundary;
+    return ErrorBoundaryEditor;
 }(react_1.Component));
-exports.EditorErrorBoundary = EditorErrorBoundary;
+exports.ErrorBoundaryEditor = ErrorBoundaryEditor;

package/blocks/ErrorBoundaryFrontend.d.ts

@@ -0,0 +1,15 @@
+import React, { Component, ErrorInfo, ReactNode } from "react";
+interface Props {
+    children: ReactNode;
+}
+interface State {
+    hasError: boolean;
+    error?: Error;
+}
+export declare class ErrorBoundaryFrontend extends Component<Props, State> {
+    state: State;
+    static getDerivedStateFromError(err: Error): State;
+    componentDidCatch(error: Error, errorInfo: ErrorInfo): void;
+    render(): React.ReactNode;
+}
+export {};

package/blocks/ErrorBoundaryFrontend.js

@@ -0,0 +1,69 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ErrorBoundaryFrontend = void 0;
+var jsx_runtime_1 = require("react/jsx-runtime");
+var react_1 = require("react");
+var ErrorBoundaryFrontend = /** @class */ (function (_super) {
+    __extends(ErrorBoundaryFrontend, _super);
+    function ErrorBoundaryFrontend() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.state = {
+            hasError: false,
+        };
+        return _this;
+    }
+    ErrorBoundaryFrontend.getDerivedStateFromError = function (err) {
+        // Update state so the next render will show the fallback UI.
+        return { hasError: true, error: err };
+    };
+    ErrorBoundaryFrontend.prototype.componentDidCatch = function (error, errorInfo) {
+        console.error("Uncaught error:", error, errorInfo);
+    };
+    ErrorBoundaryFrontend.prototype.render = function () {
+        if (this.state.hasError) {
+            var err = this.state.error;
+            if (process.dev) {
+                return ((0, jsx_runtime_1.jsx)("pre", __assign({ style: {
+                        fontSize: "12px",
+                        color: "red",
+                        border: "1px solid red",
+                        borderRadius: "4px",
+                        padding: "4px",
+                        overflowX: "auto",
+                    } }, { children: err.stack }), void 0));
+            }
+            else {
+                return null;
+            }
+        }
+        return this.props.children;
+    };
+    return ErrorBoundaryFrontend;
+}(react_1.Component));
+exports.ErrorBoundaryFrontend = ErrorBoundaryFrontend;

package/blocks/index.d.ts

@@ -1,4 +1,3 @@
-export * from "./installGutenbergHooks";
 export * from "./defineBlock";
 export * from "./inlineEditing";
 export * from "./ContentBlocks";

package/blocks/index.js

@@ -11,7 +11,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useInnerBlocks = exports.useInlineEditableValue = void 0;
-__exportStar(require("./installGutenbergHooks"), exports);
 __exportStar(require("./defineBlock"), exports);
 __exportStar(require("./inlineEditing"), exports);
 __exportStar(require("./ContentBlocks"), exports);

package/blocks/inlineEditing.js

@@ -56,31 +56,11 @@ function EditableText(_a) {
     }
 }
 exports.EditableText = EditableText;
-function getTaggedBlocks(tag) {
-    // @ts-ignore
-    return wp.blocks
-        .getBlockTypes()
-        .filter(function (block) {
-        if (!Array.isArray(block.tags))
-            return false;
-        if (typeof tag === "string") {
-            return block.tags.includes(tag);
-        }
-        else if (Array.isArray(tag)) {
-            return !!block.tags.find(function (t) { return tag.includes(t); });
-        }
-    })
-        .map(function (block) { return block.name; });
-}
 function InnerBlocks(props) {
     if (process.admin) {
         var allowedBlocks = props.allowedBlocks;
         // console.log("ALLOWED BLOCKS", props.allowTaggedBlocks, allowedBlocks)
-        return ((0, jsx_runtime_1.jsx)(InnerBlocksAdminWrapper, __assign({ orientation: props.orientation || "vertical" }, { children: (0, jsx_runtime_1.jsx)(block_editor_1.InnerBlocks
-            // @ts-ignore
-            , { 
-                // @ts-ignore
-                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: props.renderAppender, templateLock: props.templateLock, template: props.template }, void 0) }), void 0));
     }
     else {
         var blocks = (0, blockAttributes_1.useInnerBlocks)();

package/blocks/installGutenbergHooks.d.ts

@@ -1 +1,2 @@
 export declare function installEDGutenbergHooks(): void;
+export declare function setBlockManifest(manifest: any): void;

package/blocks/installGutenbergHooks.js

@@ -23,18 +23,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installEDGutenbergHooks = void 0;
+exports.setBlockManifest = exports.installEDGutenbergHooks = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 // @ts-ignore
 var hooks_1 = require("@wordpress/hooks");
 var react_1 = require("react");
 // @ts-ignore
-var blocks_1 = __importDefault(require("@manifest/blocks"));
-// @ts-ignore
 var blockAttributes_1 = require("./blockAttributes");
-var EditorErrorBoundary_1 = require("./EditorErrorBoundary");
+var ErrorBoundaryEditor_1 = require("./ErrorBoundaryEditor");
 var react_2 = require("@stitches/react");
+// @ts-ignore
+var blocks_1 = __importDefault(require("@manifest/blocks"));
+var Observable_1 = require("../utils/Observable");
+var useObservable_1 = require("../utils/useObservable");
 var BlockContext = (0, react_1.createContext)(undefined);
+// Store the block manifest as a local variable
+var blocksManifest = new Observable_1.Observable(blocks_1.default);
 function installEDGutenbergHooks() {
     (0, react_2.globalCss)({
         ".block-editor-block-list__block:hover": {
@@ -129,8 +133,13 @@ function installEDGutenbergHooks() {
     function BlockRenderer(_a) {
         var payload = _a.payload;
         var block = (0, react_1.useContext)(BlockContext);
-        var BlockComponent = blocks_1.default[block === null || block === void 0 ? void 0 : block.name];
-        return ((0, jsx_runtime_1.jsx)(EditorErrorBoundary_1.EditorErrorBoundary, { children: (0, jsx_runtime_1.jsx)(BlockComponent, __assign({}, payload), void 0) }, void 0));
+        if (!block)
+            return null;
+        var manifest = (0, useObservable_1.useObservable)(blocksManifest);
+        var BlockComponent = manifest[block.name];
+        if (!BlockComponent)
+            return (0, jsx_runtime_1.jsx)("div", { children: "Unable to load block component" }, void 0);
+        return ((0, jsx_runtime_1.jsx)(ErrorBoundaryEditor_1.ErrorBoundaryEditor, { children: (0, jsx_runtime_1.jsx)(BlockComponent, __assign({}, payload), void 0) }, void 0));
     }
     // @ts-ignore
     var parseJSX = acf.parseJSX;
@@ -141,3 +150,15 @@ function installEDGutenbergHooks() {
     };
 }
 exports.installEDGutenbergHooks = installEDGutenbergHooks;
+function setBlockManifest(manifest) {
+    blocksManifest.update(manifest);
+}
+exports.setBlockManifest = setBlockManifest;
+// @ts-ignore
+if (import.meta.webpackHot) {
+    // @ts-ignore
+    import.meta.webpackHot.accept([require.resolve("@manifest/blocks")], function () {
+        var updatedManifest = require("@manifest/blocks").default;
+        setBlockManifest(updatedManifest);
+    });
+}

package/build/babel/plugin-name-defined-components.d.ts

@@ -0,0 +1,7 @@
+import * as types from "@babel/types";
+import { Visitor } from "@babel/traverse";
+export default function ({ types: t }: {
+    types: typeof types;
+}): {
+    visitor: Visitor<any>;
+};

package/build/babel/plugin-name-defined-components.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var pascal_case_1 = require("pascal-case");
+function default_1(_a) {
+    var t = _a.types;
+    return {
+        visitor: {
+            CallExpression: function (path, state) {
+                // Does the call expression name match defineBlock or defineView?
+                var callee = path.node.callee;
+                var args = path.node.arguments;
+                if (callee.type === "Identifier" && (callee.name === "defineBlock" || callee.name === "defineView")) {
+                    // First argument a string literal?
+                    var name_1 = "";
+                    if (args.length > 0 && args[0].type === "StringLiteral") {
+                        name_1 = args[0].value;
+                        // While we're here, make sure that the name matches the filename
+                        var filename = state.file.opts.filename;
+                        var expectedName = filename
+                            .replace(state.opts.baseDirectory, "")
+                            .replace(/\.tsx?$/, "")
+                            .replace(/^\/?(blocks|views)\//, "");
+                        if (name_1 !== expectedName) {
+                            throw path.buildCodeFrameError("The name in your ".concat(callee.name, " didn't match the filename!\n\nDid you mean ").concat(callee.name, "(\"").concat(expectedName, "\")?"));
+                        }
+                    }
+                    // Second argument an arrow function?
+                    if (args.length === 2) {
+                        if (args[1].type === "ArrowFunctionExpression") {
+                            // Great! Replace the arrow function with a normal function
+                            var body = args[1].body;
+                            if (t.isExpression(body)) {
+                                body = t.blockStatement([t.returnStatement(body)]);
+                            }
+                            path.replaceWith(t.callExpression(t.identifier(callee.name), [
+                                t.stringLiteral(name_1),
+                                t.functionExpression(t.identifier((0, pascal_case_1.pascalCase)(name_1)), args[1].params, body, args[1].generator, args[1].async),
+                            ]));
+                        }
+                    }
+                }
+            },
+        },
+    };
+}
+exports.default = default_1;

package/build/create-codegen-worker.d.ts

@@ -1,4 +1,4 @@
-import { Observable } from "../cli/display/lib/Observable";
+import { Observable } from "../utils/Observable";
 import { CodegenOptions } from "./workers/codegen-worker-script";
 import { CodegenState } from "./state/codegen-state";
 export declare function createCodegenWorker(opts: CodegenOptions): Observable<CodegenState>;

package/build/create-codegen-worker.js

@@ -14,7 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCodegenWorker = void 0;
 var worker_threads_1 = require("worker_threads");
 var path_1 = require("path");
-var Observable_1 = require("../cli/display/lib/Observable");
+var Observable_1 = require("../utils/Observable");
 function createCodegenWorker(opts) {
     var worker = new worker_threads_1.Worker((0, path_1.join)(__dirname, "workers/codegen-worker-script.js"), {
         workerData: opts,

package/build/create-webpack-worker.d.ts

@@ -1,4 +1,4 @@
 import { WebpackWorkerOptions } from "./get-webpack-config";
-import { Observable } from "../cli/display/lib/Observable";
+import { Observable } from "../utils/Observable";
 import { CompilerState } from "./state/compiler-state";
 export declare function createWebpackWorker(opts: WebpackWorkerOptions): Observable<CompilerState>;

package/build/create-webpack-worker.js

@@ -14,7 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createWebpackWorker = void 0;
 var worker_threads_1 = require("worker_threads");
 var path_1 = require("path");
-var Observable_1 = require("../cli/display/lib/Observable");
+var Observable_1 = require("../utils/Observable");
 function createWebpackWorker(opts) {
     var worker = new worker_threads_1.Worker((0, path_1.join)(__dirname, "workers/webpack-worker-script.js"), {
         workerData: opts,

package/build/get-webpack-config.js

@@ -74,9 +74,11 @@ var webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
 // @ts-ignore
 var mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
 var autoprefixer_1 = __importDefault(require("autoprefixer"));
+// Custom Babel plugins
+var plugin_name_defined_components_1 = __importDefault(require("./babel/plugin-name-defined-components"));
 function getWebpackConfig(opts) {
     return __awaiter(this, void 0, void 0, function () {
-        var compiling, ALIAS, ENTRY, PLUGINS, RULES, DEFINES, VIRTUAL_MODULES, EXTERNALS, virtualModules, isServerless, isBrowser, isSSR, isDev, entryDir, distSuffix, outputFolder, loadableManifestFile, writeVirtualModule, updateTemplateRouter, templateLookupPattern, _a, updateBlocksManifest, blockLookupManifest, _b;
+        var compiling, ALIAS, ENTRY, PLUGINS, RULES, DEFINES, VIRTUAL_MODULES, EXTERNALS, virtualModules, isServerless, isBrowser, isSSR, isDev, entryDir, distSuffix, outputFolder, loadableManifestFile, writeVirtualModule, updateTemplateRouter, templateLookupPattern, _a, updateBlocksManifest, blockLookupManifest, _b, buildID;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -150,7 +152,8 @@ function getWebpackConfig(opts) {
                                         require.resolve("@babel/preset-typescript"),
                                     ],
                                     plugins: [
-                                        isBrowser && isDev && [require.resolve("react-refresh/babel"), { skipEnvCheck: true }],
+                                        [plugin_name_defined_components_1.default, { baseDirectory: opts.baseDirectory, cool: true }],
+                                        isBrowser && isDev && !opts.isAdmin && [require.resolve("react-refresh/babel"), { skipEnvCheck: true }],
                                         require.resolve("@loadable/babel-plugin"),
                                     ].filter(Boolean),
                                 },
@@ -191,17 +194,6 @@ function getWebpackConfig(opts) {
                             },
                         ],
                     });
-                    // Define some values
-                    DEFINES["process.browser"] = JSON.stringify(isBrowser);
-                    DEFINES["process.ssr"] = JSON.stringify(isServerless && !isBrowser);
-                    DEFINES["process.LOADABLE_STATS_FILE"] = JSON.stringify(loadableManifestFile);
-                    DEFINES["process.dev"] = isDev ? "true" : "false";
-                    DEFINES["process.admin"] = opts.isAdmin ? "true" : "false";
-                    DEFINES["process.env.themePath"] = JSON.stringify("/wp-content/themes/".concat(opts.themeName));
-                    DEFINES["process.themePath"] = JSON.stringify("/wp-content/themes/".concat(opts.themeName));
-                    if (isBrowser) {
-                        DEFINES["process.env.themePath"] = "window.THEME_PATH || ".concat(DEFINES["process.env.themePath"]);
-                    }
                     // Bundle analyser
                     if (!opts.isAdmin && !isDev) {
                         PLUGINS.push(new webpack_bundle_analyzer_1.BundleAnalyzerPlugin({
@@ -211,10 +203,12 @@ function getWebpackConfig(opts) {
                         }));
                     }
                     // React Refresh
-                    if (isBrowser && isDev) {
+                    if (isBrowser && isDev && !opts.isAdmin) {
                         PLUGINS.push(new react_refresh_webpack_plugin_1.default({
                             overlay: {
                                 // module: require.resolve("../utils/refreshOverlayInterop"),
+                                // @ts-ignore
+                                // sockProtocol: "http",
                                 sockHost: "127.0.0.1",
                                 sockPort: opts.hotPort,
                                 sockIntegration: "wds",
@@ -308,7 +302,8 @@ function getWebpackConfig(opts) {
                             var componentName = (0, change_case_1.pascalCase)(name);
                             return { relative: relative, name: name, module: module, componentName: componentName };
                         });
-                        if (opts.isAdmin) {
+                        var useLoadableBlocks = opts.isAdmin && !isDev;
+                        if (useLoadableBlocks) {
                             writeVirtualModule(ALIAS["@manifest/blocks"], "\n        import coreBlocks from './blocks/_core.tsx'\n        ".concat(!isServerless && "import loadable from '".concat(require.resolve("@loadable/component"), "';"), "\n\n        export default {\n          ...coreBlocks,\n          ").concat(files
                                 .map(function (_a) {
                                 var relative = _a.relative, componentName = _a.componentName, module = _a.module;
@@ -360,6 +355,21 @@ function getWebpackConfig(opts) {
                     if (opts.isAdmin) {
                         EXTERNALS["react"] = "React";
                     }
+                    // Define some values
+                    DEFINES["process.browser"] = JSON.stringify(isBrowser);
+                    DEFINES["process.ssr"] = JSON.stringify(isServerless && !isBrowser);
+                    DEFINES["process.LOADABLE_STATS_FILE"] = JSON.stringify(loadableManifestFile);
+                    DEFINES["process.dev"] = isDev ? "true" : "false";
+                    DEFINES["process.admin"] = opts.isAdmin ? "true" : "false";
+                    DEFINES["process.env.themePath"] = JSON.stringify("/wp-content/themes/".concat(opts.themeName));
+                    DEFINES["process.themePath"] = JSON.stringify("/wp-content/themes/".concat(opts.themeName));
+                    if (isDev && opts.isAdmin) {
+                        DEFINES["process.BLOCK_MANIFEST_FILE"] = JSON.stringify(ALIAS["@manifest/blocks"]);
+                    }
+                    if (isBrowser) {
+                        DEFINES["process.env.themePath"] = "window.THEME_PATH || ".concat(DEFINES["process.env.themePath"]);
+                    }
+                    buildID = Date.now();
                     return [2 /*return*/, {
                             mode: opts.mode,
                             context: opts.baseDirectory,
@@ -372,8 +382,10 @@ function getWebpackConfig(opts) {
                                 // chunkIds: "named",
                             },
                             output: {
-                                filename: "[name].".concat(opts.isAdmin ? "admin" : "frontend", ".js"),
-                                publicPath: isDev ? "//127.0.0.1:".concat(opts.hotPort, "/") : "/wp-content/themes/".concat(opts.themeName, "/dist/").concat(distSuffix, "/"),
+                                filename: "[name].".concat(opts.isAdmin ? "admin" : "frontend", ".js?v=").concat(buildID),
+                                chunkFilename: "[name].".concat(opts.isAdmin ? "admin" : "frontend", ".js?v=").concat(buildID),
+                                // publicPath: isDev ? `//127.0.0.1:${opts.hotPort}/` : `/wp-content/themes/${opts.themeName}/dist/${distSuffix}/`,
+                                publicPath: "/wp-content/themes/".concat(opts.themeName, "/dist/").concat(distSuffix, "/"),
                                 path: outputFolder,
                                 globalObject: isSSR ? "this" : "self",
                                 clean: true,

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

@@ -289,6 +289,8 @@ function beginWork(opts) {
                                         // exportFragmentSpreadSubTypes: true,
                                         inlineFragmentTypes: "combine",
                                         onlyOperationTypes: true,
+                                        skipTypename: true,
+                                        preResolveTypes: true,
                                     },
                                 },
                                 "types.views.ts": {
@@ -333,7 +335,7 @@ function beginWork(opts) {
                                                 var item = _d[_i];
                                                 if (item.name.value === "block") {
                                                     var blockField = (_c = (_b = (_a = item === null || item === void 0 ? void 0 : item.selectionSet) === null || _a === void 0 ? void 0 : _a.selections[0]) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.value;
-                                                    blockSelection = "Exclude<".concat(importedName, "[\"block\"][").concat(JSON.stringify(blockField), "], null>");
+                                                    blockSelection = "Exclude<".concat(importedName, "[\"block\"][").concat(JSON.stringify(blockField), "], null | undefined>");
                                                 }
                                                 else {
                                                     queryKeyVals.push([JSON.stringify(item.name.value), "".concat(importedName, "[").concat(JSON.stringify(item.name.value), "]")].join(": "));
@@ -460,9 +462,11 @@ function beginWork(opts) {
                     });
                 }); };
                 watchGlob(Path.resolve(opts.baseDirectory, "./acf-json/*.json"), function (path) {
+                    needsSchemaFetch = true;
                     maybeRegenerate_1(path);
                 });
                 watchGlob(Path.resolve(opts.baseDirectory, "./backend/**/*.php"), function (path) {
+                    needsSchemaFetch = true;
                     maybeRegenerate_1(path);
                 });
                 watchGlob(envFile, function () {

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

@@ -102,6 +102,7 @@ function beginWork(opts) {
                             sockPort: opts.hotPort,
                             contentBase: false,
                             noInfo: true,
+                            https: false,
                             // quiet: true,
                             // clientLogLevel: "silent",
                             headers: {

package/cli/display/components/BundleDisplay.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { CompilerState } from "../../../build/state/compiler-state";
-import { Observable } from "../lib/Observable";
+import { Observable } from "../../../utils/Observable";
 export declare function BundleDisplay(props: {
     bundle: Observable<CompilerState>;
 }): JSX.Element;

package/cli/display/components/BundleDisplay.js

@@ -15,7 +15,7 @@ exports.BundleDisplay = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var ink_1 = require("ink");
 var react_1 = require("react");
-var useObservable_1 = require("../lib/useObservable");
+var useObservable_1 = require("../../../utils/useObservable");
 var StatusIcon_1 = require("./StatusIcon");
 var statusLabels = {
     compiling: "Compiling...",

package/cli/display/components/CodegenDisplay.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { CodegenState } from "../../../build/state/codegen-state";
-import { Observable } from "../lib/Observable";
+import { Observable } from "../../../utils/Observable";
 export declare function CodegenDisplay(props: {
     codegen: Observable<CodegenState>;
 }): JSX.Element;

package/cli/display/components/CodegenDisplay.js

@@ -15,7 +15,7 @@ exports.CodegenDisplay = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var ink_1 = require("ink");
 var react_1 = require("react");
-var useObservable_1 = require("../lib/useObservable");
+var useObservable_1 = require("../../../utils/useObservable");
 var StatusIcon_1 = require("./StatusIcon");
 var statusLabels = {
     generating: "Generating...",

package/cli/display/components/DevCLIDisplay.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { CodegenState } from "../../../build/state/codegen-state";
 import { CompilerState } from "../../../build/state/compiler-state";
-import { Observable } from "../lib/Observable";
+import { Observable } from "../../../utils/Observable";
 declare type Props = {
     bundles: Observable<CompilerState>[];
     codegen?: Observable<CodegenState>;

package/components/BrowserRouter.js

@@ -17,13 +17,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BrowserRouter = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
-var remoteProps_1 = require("../utils/remoteProps");
+var remoteProps_1 = require("../routing/remoteProps");
 var routing_1 = require("../routing");
 // @ts-ignore
 var views_1 = __importDefault(require("@manifest/views"));
 var usePageLoad_1 = require("../hooks/usePageLoad");
 var hooks_1 = require("../hooks");
 var reportErrorStack_1 = require("../utils/reportErrorStack");
+var updateEditLink_1 = require("../routing/updateEditLink");
+var updateHeadTags_1 = require("../routing/updateHeadTags");
 var hasPopulatedCache = false;
 function BrowserRouter(props) {
     var setAppData = (0, hooks_1.useAppDataStore)(function (s) { return s.setAppData; });
@@ -62,9 +64,16 @@ function BrowserRouter(props) {
         (0, remoteProps_1.fetchProps)(pending.url).then(function (data) {
             var view = views_1.default[data.view];
             var finish = function () {
+                var _a;
                 setUrl(pending.url);
                 setData(data);
-                setAppData(data.appData.data);
+                if (data.appData) {
+                    setAppData(data.appData.data);
+                }
+                if (data.editLink)
+                    (0, updateEditLink_1.updateEditLink)(data.editLink);
+                if ((_a = data.meta) === null || _a === void 0 ? void 0 : _a.head)
+                    (0, updateHeadTags_1.updateHeadTags)(data.meta.head);
                 setIsLoading(false);
                 if (!pending.popped) {
                     history.pushState({}, "", pending.url);

package/components/InlinePage.js

@@ -17,7 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InlinePage = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
-var remoteProps_1 = require("../utils/remoteProps");
+var remoteProps_1 = require("../routing/remoteProps");
 var routing_1 = require("../routing");
 // @ts-ignore
 var views_1 = __importDefault(require("@manifest/views"));

package/entry/entry.admin.dev.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var blocks_1 = require("../blocks");
+var installGutenbergHooks_1 = require("../blocks/installGutenbergHooks");
 // @ts-ignore
 var _theme_1 = require("@theme");
-(0, blocks_1.installEDGutenbergHooks)();
+(0, installGutenbergHooks_1.installEDGutenbergHooks)();
 if (_theme_1.editorGlobalStyles) {
     (0, _theme_1.editorGlobalStyles)();
 }

package/entry/entry.admin.prod.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var blocks_1 = require("../blocks");
+var installGutenbergHooks_1 = require("../blocks/installGutenbergHooks");
 // @ts-ignore
 var _theme_1 = require("@theme");
-(0, blocks_1.installEDGutenbergHooks)();
+(0, installGutenbergHooks_1.installEDGutenbergHooks)();
 if (_theme_1.editorGlobalStyles) {
     (0, _theme_1.editorGlobalStyles)();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.1.32",
+  "version": "0.1.33-beta-4",
   "main": "./index.js",
   "license": "MIT",
   "bin": {