eddev 2.0.0-beta.164 → 2.0.0-beta.166

package/dist/app/entry/ssr-root-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-root-client.d.ts","sourceRoot":"","sources":["../../../src/app/entry/ssr-root-client.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiC,MAAM,OAAO,CAAA;AAIhE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAItD,wBAAgB,aAAa,CAAC,KAAK,EAAE;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,YAAY,EAAE,CAAA;CAAE,2CAYnF"}
+{"version":3,"file":"ssr-root-client.d.ts","sourceRoot":"","sources":["../../../src/app/entry/ssr-root-client.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiC,MAAM,OAAO,CAAA;AAIhE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAItD,wBAAgB,aAAa,CAAC,KAAK,EAAE;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,YAAY,EAAE,CAAA;CAAE,2CAgBnF"}

package/dist/app/entry/ssr-root-client.js

@@ -1,12 +1,12 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect } from "react";
+import { Suspense, useEffect } from "react";
 import { useSnapshot } from "valtio";
 import { BrowserRouter } from "../lib/routing/components/BrowserRouter.js";
 import { clientMetaTags } from "../lib/routing/context.js";
 import { APIProvider } from "../utils/APIProvider.js";
 import { DevUILoader } from "../lib/devtools/loader.js";
 export function SSRClientRoot(props) {
-    return (_jsxs(APIProvider, { children: [_jsx(BrowserRouter, {}), _jsxs(_Fragment, { children: [_jsx(DynamicMetaTags, {}), _jsx(DevUILoader, {})] })] }));
+    return (_jsxs(APIProvider, { children: [_jsx(BrowserRouter, {}), _jsx(_Fragment, { children: _jsx(DynamicMetaTags, {}) }), _jsx(Suspense, { fallback: null, children: _jsx(_Fragment, { children: _jsx(DevUILoader, {}) }) })] }));
 }
 function DynamicMetaTags() {
     const dynamicTags = useSnapshot(clientMetaTags).tags;

package/dist/app/entry/ssr-root.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-root.d.ts","sourceRoot":"","sources":["../../../src/app/entry/ssr-root.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAItE,wBAAgB,OAAO,CAAC,KAAK,EAAE;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,SAAS,CAAA;IACtB,MAAM,EAAE,WAAW,CAAA;IACnB,QAAQ,EAAE,YAAY,EAAE,CAAA;CACzB,2CA0BA"}
+{"version":3,"file":"ssr-root.d.ts","sourceRoot":"","sources":["../../../src/app/entry/ssr-root.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAItE,wBAAgB,OAAO,CAAC,KAAK,EAAE;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,SAAS,CAAA;IACtB,MAAM,EAAE,WAAW,CAAA;IACnB,QAAQ,EAAE,YAAY,EAAE,CAAA;CACzB,2CA+BA"}

package/dist/app/entry/ssr-root.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { Suspense } from "react";
 import { SSRRouter } from "../lib/routing/components/SSRRouter.js";
 import { getRouteMeta, normalizeRoute } from "../lib/routing/utils.js";
 import { APIProvider } from "../utils/APIProvider.js";
@@ -17,5 +18,5 @@ export function SSRRoot(props) {
                     query: {},
                     hash: "",
                     meta: getRouteMeta(props.initialData),
-                }) }), _jsx(_Fragment, {})] }));
+                }) }), _jsx(_Fragment, {}), _jsx(Suspense, { fallback: null, children: _jsx(_Fragment, {}) })] }));
 }

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

@@ -72,8 +72,8 @@ export function useLinkState(href) {
         }
         const hrefUrl = parseURL(resolveURL(href));
         const active = route ? compareUri(route, hrefUrl) : undefined;
