eddev 2.3.31 → 2.4.0-beta.2

package/dist/node/cli/cli.js

@@ -2,10 +2,9 @@ import chalk from "chalk";
 import { Command } from "commander";
 import { setDefaultResultOrder } from "dns";
 import { config as importDotEnv } from "dotenv";
-import { AdminBundler, adminLog } from "../compiler/bundler.admin.js";
-import { FrontendBundler, frontendLog } from "../compiler/bundler.frontend.js";
+import { SPABundler, spaLog } from "../compiler/bundler.spa.js";
 import { DevServer, serverlessLog } from "../compiler/dev-server.js";
-import { createVinxiCodegen } from "../compiler/vinxi-codegen.js";
+import { createAppCodegen } from "../compiler/app-codegen.js";
 import { GraphQLGenerator, graphqlLog } from "../graphql/graphql-codegen.js";
 import { BuildInfoWriter } from "../project/eddev-build-file.js";
 import { Project, projectLog } from "../project/project.js";
@@ -15,14 +14,14 @@ import { configureCliMode } from "./cli-mode.js";
 import { CLIWorker } from "./cli-worker.js";
 import { bootCLIUI } from "./display/boot-cli-app.js";
 import { VERSION } from "./version.js";
-import { buildVinxi } from "../compiler/build-vinxi.js";
+import { buildServerless } from "../compiler/build-serverless.js";
 import { createConsole } from "../utils/stateful-log.js";
 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";
+import { visualizer } from "rollup-plugin-visualizer";
 import { execa } from "execa";
 importDotEnv();
 const program = new Command()
