eddev 2.0.0-beta.9 → 2.0.0-beta.91

package/dist/node/project/project.js

@@ -1,16 +1,17 @@
+import { objFormat } from "obj-console";
 import { relative, resolve } from "path";
 import { undent } from "undent";
-import { objFormat } from "obj-console";
 import { getRepoInfo } from "../utils/get-repo-info.js";
 import { isDeploying } from "../utils/is-deploying.js";
 import { createConsole } from "../utils/stateful-log.js";
 import { Configurator } from "./config.js";
-import { loadBlockManifest } from "./manifest/block-manifest.js";
-import { loadViewManifest } from "./manifest/view-manifest.js";
-import { WPInfo } from "./wp-info.js";
 import { ProjectEnvUtils } from "./env.js";
+import { loadBlockManifest } from "./manifest/block-manifest.js";
 import { loadFieldManifest } from "./manifest/field-manifest.js";
+import { loadRouteManifest } from "./manifest/routes-manifest.js";
+import { loadViewManifest } from "./manifest/view-manifest.js";
 import { loadWidgetManifest } from "./manifest/widget-manifest.js";
+import { WPInfo } from "./wp-info.js";
 const console = createConsole("Project", "project");
 export const projectLog = console;
 /**
@@ -29,17 +30,47 @@ export class Project {
     views;
     fields;
     widgets;
+    serverRoutes;
     wp;
     reportPluginCompatibility = false;
     constructor(opts) {
         this.rootDir = opts.rootDir;
-        this.origin = ProjectEnvUtils.get("SITE_URL");
+        this.origin = ProjectEnvUtils.getSafe("SITE_URL") ?? "";
         this.reportPluginCompatibility = opts.reportPluginCompatibility || false;
         this.blocks = loadBlockManifest(this);
         this.views = loadViewManifest(this);
         this.fields = loadFieldManifest(this);
         this.widgets = loadWidgetManifest(this);
-        this.wp = new WPInfo(ProjectEnvUtils.get("SITE_URL"));
+        this.serverRoutes = loadRouteManifest(this);
+        this.wp = new WPInfo(this.origin);
+    }
+    async verifyOriginAccess() {
+        try {
+            const response = await this.wp.ping();
+            if (!response.ok) {
+                return {
+                    success: false,
+                    message: [
+                        `Failed to access WordPress origin at ${this.origin}`,
+                        `Using API Key?: ${ProjectEnvUtils.getSafe("SITE_API_KEY") ? "Yes" : "No"}`,
+                        `Response: ${response.status} ${response.statusText}`,
+                    ].join("\n"),
+                };
+            }
+            return {
+                success: true,
+            };
+        }
+        catch (err) {
+            return {
+                success: false,
+                message: [
+                    `Failed to access WordPress origin at ${this.origin}`,
+                    `Using API Key?: ${ProjectEnvUtils.getSafe("SITE_API_KEY") ? "Yes" : "No"}`,
+                    `The following error occurred:${err}`,
+                ].join("\n"),
+            };
+        }
     }
     async load() {
         console.setWorking(true);

package/dist/node/project/wp-info.d.ts

@@ -26,6 +26,7 @@ export declare class WPInfo {
     siteUrl: string;
     private cached?;
     constructor(siteUrl: string);
+    ping(): Promise<Response>;
     getInfo(force?: boolean): Promise<WPInfoData>;
     getPluginIssues(): Promise<string[]>;
 }

package/dist/node/project/wp-info.js

@@ -1,15 +1,27 @@
 import { resolveURL } from "ufo";
+import { fetchWP } from "../utils/fetch-wp.js";
 export class WPInfo {
     siteUrl;
     cached;
     constructor(siteUrl) {
         this.siteUrl = siteUrl;
     }
+    async ping() {
+        if (!this.siteUrl) {
+            throw new Error("Attempted to ping WordPress, but SITE_URL was not present in the environment.");
+        }
+        const url = resolveURL(this.siteUrl, "/wp-json/ed/v1/handshake");
+        const response = await fetchWP(url);
+        return response;
+    }
     async getInfo(force = false) {
+        if (!this.siteUrl) {
+            throw new Error("Attempted to get site info from WordPress, but SITE_URL was not present in the environment.");
+        }
         if (this.cached && !force)
             return this.cached;
         const url = resolveURL(this.siteUrl, "/wp-json/ed/v1/dev/site-info");
-        const response = await fetch(url);
+        const response = await fetchWP(url);
         const result = (await response.json());
         this.cached = result;
         return result;

package/dist/node/types/block-type.d.ts

@@ -23,67 +23,72 @@ export declare const BlockMetaSchema: z.ZodObject<{
     cache: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     allowMultiple: z.ZodDefault<z.ZodBoolean>;
     postMetaBlock: z.ZodOptional<z.ZodObject<{
+        postTypes: z.ZodArray<z.ZodString, "many">;
         fieldName: z.ZodString;
     }, "strip", z.ZodTypeAny, {
+        postTypes: string[];
         fieldName: string;
     }, {
+        postTypes: string[];
         fieldName: string;
     }>>;
     frontendMode: z.ZodDefault<z.ZodEnum<["hidden", "childrenOnly", "default"]>>;
     inserter: z.ZodDefault<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
-    cache: boolean;
+    title: string;
+    mode: "both" | "edit" | "preview";
+    slug: string;
+    tags: string[];
+    flags: Record<string, any>;
+    category: string;
+    parent: string[];
     acfName: string;
     fileName: string;
-    slug: string;
     graphqlFieldName: string;
-    title: string;
-    category: string;
     types: string[];
-    mode: "preview" | "edit" | "both";
-    tags: string[];
-    flags: Record<string, any>;
     childTags: string[];
     childBlocks: string[];
-    parent: string[];
     ancestors: string[];
     dynamic: boolean;
+    cache: boolean;
     allowMultiple: boolean;
-    frontendMode: "hidden" | "childrenOnly" | "default";
+    frontendMode: "hidden" | "default" | "childrenOnly";
     inserter: boolean;
-    description?: string | undefined;
     icon?: string | undefined;
+    description?: string | undefined;
     keywords?: string[] | undefined;
     templates?: string[] | null | undefined;
     postMetaBlock?: {
+        postTypes: string[];
         fieldName: string;
     } | undefined;
 }, {
+    title: string;
+    slug: string;
     acfName: string;
     fileName: string;
-    slug: string;
     graphqlFieldName: string;
-    title: string;
     types: string[];
-    cache?: boolean | undefined;
-    description?: string | undefined;
-    category?: string | undefined;
+    mode?: "both" | "edit" | "preview" | undefined;
+    tags?: string[] | undefined;
+    flags?: Record<string, any> | undefined;
     icon?: string | undefined;
+    category?: string | undefined;
+    parent?: string[] | undefined;
+    description?: string | undefined;
     keywords?: string[] | undefined;
     templates?: string[] | null | undefined;
-    mode?: "preview" | "edit" | "both" | undefined;
-    tags?: string[] | undefined;
-    flags?: Record<string, any> | undefined;
     childTags?: string[] | undefined;
     childBlocks?: string[] | undefined;
-    parent?: string[] | undefined;
     ancestors?: string[] | undefined;
     dynamic?: boolean | undefined;
+    cache?: boolean | undefined;
     allowMultiple?: boolean | undefined;
     postMetaBlock?: {
+        postTypes: string[];
         fieldName: string;
     } | undefined;
-    frontendMode?: "hidden" | "childrenOnly" | "default" | undefined;
+    frontendMode?: "hidden" | "default" | "childrenOnly" | undefined;
     inserter?: boolean | undefined;
 }>;
 export type BlockMetadata = z.infer<typeof BlockMetaSchema>;

package/dist/node/types/block-type.js

@@ -27,6 +27,7 @@ export const BlockMetaSchema = z.object({
     allowMultiple: z.boolean().default(true),
     postMetaBlock: z
         .object({
+        postTypes: z.array(z.string()),
         fieldName: z.string(),
     })
         .optional(),

package/dist/node/types/view-type.d.ts

@@ -9,21 +9,21 @@ export declare const ViewMetaSchema: z.ZodObject<{
     routePattern: z.ZodOptional<z.ZodString>;
     postType: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
 }, "strip", z.ZodTypeAny, {
-    cache: boolean;
-    fileName: string;
-    slug: string;
     title: string;
+    slug: string;
+    fileName: string;
+    cache: boolean;
     isCustomTemplate: boolean;
-    routePattern?: string | undefined;
     postType?: string[] | undefined;
+    routePattern?: string | undefined;
 }, {
-    fileName: string;
-    slug: string;
     title: string;
+    slug: string;
+    fileName: string;
+    postType?: string[] | undefined;
     cache?: boolean | undefined;
     isCustomTemplate?: boolean | undefined;
     routePattern?: string | undefined;
-    postType?: string[] | undefined;
 }>;
 export type ViewMetadata = z.infer<typeof ViewMetaSchema>;
 export type ViewMetadataConstructor = z.input<typeof ViewMetaSchema>;

package/dist/node/utils/fetch-wp.d.ts

@@ -0,0 +1 @@
+export declare function fetchWP(url: string | URL, args?: RequestInit): Promise<Response>;

package/dist/node/utils/fetch-wp.js

@@ -0,0 +1,27 @@
+import { ProjectEnvUtils } from "../project/env.js";
+import { Agent, fetch, setGlobalDispatcher, Headers } from "undici";
+const agent = new Agent({
+    connect: {
+        rejectUnauthorized: false,
+    },
+});
+export function fetchWP(url, args = {}) {
+    const headers = new Headers(args.headers);
+    // If an API key has been set in the environment, use it
+    const accessKey = ProjectEnvUtils.getSafe("SITE_API_KEY");
+    if (accessKey) {
+        headers.set("x-ed-api-key", accessKey);
+    }
+    // Allow self-signed certificates when using a local development domain
+    let allowSelfSigned = isDevelopmentDomain(url);
+    return fetch(url, {
+        ...args,
+        dispatcher: allowSelfSigned ? agent : undefined,
+        headers,
+    });
+}
+setGlobalDispatcher(agent);
+function isDevelopmentDomain(url) {
+    const hostname = typeof url === "string" ? new URL(url).hostname : url.hostname;
+    return !!hostname?.match(/(^[0-9\.]+$|\.local$)/);
+}

package/dist/node/utils/fs-codegen.d.ts

@@ -15,6 +15,7 @@ export declare class FSCodegen {
     project: Project;
     opts: {
         outDir: string;
+        onWritten?: (opts: Set<string>) => void;
     };
     outDir: string;
     private generators;
@@ -23,6 +24,7 @@ export declare class FSCodegen {
     private flushScheduled;
     constructor(project: Project, opts: {
         outDir: string;
+        onWritten?: (opts: Set<string>) => void;
     });
     register(generator: CodeGenerator): void;
     registerFile({ name, generate, subscribe, }: {

package/dist/node/utils/fs-codegen.js

@@ -77,7 +77,7 @@ export class FSCodegen {
     }
     async flush() {
         const files = Array.from(this.generatorFiles.values()).flat();
-        const existing = (await globby(this.outDir + "/**/*")).map((path) => resolve(this.project.rootDir, path));
+        const existing = (await globby(join(this.outDir, "/**/*"))).map((path) => resolve(this.project.rootDir, path));
         const written = new Set();
         await Promise.all(files.map(async (file) => {
             const path = join(this.project.rootDir, this.outDir, file.name);
@@ -89,6 +89,7 @@ export class FSCodegen {
                 await fs.rm(path);
             }
         }));
