eddev 2.0.0-beta.25 → 2.0.0-beta.27

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

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

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

@@ -9,6 +9,7 @@ export class ErrorBoundaryFrontend extends Component {
         return { hasError: true, error: err };
     }
     componentDidCatch(error, errorInfo) {
+        console.log("Caught error:", error, errorInfo);
         console.error("Uncaught error:", error, errorInfo);
     }
     render() {

package/dist/app/lib/blocks/InnerBlocks.d.ts

@@ -2,9 +2,19 @@ import { FunctionComponent } from "react";
 import { ContentBlockLayoutProps } from "./ContentBlocks.js";
 import { BlockTemplate } from "./editor/block-templates.js";
 type AppenderConfig = {
-    type: "default" | "button" | FunctionComponent<any>;
+    type: "default" | "button" | CustomBlockAppender;
     className?: string;
 };
+export type CustomBlockAppender = FunctionComponent<{
+    onToggle: () => void;
+    disabled: boolean;
+    isOpen: boolean;
+    blockTitle: string;
+    hasSingleBlockType: boolean;
+}>;
+export declare function createAppender(comp: CustomBlockAppender): {
+    type: CustomBlockAppender;
+};
 type InnerBlocksProps = {
     /** A list of allowed blocks, and/or block tags. */
     allowedBlocks?: (ChildBlockTypeName | BlockTagName)[];

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

@@ -9,7 +9,10 @@ const Appender = (props) => {
         return _jsx(wp.blockEditor.ButtonBlockAppender, { className: props.className, rootClientId: clientId });
     }
     else if (typeof props.type === "function") {
-        return props.type({});
+        const Type = props.type;
+        return (_jsx(wp.blockEditor.Inserter, { renderToggle: (p) => {
+                return _jsx(Type, { ...p });
+            }, rootClientId: clientId }));
     }
     else {
         return (_jsx(wp.blockEditor.DefaultBlockAppender
@@ -19,6 +22,11 @@ const Appender = (props) => {
             className: props.className, rootClientId: clientId, lastBlockClientId: clientId }));
     }
 };
+export function createAppender(comp) {
+    return {
+        type: comp,
+    };
+}
 /**
  * Allows child blocks to be added to the current block context.
  */

package/dist/app/lib/devtools/useQueryDebug.d.ts

@@ -6,4 +6,10 @@ export type QueryDebugItem = {
     children: QueryDebugItem[];
 };
 export declare function setQueryDebug(value: QueryDebugItem | undefined): void;
-export declare function useQueryDebugData(): QueryDebugItem | undefined;
+export declare function useQueryDebugData(): {
+    readonly file: string;
+    readonly errors: readonly string[];
+    readonly duration: number;
+    readonly label: string;
+    readonly children: readonly any[];
+} | undefined;

package/dist/app/lib/devtools/useQueryDebug.js

@@ -1,13 +1,10 @@
-import { create } from "zustand";
-const useQueryDebug = create((set) => ({
+import { proxy, useSnapshot } from "valtio";
+const store = proxy({
     value: undefined,
-    set: (value) => {
-        set({ value });
-    },
-}));
+});
 export function setQueryDebug(value) {
-    useQueryDebug.setState({ value });
+    store.value = value;
 }
 export function useQueryDebugData() {
-    return useQueryDebug((store) => store.value);
+    return useSnapshot(store).value;
 }

package/dist/app/lib/hooks/apiConfig.d.ts

@@ -13,6 +13,8 @@ export type APIConfigStore = {
     /**
      * Update aspects of the API client
      */
+    onResponse?: (response: Response) => void;
     set: (config: Partial<APIConfigStore>) => void;
 };
-export declare const useAPIConfig: import("zustand").UseBoundStore<import("zustand").StoreApi<APIConfigStore>>;
+export declare const apiConfig: APIConfigStore;
+export declare function useAPIConfig(): APIConfigStore;

package/dist/app/lib/hooks/apiConfig.js

@@ -1,4 +1,9 @@
-import { create } from "zustand";
-export const useAPIConfig = create((set, get) => ({
-    set: (config) => set(config),
-}));
+import { proxy } from "valtio";
+export const apiConfig = proxy({
+    set: (config) => {
+        Object.assign(apiConfig, config);
+    },
+});
+export function useAPIConfig() {
+    return apiConfig;
+}

package/dist/app/lib/hooks/index.d.ts

@@ -1,4 +1,3 @@
-export * from "./usePageLoad.js";
 export * from "./useAppData.js";
 export * from "./useRPC.js";
 export * from "./queryUtils.js";

package/dist/app/lib/hooks/index.js

@@ -1,4 +1,3 @@
-export * from "./usePageLoad.js";
 export * from "./useAppData.js";
 export * from "./useRPC.js";
 export * from "./queryUtils.js";

package/dist/app/lib/hooks/queryUtils.d.ts

@@ -1,4 +1,4 @@
-import { FetchQueryOptions, UndefinedInitialDataOptions, UseMutationOptions, UseMutationResult, UseQueryResult, UseInfiniteQueryResult, UndefinedInitialDataInfiniteOptions } from "@tanstack/react-query";
+import { FetchQueryOptions, UndefinedInitialDataInfiniteOptions, UndefinedInitialDataOptions, UseInfiniteQueryResult, UseMutationOptions, UseMutationResult, UseQueryResult } from "@tanstack/react-query";
 type OptionalMaybes<T> = T extends any[] ? T : T extends {
     [key: string]: any;
 } ? {

package/dist/app/lib/hooks/queryUtils.js

@@ -1,8 +1,8 @@
-import { useMutation, useQuery, useInfiniteQuery, } from "@tanstack/react-query";
+import { useInfiniteQuery, useMutation, useQuery, } from "@tanstack/react-query";
+import { useEffect, useState } from "react";
 import { joinURL } from "ufo";
 import { getQueryClient } from "../../utils/query-client.js";
-import { useAPIConfig } from "./apiConfig.js";
-import { useEffect, useState } from "react";
+import { apiConfig } from "./apiConfig.js";
 function createQueryError(messages, statusCode) {
     const error = new Error(messages.join(", "));
     error.statusCode = statusCode;
@@ -26,11 +26,12 @@ const fetchGETQuery = async (name, params, opts) => {
     if (params)
         url += "?params=" + encodeURIComponent(params);
     // Apply API configuration
-    const apiConfig = useAPIConfig.getState();
     if (apiConfig.customQueryFetchOptions) {
         options = await apiConfig.customQueryFetchOptions?.("query", name, params, url, options);
     }
     const response = await fetch(url, options);
+    if (apiConfig.onResponse)
+        apiConfig.onResponse(response);
     const payload = await response.json();
     if (payload.errors?.length > 0) {
         throw createQueryError(payload.errors.map((e) => e.message), response.status);
@@ -39,7 +40,7 @@ const fetchGETQuery = async (name, params, opts) => {
 };
 export function createUseQuery(init) {
     const hook = (args, options) => {
-        const customKey = useAPIConfig((state) => state.customQueryKey);
+        const customKey = apiConfig.customQueryKey;
         return useQuery({
             queryKey: [init.name, args, options?.headers, options?.headers, customKey],
             queryFn: (args) => fetchGETQuery(init.name, args.queryKey[1] ? JSON.stringify(args.queryKey[1]) : "", {
@@ -49,7 +50,7 @@ export function createUseQuery(init) {
         });
     };
     hook.fetch = async (args, options) => {
-        const customKey = useAPIConfig.getState().customQueryKey;
+        const customKey = apiConfig.customQueryKey;
         return getQueryClient().fetchQuery({
             queryKey: [init.name, args, options?.headers, options?.headers, customKey],
             queryFn: (args) => fetchGETQuery(init.name, args.queryKey[1] ? JSON.stringify(args.queryKey[1]) : "", {
@@ -65,7 +66,7 @@ function selectByPath(data, path) {
 }
 export function createUseInfiniteQuery(init) {
     const hook = (args, options) => {
-        const customKey = useAPIConfig((state) => state.customQueryKey);
+        const customKey = apiConfig.customQueryKey;
         const [initial, setInitial] = useState(() => {
             if (options?.initialData) {
                 const data = options?.initialData;
@@ -150,11 +151,12 @@ const fetchMutation = async (name, params, opts) => {
         url = `/wp-json/ed/v1/mutation/${name}`;
     }
     // Apply API configuration
-    const apiConfig = useAPIConfig.getState();
     if (apiConfig.customQueryFetchOptions) {
         options = await apiConfig.customQueryFetchOptions?.("mutation", name, params, url, options);
     }
     const response = await fetch(url, options);
+    if (apiConfig.onResponse)
+        apiConfig.onResponse(response);
     const payload = await response.json();
     if (payload.errors?.length > 0) {
         throw createQueryError(payload.errors.map((e) => e.message), response.status);

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useMemo, useRef, useState, useTransition } from "react";
-import { isRelative, parseURL, resolveURL } from "ufo";
+import { isEqual, isRelative, parseURL, resolveURL } from "ufo";
 import { RouterContext, RouterStateContext } from "../context.js";
 import { RouteLoader } from "../loader.js";
 import { getLinkHandlerMode, getRouteMeta, normalizeRoute, parseQuery, stringifyRouteLink } from "../utils.js";
@@ -255,6 +255,9 @@ export function BrowserRouter(props) {
                     goingBack: false,
                 });
             },
+            getState() {
+                return state;
+            },
             replaceHash(hash) {
                 replaceRoute({
                     ...getActiveRoute(),
@@ -305,7 +308,7 @@ export function BrowserRouter(props) {
                     subscribers.delete(fn);
                 };
             },
-            handleClickEvent(e, originalHref) {
+            handleClickEvent(e, originalHref, preferBack) {
                 const { mode, href } = getLinkHandlerMode(e, originalHref);
                 if (mode === "ignore") {
                     e.preventDefault();
@@ -316,6 +319,13 @@ export function BrowserRouter(props) {
                 }
                 else if (mode === "navigate" && href) {
                     e.preventDefault();
+                    if (preferBack) {
+                        const lastState = state.history.length > 1 && state.history[state.history.length - 2];
+                        if (lastState && isEqual(href, lastState.uri)) {
+                            history.back();
+                            return;
+                        }
+                    }
                     api.navigate(href);
                 }
             },

package/dist/app/lib/routing/components/Link.d.ts

@@ -3,6 +3,7 @@ type Props<T extends ElementType = "a"> = NoInfer<Omit<ComponentPropsWithRef<T>,
     href?: string | null;
     target?: string | null;
     as?: T;
+    preferBack?: boolean;
 };
 export declare const Link: <T extends ElementType = "a">(props: Props<T>) => ReactElement;
 /**

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

@@ -6,7 +6,7 @@ import { useRouter } from "../hooks/useRouter.js";
 import { isSameOrigin } from "../utils.js";
 import { useRoute } from "../hooks/useRoute.js";
 import { useRouterState } from "../hooks/useRouterState.js";
-export const Link = forwardRef((props, ref) => {
+export const Link = forwardRef(({ preferBack, ...props }, ref) => {
     const Comp = props.as || "a";
     if (env.admin) {
         return (_jsx(Comp, { ref: ref, ...props, href: props.href ?? undefined, onClick: (e) => {
@@ -15,17 +15,16 @@ export const Link = forwardRef((props, ref) => {
             } }));
     }
     else {
-        const preload = useRouter((r) => r.preload);
-        const handleClickEvent = useRouter((r) => r.handleClickEvent);
+        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: props.href ?? undefined, onMouseEnter: (e) => {
                 if (props.onMouseEnter) {
                     props.onMouseEnter(e);
                 }
-                preload(props.href);
+                router.preload(props.href);
             }, onClick: (e) => {
                 props.onClick?.(e);
-                handleClickEvent(e, props.href ?? undefined);
+                router.handleClickEvent(e, props.href ?? undefined, preferBack);
             } }));
     }
 });

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

@@ -3,6 +3,7 @@ import { memo, useMemo } from "react";
 import { RouteItemContext } from "../context.js";
 import { useRouter } from "../hooks/useRouter.js";
 import { useRouterState } from "../hooks/useRouterState.js";
+import { ErrorBoundaryFrontend } from "../../blocks/ErrorBoundaryFrontend.js";
 export const AppRenderer = memo(() => {
     const { appData, appComponent: AppComponent } = useRouter().loader;
     const { activeRoute } = useRouterState();
@@ -22,7 +23,7 @@ export function RouteDisplay(props) {
     }
     return useMemo(() => {
         let child = !!Component && _jsx(Component, { ...props.route.props });
-        return _jsx(RouteItemContext.Provider, { value: props.route, children: child });
+        return (_jsx(ErrorBoundaryFrontend, { children: _jsx(RouteItemContext.Provider, { value: props.route, children: child }) }));
     }, [Component, props.route, props.route]);
 }
 RouteDisplay.displayName = "RouteDisplay";

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

@@ -26,6 +26,9 @@ export const RouterContext = createContext({
     replaceQuery(query) { },
     handleClickEvent(e, originalHref) { },
     emitEvent(event) { },
+    getState() {
+        return null;
+    },
 });
 export const RouterStateContext = createContext({
     history: [NOOP_ROUTE],

package/dist/app/lib/routing/hooks/useRoute.d.ts

@@ -1,2 +1,17 @@
 import type { RouteState } from "../types.js";
+/**
+ * Returns the current route object.
+ *
+ * In most circumstances, this will be the active top-level route.
+ *
+ * In cases where manual rendering of routes is taking place, such as during page transitions or in some modal cases.
+ *
+ * @returns The current route
+ */
 export declare function useRoute(): RouteState;
+/**
+ * Returns the current route, if it matches the specified view, otherwise null.
+ */
+export declare function useViewRoute<V extends keyof ViewProps>(view: V): Extract<RouteState, {
+    view: V;
+}> | null;

package/dist/app/lib/routing/hooks/useRoute.js

@@ -1,5 +1,26 @@
 import { useContext } from "react";
 import { RouteItemContext } from "../context.js";
+/**
+ * Returns the current route object.
+ *
+ * In most circumstances, this will be the active top-level route.
+ *
+ * In cases where manual rendering of routes is taking place, such as during page transitions or in some modal cases.
+ *
+ * @returns The current route
+ */
 export function useRoute() {
     return useContext(RouteItemContext);
 }
+/**
+ * Returns the current route, if it matches the specified view, otherwise null.
+ */
+export function useViewRoute(view) {
+    const route = useContext(RouteItemContext);
+    if (route.view === view) {
+        return route;
+    }
+    else {
+        return null;
+    }
+}

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

@@ -102,13 +102,15 @@ export type RouterAPI = {
     /** Replace the hash */
     replaceHash: (hash: string) => void;
     /** Handle link clicking events */
-    handleClickEvent(e: PointerOrMouseEvent, href?: string): void;
+    handleClickEvent(e: PointerOrMouseEvent, href?: string, preferBack?: boolean): void;
     /** A reference to the route loader (mostly for internal use) */
     loader: RouteLoader;
     /** Subscribe to events */
     subscribe: (subscribe: RouterSubscriber) => () => void;
     /** This function is used by the routing system automatically */
     emitEvent: (event: RouterEvent) => void;
+    /** Returns the current RouterState */
+    getState: () => RouterAPIState | null;
 };
 export type TypedRouteState<T, TProps> = {
     /** A unique ID, representing this history item. */

package/dist/app/server/defineRouter.d.ts

@@ -0,0 +1,2 @@
+import { Hono } from "hono";
+export declare function defineRouter(): Hono;

package/dist/app/server/defineRouter.js

@@ -0,0 +1,4 @@
+import { Hono } from "hono";
+export function defineRouter() {
+    return new Hono();
+}

package/dist/app/server/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./render-ssr-page.js";
 export * from "./server-context.js";
 export * from "./proxy-wp-admin.js";
+export * from "./defineRouter.js";

package/dist/app/server/index.js

@@ -1,3 +1,4 @@
 export * from "./render-ssr-page.js";
 export * from "./server-context.js";
 export * from "./proxy-wp-admin.js";
+export * from "./defineRouter.js";

package/dist/app/server/server-context.js

@@ -1,7 +1,7 @@
 import { parseURL, stringifyParsedURL, withQuery } from "ufo";
 import { filterHeader } from "./utils/headers.js";
 import { createUrlReplacer } from "./utils/replace-host.js";
-const PROXY_RESPONSE_HEADERS = ["content-type", "set-cookie", /^x-/, "cache-control"];
+const PROXY_RESPONSE_HEADERS = ["content-type", "set-cookie", /^x-/, "cache-control", /woocommerce/];
 const PROXY_REQUEST_HEADERS = [
     "content-type",
     "accept",
@@ -11,6 +11,7 @@ const PROXY_REQUEST_HEADERS = [
     "referer",
     "user-agent",
     "authorization",
+    "woocommerce-session",
 ];
 let runtime;
 export class ServerContext {
@@ -50,12 +51,14 @@ export class ServerContext {
         if (!response.ok) {
             return response;
         }
+        // console.log("Response headers", response.headers)
         const headers = {};
         response.headers.forEach((value, key) => {
             if (filterHeader(key, PROXY_RESPONSE_HEADERS)) {
                 headers[key] = value;
             }
         });
+        // console.log("Returning headers", headers)
         let text = await response.text();
         if (opts?.replaceUrls && this.replaceUrls) {
             text = this.replaceUrls(text);
@@ -116,6 +119,7 @@ export class ServerContext {
                 "Content-Type": "application/json",
                 Accept: "application/json",
             },
+            redirect: "manual",
         });
     }
     async fetchMutation(req) {
@@ -130,6 +134,7 @@ export class ServerContext {
                 Accept: "application/json",
             },
             body: JSON.stringify(req.body),
+            redirect: "manual",
         });
     }
 }

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

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.25";
+export declare const VERSION = "2.0.0-beta.27";

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.25";
+export const VERSION = "2.0.0-beta.27";

package/dist/node/compiler/get-vite-config.js

@@ -100,7 +100,6 @@ export function ssrPlugin() {
                 ...config.optimizeDeps,
                 include: [
                     "valtio",
-                    "zustand",
                     "@tanstack/react-query",
                     "qs",
                     "react",

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

@@ -20,10 +20,9 @@ export function createVinxiApp(args) {
             routeRules: {
                 "/wp-content/uploads/**": {
                     proxy: joinURL(args.origin, "wp-content/uploads/**"),
-                    headers: {
-                        "Cache-Control": "max-age=86400",
-                        "CDN-Cache-Control": "max-age=86400",
-                        "Vercel-CDN-Cache-Control": "max-age=86400",
+                    cache: {
+                        maxAge: 86400,
+                        varies: [],
                     },
                 },
                 "/wp-content/plugins/**": {
@@ -36,8 +35,23 @@ export function createVinxiApp(args) {
                 },
                 "/wp-content/**": { proxy: joinURL(args.origin, "wp-content/**") },
                 "/wp-includes/**": { proxy: joinURL(args.origin, "wp-includes/**") },
-                "/*": {
+                "/_data/**": {
                     isr: 300,
+                    swr: true,
+                    cache: {
+                        maxAge: 300,
+                        swr: true,
+                        varies: ["Authorization"],
+                    },
+                },
+                "/**/*": {
+                    isr: 300,
+                    swr: true,
+                    cache: {
+                        maxAge: 300,
+                        swr: true,
+                        varies: ["Authorization"],
+                    },
                 },
             },
         },

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

@@ -227,7 +227,7 @@ export function createVinxiCodegen(opts) {
               return await serverContext.fetchMutation({
                 name: id,
                 body,
-                headers: {},
+                headers: getRequestHeaders(event),
               })
             }),
           )

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

@@ -227,6 +227,9 @@ export class GraphQLGenerator {
                 documents: getDocuments(["queries", "views", "blocks", "fragments"]),
                 hasDocuments: true,
                 banner: `import { ContentBlock } from "eddev/blocks"`,
+                footer: Object.keys(wp.scalarTypes)
+                    .map((name) => `export type ${name}Scalar = Scalars["${name}"]["output"]`)
+                    .join("\n"),
                 plugins: {
                     typescript: [typescriptPlugin, {}],
                     typescriptOperations: [typescriptOperationsPlugin, {}],
@@ -400,7 +403,7 @@ export class GraphQLGenerator {
             errors.push(String(err));
         }
         if (args.banner) {
-            output = args.banner + "\n\n" + output;
+            output = args.banner + "\n\n" + output + "\n" + (args.footer ?? "");
         }
         if (errors.length === 0) {
             const didWrite = await fs.writeIfUnchanged(config.filename, output);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.0.0-beta.25",
+  "version": "2.0.0-beta.27",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -110,8 +110,7 @@
     "vite-tsconfig-paths": "^4.2.1",
     "zod": "^3.22.4",
     "zod-to-json-schema": "^3.21.4",
-    "zod-validation-error": "^2.1.0",
-    "zustand": "^4.5.5"
+    "zod-validation-error": "^2.1.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.21",

package/dist/app/lib/hooks/usePageLoad.d.ts

@@ -1,6 +0,0 @@
-interface PageLoadStore {
-    loading: boolean;
-    setIsLoading(loading: boolean): void;
-}
-export declare const usePageLoad: import("zustand").UseBoundStore<import("zustand").StoreApi<PageLoadStore>>;
-export {};

package/dist/app/lib/hooks/usePageLoad.js

@@ -1,5 +0,0 @@
-import { create } from "zustand";
-export const usePageLoad = create((set) => ({
-    loading: false,
-    setIsLoading: (loading) => set({ loading: loading }),
-}));