-        const childActive = !active && route ? isSubpath(hrefUrl.pathname, route.pathname) : undefined;
-        const pending = pendingRoute ? compareUri(pendingRoute, hrefUrl) : undefined;
+        const childActive = !active && route ? isSubpath(hrefUrl.pathname, route.pathname) || undefined : undefined;
+        const pending = pendingRoute ? compareUri(pendingRoute, hrefUrl) || undefined : undefined;
         return {
             active,
             childActive,
@@ -101,6 +101,9 @@ function compareUri(route, href) {
     }
 }
 function isSubpath(parentPath, childPath) {
+    if (parentPath === "/" || childPath === "/") {
+        return false;
+    }
     if (withoutTrailingSlash(parentPath) === withoutTrailingSlash(childPath)) {
         return false;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"server-context.d.ts","sourceRoot":"","sources":["../../../src/app/server/server-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAE5D,OAAO,EAAiC,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAEpF,OAAO,EAAqB,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAE5E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAKxD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,eAAe,CAAA;IAC7B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,QAAQ,CAAA;CACxC,CAAA;AAkBD;;GAEG;AACH,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,GAAG,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;CACtB,CAAA;AAED,qBAAa,aAAa;IACxB,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;IACxD,QAAQ,EAAE,MAAM,EAAE,CAAK;IACvB,MAAM,EAAE,QAAQ,CAAA;IAEhB,MAAM,CAAC,IAAI,EAAE,aAAa,CAAA;gBAEd,IAAI,EAAE,iBAAiB;IAWnC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAOzC,IAAI,OAAO,yBAEV;IAED,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,oBAAoB;IAI1C,YAAY,CAAC,GAAG,EAAE,MAAM;IAQlB,WAAW,CACf,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,WAAW,GAAG;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GACjE,OAAO,CAAC,QAAQ,CAAC;IA6BpB,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,OAAO,GAAG,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,KAAK,EAAE;IAoFvG,cAAc,CAAC,GAAG,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,cAAc,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;IAwGtF,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC;IAgC5C,qBAAqB,CAAC,GAAG,CAAC,EAAE,cAAc;IAYpC,eAAe,CAAC,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,cAAc,CAAA;KAAE;IA4D9E,aAAa,CAAC,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,cAAc,CAAA;KAAE;IAehF,IAAI,kBAAkB,aAcrB;IAED,aAAa,CAAC,YAAY,EAAE,MAAM;IAUlC,cAAc,CAAC,MAAM,EAAE,MAAM;;;;;;;;;;;;;CAiD9B"}
+{"version":3,"file":"server-context.d.ts","sourceRoot":"","sources":["../../../src/app/server/server-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAE5D,OAAO,EAAiC,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAEpF,OAAO,EAAqB,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAE5E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAKxD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,eAAe,CAAA;IAC7B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,QAAQ,CAAA;CACxC,CAAA;AAkBD;;GAEG;AACH,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,GAAG,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;CACtB,CAAA;AAED,qBAAa,aAAa;IACxB,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;IACxD,QAAQ,EAAE,MAAM,EAAE,CAAK;IACvB,MAAM,EAAE,QAAQ,CAAA;IAEhB,MAAM,CAAC,IAAI,EAAE,aAAa,CAAA;gBAEd,IAAI,EAAE,iBAAiB;IAWnC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAOzC,IAAI,OAAO,yBAEV;IAED,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,oBAAoB;IAI1C,YAAY,CAAC,GAAG,EAAE,MAAM;IAQlB,WAAW,CACf,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,WAAW,GAAG;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GACjE,OAAO,CAAC,QAAQ,CAAC;IAuCpB,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,OAAO,GAAG,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,KAAK,EAAE;IAoFvG,cAAc,CAAC,GAAG,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,cAAc,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;IAwGtF,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC;IAgC5C,qBAAqB,CAAC,GAAG,CAAC,EAAE,cAAc;IAYpC,eAAe,CAAC,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,cAAc,CAAA;KAAE;IA4D9E,aAAa,CAAC,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,cAAc,CAAA;KAAE;IAehF,IAAI,kBAAkB,aAcrB;IAED,aAAa,CAAC,YAAY,EAAE,MAAM;IAUlC,cAAc,CAAC,MAAM,EAAE,MAAM;;;;;;;;;;;;;CAiD9B"}

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

@@ -71,9 +71,21 @@ export class ServerContext {
             }
         });
         let text = await response.text();
+        try {
+            console.log("PARSE 1", JSON.parse(text));
+        }
+        catch (e) {
+            console.log("PARSE 1 ERROR", e);
+        }
         if (opts?.replaceUrls) {
             text = this.replaceUrls(text, opts.newOrigin);
         }
+        try {
+            console.log("PARSE 2", JSON.parse(text));
+        }
+        catch (e) {
+            console.log("PARSE 2 ERROR", e);
+        }
         return new Response(text, {
             status: response.status,
             statusText: response.statusText,

package/dist/node/cli/cli.js

@@ -17,7 +17,12 @@ import { bootCLIUI } from "./display/boot-cli-app.js";
 import { VERSION } from "./version.js";
 import { buildVinxi } from "../compiler/build-vinxi.js";
 import { createConsole } from "../utils/stateful-log.js";
-import { join } from "path";
+import { join, relative } from "path";
+import { ensureSelfSignedCert } from "../utils/self-signed-cert.js";
+import { parseURL } from "ufo";
+import { corePlugins } from "../compiler/get-vite-config.js";
+import { build } from "vite";
+import rollupVisualizer from "rollup-plugin-visualizer";
 importDotEnv();
 const program = new Command()
     .version(VERSION)
@@ -218,16 +223,90 @@ program
         console.log("Done building SPA WordPress");
     }
 });