+        this.opts.onWritten?.(written);
     }
     stop() {
         this.unsubscribers.forEach((unsub) => unsub());

package/dist/node/utils/is-deploying.js

@@ -2,5 +2,5 @@
  * Returns true if we think that the compiler is running in a deployment context (Vercel, GitHub Actions, etc.)
  */
 export function isDeploying() {
-    return !!process.env.VERCEL;
+    return !!process.env.VERCEL || !!process.env.GITHUB_ACTIONS;
 }

package/dist/node/utils/stateful-log.js

@@ -133,6 +133,8 @@ export class StatefulLog {
         this.notifySubscribers();
     }
     addLogEntry(kind, ...messages) {
+        // We ignore SSL errors in dev mode.
+        // if (typeof messages[0] === "string" && messages[0].includes("NODE_TLS_REJECT_UNAUTHORIZED")) return
         if (cliMode.interactive) {
             const entry = {
                 id: getID(),

package/dist/node/utils/watch-file-tree.d.ts

@@ -5,7 +5,21 @@ export type FileEvent = {
     type: FileWatchEvent;
     file: string;
 };
-export declare function watchFileTree(pattern: string | string[], callback: (files: FileList, event?: FileEvent) => void): Promise<Disposer>;
-export declare function watchFileTreeForChanges(pattern: string | string[], callback: (event: FileEvent) => void): Promise<Disposer>;
-export declare function getFileTree(pattern: string | string[]): Promise<FileList>;
+type WatchTreeOpts = {
+    pattern: string | string[];
+    ignore?: string[];
+    callback: (files: FileList, event?: FileEvent) => void;
+};
+export declare function watchFileTree({ pattern, callback, ignore }: WatchTreeOpts): Promise<Disposer>;
+type WatchTreeChangesOpts = {
+    pattern: string | string[];
+    ignore?: string | RegExp | string[];
+    callback: (event: FileEvent) => void;
+};
+export declare function watchFileTreeForChanges({ pattern, callback, ignore }: WatchTreeChangesOpts): Promise<Disposer>;
+type GetTreeOpts = {
+    pattern: string | string[];
+    ignore?: string[];
+};
+export declare function getFileTree(opts: GetTreeOpts): Promise<FileList>;
 export {};

package/dist/node/utils/watch-file-tree.js

@@ -1,11 +1,13 @@
 import chokidar from "chokidar";
 import { globby } from "globby";
-export function watchFileTree(pattern, callback) {
+export function watchFileTree({ pattern, callback, ignore }) {
     const files = [];
     let ready = false;
     return new Promise((resolve) => {
         const watcher = chokidar
-            .watch(pattern)
+            .watch(pattern, {
+            ignored: ignore,
+        })
             .on("add", (path) => {
             files.push(path);
             if (ready)
@@ -31,7 +33,7 @@ export function watchFileTree(pattern, callback) {
         });
     });
 }
-export function watchFileTreeForChanges(pattern, callback) {
+export function watchFileTreeForChanges({ pattern, callback, ignore }) {
     let ready = false;
     return new Promise((resolve) => {
         const watcher = chokidar
@@ -50,9 +52,14 @@ export function watchFileTreeForChanges(pattern, callback) {
         })
             .on("ready", () => {
             ready = true;
+            resolve(() => {
+                watcher.close();
+            });
         });
     });
 }
-export function getFileTree(pattern) {
-    return globby(pattern);
+export function getFileTree(opts) {
+    return globby(opts.pattern, {
+        ignore: opts.ignore,
+    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.0.0-beta.9",
+  "version": "2.0.0-beta.91",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -38,6 +38,10 @@
       "types": "./dist/app/lib/devtools/index.d.ts",
       "import": "./dist/app/lib/devtools/index.js"
     },
+    "./runtime": {
+      "types": "./dist/app/lib/runtime/index.d.ts",
+      "import": "./dist/app/lib/runtime/index.js"
+    },
     "./server": {
       "types": "./dist/app/server/index.d.ts",
       "import": "./dist/app/server/index.js"
@@ -72,21 +76,18 @@
   "license": "ISC",
   "dependencies": {
     "@babel/types": "^7.25.2",
-    "@clack/prompts": "^0.7.0",
+    "@epic-web/cachified": "^5.2.0",
     "@graphql-codegen/core": "^4.0.0",
     "@graphql-codegen/typescript": "^4.0.1",
     "@graphql-codegen/typescript-operations": "^4.0.1",
     "@graphql-tools/load": "^8.0.0",
     "@graphql-tools/url-loader": "^8.0.0",
-    "@inquirer/prompts": "^5.0.6",
     "@nozbe/microfuzz": "^1.0.0",
     "@rollup/plugin-replace": "^5.0.5",
     "@tanstack/react-query": "^5.51.23",
+    "@trpc/client": "^11.0.0-rc.608",
+    "@trpc/server": "^11.0.0-rc.608",
     "@types/qs": "^6.9.15",
-    "@types/wordpress__blocks": "^12.5.13",
-    "@types/wordpress__components": "^23.0.11",
-    "@types/wordpress__editor": "^13.6.7",
-    "@types/wordpress__hooks": "^2.11.0",
     "@vinxi/react": "^0.2.5",
     "@vitejs/plugin-react": "^4.1.1",
     "chalk": "^5.3.0",
@@ -97,31 +98,34 @@
     "dotenv": "^16.3.1",
     "globby": "^13.2.2",
     "graphql": "^16.8.1",
+    "hono": "^4.6.2",
     "ink": "^5.0.1",
     "ink-spinner": "^5.0.0",
-    "ink-text-input": "^6.0.0",
-    "listhen": "^1.6.0",
+    "lru-cache": "10.4.1",
     "mkcert": "^3.2.0",
     "obj-console": "^1.0.2",
     "object-code": "^1.3.3",
     "qs": "^6.13.0",
+    "superjson": "^2.2.1",
     "ts-poet": "^6.6.0",
     "ufo": "^1.3.1",
     "undent": "^0.1.0",
+    "undici": "^6.21.0",
     "valtio": "^1.13.2",
     "vinxi": "^0.4.3",
     "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",
-    "@types/express-http-proxy": "^1.6.6",
     "@types/node": "^20.9.0",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
+    "@types/wordpress__blocks": "^12.5.13",
+    "@types/wordpress__components": "^23.0.11",
+    "@types/wordpress__editor": "^13.6.7",
+    "@types/wordpress__hooks": "^2.11.0",
     "typescript": "^5.5.2"
   },
   "peerDependencies": {

package/types.app.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="vite/client" />
-/// <reference types="./types.meta" />
-/// <reference types="./types.env" />
+/// <reference types="./types.meta.d.ts" />
+/// <reference types="./types.env.d.ts" />
+import { Router } from "@trpc/server"
 
 declare global {
   interface ViewProps {}
@@ -13,6 +14,7 @@ declare global {
   interface PostMetaTypes {}
 
   interface RPCRouter {}
+  interface RPCContext {}
 
   type AppData = ViewProps["_app"]
 

package/types.app.internal.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="./types.manifests" />
-/// <reference types="./types.app" />
+/// <reference types="./types.manifests.d.ts" />
+/// <reference types="./types.app.d.ts" />
 
 declare global {
   interface ViewProps {

package/types.node.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="./types.app" />
-/// <reference types="./types.meta" />
-/// <reference types="./types.env" />
+/// <reference types="./types.app.d.ts" />
+/// <reference types="./types.meta.d.ts" />
+/// <reference types="./types.env.d.ts" />

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

@@ -1,15 +0,0 @@
-import { 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(): string | number | boolean | import("react/jsx-runtime").JSX.Element | Iterable<ReactNode> | null | undefined;
-}
-export {};

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

@@ -1,35 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Component } from "react";
-export class ErrorBoundaryFrontend extends Component {
-    state = {
-        hasError: false,
-    };
-    static getDerivedStateFromError(err) {
-        // Update state so the next render will show the fallback UI.
-        return { hasError: true, error: err };
-    }
-    componentDidCatch(error, errorInfo) {
-        console.error("Uncaught error:", error, errorInfo);
-    }
-    render() {
-        if (this.state.hasError) {
-            const err = this.state.error;
-            if (env.dev) {
-                return (_jsx("pre", { style: {
-                        backgroundColor: "#fafafa",
-                        fontSize: "12px",
-                        color: "#d92a0b",
-                        border: "2px solid #d92a0b",
-                        borderRadius: "4px",
-                        padding: "8px",
-                        overflowX: "auto",
-                        fontFamily: '"Roboto Mono", Menlo, monospace',
-                    }, children: err.stack }));
-            }
-            else {
-                return null;
-            }
-        }
-        return this.props.children;
-    }
-}

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

@@ -1,4 +0,0 @@
-import { create } from "zustand";
-export const useAPIConfig = create((set, get) => ({
-    set: (config) => set(config),
-}));

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 }),
-}));

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

@@ -1,2 +0,0 @@
-declare const _default: "<!doctype html>\n<html lang=\"en\">\n  <head>\n    <meta charset=\"UTF-8\" />\n    <link rel=\"icon\" type=\"image/svg+xml\" href=\"/vite.svg\" />\n    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\" />\n    <!--ssr-meta-->\n  </head>\n  <body>\n    <div id=\"root\"><!--ssr-outlet--></div>\n    <!--ssr-meta-->\n    <script type=\"module\" src=\"/_boot.js\"></script>\n  </body>\n</html>";
-export default _default;

package/dist/app/server/utils/index.html.js

@@ -1,14 +0,0 @@
-export default `<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <!--ssr-meta-->
-  </head>
-  <body>
-    <div id="root"><!--ssr-outlet--></div>
-    <!--ssr-meta-->
-    <script type="module" src="/_boot.js"></script>
-  </body>
-</html>`;