eddev 0.1.33-beta-3 → 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,6 +74,8 @@ 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, buildID;
@@ -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,20 @@ 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,

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.33-beta-3",
+  "version": "0.1.33-beta-4",
   "main": "./index.js",
   "license": "MIT",
   "bin": {

package/{utils → routing}/remoteProps.d.ts

@@ -1,9 +1,17 @@
 import URLParse from "url-parse";
+export declare type ParsedRouteTags = Record<"title" | "meta" | "script" | "style" | "link", {
+    [key: string]: string;
+}[]>;
 export interface RouteData {
     view: string;
+    editLink?: string;
     viewType: "react" | "html";
     viewData: any;
     appData: any;
+    meta?: {
+        head: ParsedRouteTags;
+        footer: ParsedRouteTags;
+    };
 }
 export declare function parseURL(url: string): URLParse<string>;
 export declare function setInitialProps(url: string, data: RouteData): void;

package/{utils → routing}/remoteProps.js

@@ -58,7 +58,7 @@ function setInitialProps(url, data) {
 exports.setInitialProps = setInitialProps;
 function isSameOrigin(url) {
     var parsed = parseURL(url);
-    return parsed.origin === document.location.origin;
+    return parsed.origin === document.location.origin && !parsed.pathname.match(/\.[a-z0-9]$/i);
 }
 exports.isSameOrigin = isSameOrigin;
 function fetchProps(url) {

package/routing/routing.d.ts

@@ -1,7 +1,7 @@
 import { ReactNode, PropsWithChildren } from "react";
 import { APropsWithoutRef } from "react-html-props";
 import URLParse from "url-parse";
-import { RouteData } from "../utils/remoteProps";
+import { RouteData } from "./remoteProps";
 declare type RouteItem = URLParse<any> & {
     data?: RouteData;
 };

package/routing/updateEditLink.d.ts

@@ -0,0 +1 @@
+export declare function updateEditLink(link?: string): void;

package/routing/updateEditLink.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateEditLink = void 0;
+function updateEditLink(link) {
+    if (link) {
+        var editLink = document.querySelector("#wp-admin-bar-edit a");
+        if (editLink) {
+            editLink.setAttribute("href", link);
+        }
+    }
+}
+exports.updateEditLink = updateEditLink;

package/routing/updateHeadTags.d.ts

@@ -0,0 +1,2 @@
+import { ParsedRouteTags } from "./remoteProps";
+export declare function updateHeadTags(tags: ParsedRouteTags): void;

package/routing/updateHeadTags.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateHeadTags = void 0;
+function updateHeadTags(tags) {
+    // Update the document title
+    if (tags.title && tags.title.length > 0 && typeof tags.title[0].__code === "string") {
+        document.title = tags.title[0].__code;
+    }
+    // TODO: Add any missing script/link/style tags too!
+}
+exports.updateHeadTags = updateHeadTags;

package/components/ContentBlocks.d.ts

@@ -1,36 +0,0 @@
-import { ReactElement } from "react";
-export declare type ContentBlock<T extends keyof BlockProps | string = any> = {
-    blockName: T;
-    props: BlockProps extends keyof BlockProps ? BlockProps[T] : any;
-    innerBlocks: ContentBlock[];
-    innerHTML?: string;
-    innerContent?: string[];
-    rule: string;
-    inline: any;
-};
-declare type BlocksContext = {
-    ancestors: ContentBlock[];
-    parent?: ContentBlock;
-    prev?: ContentBlock;
-    next?: ContentBlock;
-    current: ContentBlock;
-};
-export declare const BlocksContext: import("react").Context<BlocksContext | undefined>;
-declare type Props = {
-    blocks: ContentBlock[];
-    wrapBlock?: (child: ReactElement, ctx: BlocksContext) => ReactElement;
-    spacer?: (ctx: {
-        ancestors: ContentBlock[];
-        parent?: ContentBlock;
-        prev: ContentBlock | null;
-        next: ContentBlock | null;
-    }) => ReactElement | null;
-};
-export declare type GenericBlockProps = {
-    innerHTML?: string;
-    innerContent?: string[];
-    innerBlocks?: ContentBlock[];
-    children: ReactElement | null;
-};
-export declare function ContentBlocks(props: Props): JSX.Element | null;
-export {};

package/components/ContentBlocks.js

@@ -1,92 +0,0 @@
-"use strict";
-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);
-};
-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));
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ContentBlocks = exports.BlocksContext = void 0;
-var jsx_runtime_1 = require("react/jsx-runtime");
-// @ts-ignore
-var blocks_1 = __importDefault(require("@manifest/blocks"));
-var blockAttributes_1 = require("../blocks/blockAttributes");
-var react_1 = require("react");
-exports.BlocksContext = (0, react_1.createContext)(undefined);
-function ContentBlocks(props) {
-    if (!Array.isArray(props.blocks))
-        return null;
-    var parentContext = (0, react_1.useContext)(exports.BlocksContext);
-    var blocks = (0, react_1.useMemo)(function () {
-        return props.blocks.map(function (block, index) {
-            // Create a context object for the current block
-            var ctx = __assign(__assign({}, parentContext), { ancestors: __spreadArray(__spreadArray([], ((parentContext === null || parentContext === void 0 ? void 0 : parentContext.ancestors) || []), true), [
-                    parentContext === null || parentContext === void 0 ? void 0 : parentContext.current,
-                ], false).filter(Boolean), parent: parentContext === null || parentContext === void 0 ? void 0 : parentContext.current, current: block, prev: props.blocks[index - 1], next: props.blocks[index + 1] });
-            // Figure out the
-            var blockNode;
-            if (block.blockName in blocks_1.default) {
-                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, 
-                        // 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));
-            }
-            else if (block.innerHTML) {
-                blockNode = ((0, jsx_runtime_1.jsx)("div", { dangerouslySetInnerHTML: { __html: block.innerHTML } }, void 0));
-            }
-            else {
-                blockNode = null;
-            }
-            return [ctx, block, blockNode];
-        });
-    }, [props.blocks]);
-    var layout = (0, react_1.useMemo)(function () {
-        return blocks.filter(Boolean).map(function (_a, index) {
-            var ctx = _a[0], block = _a[1], blockNode = _a[2];
-            // Exit early if the block is null
-            if (blockNode === null)
-                return (0, jsx_runtime_1.jsx)(react_1.Fragment, {}, index);
-            // Custom wrap function?
-            if (props.wrapBlock) {
-                blockNode = props.wrapBlock(blockNode, ctx);
-            }
-            // Wrap the block in a context provider
-            blockNode = ((0, jsx_runtime_1.jsx)(exports.BlocksContext.Provider, __assign({ value: ctx }, { children: blockNode }), void 0));
-            // Custom spacer function?
-            var spaceBefore = null;
-            var spaceAfter = null;
-            if (props.spacer) {
-                // Before block
-                spaceBefore = props.spacer(__assign(__assign({}, ctx), { prev: ctx.prev || null, next: ctx.current || null }));
-                // After block (last block only)
-                if (index === props.blocks.length - 1) {
-                    spaceAfter = props.spacer(__assign(__assign({}, ctx), { prev: block, next: null }));
-                }
-            }
-            // Attempt to wrap the block
-            return ((0, jsx_runtime_1.jsxs)(react_1.Fragment, { children: [spaceBefore, blockNode, spaceAfter] }, index));
-        });
-    }, [blocks, props.wrapBlock, props.spacer]);
-    return (0, jsx_runtime_1.jsx)(react_1.Fragment, { children: layout }, void 0);
-}
-exports.ContentBlocks = ContentBlocks;

