eddev 2.0.0-beta.13 → 2.0.0-beta.15

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

@@ -1,2 +1,2 @@
-export * from "./defineField";
-export * from "./defineWidget";
+export * from "./defineField.js";
+export * from "./defineWidget.js";

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

@@ -1,2 +1,2 @@
-export * from "./defineField";
-export * from "./defineWidget";
+export * from "./defineField.js";
+export * from "./defineWidget.js";

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

@@ -1,4 +1,4 @@
-export * from "./read-block-manifest";
-export * from "./read-view-manifest";
-export * from "./read-admin-manifest";
-export * from "./internal-store";
+export * from "./read-block-manifest.js";
+export * from "./read-view-manifest.js";
+export * from "./read-admin-manifest.js";
+export * from "./internal-store.js";

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

@@ -1,4 +1,4 @@
-export * from "./read-block-manifest";
-export * from "./read-view-manifest";
-export * from "./read-admin-manifest";
-export * from "./internal-store";
+export * from "./read-block-manifest.js";
+export * from "./read-view-manifest.js";
+export * from "./read-admin-manifest.js";
+export * from "./internal-store.js";

package/dist/app/server/index.js

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

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

@@ -1,7 +1,6 @@
 /// <reference types="vinxi/types/server" />
 import { splitSetCookieString } from "cookie-es";
 import { getProxyRequestHeaders, getRequestURL, getWebRequest } from "vinxi/http";
