eddev 2.0.0-beta.84 → 2.0.0-beta.86

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

@@ -44,7 +44,7 @@ export declare const editorConfigStore: {
     currentBlocksConfig: EditorConfigItem;
 };
 export declare function configureEditorBlocks(config: EditorConfigItem): void;
-export declare function transformTemplateToBlocks(template: BlockTemplate, locked?: boolean): any;
+export declare function transformTemplateToBlocks(template: BlockTemplate, locked?: boolean, isFromTemplate?: boolean): any;
 type PostInfo = {
     template: TemplateName | "default";
     type: PostTypeName;

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

@@ -31,7 +31,7 @@ export function configureEditorBlocks(config) {
     let header = config.headerTemplate ? syncBlocks(transformTemplateToBlocks(config.headerTemplate)) : [];
     let footer = config.footerTemplate ? syncBlocks(transformTemplateToBlocks(config.footerTemplate)) : [];
     if (!blocks.length && config.defaultBlocks) {
-        blocks = transformTemplateToBlocks(config.defaultBlocks, false);
+        blocks = transformTemplateToBlocks(config.defaultBlocks, false, false);
     }
     let newBlocks = [...header, ...blocks, ...footer];
     wp.data.dispatch("core/block-editor").resetBlocks(newBlocks);
@@ -47,12 +47,12 @@ export function configureEditorBlocks(config) {
         });
     }
 }
