eddev 2.0.0-beta.17 → 2.0.0-beta.19

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

@@ -6,6 +6,7 @@ import { SSRRoot } from "../entry/ssr-root.js";
 import { RouteLoader } from "../lib/routing/loader.js";
 export async function renderPageToSSRStream(pathname, initialData, serverContext) {
     const clientManifest = serverContext.getManifest("client");
+    console.log("Manifest is", clientManifest);
     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) => {
@@ -14,7 +15,7 @@ export async function renderPageToSSRStream(pathname, initialData, serverContext
                 resolve(stream);
             },
             bootstrapModules: [clientManifest.inputs[clientManifest.handler].output.path],
-            bootstrapScriptContent: `window.manifest = ${JSON.stringify(clientManifest.json())}; window._PAGE_DATA = ${JSON.stringify(initialData)}`,
+            bootstrapScriptContent: `window.manifest = ${JSON.stringify(await clientManifest.json())}; window._PAGE_DATA = ${JSON.stringify(initialData)}`,
         });
     });
     return stream;

package/dist/node/cli/cli.js

@@ -2,8 +2,8 @@ import chalk from "chalk";
 import { Command } from "commander";
 import { setDefaultResultOrder } from "dns";
 import { config as importDotEnv } from "dotenv";
-import { adminLog } from "../compiler/bundler.admin.js";
-import { frontendLog } from "../compiler/bundler.frontend.js";
+import { AdminBundler, adminLog } from "../compiler/bundler.admin.js";
+import { FrontendBundler, frontendLog } from "../compiler/bundler.frontend.js";
 import { DevServer, serverlessLog } from "../compiler/dev-server.js";
 import { createVinxiCodegen } from "../compiler/vinxi-codegen.js";
 import { graphqlLog } from "../graphql/graphql-codegen.js";
@@ -160,13 +160,24 @@ program
             console,
         });
     }
-    // Load the compiler
-    // new AdminBundler(project, {
-    //   mode: "development",
-    // })
-    // new FrontendBundler(project, {
-    //   mode: "production",
-    // })
+    else {
+        const codegen = createVinxiCodegen({
+            mode: "production",
+            project: project,
+            serverless: false,
+        });
+        await codegen.run();
+        console.info("Building for SPA WordPress (Frontend and Admin)");
+        // Load the compiler
+        const admin = new AdminBundler(project, {
+            mode: "development",
+        });
+        const frontend = new FrontendBundler(project, {
+            mode: "production",
+        });
+        await Promise.all([admin.start(), frontend.start()]);
+        console.log("Done building SPA WordPress");
+    }
 });
 program
     .command("info")

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

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.16";
+export declare const VERSION = "2.0.0-beta.19";

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.16";
+export const VERSION = "2.0.0-beta.19";

package/dist/node/compiler/bundler.admin.d.ts

@@ -8,6 +8,6 @@ export declare class AdminBundler {
     project: Project;
     opts: Options;
     constructor(project: Project, opts: Options);
-    protected start(): Promise<void>;
+    start(): Promise<void>;
 }
 export {};

package/dist/node/compiler/bundler.admin.js

