eddev 2.0.0-beta.69 → 2.0.0-beta.70

package/dist/app/entry/boot-admin.js

@@ -4,7 +4,6 @@ import { installEDGutenbergHooks } from "../lib/blocks/editor/installGutenbergHo
 export default function bootAdmin() {
     console.log("Booting admin");
     if (window.name === "editor-canvas") {
-        console.log("In canvas");
     }
     else {
         installEDGutenbergHooks();

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

@@ -214,7 +214,7 @@ export function BrowserRouter(props) {
                     hash: link.hash,
                     search: "",
                     query: link.query,
-                    pathname: link.pathname,
+                    pathname: data.canonical ?? link.pathname,
                     view: data.view,
                     props: data.viewData?.data ?? {},
                     component: lazyComponent,

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { forwardRef, useMemo } from "react";
-import { parseURL, resolveURL, withoutTrailingSlash } from "ufo";
+import { parseURL, resolveURL, withoutTrailingSlash, withTrailingSlash } from "ufo";
 import { useIsSSR } from "../hooks/useIsSSR.js";
 import { useRouter } from "../hooks/useRouter.js";
 import { isSameOrigin } from "../utils.js";
@@ -17,7 +17,7 @@ export const Link = forwardRef(({ preferBack, ...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: 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), onMouseEnter: (e) => {
                 if (props.onMouseEnter) {
                     props.onMouseEnter(e);
                 }

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

@@ -56,6 +56,7 @@ export class RouteLoader {
         return this.entries.has(cacheKey);
     }
     async loadRouteData(pathname, withAppData = false) {
+        pathname = withTrailingSlash(pathname);
         const cacheKey = this.getKey(pathname);
         // Cached value?
         if (this.entries.has(cacheKey))
@@ -65,9 +66,12 @@ export class RouteLoader {
             serverless: env.serverless,
             debug: env.dev,
         });
-        const promise = this.fetchImpl(requestUrl, {})
-            .then((response) => response.text())
-            .then((text) => {
+        const promise = this.fetchImpl(requestUrl)
+            .then(async (response) => {
+            if (response.redirected) {
+                return { redirect: response.url };
+            }
+            let text = await response.text();
             if (this.processProps) {
                 text = this.processProps(text);
             }
@@ -78,14 +82,15 @@ export class RouteLoader {
                 throw new RouteError(`JSON parse error for route '${pathname}':\n${err?.message}`, 500);
             }
         })
-            .then((data) => {
+            .then(async (data) => {
             if (data.redirect) {
-                const redirect = data.redirect;
-                data = this.loadRouteData(redirect).then((data) => {
-                    data.canonical = redirect;
-                    return data;
-                });
+                const redirect = parseURL(data.redirect).pathname;
+                data = await this.loadRouteData(redirect);
+                data.canonical = redirect;
             }
+            return data;
+        })
+            .then((data) => {
             this.entries.set(cacheKey, new Promise((resolve) => resolve(data)));
             return data;
         });

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

@@ -1,5 +1,5 @@
 import { parse as qsParse, stringify as qsStringify } from "qs";
-import { parseURL, resolveURL, stringifyParsedURL, withoutTrailingSlash } from "ufo";
+import { parseURL, resolveURL, stringifyParsedURL, withoutTrailingSlash, withTrailingSlash } from "ufo";
 export function isSameOrigin(url) {
     if (typeof document === "undefined") {
         return url.startsWith("/");
@@ -81,6 +81,7 @@ export function normalizeRoute(route) {
 export function stringifyRouteLink(route) {
     return stringifyParsedURL({
         ...route,
+        pathname: withTrailingSlash(route.pathname),
         search: stringifyQuery(route.query),
     });
 }

package/dist/app/server/proxy-wp-admin.js

@@ -2,11 +2,25 @@
 import { splitSetCookieString } from "cookie-es";
 import { getProxyRequestHeaders, getRequestURL, getWebRequest } from "vinxi/http";
 import { ServerContext } from "./server-context.js";
+import { renderErrorPage } from "./render-ssr-page.js";
 export async function proxyWpAdmin(event) {
     const serverContext = ServerContext.main;
     const replaceUrls = serverContext.replaceUrls;
     const req = getWebRequest(event);
-    const proxyUrl = serverContext.getOriginUrl(getRequestURL(event).href);
+    const reqUrl = getRequestURL(event);
+    const serverlessConfig = serverContext.config.serverless;
+    if (!serverContext.dev) {
+        if (reqUrl.pathname.toLowerCase().match(/\/+(graphql|wp\-(admin|login|json))/)) {
+            if (serverlessConfig.admin === "hide") {
+                return renderErrorPage({
+                    code: 404,
+                    pathname: reqUrl.pathname,
+                    title: "Not Found",
+                });
+            }
+        }
+    }
+    const proxyUrl = serverContext.getOriginUrl(reqUrl.href);
     // Prepare request headers to be sent to the origin server
     const proxyHeaders = getProxyRequestHeaders(event);
     proxyHeaders["X-ED-Dev-Proxy"] = "true";

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

@@ -6,6 +6,13 @@ type SSRArgs = {
 export declare function getSsrStream(args: SSRArgs): Promise<ReadableStream<Uint8Array>>;
 type RenderArgs = {
     pathname: string;
+    statusCode?: number;
 };
 export declare function renderPage(args: RenderArgs): Promise<Response>;
+type RenderErrorPageArgs = {
+    pathname: string;
+    code: number;
+    title: string;
+};
+export declare function renderErrorPage(args: RenderErrorPageArgs): Promise<Response>;
 export {};

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

@@ -67,6 +67,7 @@ export async function renderPage(args) {
             data = await response.json();
             data.appData = appData;
             data.trackers = trackers;
+            responseInit.status = response.status;
         }
         catch (err) {
             data = {
@@ -74,6 +75,7 @@ export async function renderPage(args) {
                 viewType: "react",
                 viewData: {},
                 appData: appData,
+                trackers: trackers,
             };
             console.error(err);
             responseInit.status = 500;
@@ -98,3 +100,46 @@ export async function renderPage(args) {
         });
     }
 }
+export async function renderErrorPage(args) {
+    return renderPage({
+        pathname: "/_error",
+        statusCode: args.code,
+    });
+    // const serverContext = ServerContext.main
+    // let headers = new Headers()
+    // let responseInit: ResponseInit = {
+    //   headers,
+    // }
+    // try {
+    //   const { appData, trackers } = await serverContext.fetchAppData()
+    //   let data: RouteDataWithTrackers
+    //   data = {
+    //     view: "_error",
+    //     viewType: "react",
+    //     viewData: {},
+    //     appData,
+    //     trackers,
+    //   }
+    //   responseInit.status = 500
+    //   headers.set("Content-Type", "text/html; charset=utf-8")
+    //   const stream = await getSsrStream({
+    //     ...args,
+    //     initialData: data,
+    //   })
+    //   return new Response(stream, responseInit)
+    // } catch (err) {
+    //   console.error(err)
+    //   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>',
+    //     {
+    //       status: 500,
+    //       statusText: "Internal Server Error",
+    //       headers: {
+    //         "Content-Type": "text/html; charset=utf-8",
+    //       },
+    //     },
+    //   )
+    // }
+}

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

@@ -1,4 +1,4 @@
-import { parseURL, stringifyParsedURL, withQuery } from "ufo";
+import { parseURL, stringifyParsedURL, withQuery, withTrailingSlash } 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", /woocommerce/];
@@ -76,22 +76,39 @@ export class ServerContext {
         });
     }
     async fetchRouteData(req) {
-        const fetchUrl = withQuery(req.pathname, {
+        const fetchUrl = withQuery(withTrailingSlash(req.pathname), {
             ...req.query,
             _props: "1",
             _ssr: "1",
             _debug: this.dev ? "1" : undefined,
         });
         // console.log("Fetching route data", req.pathname)
-        const result = this.fetchOrigin(fetchUrl, {
+        const result = await this.fetchOrigin(fetchUrl, {
             cache: "no-cache",
             replaceUrls: true,
             headers: {
                 "Content-Type": "application/json",
                 Accept: "application/json",
             },
+            redirect: "manual",
         });
-        // console.log("Finished fetching route data")
+        if (result.headers.get("content-type") && result.headers.get("location")) {
+            let location = result.headers.get("location");
+            let status = result.status;
+            if (this.replaceUrls) {
+                location = this.replaceUrls(location);
+            }
+            const headers = new Headers({
+                ...result.headers,
+            });
+            headers.delete("location");
+            return new Response(JSON.stringify({
+                redirect: location,
+                status: status,
+            }), {
+                headers: headers,
+            });
+        }
         return result;
     }
     async fetchAppData() {
@@ -130,7 +147,6 @@ export class ServerContext {
                 "Content-Type": "application/json",
                 Accept: "application/json",
             },
-            redirect: "manual",
         });
     }
     async fetchMutation(req) {
@@ -145,7 +161,6 @@ export class ServerContext {
                 Accept: "application/json",
             },
             body: JSON.stringify(req.body),
-            redirect: "manual",
         });
     }
     get allowedCorsOrigins() {

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

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.69";
+export declare const VERSION = "2.0.0-beta.70";

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.69";
+export const VERSION = "2.0.0-beta.70";

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

@@ -79,12 +79,18 @@ export function createVinxiApp(args) {
             },
         },
         routers: [
-            {
-                name: "public",
-                type: "static",
-                dir: "./assets",
-                base: joinURL(args.publicUrl, "assets"),
-            },
+            ...args.config.serverless.themeAssets.map((folder) => {
+                const folderName = folder
+                    .split("/")
+                    .filter((p) => !p.includes("*") && p !== ".")
+                    .join("/");
+                return {
+                    name: "public_" + folderName,
+                    type: "static",
+                    dir: "./" + folderName,
+                    base: joinURL(args.publicUrl, folderName),
+                };
+            }),
             {
                 name: "data-api",
                 type: "http",

package/dist/node/project/config.d.ts

@@ -28,6 +28,7 @@ export declare const EDConfigSchema: z.ZodObject<{
         enabled: z.ZodDefault<z.ZodBoolean>;
         uploads: z.ZodEnum<["proxy", "remote"]>;
         plugins: z.ZodDefault<z.ZodEnum<["proxy", "remote"]>>;
+        admin: z.ZodDefault<z.ZodEnum<["proxy", "hide"]>>;
         themeAssets: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
         apiOnly: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         endpoints: z.ZodRecord<z.ZodString, z.ZodString>;
@@ -44,6 +45,7 @@ export declare const EDConfigSchema: z.ZodObject<{
         plugins: "proxy" | "remote";
         enabled: boolean;
         uploads: "proxy" | "remote";
+        admin: "hide" | "proxy";
         themeAssets: string[];
         apiOnly: boolean;
         endpoints: Record<string, string>;
@@ -57,6 +59,7 @@ export declare const EDConfigSchema: z.ZodObject<{
         endpoints: Record<string, string>;
         plugins?: "proxy" | "remote" | undefined;
         enabled?: boolean | undefined;
+        admin?: "hide" | "proxy" | undefined;
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
         defaultRevalidate?: number | undefined;
@@ -84,6 +87,7 @@ export declare const EDConfigSchema: z.ZodObject<{
         plugins: "proxy" | "remote";
         enabled: boolean;
         uploads: "proxy" | "remote";
+        admin: "hide" | "proxy";
         themeAssets: string[];
         apiOnly: boolean;
         endpoints: Record<string, string>;
@@ -113,6 +117,7 @@ export declare const EDConfigSchema: z.ZodObject<{
         endpoints: Record<string, string>;
         plugins?: "proxy" | "remote" | undefined;
         enabled?: boolean | undefined;
+        admin?: "hide" | "proxy" | undefined;
         themeAssets?: string[] | undefined;
         apiOnly?: boolean | undefined;
         defaultRevalidate?: number | undefined;

package/dist/node/project/config.js

@@ -37,12 +37,15 @@ export const EDConfigSchema = z.object({
             .enum(["proxy", "remote"])
             .default("remote")
             .describe("Whether to proxy plugin assets or serve them from the serverless endpoint.\nDefault is `remote`, but `proxy` can be used to hide the CMS origin."),
-        // theme: z.enum(["proxy", "copy", "remote"]),
+        admin: z
+            .enum(["proxy", "hide"])
+            .default("proxy")
+            .describe("How to handle the WordPress admin URLs.\nDefault is `proxy`, which will proxy the admin URLs to the CMS origin. When set to `hide`, all /wp-admin, /wp-json and /wp-login.php URLs will show a 404 page.\nHas no effect in dev mode."),
         themeAssets: z
             .array(z.string())
             .optional()
             .default(["assets"])
-            .describe('Files to include in a serverless deployment.\nDefault is `["assets"]`'),
+            .describe('Asset folders to include in a serverless deployment.\nDefault is `["assets"]`'),
         apiOnly: z.boolean().optional().default(false).describe("Whether to deploy only the API, not the frontend"),
         endpoints: z
             .record(z.string(), z.string())

package/package.json

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