-export function transformTemplateToBlocks(template, locked = true) {
+export function transformTemplateToBlocks(template, locked = true, isFromTemplate = true) {
     return template.map(([name, props, children]) => {
         const attributes = {
             data: {},
             inline: {},
-            isFromTemplate: true,
+            isFromTemplate: isFromTemplate,
             lock: undefined,
         };
         if (props.locked === false) {
@@ -69,7 +69,7 @@ export function transformTemplateToBlocks(template, locked = true) {
             clientId: "block-" + Math.random().toString(36),
             name: resolveAcfBlockName(name),
             attributes: attributes,
-            innerBlocks: children ? transformTemplateToBlocks(children, false) : [],
+            innerBlocks: children ? transformTemplateToBlocks(children, false, isFromTemplate) : [],
             isValid: true,
             validationIssues: [],
         };

package/dist/app/lib/routing/components/BrowserRouter.js

@@ -133,7 +133,6 @@ export function BrowserRouter(props) {
         }
         internals.poppedState = (href, data) => {
             const stack = state.history;
-            // console.log("Popped state", stack)
             // Is the route in our history stack? (going back)
             const index = stack.findIndex((item) => item.id === data.id);
             if (index >= 0) {
@@ -199,11 +198,20 @@ export function BrowserRouter(props) {
             });
             if (cancelled)
                 return;
-            const data = await loader.loadRouteData(parseHrefPath(args.url));
-            if (!data.view) {
-                console.error("No `view` property in route data");
-                return;
-            }
+            const data = await loader.loadRouteData(parseHrefPath(args.url)).catch((err) => {
+                emitEvent({ type: "error", error: err, critical: true });
+                return {
+                    view: "_error",
+                    viewType: "react",
+                    appData: loader.appData,
+                    viewData: {
+                        data: {
+                            code: 500,
+                            error: err,
+                        },
+                    },
+                };
+            });
             const lazyComponent = loader.getRouteComponent(data.view);
             if (!lazyComponent) {
                 console.error(`No component found for view: ${data.view}`);
@@ -289,7 +297,7 @@ export function BrowserRouter(props) {
                     if (loader.hasRouteData(link.pathname))
                         return;
                     emitEvent({ type: "preload:start", currentRoute: getActiveRoute(), link });
-                    const data = await loader.loadRouteData(link.pathname).then((data) => {
+                    await loader.loadRouteData(link.pathname).then((data) => {
                         emitEvent({ type: "preload:data-ready", currentRoute: getActiveRoute(), link, data });
                     });
                 }
@@ -322,7 +330,7 @@ export function BrowserRouter(props) {
                 };
             },
             handleClickEvent(e, originalHref, preferBack) {
-                const { mode, href } = getLinkHandlerMode(e, originalHref);
+                const { mode, href } = getLinkHandlerMode(e, originalHref, state.activeRoute);
                 if (mode === "ignore") {
                     e.preventDefault();
                     return;

package/dist/app/lib/routing/components/Link.js

@@ -17,7 +17,7 @@ export const Link = forwardRef(({ preferBack, as, ...props }, ref) => {
     else {
         const router = useRouter();
         const state = useLinkState(props.href ?? "");
-        return (_jsx(Comp, { ref: ref, "data-active": state.active ?? undefined, "data-child-active": state.childActive ?? undefined, "data-pending": state.pending ?? undefined, ...props, href: withTrailingSlash(props.href ?? undefined), onMouseEnter: (e) => {
+        return (_jsx(Comp, { ref: ref, "data-active": state.active ?? undefined, "data-child-active": state.childActive ?? undefined, "data-pending": state.pending ?? undefined, ...props, href: withTrailingSlash(props.href ?? undefined, true), onMouseEnter: (e) => {
                 if (props.onMouseEnter) {
                     props.onMouseEnter(e);
                 }

package/dist/app/lib/routing/components/ScrollRestoration.js

@@ -11,7 +11,10 @@ export function ScrollRestoration(props) {
         }));
     useRouterEvents((event) => {
         if (event.type === "navigate:changed") {
-            // console.log("Changed! Restoring scroll", event.currentRoute)
+            // If the pathname and search term are the same, then we're on the same page
+            const isSameRoute = event.currentRoute.pathname === event.lastRoute.pathname && event.currentRoute.search === event.lastRoute.search;
+            if (isSameRoute)
+                return;
             if (event.currentRoute.returnState) {
                 restore({
                     top: event.currentRoute.returnState.scrollTop ?? 0,

package/dist/app/lib/routing/loader.js

@@ -76,7 +76,11 @@ export class RouteLoader {
                 text = this.processProps(text);
             }
             try {
-                return JSON.parse(text);
+                const payload = JSON.parse(text);
+                if (!payload.view) {
+                    throw new RouteError(`Invalid route data for '${pathname}'`, 500);
+                }
+                return payload;
             }
             catch (err) {
                 throw new RouteError(`JSON parse error for route '${pathname}':\n${err?.message}`, 500);

package/dist/app/lib/routing/types.d.ts

@@ -83,7 +83,7 @@ export type RouterEvent = {
     data: RouteData;
 } | {
     type: "error";
-    critical: false;
+    critical: boolean;
     error: Error;
 };
 export type RouterSubscriber = (event: RouterEvent) => void;

package/dist/app/lib/routing/utils.d.ts

@@ -7,7 +7,7 @@ export type LinkHandlerMode = {
     mode: "ignore" | "navigate" | "native";
     href?: string;
 };
-export declare function getLinkHandlerMode(e?: PointerOrMouseEvent, href?: string): LinkHandlerMode;
+export declare function getLinkHandlerMode(e?: PointerOrMouseEvent, href?: string, currentRoute?: RouteState): LinkHandlerMode;
 type Partialize<T, TKeys extends keyof T> = Partial<Pick<T, TKeys>> & Omit<T, TKeys>;
 export declare function normalizeRoute(route: Partialize<RouteState, "uri" | "returnState" | "key">): RouteState;
 export declare function stringifyRouteLink(route: RouteLink): string;

package/dist/app/lib/routing/utils.js

@@ -15,7 +15,7 @@ export function isSamePathname(a, b) {
     const right = parseURL(b).pathname.replace(/\/$/, "").toLocaleLowerCase();
     return left === right;
 }
-export function getLinkHandlerMode(e, href) {
+export function getLinkHandlerMode(e, href, currentRoute) {
     try {
         // Attempt to get the link element, if there is one
         let eventTarget = null;
@@ -36,7 +36,11 @@ export function getLinkHandlerMode(e, href) {
         if (!href)
             return { mode: "native", href };
         // Resolve the URL and check if it's the same origin
-        const resolved = href.startsWith("http") ? href : resolveURL(document.location.href, href);
+        const resolved = href.startsWith("http")
+            ? href
+            : href.startsWith("/")
+                ? resolveURL(document.location.origin, href)
+                : resolveURL(document.location.href, href);
         const parsed = parseURL(resolved);
         const isSameOrigin = parsed.host?.replace(/:.+/, "") === document.location.host.replace(/:.+/, "");
         // External links should be handled natively
@@ -57,6 +61,17 @@ export function getLinkHandlerMode(e, href) {
         // Starts with /wp-, use native (wp-content, wp-admin etc)
         if (parsed.pathname.startsWith("/wp-"))
             return { mode: "native", href };
+        // If pathname+query are identical, but the hash is different, then allow the browser to handle it
+        if (currentRoute &&
+            isSamePathname(currentRoute.pathname, parsed.pathname) &&
+            currentRoute.search === parsed.search) {
+            if (currentRoute.hash !== parsed.hash) {
+                return { mode: "native", href };
+            }
+            else {
+                return { mode: "ignore", href };
+            }
+        }
         return { mode: "navigate", href };
     }
     catch (err) {

package/dist/app/server/render-ssr-page.d.ts

@@ -15,6 +15,7 @@ type RenderErrorPageArgs = {
     code: number;
     title: string;
     newOrigin?: string;
+    realError?: Error;
 };
 export declare function renderErrorPage(args: RenderErrorPageArgs): Promise<Response>;
 export {};

package/dist/app/server/render-ssr-page.js

@@ -68,15 +68,14 @@ export async function renderPage(args) {
             responseInit.status = response.status;
         }
         catch (err) {
-            data = {
-                view: "_error",
-                viewType: "react",
-                viewData: {},
-                appData: appData,
-                trackers: trackers,
-            };
             console.error(err);
-            responseInit.status = 500;
+            return renderErrorPage({
+                pathname: args.pathname,
+                code: 500,
+                newOrigin: args.newOrigin,
+                realError: err,
+                title: "Internal Server Error",
+            });
         }
         headers.set("Content-Type", "text/html; charset=utf-8");
         const stream = await getSsrStream({
@@ -87,6 +86,15 @@ export async function renderPage(args) {
     }
     catch (err) {
         console.error(err);
+        if (args.statusCode !== 500) {
+            return renderErrorPage({
+                pathname: args.pathname,
+                code: 500,
+                newOrigin: args.newOrigin,
+                realError: err,
+                title: "Internal Server Error",
+            });
+        }
         return new Response('<!DOCTYPE html><html><head><title>500 Internal Server Error</title></head><body><h1>500 Internal Server Error</h1><p>"' +
             String(err) +
             '"</p></body></html>', {

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

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.84";
+export declare const VERSION = "2.0.0-beta.86";

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.84";
+export const VERSION = "2.0.0-beta.86";

package/dist/node/compiler/vinxi-app.js

@@ -35,8 +35,6 @@ export function createVinxiApp(args) {
                     },
                 },
                 "/robots.txt": {
-                    proxy: joinURL(args.origin, "robots.txt"),
-                    static: true,
                     cache: {
                         maxAge: 3600,
                         varies: [],

package/package.json

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