eddev 2.0.0-beta.23 → 2.0.0-beta.231

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

@@ -1,10 +1,11 @@
 import { parseURL } from "ufo";
 import { createDevServer } from "vinxi/dev-server";
 import { ProjectEnvUtils } from "../project/env.js";
-import { ensureSelfSignedCert } from "../utils/self-signed-cert.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 {
@@ -21,22 +22,26 @@ export class DevServer {
         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;
+        this.hostOrigin = (opts.https ? "https" : "http") + "://" + 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 ??
@@ -45,49 +50,67 @@ export class DevServer {
             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"],
-        };
+        let httpsConfig;
+        if (this.opts.https) {
+            const keys = await ensureSelfSignedCert(this.hostname, this.project.rootDir);
+            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'`);
+                }
+            });
+        }
+        else {
+            httpsConfig = false;
+        }
         let devApp = null;
         app.hooks.addHooks({
             "app:dev:start": async ({ app, serveConfig }) => {
                 serveConfig.https = httpsConfig;
-                serveConfig.hostname = this.hostname;
+                serveConfig.hostname = this.opts.https ? this.hostname : undefined;
+                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,
+            hostname: this.opts.https ? this.hostname : undefined,
             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,
+            hostname: this.opts.https ? this.hostname : undefined,
             port: this.port,
             https: httpsConfig,
             qr: false,
             showURL: false,
+            public: true,
         });
         await app.hooks.callHook("app:dev:server:listener:created", {
             app,
             devApp,
             listener,
         });
+        // console.log("Listening")
         console.setWorking(false);
         console.setState({
             serverlessUrl: this.hostOrigin,

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

@@ -8,12 +8,23 @@ export type Args = {
     outDir?: string;
     publicUrl: string;
     console: StatefulLog<any>;
+    client: boolean;
 };
 export declare function envPlugin(args: Args): PluginOption;
-export declare function reactPlugin(): 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,CAoDlD;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,CA+DtD"}

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

@@ -8,15 +8,17 @@ import tsconfigPaths from "vite-tsconfig-paths";
 import { cliMode } from "../cli/cli-mode.js";
 export function envPlugin(args) {
     const envDefines = {
-        client: args.serverless ? "!import.meta.env.SSR" : "true",
+        client: args.client ? "true" : "false",
         serverless: args.serverless ? "true" : "false",
         dev: args.mode === "development" ? "true" : "false",
         admin: args.target === "cms" ? "true" : "false",
         themePath: JSON.stringify(args.publicUrl),
         devUI: args.mode === "development" ? "true" : "false",
         serverlessOrigin: JSON.stringify("http://serverleress-endpoint"),
-        rpcEnabled: "false",
+        rpcEnabled: "true",
         origin: JSON.stringify(process.env.SITE_URL ?? "/"),
+        VERCEL_DEPLOYMENT_ID: JSON.stringify(process.env.VERCEL_DEPLOYMENT_ID ?? ""),
+        VERCEL_SKEW_PROTECTION_ENABLED: JSON.stringify(process.env.VERCEL_SKEW_PROTECTION_ENABLED ?? "0"),
     };
     const expandDefines = (obj, prefixes = []) => {
         const result = {};
@@ -27,19 +29,61 @@ export function envPlugin(args) {
         }
         return result;
     };
+    const envVariables = {};
+    for (let key in process.env) {
+        if (key.startsWith("ED_PUBLIC_")) {
+            // Include all ED_PUBLIC_ variables
+            envVariables[key] = JSON.stringify(process.env[key]);
+        }
+        else if (key.startsWith("ED_")) {
+            if (!args.client) {
+                // Only include ED_ variables in non-client bundles
+                envVariables[key] = JSON.stringify(process.env[key]);
+            }
+        }
+    }
+    // console.log("Envs are", envVariables)
+    // const envFile = configDotenv()
+    // if (envFile.parsed) {
+    // }
     return replace({
-        values: expandDefines(envDefines, ["process.env.", "process.", "env."]),
+        values: {
+            ...expandDefines(envDefines, ["process.env.", "process.", "env."]),
+            ...expandDefines(envVariables, ["process.env.", "import.meta.env."]),
+            "process.env.SITE_API_KEY": JSON.stringify(process.env.SITE_API_KEY),
+        },
         preventAssignment: true,
     });
 }
-export function reactPlugin() {
+export function reactPlugin(args = {}) {
+    let currentFile = null;
     return react({
         babel: {
             overrides: [{ test: /types\./, compact: true }],
             plugins: [
                 {
                     visitor: {
-                        ExportNamedDeclaration: (path) => {
+                        Program: {
+                            enter: (path, state) => {
+                                const filename = state.file.opts.filename;
+                                if (filename.match(/.\/blocks\/.+\.tsx/)) {
+                                    currentFile = { type: "block", id: filename.replace(/.*\/blocks\/(.+)\.tsx/, "$1") };
+                                }
+                                else if (filename.match(/.\/views\/.+\.tsx/)) {
+                                    currentFile = { type: "view", id: filename.replace(/.*\/views\/(.+)\.tsx/, "$1") };
+                                }
+                                else {
+                                    currentFile = null;
+                                }
+                            },
+                            exit: (path, state) => {
+                                currentFile = null;
+                                // console.log("Exiting", state.file.opts.filename)
+                            },
+                        },
+                        ExportNamedDeclaration: (path, state) => {
+                            if (!currentFile)
+                                return;
                             const decl = path.node.declaration;
                             if (decl?.type !== "VariableDeclaration")
                                 return;
@@ -47,11 +91,20 @@ export function reactPlugin() {
                             if (!t.isIdentifier(id))
                                 return;
                             if (id.name === "meta") {
-                                path.remove();
+                                if (args.retainBlockMeta && currentFile?.type === "block") {
+                                    // Adds a defineBlock.meta("name", meta) call, which can be used by the editor
+                                    path.replaceWith(t.callExpression(t.memberExpression(t.identifier("defineBlock"), t.identifier("meta")), [
+                                        t.stringLiteral(currentFile.id),
+                                        decl.declarations[0].init,
+                                    ]));
+                                }
+                                else {
+                                    path.remove();
+                                }
                             }
                         },
                         ExportDefaultDeclaration: (path) => {
-                            if (!path.hub.file.opts.filename.match(/\/(blocks|views)\//))
+                            if (!currentFile)
                                 return;
                             if (path.node.declaration.type === "CallExpression") {
                                 const call = path.node.declaration;
@@ -66,7 +119,11 @@ export function reactPlugin() {
                                         if (t.isExpression(body)) {
                                             body = t.blockStatement([t.returnStatement(body)]);
                                         }
-                                        path.replaceWith(t.exportDefaultDeclaration(t.functionDeclaration(t.identifier(pascalCase(type + "-" + name)), args[1].params, body, args[1].generator, args[1].async)));
+                                        const componentName = pascalCase(type) + "_" + name.replace(/[^a-z0-9]/g, "_").replace(/_+/g, "_");
+                                        path.replaceWithMultiple([
+                                            t.exportDefaultDeclaration(t.functionDeclaration(t.identifier(componentName), args[1].params, body, args[1].generator, args[1].async)),
+                                            t.expressionStatement(t.assignmentExpression("=", t.memberExpression(t.identifier(componentName), t.identifier("displayName")), t.stringLiteral(pascalCase(type) + "(" + name + ")"))),
+                                        ]);
                                     }
                                 }
                             }
@@ -87,11 +144,18 @@ export function ssrPlugin() {
             config.legacy = {
                 ...config.legacy,
                 proxySsrExternalModules: true,
+                // @ts-ignore
+                skipWebSocketTokenCheck: true,
             };
             config.ssr = {
                 ...config.ssr,
-                // @ts-ignore
-                noExternal: ["eddev", "vinxi", "react-use", ...(config?.optimizeDeps?.noExternal ?? [])],
+                noExternal: [
+                    "eddev",
+                    "vinxi",
+                    "react-use",
+                    // @ts-ignore
+                    ...(config?.optimizeDeps?.noExternal ?? []),
+                ],
                 optimizeDeps: {
                     exclude: ["eddev", "vinxi"],
                 },
@@ -100,7 +164,6 @@ export function ssrPlugin() {
                 ...config.optimizeDeps,
                 include: [
                     "valtio",
-                    "zustand",
                     "@tanstack/react-query",
                     "qs",
                     "react",
@@ -109,6 +172,11 @@ export function ssrPlugin() {
                 ],
                 exclude: ["eddev", "vinxi", ...(config?.optimizeDeps?.exclude ?? [])],
             };
+            config.server = {
+                ...config.server,
+                allowedHosts: true,
+                cors: true,
+            };
             return config;
         },
     };
@@ -135,59 +203,125 @@ function buildStatusPlugin(console) {
     };
 }
 export function corePlugins(args) {
-    return [args.serverless && ssrPlugin(), envPlugin(args), tsconfigPaths(), reactPlugin()].flat();
+    return [
+        args.serverless && ssrPlugin(),
+        envPlugin(args),
+        tsconfigPaths(),
+        reactPlugin({ retainBlockMeta: args.target === "cms" }),
+        ignoreRollupErrorsPlugin(),
+        args.console && loggerPlugin({ console: args.console }),
+    ].flat();
 }
-export function getViteConfig(args) {
-    const console = args.console;
-    const logger = createLogger();
-    logger.info = (msg) => args.console.info(msg.replace(/\n/, ""));
-    logger.warn = (msg) => {
-        if (typeof msg === "string" && msg.includes("Error when using sourcemap for reporting"))
-            return;
-        return args.console.warn(msg.replace(/\n/, ""));
+export function storybookVitePlugins(args) {
+    return [args.serverless && ssrPlugin(), envPlugin(args), tsconfigPaths()].flat();
+}
+export function ignoreRollupErrorsPlugin() {
+    return {
+        name: "ignore-rollup-errors",
+        config(config) {
+            const onWarn = config.build?.rollupOptions?.onwarn;
+            return {
+                build: {
+                    rollupOptions: {
+                        onwarn(warning, warn) {
+                            if (!cliMode.verbose &&
+                                warning.code &&
+                                ["SOURCEMAP_ERROR", "UNUSED_EXTERNAL_IMPORT", "INVALID_ANNOTATION", "EVAL"].includes(warning.code)) {
+                                return;
+                            }
+                            if (warning.code) {
+                                warning.message = warning.code + ": " + warning.message;
+                            }
+                            if (onWarn) {
+                                onWarn(warning, warn);
+                            }
+                            else {
+                                warn(warning);
+                            }
+                        },
+                    },
+                },
+            };
+        },
     };
-    logger.error = (msg) => args.console.fail(msg.replace(/\n/, ""));
-    logger.warnOnce = (msg) => args.console.warn(msg.replace(/\n/, ""));
-    logger.clearScreen = () => {
-        args.console.resetLog();
+}
+export function loggerPlugin(args) {
+    return {
+        name: "eddev:logger",
+        config() {
+            const logger = createLogger();
+            logger.info = (msg) => {
+                if (msg.includes("hmr update"))
+                    args.console.resetLog();
+                args.console.info(msg.replace(/\n/, ""));
+            };
+            logger.warn = (msg) => {
+                if (typeof msg === "string" && msg.includes("auto-determine entry point"))
+                    return;
+                if (typeof msg === "string" && msg.includes("Error when using sourcemap for reporting"))
+                    return;
+                return args.console.warn(msg.replace(/\n/, ""));
+            };
+            logger.error = (msg) => {
+                args.console.fail(msg.replace(/\n/, ""));
+            };
+            logger.warnOnce = (msg) => {
+                args.console.warn(msg.replace(/\n/, ""));
+            };
+            logger.clearScreen = () => {
+                args.console.resetLog();
+            };
+            return {
+                customLogger: logger,
+            };
+        },
     };
+}
+export function getViteConfig(args) {
+    const console = args.console;
+    const entryFile = `./.eddev/${args.mode === "production" ? "prod" : "dev"}-spa/entry.${args.target === "cms" ? "admin" : "client"}.tsx`;
     /** Initial config */
     const config = {
         appType: "custom",
         mode: args.mode,
         root: args.rootDir,
-        customLogger: logger,
         logLevel: cliMode.verbose ? "info" : "warn",
         base: withoutTrailingSlash(args.publicUrl) + "/dist/" + args.target,
         define: {
             "process.env.NODE_ENV": JSON.stringify(args.mode),
         },
-        plugins: [tsconfigPaths(), envPlugin(args), reactPlugin(), buildStatusPlugin(console)],
+        plugins: [
+            tsconfigPaths(),
+            envPlugin(args),
+            reactPlugin({
+                retainBlockMeta: args.target === "cms",
+            }),
+            buildStatusPlugin(console),
+            ignoreRollupErrorsPlugin(),
+            loggerPlugin({ console }),
+        ],
         build: {
             manifest: true,
             sourcemap: true,
-            minify: args.mode === "production",
+            minify: args.target === "cms" ? false : args.mode === "production",
             modulePreload: false,
             outDir: args.outDir,
-            // watch: {},
+            lib: args.target === "cms"
+                ? {
+                    entry: [entryFile],
+                    fileName: (format, entryName) => `${entryName}.${format}.js`,
+                    name: "eddev",
+                    formats: ["iife"],
+                    cssFileName: "style",
+                }
+                : undefined,
             rollupOptions: {
-                input: `./.eddev/${args.mode === "production" ? "prod" : "dev"}-spa/entry.${args.target === "cms" ? "admin" : "client"}.tsx`,
+                input: args.target === "frontend" ? entryFile : undefined,
                 external: args.target === "cms" ? ["react", "react-dom"] : [],
-                onwarn(warning, warn) {
-                    if (!cliMode.verbose &&
-                        warning.code &&
-                        ["SOURCEMAP_ERROR", "UNUSED_EXTERNAL_IMPORT", "INVALID_ANNOTATION", "EVAL"].includes(warning.code)) {
-                        return;
-                    }
-                    if (warning.code) {
-                        warning.message = warning.code + ": " + warning.message;
-                    }
-                    warn(warning);
-                },
                 output: args.target === "cms"
                     ? {
-                        entryFileNames: "main.admin.js",
-                        format: "iife",
+                        // entryFileNames: "main.admin.js",
+                        // format: "iife",
                         globals: {
                             react: "window.React",
                             "react-dom": "window.ReactDOM",

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

@@ -1,4 +1,5 @@
 import { StatefulLog } from "../utils/stateful-log.js";
+import { EDConfig } from "../project/config.js";
 export type AppArgs = {
     mode: "development" | "production";
     publicUrl: string;
@@ -6,5 +7,17 @@ export type AppArgs = {
     origin: string;
     log?: StatefulLog<any>;
     preset?: string;
+    routes?: CustomRoute[];
+    rpcBases?: string[];
+    config: EDConfig;
+};
+type HTTPMethod = "GET" | "POST" | "PUT" | "OPTIONS" | "HEAD";
+type CustomRouteFunction = (req: Request) => Response;
+type CustomRouteModule = Record<HTTPMethod, CustomRouteFunction>;
+type CustomRoute = {
+    pattern: string;
+    handler: () => Promise<CustomRouteModule>;
 };
 export declare function createVinxiApp(args: AppArgs): import("vinxi").App;
+export {};
+//# sourceMappingURL=vinxi-app.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"vinxi-app.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/vinxi-app.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAGtD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAI/C,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,WAAW,EAAE,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED,KAAK,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,CAAA;AAC7D,KAAK,mBAAmB,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,QAAQ,CAAA;AACrD,KAAK,iBAAiB,GAAG,MAAM,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAA;AAEhE,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAA;CAC1C,CAAA;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,uBA2O3C"}