@@ -10,7 +10,6 @@ export class AdminBundler {
     constructor(project, opts) {
         this.project = project;
         this.opts = opts;
-        this.start();
     }
     async start() {
         console.info(`Creating ${this.opts.mode} WordPress admin build...`);

package/dist/node/compiler/bundler.frontend.js

@@ -10,7 +10,6 @@ export class FrontendBundler {
     constructor(project, opts) {
         this.project = project;
         this.opts = opts;
-        this.start();
     }
     async start() {
         console.info(`Creating ${this.opts.mode} SPA build...`);

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

@@ -91,7 +91,7 @@ export function ssrPlugin() {
             config.ssr = {
                 ...config.ssr,
                 // @ts-ignore
-                noExternal: ["eddev", "vinxi", ...(config?.optimizeDeps?.noExternal ?? [])],
+                noExternal: ["eddev", "vinxi", "react-use", ...(config?.optimizeDeps?.noExternal ?? [])],
                 optimizeDeps: {
                     exclude: ["eddev", "vinxi"],
                 },
@@ -169,9 +169,9 @@ export function getViteConfig(args) {
             minify: args.mode === "production",
             modulePreload: false,
             outDir: args.outDir,
-            watch: {},
+            // watch: {},
             rollupOptions: {
-                input: `/.eddev/${args.mode === "production" ? "prod" : "dev"}-spa/entry.${args.target === "cms" ? "admin" : "client"}.tsx`,
+                input: `./.eddev/${args.mode === "production" ? "prod" : "dev"}-spa/entry.${args.target === "cms" ? "admin" : "client"}.tsx`,
                 external: args.target === "cms" ? ["react", "react-dom"] : [],
                 onwarn(warning, warn) {
                     if (!cliMode.verbose &&

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

@@ -97,7 +97,7 @@ export function createVinxiCodegen(opts) {
           import { devToolsStore } from 'eddev/devtools'
 
           // Set up a dynamic entry which will load the configured tailwind manifest
-          devToolsStore.loadTailwindConfig = () => import('./manifest/tailwind-config')
+          devToolsStore.loadTailwindConfig = () => import('./manifest/tailwind-config.js')
 
           // Create the asset renderer, which will ensure scripts/styles are mounted correctly
           function getAssets() {
@@ -157,7 +157,7 @@ export function createVinxiCodegen(opts) {
             generate: code /* tsx */ `
         /// <reference types="vinxi/types/server" />
         import { createRouter, eventHandler, getRouterParam, getQuery, getWebRequest, getRequestHeaders } from "vinxi/http"
-        import { serverContext } from "./context"
+        import { serverContext } from "./context.js"
 
         const router = createRouter()
           .get(
@@ -221,13 +221,14 @@ export function createVinxiCodegen(opts) {
             generate: code /* tsx */ `
       /// <reference types="vinxi/types/server" />
       import "../../views/index.css"
-      import "./manifest/blocks"
-      import "./manifest/styles"
-      import "./manifest/views"
+      import "./manifest/blocks.js"
+      import "./manifest/styles.js"
+      import "./manifest/views.js"
 
       import { renderPageToSSRStream, proxyWpAdmin } from "eddev/server"
       import { eventHandler, setResponseHeader, setResponseStatus, getRequestURL } from "vinxi/http"
-      import { serverContext } from "./context"
+      import { serverContext } from "./context.js"
+      import { getManifest } from "vinxi/manifest"
 
       export default eventHandler({
         handler: async (event) => {
@@ -246,6 +247,7 @@ export function createVinxiCodegen(opts) {
           if (response.ok) {
             setResponseStatus(event, response.status)
             setResponseHeader(event, "Content-Type", "text/html; charset=utf-8")
+            console.log('MM', getManifest('client'))
             return renderPageToSSRStream(url.pathname, await response.json(), serverContext)
           } else {
             return response
@@ -263,7 +265,7 @@ export function createVinxiCodegen(opts) {
       /// <reference types="vinxi/types/server" />
       import { proxyWpAdmin } from "eddev/server"
       import { eventHandler } from "vinxi/http"
-      import { serverContext } from "./context"
+      import { serverContext } from "./context.js"
 
       export default eventHandler(async (event) => {
         return proxyWpAdmin(event, serverContext)
@@ -399,7 +401,7 @@ export function createVinxiCodegen(opts) {
         name: "manifest/tailwind-config.ts",
         generate: async () => {
             return code /* ts */ `
-        import tw from "../../../tailwind.config"
+        import tw from "../../../tailwind.config.ts"
         import resolveConfig from 'tailwindcss/resolveConfig'
         import { devToolsStore } from 'eddev/devtools'
 

package/package.json

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