eddev 2.0.0-beta.2 → 2.0.0-beta.200

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.2";
+export const VERSION = "2.0.0-beta.200";

package/dist/node/compiler/build-vinxi.d.ts

@@ -0,0 +1,9 @@
+import { Project } from "../project/project.js";
+import { StatefulLog } from "../utils/stateful-log.js";
+type Options = {
+    project: Project;
+    console: StatefulLog<any>;
+};
+export declare function buildVinxi(opts: Options): Promise<void>;
+export {};
+//# sourceMappingURL=build-vinxi.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"build-vinxi.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/build-vinxi.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAItD,KAAK,OAAO,GAAG;IACb,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;CAC1B,CAAA;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,OAAO,iBAwC7C"}

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

@@ -0,0 +1,38 @@
+import { code } from "ts-poet";
+import { createVinxiApp } from "./vinxi-app.js";
+import { createVinxiCodegen } from "./vinxi-codegen.js";
+export async function buildVinxi(opts) {
+    const { project, console } = opts;
+    const preset = process.env.TARGET ??
+        process.env.PRESET ??
+        process.env.SERVER_PRESET ??
+        process.env.SERVER_TARGET ??
+        process.env.NITRO_PRESET ??
+        process.env.NITRO_TARGET ??
+        (process.env.VERCEL ? "vercel" : undefined) ??
+        (process.versions.bun !== undefined ? "bun" : "node-server");
+    const appConf = {
+        mode: "production",
+        origin: project.origin,
+        publicUrl: project.publicUrl,
+        rootDir: project.rootDir,
+        rpcBases: (await project.serverRoutes.get()).bases,
+        preset,
+        config: project.config,
+    };
+    const codegen = createVinxiCodegen({
+        mode: "production",
+        project: project,
+        serverless: true,
+    });
+    codegen.registerFile({
+        name: "../../app.config.mjs",
+        generate: code /* ts */ `
+      import { createVinxiApp } from 'eddev/_internal/create-vinxi-app.js'
+      export default createVinxiApp(${JSON.stringify(appConf)})
+    `,
+    });
+    await codegen.runAndWatch();
+    const app = createVinxiApp(appConf);
+    await app.build();
+}

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

@@ -1,5 +1,5 @@
 import { Project } from "../project/project.js";