@@ -42,7 +41,7 @@ program.command("create-favicons").action(async () => {
 program
     .command("dev")
     .description("Run in dev mode")
-    .option("-m, --mode <mode>", "Comma separated list of modes, or a single mode.", "frontend,admin,graphql,serverless")
+    .option("-m, --mode <mode>", 'Comma separated list of modes: "spa", "graphql", "serverless". "frontend" and "admin" build just one of the SPA bundles.', "spa,graphql,serverless")
     .option("--fast", "Shorthand for --mode graphql,serverless", false)
     .option("--https <enabled>", "Use HTTPS for the dev server", (val) => val === "true" || val === "1", true)
     .option("--verbose", "Show extra debugging info", false)
@@ -70,11 +69,18 @@ program
     if (options.fast) {
         options.mode = "graphql,serverless";
     }
+    const modes = new Set(String(options.mode || "spa,graphql,serverless")
+        .split(",")
+        .map((mode) => mode.trim()));
+    const spaTargets = [];
+    if (modes.has("spa") || modes.has("frontend"))
+        spaTargets.push("frontend");
+    if (modes.has("spa") || modes.has("admin"))
+        spaTargets.push("cms");
     const tasks = {
-        admin: !options.mode || options.mode.includes("admin"),
-        frontend: !options.mode || options.mode.includes("frontend"),
-        serverless: !options.mode || options.mode.includes("serverless"),
-        graphql: !options.mode || options.mode.includes("graphql"),
+        spa: spaTargets.length > 0,
+        serverless: modes.has("serverless"),
+        graphql: modes.has("graphql"),
     };
     // https://github.com/node-fetch/node-fetch/issues/1624#issuecomment-1407717012
     setDefaultResultOrder("ipv4first");
@@ -91,8 +97,7 @@ program
         getProject: () => project,
         logs: {
             project: projectLog,
-            adminBundle: tasks.admin ? adminLog : undefined,
-            frontendBundle: tasks.frontend ? frontendLog : undefined,
+            spa: tasks.spa ? spaLog : undefined,
             serverless: tasks.serverless ? serverlessLog : undefined,
             graphql: tasks.graphql ? graphqlLog : undefined,
         },
@@ -119,8 +124,8 @@ program
     const infoWriter = new BuildInfoWriter(project);
     infoWriter.watch();
     infoWriter.write();
-    if (tasks.admin || tasks.frontend) {
-        const spaStaging = createVinxiCodegen({
+    if (tasks.spa) {
+        const spaStaging = createAppCodegen({
             mode: "development",
             project,
             serverless: false,
@@ -128,20 +133,13 @@ program
         });
         await spaStaging.runAndWatch();
     }
-    // Boot up admin in a worker
-    if (tasks.admin) {
+    // Boot up the SPA client (frontend + admin bundles) in a worker
+    if (tasks.spa) {
         new CLIWorker({
-            log: adminLog,
-            mode: "admin",
-            verbose: options.verbose,
-        });
-    }
-    // Boot up frontend in a worker
-    if (tasks.frontend) {
-        new CLIWorker({
-            log: frontendLog,
-            mode: "frontend",
+            log: spaLog,
+            mode: "spa",
             verbose: options.verbose,
+            spaTargets,
         });
     }
     // Load the compiler
@@ -171,7 +169,7 @@ program
         console.info = (...args) => {
             serverlessLog.info(...args);
         };
-        const serverlessStaging = createVinxiCodegen({
+        const serverlessStaging = createAppCodegen({
             mode: "development",
             project,
             serverless: true,
@@ -215,8 +213,8 @@ program
     const project = await Project.create({
         rootDir: process.cwd(),
     });
-    const buildServerless = options.serverless || process.env.VERCEL;
-    if (buildServerless) {
+    const shouldBuildServerless = options.serverless || process.env.VERCEL;
+    if (shouldBuildServerless) {
         // Verify that the we have access to the origin
         const result = await project.verifyOriginAccess();
         if (!result.success) {
@@ -224,15 +222,16 @@ program
             process.exit(1);
             return;
         }
-        await buildVinxi({
+        await buildServerless({
             project,
             console,
         });
+        console.log("Done building serverless app");
     }
     else {
         const infoWriter = new BuildInfoWriter(project);
         // Generate bootstrap files
-        const codegen = createVinxiCodegen({
+        const codegen = createAppCodegen({
             mode: "production",
             project: project,
             serverless: false,
@@ -240,16 +239,13 @@ program
         await codegen.run();
         console.info("Building for SPA WordPress (Frontend and Admin)");
         // Load the compiler
-        const admin = new AdminBundler(project, {
-            mode: "production",
-        });
-        const frontend = new FrontendBundler(project, {
+        const spa = new SPABundler(project, {
             mode: "production",
         });
         const graphql = new GraphQLGenerator(project, {
             optimize: true,
         });
-        await Promise.all([infoWriter.write(), admin.start(), frontend.start(), graphql.start()]);
+        await Promise.all([infoWriter.write(), spa.start(), graphql.start()]);
         console.log("Done building SPA WordPress");
     }
 });
@@ -276,15 +272,13 @@ program
         rootDir: process.cwd(),
     });
     // Generate bootstrap files
-    const codegen = createVinxiCodegen({
+    const codegen = createAppCodegen({
         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({
@@ -309,7 +303,7 @@ program
             modulePreload: false,
             outDir: outDir,
             lib: undefined,
-            rollupOptions: {
+            rolldownOptions: {
                 input: "./.eddev/prod/entry.client.tsx",
             },
         },
@@ -319,7 +313,7 @@ program
 });
 program
     .command("preview")
-    .description("Run a local production build, which was previously built with `eddev build --serverless`")
+    .description("Run a local production build, which was previously built with `TARGET=node-server eddev build --serverless`")
     .option("--host", "Hostname to serve the application", "")
     .option("--port <port>", "Port to serve the application", "8080")
     .action(async (options) => {
@@ -348,9 +342,9 @@ program
         watch: false,
         rootDir: process.cwd(),
     });
-    const entry = ".output/server/index.mjs";
+    const entry = ".eddev/output/server/index.mjs";
     console.info("Looking for production serverless build in: " + entry + "...");
-    await import(join(process.cwd(), ".output/server/index.mjs"));
+    await import(join(process.cwd(), entry));
     console.log("Visit " + chalk.cyan(`https://${process.env.HOST}:${process.env.PORT}`) + " to see your app.");
 });
 program

package/dist/node/cli/display/CLIApp.d.ts

@@ -1,16 +1,14 @@
 import type { graphqlLog } from "../../graphql/graphql-codegen.js";
 import type { Project, projectLog } from "../../project/project.js";
-import type { adminLog } from "../../compiler/bundler.admin.js";
-import type { frontendLog } from "../../compiler/bundler.frontend.js";
+import type { spaLog } from "../../compiler/bundler.spa.js";
 import { serverlessLog } from "../../compiler/dev-server.js";
 export type CLIDisplayProps = {
     getProject: () => Project;
     logs: {
         project?: typeof projectLog;
         graphql?: typeof graphqlLog;
-        frontendBundle?: typeof frontendLog;
+        spa?: typeof spaLog;
         serverless?: typeof serverlessLog;
-        adminBundle?: typeof adminLog;
     };
 };
 export declare function CLIApp(props: CLIDisplayProps): import("react").JSX.Element;

package/dist/node/cli/display/CLIApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CLIApp.d.ts","sourceRoot":"","sources":["../../../../src/node/cli/display/CLIApp.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAClE,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAA;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAA;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAQ5D,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,EAAE,MAAM,OAAO,CAAA;IACzB,IAAI,EAAE;QACJ,OAAO,CAAC,EAAE,OAAO,UAAU,CAAA;QAC3B,OAAO,CAAC,EAAE,OAAO,UAAU,CAAA;QAC3B,cAAc,CAAC,EAAE,OAAO,WAAW,CAAA;QACnC,UAAU,CAAC,EAAE,OAAO,aAAa,CAAA;QACjC,WAAW,CAAC,EAAE,OAAO,QAAQ,CAAA;KAC9B,CAAA;CACF,CAAA;AAOD,wBAAgB,MAAM,CAAC,KAAK,EAAE,eAAe,+BAmG5C"}
+{"version":3,"file":"CLIApp.d.ts","sourceRoot":"","sources":["../../../../src/node/cli/display/CLIApp.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAClE,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAQ5D,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,EAAE,MAAM,OAAO,CAAA;IACzB,IAAI,EAAE;QACJ,OAAO,CAAC,EAAE,OAAO,UAAU,CAAA;QAC3B,OAAO,CAAC,EAAE,OAAO,UAAU,CAAA;QAC3B,GAAG,CAAC,EAAE,OAAO,MAAM,CAAA;QACnB,UAAU,CAAC,EAAE,OAAO,aAAa,CAAA;KAClC,CAAA;CACF,CAAA;AAOD,wBAAgB,MAAM,CAAC,KAAK,EAAE,eAAe,+BAkG5C"}

package/dist/node/cli/display/CLIApp.js

@@ -47,11 +47,10 @@ export function CLIApp(props) {
     const logs = useStatefulLogs({
         projectLog: props.logs.project,
         graphqlLog: props.logs.graphql,
-        frontendLog: props.logs.frontendBundle,
-        adminLog: props.logs.adminBundle,
+        spaLog: props.logs.spa,
         serverlessLog: props.logs.serverless,
     });
-    const mainLog = logs.serverlessLog || logs.frontendLog || logs.adminLog || logs.graphqlLog || logs.projectLog;
+    const mainLog = logs.serverlessLog || logs.spaLog || logs.graphqlLog || logs.projectLog;
     const logList = Object.entries(logs).filter(([key, log]) => log !== mainLog);
     return (_jsxs(_Fragment, { children: [_jsx(Static, { items: mainLog ? mainLog.entries : [], children: (item, i) => {
                     return _jsx(LogItem, { item: item }, item.id);

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/node/cli/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,WAAW,CAAA"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/node/cli/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,iBAAiB,CAAA"}

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.3.31";
+export const VERSION = "2.4.0-beta.2";

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

@@ -0,0 +1,18 @@
+import { Project } from "../project/project.js";
+import { FSCodegen } from "../utils/fs-codegen.js";
+type Options = {
+    mode: "development" | "production";
+    serverless: boolean;
+    project: Project;
+    endpoint?: string;
+};
+/** The generated entry folder, relative to `.eddev`: `dev`, `prod`, `dev-spa` or `prod-spa`. */
+export declare function getAppFolder(opts: Pick<Options, "mode" | "serverless">): string;
+export declare function runAppCodegen(opts: Options): Promise<void>;
+/**
+ * Generates the entry points and manifests in `.eddev/<folder>`, which the bundlers compile.
+ * SPA mode gets client + admin entries; serverless mode additionally gets the server entry.
+ */
+export declare function createAppCodegen(opts: Options): FSCodegen;
+export {};
+//# sourceMappingURL=app-codegen.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"app-codegen.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/app-codegen.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAGlD,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,gGAAgG;AAChG,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAAC,UAEtE;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,OAAO,iBAIhD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,aA8d7C"}