+program
+    .command("analyze")
+    .description("Generate a bundle size analysis")
+    .action(async (options) => {
+    process.env["NODE_ENV"] = "production";
+    /** Ignore self-signed certificate errors in dev mode */
+    // process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0"
+    init(options.verbose);
+    configureCliMode({
+        interactive: false,
+        readonly: false,
+        exitOnValidationError: true,
+        detailed: true,
+        verbose: false,
+        watch: false,
+        rootDir: process.cwd(),
+    });
+    const console = createConsole("build");
+    // Load the project info
+    const project = await Project.create({
+        rootDir: process.cwd(),
+    });
+    // Generate bootstrap files
+    const codegen = createVinxiCodegen({
+        mode: "production",
+        project: project,
+        serverless: false,
+    });
+    await codegen.run();
+    const outDir = relative(project.rootDir, "./dist/frontend-analysis/");
+    // @ts-ignore
+    const visualizer = rollupVisualizer.default;
+    await build({
+        plugins: [
+            ...corePlugins({
+                rootDir: project.rootDir,
+                console: console,
+                mode: "production",
+                publicUrl: project.publicUrl,
+                serverless: true,
+                target: "frontend",
+                client: true,
+            }),
+            visualizer({
+                emitFile: true,
+                filename: "stats.html",
+                template: "sunburst",
+            }),
+        ],
+        build: {
+            manifest: true,
+            sourcemap: true,
+            minify: true,
+            modulePreload: false,
+            outDir: outDir,
+            lib: undefined,
+            rollupOptions: {
+                input: "./.eddev/prod/entry.client.tsx",
+            },
+        },
+    });
+    console.log("Done building SPA WordPress");
+});
 program
     .command("preview")
     .description("Run a local production build, which was previously built with `eddev build --serverless`")