-export declare const adminLog: import("../utils/statefulLog.js").StatefulLog<unknown>;
+export declare const adminLog: import("../utils/stateful-log.js").StatefulLog<unknown>;
 type Options = {
     mode: "development" | "production";
     watch?: boolean;
@@ -8,6 +8,7 @@ export declare class AdminBundler {
     project: Project;
     opts: Options;
     constructor(project: Project, opts: Options);
-    protected start(): Promise<void>;
+    start(): Promise<void>;
 }
 export {};
+//# sourceMappingURL=bundler.admin.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"bundler.admin.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/bundler.admin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAO/C,eAAO,MAAM,QAAQ,yDAAU,CAAA;AAE/B,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,qBAAa,YAAY;IAEd,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,OAAO;gBADb,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO;IAGhB,KAAK;CA+BZ"}

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

@@ -1,7 +1,7 @@
 import { relative } from "path";
 import { build, defineConfig, mergeConfig } from "vite";
-import { createConsole } from "../utils/statefulLog.js";
-import { getViteConfig } from "./vite/get-vite-config.js";
+import { createConsole } from "../utils/stateful-log.js";
+import { getViteConfig } from "./get-vite-config.js";
 const console = createConsole("Admin Bundle", "admin");
 export const adminLog = console;
 export class AdminBundler {
@@ -10,18 +10,18 @@ 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...`);
         const baseConfig = getViteConfig({
             console,
             mode: this.opts.mode,
-            project: this.project,
+            publicUrl: this.project.publicUrl,
             rootDir: this.project.rootDir,
             outDir: relative(this.project.rootDir, "./dist/cms/"),
             serverless: false,
             target: "cms",
+            client: true,
         });
         console.verbose("Vite config:", baseConfig);
         await build(mergeConfig(baseConfig, defineConfig({

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

@@ -1,8 +1,9 @@
 import { Project } from "../project/project.js";
-export declare const frontendLog: import("../utils/statefulLog.js").StatefulLog<unknown>;
+export declare const frontendLog: import("../utils/stateful-log.js").StatefulLog<unknown>;
 type Options = {
     mode: "development" | "production";
     watch?: boolean;
+    bundleAnalysis?: boolean;
 };
 export declare class FrontendBundler {
     project: Project;
@@ -11,3 +12,4 @@ export declare class FrontendBundler {
     start(): Promise<void>;
 }
 export {};
+//# sourceMappingURL=bundler.frontend.d.ts.map

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

@@ -0,0 +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;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

@@ -1,7 +1,8 @@
 import { relative } from "path";
 import { build, defineConfig, mergeConfig } from "vite";
-import { createConsole } from "../utils/statefulLog.js";
-import { getViteConfig } from "./vite/get-vite-config.js";
+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 {
@@ -10,21 +11,10 @@ export class FrontendBundler {
     constructor(project, opts) {
         this.project = project;
         this.opts = opts;
-        this.start();
     }
     async start() {
         console.info(`Creating ${this.opts.mode} SPA build...`);
-        const baseConfig = getViteConfig({
-            console,
-            mode: this.opts.mode,
-            project: this.project,
-            rootDir: this.project.rootDir,
-            outDir: relative(this.project.rootDir, "./dist/frontend/"),
-            serverless: false,
-            target: "frontend",
-        });
-        console.verbose("Vite config:", baseConfig);
-        await build(mergeConfig(baseConfig, defineConfig({
+        const config = {
             build: {
                 watch: this.opts.watch
                     ? {
@@ -32,6 +22,30 @@ export class FrontendBundler {
                     }
                     : 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: outDir,
+            serverless: false,
+            target: "frontend",
+            client: true,
+        });
+        await build(mergeConfig(baseConfig, defineConfig(config)));
     }
 }

package/dist/node/compiler/dev-server.d.ts

@@ -0,0 +1,19 @@
+import { Project } from "../project/project.js";
+export type ServerlessDevStatus = {
+    serverlessUrl: string;
+    wordpressUrl: string;
+};
+export declare const serverlessLog: import("../utils/stateful-log.js").StatefulLog<ServerlessDevStatus>;
+type Options = {};
+export declare class DevServer {
+    project: Project;
+    opts: Options;
+    origin: string;
+    hostname: string;
+    hostOrigin: string;
+    port: number;
+    constructor(project: Project, opts: Options);
+    start(): Promise<void>;
+}
+export {};
+//# sourceMappingURL=dev-server.d.ts.map

package/dist/node/compiler/dev-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/dev-server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAO/C,MAAM,MAAM,mBAAmB,GAAG;IAChC,aAAa,EAAE,MAAM,CAAA;IACrB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAID,eAAO,MAAM,aAAa,qEAAU,CAAA;AAEpC,KAAK,OAAO,GAAG,EAAE,CAAA;AAEjB,qBAAa,SAAS;IAOX,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,OAAO;IAPtB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,SAAO;gBAGF,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO;IAUhB,KAAK;CAmGZ"}

package/dist/node/compiler/dev-server.js

@@ -0,0 +1,113 @@
+import { parseURL } from "ufo";
+import { createDevServer } from "vinxi/dev-server";
+import { ProjectEnvUtils } from "../project/env.js";
+import { ensureSelfSignedCert, isCertificateTrusted } from "../utils/self-signed-cert.js";
+import { createConsole } from "../utils/stateful-log.js";
+import { createVinxiApp } from "./vinxi-app.js";
+import { createVinxiCodegen } from "./vinxi-codegen.js";
+import chalk from "chalk";
+const console = createConsole("Dev Server", "dev");
+export const serverlessLog = console;
+export class DevServer {
+    project;
+    opts;
+    origin;
+    hostname;
+    hostOrigin;
+    port = 8080;
+    constructor(project, opts) {
+        this.project = project;
+        this.opts = opts;
+        this.start();
+        this.origin = ProjectEnvUtils.get("SITE_URL");
+        const parsedSiteURL = parseURL(this.origin);
+        this.hostname = parsedSiteURL.host?.endsWith(".local") ? parsedSiteURL.host : "localhost";
+        this.hostOrigin = "https://" + this.hostname + ":" + this.port;
+    }
+    async start() {
+        console.setWorking(true);
+        // console.log("Setting up vinxi codegen")
+        const codegen = createVinxiCodegen({
+            mode: "development",
+            project: this.project,
+            serverless: true,
+        });
+        await codegen.runAndWatch();
+        // console.log("Has run once")
+        const app = createVinxiApp({
+            mode: "development",
+            origin: this.origin,
+            publicUrl: this.project.publicUrl,
+            rootDir: this.project.rootDir,
+            log: console,
+            rpcBases: (await this.project.serverRoutes.get()).bases,
+            config: this.project.config,
+        });
+        const preset = process.env.TARGET ??
+            process.env.PRESET ??
+            process.env.SERVER_PRESET ??
+            process.env.SERVER_TARGET ??
+            process.env.NITRO_PRESET ??
+            process.env.NITRO_TARGET ??
+            (process.versions.bun !== undefined ? "bun" : "node-server");
+        const keys = await ensureSelfSignedCert(this.hostname, this.project.rootDir);
+        const httpsConfig = {
+            cert: keys.certFile,
+            key: keys.keyFile,
+            domains: [this.hostname, "localhost"],
+        };
+        isCertificateTrusted(keys.certFile).then((trusted) => {
+            if (!trusted) {
+                serverlessLog.warn(`The certificate for ${chalk.bold(this.hostname)} is not trusted.`);
+                serverlessLog.info(`- Please open Keychain\n- Search for ${chalk.bold(this.hostname)}\n- Double-click each entry\n- Select 'Always Trust'`);
+            }
+        });
+        let devApp = null;
+        app.hooks.addHooks({
+            "app:dev:start": async ({ app, serveConfig }) => {
+                serveConfig.https = httpsConfig;
+                serveConfig.hostname = this.hostname;
+                serveConfig.allowedHosts = true;
+            },
+            "app:dev:server:created": async (args) => {
+                devApp = args.devApp;
+            },
+        });
+        // console.log("Creating dev server")
+        await createDevServer(app, {
+            force: false,
+            devtools: false,
+            // @ts-ignore
+            hostname: this.hostname,
+            port: this.port,
+            // @ts-ignore
+            preset: preset,
+            https: httpsConfig,
+        });
+        // console.log("Rnning listen hook")
+        // @ts-ignore
+        await app.hooks.callHook("app:dev:server:listener:creating", {
+            app,
+            devApp,
+        });
+        // console.log("Creating another listener")
+        const listener = await devApp.listen(this.port, {
+            hostname: this.hostname,
+            port: this.port,
+            https: httpsConfig,
+            qr: false,
+            showURL: false,
+        });
+        await app.hooks.callHook("app:dev:server:listener:created", {
+            app,
+            devApp,
+            listener,
+        });
+        // console.log("Listening")
+        console.setWorking(false);
+        console.setState({
+            serverlessUrl: this.hostOrigin,
+            wordpressUrl: this.origin,
+        });
+    }
+}

package/dist/node/compiler/get-vite-config.d.ts

@@ -0,0 +1,30 @@
+import { InlineConfig, PluginOption } from "vite";
+import { StatefulLog } from "../utils/stateful-log.js";
+export type Args = {
+    mode: "development" | "production";
+    serverless: boolean;
+    target: "frontend" | "cms";
+    rootDir: string;
+    outDir?: string;
+    publicUrl: string;
+    console: StatefulLog<any>;
+    client: boolean;
+};
+export declare function envPlugin(args: Args): PluginOption;
+type ReactPluginArgs = {
+    retainBlockMeta?: boolean;
+};
+export declare function reactPlugin(args?: ReactPluginArgs): PluginOption[];
+/**
+ * Turns on SSR module proxying,
+ */
+export declare function ssrPlugin(): PluginOption;
+export declare function corePlugins(args: Args): PluginOption[];
+export declare function storybookVitePlugins(args: Args): PluginOption[];
+export declare function ignoreRollupErrorsPlugin(): PluginOption;
+export declare function loggerPlugin(args: {
+    console: StatefulLog<any>;
+}): PluginOption;
+export declare function getViteConfig(args: Args): InlineConfig;
+export {};
+//# sourceMappingURL=get-vite-config.d.ts.map

package/dist/node/compiler/get-vite-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-vite-config.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/get-vite-config.ts"],"names":[],"mappings":"AAKA,OAAO,EAAgB,YAAY,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEtD,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,UAAU,GAAG,KAAK,CAAA;IAC1B,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;IACzB,MAAM,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CAkDlD;AAED,KAAK,eAAe,GAAG;IACrB,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,wBAAgB,WAAW,CAAC,IAAI,GAAE,eAAoB,kBA4FrD;AAED;;GAEG;AACH,wBAAgB,SAAS,IAAI,YAAY,CA4CxC;AAwBD,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,EAAE,CAStD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,EAAE,CAE/D;AAED,wBAAgB,wBAAwB,IAAI,YAAY,CA8BvD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE;IAAE,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;CAAE,GAAG,YAAY,CA4B9E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CA8DtD"}