-import { getManifest } from "vinxi/manifest";
 export async function proxyWpAdmin(event, serverContext) {
     const replaceUrls = serverContext.replaceUrls;
     const req = getWebRequest(event);
@@ -51,7 +50,7 @@ export async function proxyWpAdmin(event, serverContext) {
         }
         // If the content type is text/html, inject the Vite assets into the response — assuming the placeholder comments are found
         if (contentType.startsWith("text/html")) {
-            const clientManifest = getManifest("admin");
+            const clientManifest = serverContext.getManifest("admin");
             const assets = await clientManifest.inputs[clientManifest.handler].assets();
             body = body.replace("<!---VITE_HEADER--->", () => assets.map((asset) => renderAsset(asset)).join("\n"));
             body = body.replace("<!---VITE_FOOTER--->", () => renderAsset({

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

@@ -1,2 +1,3 @@
 import type { RouteData } from "../lib/routing/types.js";
-export declare function renderPageToSSRStream(pathname: string, initialData: RouteData): Promise<unknown>;
+import { ServerContext } from "./server-context.js";
+export declare function renderPageToSSRStream(pathname: string, initialData: RouteData, serverContext: ServerContext): Promise<unknown>;

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

@@ -2,11 +2,10 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { renderAsset } from "@vinxi/react";
 import { Suspense } from "react";
 import { renderToPipeableStream } from "react-dom/server";
-import { getManifest } from "vinxi/manifest";
 import { SSRRoot } from "../entry/ssr-root.js";
 import { RouteLoader } from "../lib/routing/loader.js";
-export async function renderPageToSSRStream(pathname, initialData) {
-    const clientManifest = getManifest("client");
+export async function renderPageToSSRStream(pathname, initialData, serverContext) {
+    const clientManifest = serverContext.getManifest("client");
     const assets = await clientManifest.inputs[clientManifest.handler].assets();
     const jsx = (_jsx(SSRRoot, { assets: _jsx(Suspense, { children: assets.map((m) => renderAsset(m)) }), pathname: pathname, initialData: initialData, loader: new RouteLoader() }));
     const stream = await new Promise(async (resolve) => {
@@ -15,7 +14,7 @@ export async function renderPageToSSRStream(pathname, initialData) {
                 resolve(stream);
             },
             bootstrapModules: [clientManifest.inputs[clientManifest.handler].output.path],
-            bootstrapScriptContent: `window.manifest = ${JSON.stringify(await clientManifest.json())}; window._PAGE_DATA = ${JSON.stringify(initialData)}`,
+            bootstrapScriptContent: `window.manifest = ${JSON.stringify(clientManifest.json())}; window._PAGE_DATA = ${JSON.stringify(initialData)}`,
         });
     });
     return stream;

package/dist/app/server/server-context.d.ts

@@ -1,13 +1,16 @@
-import { UrlReplacerConf } from "./utils/replace-host.js";
 import { RequestHeaders } from "vinxi/http";
+import { UrlReplacerConf } from "./utils/replace-host.js";
+import { Manifest } from "vinxi/dist/types/types/manifest";
 export type ServerContextArgs = {
     dev: boolean;
     origin: string;
+    getManifest: (name: string) => Manifest;
     replaceUrls?: UrlReplacerConf;
 };
 export declare class ServerContext {
     dev: boolean;
     origin: string;
+    getManifest: (name: string) => Manifest;
     replaceUrls?: (text: string) => string;
     constructor(conf: ServerContextArgs);
     getOriginUrl(url: string): string;

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

@@ -15,10 +15,12 @@ const PROXY_REQUEST_HEADERS = [
 export class ServerContext {
     dev;
     origin;
+    getManifest;
     replaceUrls;
     constructor(conf) {
         this.dev = conf.dev;
         this.origin = conf.origin;
+        this.getManifest = conf.getManifest;
         if (conf.replaceUrls) {
             this.replaceUrls = createUrlReplacer(conf.replaceUrls);
         }

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

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.13";
+export declare const VERSION = "2.0.0-beta.10";

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.13";
+export const VERSION = "2.0.0-beta.10";

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

@@ -85,8 +85,29 @@ export function ssrPlugin() {
         name: "proxy-external-ssr-modules",
         config(config) {
             config.legacy = {
+                ...config.legacy,
                 proxySsrExternalModules: true,
             };
+            // config.ssr = {
+            //   ...config.ssr,
+            //   noExternal: ["eddev", ...(config?.optimizeDeps?.noExternal ?? [])],
+            //   // optimizeDeps: {
+            //   //   include: ["eddev", "vinxi"],
+            //   // },
+            // }
+            config.optimizeDeps = {
+                ...config.optimizeDeps,
+                include: [
+                    "valtio",
+                    "zustand",
+                    "@tanstack/react-query",
+                    "qs",
+                    "react",
+                    "react-dom/client",
+                    ...(config?.optimizeDeps?.include ?? []),
+                ],
+                exclude: ["eddev", ...(config?.optimizeDeps?.exclude ?? [])],
+            };
             return config;
         },
     };
@@ -113,12 +134,7 @@ function buildStatusPlugin(console) {
     };
 }
 export function corePlugins(args) {
-    return [
-        tsconfigPaths(),
-        reactPlugin(),
-        args.mode === "development" && args.serverless && ssrPlugin(),
-        envPlugin(args),
-    ].flat();
+    return [tsconfigPaths(), reactPlugin(), args.serverless && ssrPlugin(), envPlugin(args)].flat();
 }
 export function getViteConfig(args) {
     const console = args.console;

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

@@ -17,22 +17,30 @@ export function createVinxiCodegen(opts) {
     if (opts.serverless) {
         codegen.registerFile({
             name: "context.ts",
-            generate: code /* tsx */ `
-      import { ServerContext } from "eddev/server"
-
-      export const serverContext = new ServerContext(${JSON.stringify({
-                dev: true,
-                origin: project.origin,
-                replaceUrls: {
-                    from: project.origin,
-                    to: opts.endpoint ?? "",
-                    prefixes: [
-                        { prefix: "/wp-content/uploads", replace: project.config?.serverless.uploads === "proxy" },
-                        { prefix: "/wp-content/plugins", replace: project.config?.serverless.plugins === "proxy" },
-                    ],
-                },
-            })})
-    `.toString(),
+            generate: () => {
+                const args = {
+                    dev: true,
+                    origin: project.origin,
+                    replaceUrls: {
+                        from: project.origin,
+                        to: opts.endpoint ?? "",
+                        prefixes: [
+                            { prefix: "/wp-content/uploads", replace: project.config?.serverless.uploads === "proxy" },
+                            { prefix: "/wp-content/plugins", replace: project.config?.serverless.plugins === "proxy" },
+                        ],
+                    },
+                };
+                return code /* tsx */ `
+          import { ServerContext } from "eddev/server"
+          import { getManifest } from "vinxi/manifest"
+
+          export const serverContext = new ServerContext({${Object.entries(args)
+                    .map(([key, value]) => `${key}: ${JSON.stringify(value)}`)
+                    .join(",\n")},
+            getManifest
+          })
+        `.toString();
+            },
         });
     }
     if (opts.serverless) {
@@ -238,7 +246,7 @@ export function createVinxiCodegen(opts) {
           if (response.ok) {
             setResponseStatus(event, response.status)
             setResponseHeader(event, "Content-Type", "text/html; charset=utf-8")
-            return renderPageToSSRStream(url.pathname, await response.json())
+            return renderPageToSSRStream(url.pathname, await response.json(), serverContext)
           } else {
             return response
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.15",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -118,11 +118,11 @@
     "@types/node": "^20.9.0",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
+    "typescript": "^5.5.2",
     "@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"
+    "@types/wordpress__hooks": "^2.11.0"
   },
   "peerDependencies": {
     "react": "^18.3.1",