-    .option("--host", "Hostname to serve the application", "127.0.0.1")
-    .option("--port", "Port to serve the application", "3000")
+    .option("--host", "Hostname to serve the application", "")
+    .option("--port", "Port to serve the application", "8080")
     .action(async (options) => {
+    const project = await Project.create({
+        rootDir: process.cwd(),
+    });
+    const parsedSiteURL = parseURL(project.origin);
+    const defaultHostname = parsedSiteURL.host?.endsWith(".local") ? parsedSiteURL.host : "127.0.0.1";
     process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0";
     process.env["NODE_ENV"] = "production";
     process.env["HOST"] = options.host;
     process.env["PORT"] = options.port;
+    if (!options.host) {
+        process.env["HOST"] = defaultHostname;
+        const keys = await ensureSelfSignedCert(defaultHostname, process.cwd());
+        process.env["NITRO_SSL_CERT"] = keys.cert;
+        process.env["NITRO_SSL_KEY"] = keys.key;
+    }
     init(options.verbose);
     configureCliMode({
         interactive: true,

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

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.0.0-beta.164";
+export declare const VERSION = "2.0.0-beta.165";
 //# sourceMappingURL=version.d.ts.map

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.164";
+export const VERSION = "2.0.0-beta.165";

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

@@ -3,6 +3,7 @@ export declare const frontendLog: import("../utils/stateful-log.js").StatefulLog
 type Options = {
     mode: "development" | "production";
     watch?: boolean;
+    bundleAnalysis?: boolean;
 };
 export declare class FrontendBundler {
     project: Project;

package/dist/node/compiler/bundler.frontend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bundler.frontend.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/bundler.frontend.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAO/C,eAAO,MAAM,WAAW,yDAAU,CAAA;AAElC,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,qBAAa,eAAe;IAEjB,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,OAAO;gBADb,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO;IAGhB,KAAK;CA+BZ"}
+{"version":3,"file":"bundler.frontend.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/bundler.frontend.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAQ/C,eAAO,MAAM,WAAW,yDAAU,CAAA;AAElC,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAA;AAED,qBAAa,eAAe;IAEjB,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,OAAO;gBADb,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO;IAGhB,KAAK;CAwCZ"}

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

@@ -2,6 +2,7 @@ import { relative } from "path";
 import { build, defineConfig, mergeConfig } from "vite";
 import { createConsole } from "../utils/stateful-log.js";
 import { getViteConfig } from "./get-vite-config.js";
+import rollupVisualizer from "rollup-plugin-visualizer";
 const console = createConsole("Frontend Bundler", "spa");
 export const frontendLog = console;
 export class FrontendBundler {
@@ -13,25 +14,38 @@ export class FrontendBundler {
     }
     async start() {
         console.info(`Creating ${this.opts.mode} SPA build...`);
+        const config = {
+            build: {
+                watch: this.opts.watch
+                    ? {
+                        buildDelay: 200,
+                    }
+                    : undefined,
+            },
+        };
+        let outDir = relative(this.project.rootDir, "./dist/frontend/");
+        if (this.opts.bundleAnalysis) {
+            outDir = relative(this.project.rootDir, "./dist/frontend-analysis/");
+            // @ts-ignore
+            const visualizer = rollupVisualizer.default;
+            config.plugins = [
+                visualizer({
+                    emitFile: true,
+                    filename: "stats.html",
+                    template: "sunburst",
+                }),
+            ];
+        }
         const baseConfig = getViteConfig({
             console,
             mode: this.opts.mode,
             publicUrl: this.project.publicUrl,
             rootDir: this.project.rootDir,
-            outDir: relative(this.project.rootDir, "./dist/frontend/"),
+            outDir: outDir,
             serverless: false,
             target: "frontend",
             client: true,
         });
-        console.verbose("Vite config:", baseConfig);
-        await build(mergeConfig(baseConfig, defineConfig({
-            build: {
-                watch: this.opts.watch
-                    ? {
-                        buildDelay: 200,
-                    }
-                    : undefined,
-            },
-        })));
+        await build(mergeConfig(baseConfig, defineConfig(config)));
     }
 }

package/dist/node/compiler/vinxi-codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vinxi-codegen.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/vinxi-codegen.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAIlD,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,UAAU,EAAE,OAAO,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAAC,UAExE;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,OAAO,iBAIlD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,aAmqB/C"}
+{"version":3,"file":"vinxi-codegen.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/vinxi-codegen.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAIlD,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,UAAU,EAAE,OAAO,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAAC,UAExE;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,OAAO,iBAIlD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,aA8qB/C"}

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

@@ -1,6 +1,6 @@
 import { code, imp } from "ts-poet";
 import { FSCodegen } from "../utils/fs-codegen.js";
-import { camelCase } from "change-case-all";
+import { camelCase, pascalCase } from "change-case-all";
 import { ProjectEnvUtils } from "../project/env.js";
 export function getVinxiFolder(opts) {
     return (opts.mode === "development" ? "dev" : "prod") + (opts.serverless ? "" : "-spa");
@@ -434,19 +434,30 @@ export function createVinxiCodegen(opts) {
         name: "manifest/blocks.ts",
         generate: async () => {
             const blockManifest = await project.blocks.get();
+            let blockImports = [];
+            let blockEntries = [];
+            for (const [name, block] of Object.entries(blockManifest.blocks)) {
+                if (name.match(/^_[a-z]+$/i))
+                    continue;
+                const importSource = JSON.stringify("../../../" + block.fileName);
+                const jsName = pascalCase(name);
+                if (block.dynamic) {
+                    const importStatement = `dynamic(() => import(${importSource}), ${JSON.stringify(block.fileName)})`;
+                    blockEntries.push(JSON.stringify(block.acfName) + ": " + importStatement);
+                }
+                else {
+                    blockImports.push(`import ${jsName} from ${importSource}`);
+                    blockEntries.push(JSON.stringify(block.acfName) + ": " + jsName);
+                }
+            }
             return code /* ts */ `
         import { blockManifestReader } from 'eddev/_internal'
         import { dynamic } from 'eddev/dynamic'
         import core from '../../../blocks/_core'
+        ${blockImports.join("\n")}
 
         const manifest = {
-          ${Object.entries(blockManifest.blocks)
-                .filter(([name]) => !name.match(/^_[a-z]+$/i))
-                .map(([name, block]) => {
-                const importStatement = `dynamic(() => import(${JSON.stringify("../../../" + block.fileName)}), ${JSON.stringify(block.fileName)})`;
-                return JSON.stringify(block.acfName) + ": " + importStatement;
-            })
-                .join(",\n")},
+          ${blockEntries.join(",\n")},
           ...core
         }
 

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

@@ -563,7 +563,7 @@ export class GraphQLGenerator {
             output = await codegen(config);
         }
         catch (err) {
-            errors.push(String(err));
+            errors.push(err);
         }
         if (args.banner) {
             output = args.banner + "\n\n" + output + "\n" + (args.footer ?? "");

package/dist/node/graphql/plugins/gql-plugin-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gql-plugin-files.d.ts","sourceRoot":"","sources":["../../../../src/node/graphql/plugins/gql-plugin-files.ts"],"names":[],"mappings":"AAKA,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IACzE,eAAe,EAAE;QACf,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KACtB,CAAA;IACD,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;;qBAGkB,GAAG,aAAa,GAAG,UAAU,YAAY,QAAQ,GAAG;;AADvE,wBAkEC"}
+{"version":3,"file":"gql-plugin-files.d.ts","sourceRoot":"","sources":["../../../../src/node/graphql/plugins/gql-plugin-files.ts"],"names":[],"mappings":"AAIA,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IACzE,eAAe,EAAE;QACf,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KACtB,CAAA;IACD,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;;qBAGkB,GAAG,aAAa,GAAG,UAAU,YAAY,QAAQ,GAAG;;AADvE,wBAkEC"}

package/dist/node/graphql/plugins/gql-plugin-queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gql-plugin-queries.d.ts","sourceRoot":"","sources":["../../../../src/node/graphql/plugins/gql-plugin-queries.ts"],"names":[],"mappings":"AAYA,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;;qBAKkB,GAAG,aAAa,GAAG,UAAU,YAAY,QAAQ,GAAG;;AADvE,wBA2TC"}
+{"version":3,"file":"gql-plugin-queries.d.ts","sourceRoot":"","sources":["../../../../src/node/graphql/plugins/gql-plugin-queries.ts"],"names":[],"mappings":"AAWA,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;;qBAKkB,GAAG,aAAa,GAAG,UAAU,YAAY,QAAQ,GAAG;;AADvE,wBA2TC"}

package/dist/node/graphql/plugins/gql-plugin-queries.js

@@ -1,6 +1,6 @@
 import { printSourceLocation, visit, } from "graphql";
-import { code, imp } from "ts-poet";
 import { basename } from "path";
+import { code, imp } from "ts-poet";
 export default {
     plugin: (schema, documents, config, info) => {
         const hooks = {};

package/dist/node/project/manifest/block-manifest.js

@@ -134,6 +134,7 @@ function readBlockDataAsJSONExport(file, contents) {
     result.inserter = userData.inserter;
     result.frontendMode = userData.frontendMode;
     result.blockStyles = userData.blockStyles;
+    result.dynamic = userData.lazyLoad ?? true;
     if (userData.postMetaBlock) {
         result.postMetaBlock = {
             postTypes: userData.postMetaBlock.postTypes,
@@ -195,7 +196,7 @@ function readBlockDataAsComment(file) {
                 meta.childTags = value.split(/,\s*/);
                 return;
             case "dynamic":
-                meta.dynamic = value === "true";
+                meta.dynamic = value !== "false";
                 return;
             case "cache":
                 meta.cache = value === "true";

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

@@ -47,6 +47,7 @@ export declare const BlockMetaSchema: z.ZodObject<{
         name: string;
         isDefault?: boolean | undefined;
     }>, "many">>;
+    lazyLoad: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     title: string;
     mode: "both" | "edit" | "preview";
@@ -80,6 +81,7 @@ export declare const BlockMetaSchema: z.ZodObject<{
         name: string;
         isDefault?: boolean | undefined;
     }[] | undefined;
+    lazyLoad?: boolean | undefined;
 }, {
     title: string;
     slug: string;
@@ -113,6 +115,7 @@ export declare const BlockMetaSchema: z.ZodObject<{
         name: string;
         isDefault?: boolean | undefined;
     }[] | undefined;
+    lazyLoad?: boolean | undefined;
 }>;
 export type BlockMetadata = z.infer<typeof BlockMetaSchema>;
 export type BlockMetadataConstructor = z.input<typeof BlockMetaSchema>;

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

@@ -1 +1 @@
-{"version":3,"file":"block-type.d.ts","sourceRoot":"","sources":["../../../src/node/types/block-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAA;AAMrE,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+B1B,CAAA;AAEF,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAA;AAE3D,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAA;AAEtE,wBAAgB,aAAa,CAAC,KAAK,EAAE,aAAa,UAkBjD;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,UA6B5D"}
+{"version":3,"file":"block-type.d.ts","sourceRoot":"","sources":["../../../src/node/types/block-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAA;AAMrE,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgC1B,CAAA;AAEF,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAA;AAE3D,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAA;AAEtE,wBAAgB,aAAa,CAAC,KAAK,EAAE,aAAa,UAkBjD;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,UA6B5D"}

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

@@ -34,6 +34,7 @@ export const BlockMetaSchema = z.object({
     frontendMode: z.enum(["hidden", "childrenOnly", "default"]).default("default"),
     inserter: z.boolean().default(true),
     blockStyles: z.array(z.object({ name: z.string(), label: z.string(), isDefault: z.boolean().optional() })).optional(),
+    lazyLoad: z.boolean().optional(),
 });
 export function describeBlock(block) {
     let output = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.0.0-beta.164",
+  "version": "2.0.0-beta.166",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -119,6 +119,7 @@
     "obj-console": "^1.0.2",
     "object-code": "^1.3.3",
     "qs": "^6.13.0",
+    "rollup-plugin-visualizer": "^5.14.0",
     "superjson": "^2.2.1",
     "ts-poet": "^6.6.0",
     "ufo": "^1.3.1",

package/types.meta.d.ts

@@ -179,6 +179,13 @@ declare global {
      * Block styles work like 'variants' for a block, allowing you to quickly switch between different styles of the same block.
      */
     blockStyles?: { name: string; label: string; isDefault?: boolean }[]
+
+    /**
+     * Whether to lazy-load this block using Suspense.
+     * You can disable this for blocks with a smaller size footprint, or blocks which are almost always rendered on first visit.
+     * @default true
+     */
+    lazyLoad?: boolean
   }
 }
 type BlockIcon =