package/components/routing.d.ts

@@ -1,44 +0,0 @@
-import { ReactNode, PropsWithChildren } from "react";
-import { APropsWithoutRef } from "react-html-props";
-import URLParse from "url-parse";
-import { RouteData } from "../utils/remoteProps";
-declare type RouteItem = URLParse<any> & {
-    data?: RouteData;
-};
-declare type AnyPromise = Promise<any>;
-declare type MatchResult = boolean | string;
-declare type RouteStatus = "leaving" | "parent-leaving" | "active" | "inactive";
-declare type RouteContextConfig = {
-    debugName?: string;
-    match?(next: RouteItem): MatchResult;
-    beforeLeave?(current: RouteItem, next: RouteItem, parentIsLeaving: boolean): AnyPromise | undefined;
-    onChange?(route: RouteItem, status: RouteStatus): void;
-};
-export declare function useRoute(): RouteItem;
-export declare type RouteProps = RouteContextConfig & {
-    children: ReactNode;
-};
-export declare function Route(props: RouteProps): JSX.Element | null;
-export declare function createRouteItem(url: string, data: RouteData): RouteItem;
-declare type RouterRootProps = {
-    url: string;
-    data: RouteData;
-    children: ReactNode;
-    onNavigateRequest?: (url: string) => void;
-    onPreload?: (url: string) => void;
-    onNavigated?: (url: string) => void;
-};
-export declare function RouterRoot(props: RouterRootProps): JSX.Element;
-declare type SwitchProps = {
-    children: ReactNode | ReactNode[];
-};
-export declare const Link: import("react").ForwardRefExoticComponent<APropsWithoutRef & {
-    preload?: boolean | undefined;
-} & {
-    className?: string | undefined;
-} & import("react").RefAttributes<HTMLAnchorElement>>;
-export declare function Switch({ children }: SwitchProps): JSX.Element;
-export declare function RouteItemContext(props: PropsWithChildren<{
-    route: RouteItem;
-}>): JSX.Element;
-export {};

package/components/routing.js

@@ -1,363 +0,0 @@
-"use strict";
-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);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RouteItemContext = exports.Switch = exports.Link = exports.RouterRoot = exports.createRouteItem = exports.Route = exports.useRoute = void 0;
-var jsx_runtime_1 = require("react/jsx-runtime");
-var react_1 = require("react");
-var react_merge_refs_1 = __importDefault(require("react-merge-refs"));
-var url_parse_1 = __importDefault(require("url-parse"));
-// const logger = (...args: any[]) => console.log(...args)
-var logger = function () {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
-    }
-};
-function createRouteContext(opts) {
-    var _a, _b;
-    var subscribers = [];
-    var notify = function (item, status) {
-        subscribers.forEach(function (handler) { return handler(item, status); });
-    };
-    var parentIsSwitch = opts.parent && opts.parent.isSwitch;
-    var ctx = {
-        item: opts.initial,
-        config: opts.config || {},
-        parent: opts.parent,
-        children: [],
-        status: "inactive",
-        currentMatch: false,
-        isSwitch: !!opts.isSwitch,
-        onNavigate: opts.onNavigate,
-        onPreload: opts.onPreload,
-        propagateChange: function (item, matches) {
-            ctx.item = item;
-            ctx.currentMatch = matches;
-            ctx.status = matches ? "active" : "inactive";
-            ctx.children.forEach(function (child) {
-                child.propagateChange(item, child.match(item));
-            });
-            notify(item, ctx.status);
-        },
-        propagateCandidate: function (next, prev) {
-            // if (ctx.status === "leaving") return Promise.resolve();
-            var promises = [Promise.resolve()];
-            var matches = ctx.match(next);
-            logger(ctx.config.debugName, "was", ctx.status, matches);
-            if (ctx.status === "active" && (!matches || matches !== ctx.currentMatch)) {
-                logger(ctx.config.debugName, "is leaving because ", matches, "!=", ctx.currentMatch);
-                ctx.status = "leaving";
-            }
-            logger(ctx.config.debugName, "is now", ctx.status);
-            if (ctx.status === "leaving") {
-                promises.push(this.propagateLeaving(prev, next, false));
-            }
-            else {
-                ctx.children.forEach(function (child) {
-                    promises.push(child.propagateCandidate(next, prev));
-                });
-            }
-            notify(prev, ctx.status);
-            return Promise.all(promises);
-        },
-        propagateLeaving: function (current, next, parentIsLeaving) {
-            ctx.status = parentIsLeaving ? "parent-leaving" : "leaving";
-            logger(ctx.status);
-            var promises = [Promise.resolve()];
-            if (ctx.config.beforeLeave) {
-                var result = ctx.config.beforeLeave(current, next, parentIsLeaving);
-                if (result)
-                    promises.push(result);
-            }
-            ctx.children.forEach(function (child) {
-                var result = child.propagateLeaving(current, next, true);
-                if (result) {
-                    promises.push(result);
-                }
-            });
-            notify(current, ctx.status);
-            return Promise.all(promises);
-        },
-        subscribe: function (handler) {
-            subscribers.push(handler);
-            handler(ctx.item, ctx.status);
-            return function () {
-                var i = subscribers.indexOf(handler);
-                if (i !== -1) {
-                    subscribers.splice(i, 1);
-                }
-            };
-        },
-        getFirstMatch: function (item) {
-            logger("Checking items", this.children, item);
-            for (var _i = 0, _a = this.children; _i < _a.length; _i++) {
-                var child = _a[_i];
-                if (child.matchSelf(item)) {
-                    logger("Matched", child.config.debugName);
-                    return child;
-                }
-            }
-        },
-        match: function (item) {
-            if (parentIsSwitch) {
-                var parent_1 = ctx.parent;
-                return parent_1.getFirstMatch(item) === ctx && this.matchSelf(item);
-            }
-            return this.matchSelf(item);
-        },
-        matchSelf: function (item) {
-            var _a, _b;
-            if ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.config) === null || _a === void 0 ? void 0 : _a.match) {
-                return (_b = ctx === null || ctx === void 0 ? void 0 : ctx.config) === null || _b === void 0 ? void 0 : _b.match(item);
-            }
-            else {
-                return true;
-            }
-        },
-        update: function () { },
-        dispose: (_a = opts.dispose) !== null && _a !== void 0 ? _a : (function () { }),
-        fork: function (config, opts) {
-            if (opts === void 0) { opts = {}; }
-            var child = createRouteContext({
-                initial: ctx.item,
-                config: config,
-                parent: ctx,
-                isSwitch: opts.isSwitch,
-                onNavigate: ctx.onNavigate,
-                onPreload: ctx.onPreload,
-                dispose: function () {
-                    var i = ctx.children.indexOf(child);
-                    if (i !== -1)
-                        ctx.children.splice(i, 1);
-                },
-            });
-            ctx.children.push(child);
-            if (ctx.isSwitch) {
-            }
-            return child;
-        },
-    };
-    logger("Initting", ctx.config.debugName, opts.initial);
-    if (parentIsSwitch) {
-        logger("Parent is switch");
-        if (!((_b = opts.parent) === null || _b === void 0 ? void 0 : _b.getFirstMatch(opts.initial))) {
-            logger("FFFF", ctx.config.match, ctx.match(opts.initial));
-            ctx.currentMatch = ctx.matchSelf(opts.initial);
-            ctx.status = ctx.currentMatch ? "active" : "inactive";
-        }
-    }
-    else {
-        ctx.currentMatch = ctx.matchSelf(opts.initial);
-        ctx.status = ctx.currentMatch ? "active" : "inactive";
-    }
-    subscribers.push(function (item, status) {
-        if (ctx.config.onChange) {
-            ctx.config.onChange(item, status);
-        }
-    });
-    // notify(ctx.item, ctx.status);
-    return ctx;
-}
-var RouterContext = (0, react_1.createContext)(undefined);
-function useForkedRouter(conf, opts) {
-    var parent = (0, react_1.useContext)(RouterContext);
-    var ctx = (0, react_1.useMemo)(function () {
-        return parent.fork(conf, opts);
-    }, [parent]);
-    // useEffect(() => {
-    //   if (onChange) {
-    //     return ctx.subscribe(onChange);
-    //   }
-    // }, [ctx, onChange]);
-    Object.assign(ctx.config, conf);
-    // ctx.config.match = conf.match;
-    // ctx.config.beforeLeave = conf.beforeLeave;
-    // ctx.config.beforeLeave = conf.beforeLeave;
-    (0, react_1.useEffect)(function () {
-        return function () { return ctx.dispose(); };
-    }, [ctx]);
-    return ctx;
-}
-function useRoute() {
-    var router = (0, react_1.useContext)(RouterContext);
-    var _a = (0, react_1.useState)(router.item), route = _a[0], setRoute = _a[1];
-    (0, react_1.useEffect)(function () {
-        return router.subscribe(function (item, status) {
-            setRoute(item);
-        });
-    }, [router]);
-    return route;
-}
-exports.useRoute = useRoute;
-function Route(props) {
-    var ctx = useForkedRouter({
-        match: props.match,
-        beforeLeave: props.beforeLeave,
-        debugName: props.debugName,
-        onChange: props.onChange,
-    });
-    logger("Intial route for", props.debugName, ctx.status, ctx.currentMatch);
-    var _a = (0, react_1.useState)(ctx.status), status = _a[0], setStatus = _a[1];
-    (0, react_1.useEffect)(function () {
-        return ctx.subscribe(function (item, status) {
-            setStatus(status);
-        });
-    }, [ctx]);
-    if (status === "inactive")
-        return null;
-    return (0, jsx_runtime_1.jsx)(RouterContext.Provider, __assign({ value: ctx }, { children: props.children }), void 0);
-}
-exports.Route = Route;
-function createRouteItem(url, data) {
-    var parsed = (0, url_parse_1.default)(url, true);
-    return __assign(__assign({}, parsed), { data: data });
-}
-exports.createRouteItem = createRouteItem;
-function RouterRoot(props) {
-    var _this = this;
-    var onNavigateRef = (0, react_1.useRef)(props.onNavigateRequest);
-    var onPreNavigateRef = (0, react_1.useRef)(props.onPreload);
-    var ctx = (0, react_1.useMemo)(function () {
-        return createRouteContext({
-            initial: createRouteItem(props.url, props.data),
-            config: {
-                debugName: "ROOT",
-            },
-            onNavigate: function (path) { return __awaiter(_this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    // User has clicked a link
-                    if (onNavigateRef.current) {
-                        onNavigateRef.current(path);
-                    }
-                    return [2 /*return*/];
-                });
-            }); },
-            onPreload: function (path) {
-                if (onPreNavigateRef.current) {
-                    onPreNavigateRef.current(path);
-                }
-            },
-        });
-    }, []);
-    onNavigateRef.current = props.onNavigateRequest;
-    onPreNavigateRef.current = props.onPreload;
-    (0, react_1.useEffect)(function () {
-        var cancelled = false;
-        var item = createRouteItem(props.url, props.data);
-        if (item.href !== ctx.item.href || item.data !== ctx.item.data) {
-            ctx.propagateCandidate(item, ctx.item).then(function () {
-                if (!cancelled) {
-                    ctx.propagateChange(item, true);
-                }
-            });
-            return function () {
-                cancelled = true;
-            };
-        }
-    }, [props.url, props.data]);
-    return (0, jsx_runtime_1.jsx)(RouterContext.Provider, __assign({ value: ctx }, { children: props.children }), void 0);
-}
-exports.RouterRoot = RouterRoot;
-exports.Link = (0, react_1.forwardRef)(function (props, ref) {
-    var localRef = (0, react_1.useRef)();
-    var router = (0, react_1.useContext)(RouterContext);
-    (0, react_1.useEffect)(function () {
-        if (props.preload && localRef.current) {
-            router === null || router === void 0 ? void 0 : router.onPreload(localRef.current.href);
-        }
-    }, [props.preload]);
-    return ((0, jsx_runtime_1.jsx)("a", __assign({ ref: (0, react_merge_refs_1.default)([localRef, ref]) }, props, { onMouseEnter: function (e) {
-            if (props.onMouseOver) {
-                props.onMouseOver(e);
-            }
-            router === null || router === void 0 ? void 0 : router.onPreload(e.currentTarget.href);
-        }, onClick: function (e) {
-            if (process.admin) {
-                e.preventDefault();
-                return;
-            }
-            if (props.onClick) {
-                props.onClick(e);
-            }
-            if (!e.isDefaultPrevented() && router && !e.ctrlKey && !e.metaKey) {
-                var url = (0, url_parse_1.default)(e.currentTarget.href, true);
-                if (url.origin === document.location.origin) {
-                    router.onNavigate(e.currentTarget.href);
-                    e.preventDefault();
-                }
-            }
-        } }), void 0));
-});
-function Switch(_a) {
-    var children = _a.children;
-    var ctx = useForkedRouter({
-        debugName: "SWITCH",
-        match: function () {
-            return true;
-        },
-        beforeLeave: function () {
-            return undefined;
-        },
-    }, { isSwitch: true });
-    return (0, jsx_runtime_1.jsx)(RouterContext.Provider, __assign({ value: ctx }, { children: children }), void 0);
-}
-exports.Switch = Switch;
-function RouteItemContext(props) {
-    var ctx = useForkedRouter({
-        match: function () { return true; },
-        beforeLeave: undefined,
-        debugName: undefined,
-        onChange: undefined,
-    });
-    return (0, jsx_runtime_1.jsx)(RouterContext.Provider, __assign({ value: ctx }, { children: props.children }), void 0);
-}
-exports.RouteItemContext = RouteItemContext;