eddev 2.3.30 → 2.4.0-beta.1

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

@@ -1,12 +1,10 @@
-import * as t from "@babel/types";
 import replace from "@rollup/plugin-replace";
 import react from "@vitejs/plugin-react";
 import glsl from "vite-plugin-glsl";
-import { pascalCase } from "change-case-all";
 import { withoutTrailingSlash } from "ufo";
-import { createLogger } from "vite";
-import tsconfigPaths from "vite-tsconfig-paths";
+import { createLogger, esmExternalRequirePlugin } from "vite";
 import { cliMode } from "../cli/cli-mode.js";
+import { transformsPlugin } from "./transforms/index.js";
 export function envPlugin(args) {
     const serverlessOrigin = args.client && !args.serverless ? '(window.SERVERLESS_ENDPOINT ?? "/")' : JSON.stringify("/");
     const envDefines = {
@@ -57,84 +55,18 @@ export function envPlugin(args) {
         preventAssignment: true,
     });
 }
-export function reactPlugin(args = {}) {
-    let currentFile = null;
-    return react({
-        babel: {
-            overrides: [{ test: /types\./, compact: true }],
-            plugins: [
-                {
-                    visitor: {
-                        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;
-                            const id = decl.declarations[0].id;
-                            if (!t.isIdentifier(id))
-                                return;
-                            if (id.name === "meta") {
-                                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 (!currentFile)
-                                return;
-                            if (path.node.declaration.type === "CallExpression") {
-                                const call = path.node.declaration;
-                                if (call.callee.type === "Identifier" && ["defineBlock", "defineView"].includes(call.callee.name)) {
-                                    const type = call.callee.name.replace("define", "");
-                                    const args = call.arguments;
-                                    if (args.length === 2 &&
-                                        args[0].type === "StringLiteral" &&
-                                        args[1].type === "ArrowFunctionExpression") {
-                                        const name = args[0].value;
-                                        let body = args[1].body;
-                                        if (t.isExpression(body)) {
-                                            body = t.blockStatement([t.returnStatement(body)]);
-                                        }
-                                        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 + ")"))),
-                                        ]);
-                                    }
-                                }
-                            }
-                        },
-                    },
-                },
-            ],
-        },
-    });
+/** Maps the bundler args to the target used by eddev's source transforms. */
+export function getTransformTarget(args) {
+    if (args.target === "cms")
+        return "cms";
+    return args.client ? "frontend" : "server";
+}
+/**
+ * React (JSX, Fast Refresh) plus eddev's block/view source transforms.
+ * See `./transforms` for what the transforms do.
+ */
+export function reactPlugin(args) {
+    return [transformsPlugin({ target: args.target }), react()];
 }
 /**
  * Turns on SSR module proxying,
@@ -145,21 +77,18 @@ export function ssrPlugin() {
         config(config) {
             config.legacy = {
                 ...config.legacy,
-                proxySsrExternalModules: true,
-                // @ts-ignore
                 skipWebSocketTokenCheck: true,
             };
             config.ssr = {
                 ...config.ssr,
                 noExternal: [
                     "eddev",
-                    "vinxi",
                     "react-use",
                     // @ts-ignore
                     ...(config?.optimizeDeps?.noExternal ?? []),
                 ],
                 optimizeDeps: {
-                    exclude: ["eddev", "vinxi"],
+                    exclude: ["eddev"],
                 },
             };
             config.optimizeDeps = {
@@ -173,7 +102,7 @@ export function ssrPlugin() {
                     "react-dom/client",
                     ...(config?.optimizeDeps?.include ?? []),
                 ],
-                exclude: ["eddev", "vinxi", ...(config?.optimizeDeps?.exclude ?? [])],
+                exclude: ["eddev", ...(config?.optimizeDeps?.exclude ?? [])],
             };
             config.server = {
                 ...config.server,
@@ -184,30 +113,55 @@ export function ssrPlugin() {
         },
     };
 }
-function buildStatusPlugin(console) {
+/**
+ * Tracks one or more concurrent builds reporting into the same log. The log shows "working" until
+ * every build has finished, and "error" if any of them failed.
+ */
+export function createBuildStatusTracker(console) {
+    const active = new Set();
+    const failed = new Set();
     let hasStarted = false;
+    return {
+        start(id) {
+            if (active.size === 0) {
+                if (hasStarted) {
+                    console.resetLog();
+                }
+                else {
+                    hasStarted = true;
+                    console.startTimer();
+                }
+            }
+            active.add(id);
+            failed.delete(id);
+            console.setWorking(true);
+        },
+        end(id, didFail) {
+            active.delete(id);
+            if (didFail)
+                failed.add(id);
+            if (active.size === 0) {
+                console.setWorking(false, failed.size ? "error" : undefined);
+            }
+        },
+    };
+}
+function buildStatusPlugin(status, id) {
     return {
         name: "eddev:logging",
         enforce: "post",
         buildStart() {
-            if (hasStarted) {
-                console.resetLog();
-            }
-            else {
-                hasStarted = true;
-                console.startTimer();
-            }
-            console.setWorking(true);
+            status.start(id);
         },
         buildEnd(error) {
             if (error)
-                console.setWorking(false, "error");
+                status.end(id, true);
         },
         renderError() {
-            console.setWorking(false, "error");
+            status.end(id, true);
         },
         writeBundle() {
-            console.setWorking(false);
+            status.end(id);
         },
     };
 }
@@ -223,6 +177,23 @@ export function workersPlugin() {
         },
     };
 }
+/**
+ * Settings shared by every eddev Vite build:
+ * - tsconfig `paths` (eg. `@components/*`) are resolved natively by Vite.
+ * - CSS minification (Lightning CSS) recovers from invalid declarations with a warning instead of
+ *   failing the build. Browsers drop such declarations anyway, and esbuild (Vite 6) passed them through.
+ */
+export function baseConfigPlugin() {
+    return {
+        name: "eddev:base-config",
+        config() {
+            return {
+                resolve: { tsconfigPaths: true },
+                css: { lightningcss: { errorRecovery: true } },
+            };
+        },
+    };
+}
 export function corePlugins(args) {
     return [
         glsl({
@@ -230,28 +201,39 @@ export function corePlugins(args) {
         }),
         args.serverless && ssrPlugin(),
         envPlugin(args),
-        tsconfigPaths(),
-        reactPlugin({ retainBlockMeta: args.target === "cms" }),
+        baseConfigPlugin(),
+        reactPlugin({ target: getTransformTarget(args) }),
         ignoreRollupErrorsPlugin(),
         workersPlugin(),
-        args.console && loggerPlugin({ console: args.console }),
+        args.console && loggerPlugin({ console: args.console, label: args.logLabel }),
     ].flat();
 }
 export function storybookVitePlugins(args) {
-    return [args.serverless && ssrPlugin(), envPlugin(args), tsconfigPaths()].flat();
+    return [args.serverless && ssrPlugin(), envPlugin(args), baseConfigPlugin()].flat();
 }
+/** Bundler warnings hidden unless `--verbose` is set: noisy, and not actionable in project code. */
+const QUIET_WARNING_CODES = [
+    "SOURCEMAP_ERROR",
+    "SOURCEMAP_BROKEN",
+    "UNUSED_EXTERNAL_IMPORT",
+    "INVALID_ANNOTATION",
+    "EVAL",
+    "PLUGIN_TIMINGS",
+    "MODULE_LEVEL_DIRECTIVE",
+];
+const isQuietWarning = (msg) => !cliMode.verbose && typeof msg === "string" && QUIET_WARNING_CODES.some((code) => msg.includes(`[${code}]`));
 export function ignoreRollupErrorsPlugin() {
     return {
         name: "ignore-rollup-errors",
         config(config) {
-            const onWarn = config.build?.rollupOptions?.onwarn;
+            const onWarn = config.build?.rolldownOptions?.onwarn ?? config.build?.rollupOptions?.onwarn;
             return {
                 build: {
-                    rollupOptions: {
+                    rolldownOptions: {
                         onwarn(warning, warn) {
                             if (!cliMode.verbose &&
                                 warning.code &&
-                                ["SOURCEMAP_ERROR", "UNUSED_EXTERNAL_IMPORT", "INVALID_ANNOTATION", "EVAL"].includes(warning.code)) {
+                                QUIET_WARNING_CODES.includes(warning.code)) {
                                 return;
                             }
                             if (warning.code) {
@@ -271,6 +253,7 @@ export function ignoreRollupErrorsPlugin() {
     };
 }
 export function loggerPlugin(args) {
+    const prefix = (msg) => (args.label ? `[${args.label}] ` : "") + msg.replace(/\n/, "");
     return {
         name: "eddev:logger",
         config() {
@@ -278,22 +261,23 @@ export function loggerPlugin(args) {
             logger.info = (msg) => {
                 if (msg.includes("hmr update"))
                     args.console.resetLog();
-                args.console.info(msg.replace(/\n/, ""));
+                args.console.info(prefix(msg));
             };
             logger.warn = (msg) => {
+                if (isQuietWarning(msg))
+                    return;
                 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/, ""));
+                return args.console.warn(prefix(msg));
             };
             logger.error = (msg) => {
-                args.console.fail(msg.replace(/\n/, ""));
-                if (args.completeOnError)
-                    args.console.setWorking(false, "error");
+                args.console.fail(prefix(msg));
+                args.onError?.();
             };
             logger.warnOnce = (msg) => {
-                args.console.warn(msg.replace(/\n/, ""));
+                args.console.warn(prefix(msg));
             };
             logger.clearScreen = () => {
                 args.console.resetLog();
@@ -306,6 +290,8 @@ export function loggerPlugin(args) {
 }
 export function getViteConfig(args) {
     const console = args.console;
+    const status = args.status ?? createBuildStatusTracker(console);
+    const buildId = args.logLabel ?? args.target;
     const entryFile = `./.eddev/${args.mode === "production" ? "prod" : "dev"}-spa/entry.${args.target === "cms" ? "admin" : "client"}.tsx`;
     /** Initial config */
     const config = {
@@ -321,14 +307,16 @@ export function getViteConfig(args) {
             glsl({
                 root: args.rootDir,
             }),
-            tsconfigPaths(),
+            baseConfigPlugin(),
             envPlugin(args),
-            reactPlugin({
-                retainBlockMeta: args.target === "cms",
-            }),
-            buildStatusPlugin(console),
+            reactPlugin({ target: getTransformTarget(args) }),
+            // The cms bundle uses WordPress' React globals. Bundled CommonJS (eg. react/jsx-runtime) calls
+            // require("react"), which Rolldown leaves as-is for externals; this rewrites it to an import so it
+            // maps to `window.React` in the IIFE output.
+            args.target === "cms" && esmExternalRequirePlugin({ external: ["react", "react-dom"] }),
+            buildStatusPlugin(status, buildId),
             ignoreRollupErrorsPlugin(),
-            loggerPlugin({ console, completeOnError: true }),
+            loggerPlugin({ console, label: args.logLabel, onError: () => status.end(buildId, true) }),
             workersPlugin(),
         ],
         build: {
@@ -346,9 +334,9 @@ export function getViteConfig(args) {
                     cssFileName: "style",
                 }
                 : undefined,
-            rollupOptions: {
+            rolldownOptions: {
                 input: args.target === "frontend" ? entryFile : undefined,
-                external: args.target === "cms" ? ["react", "react-dom"] : [],
+                // cms externals (react, react-dom) are handled by esmExternalRequirePlugin above
                 output: args.target === "cms"
                     ? {
                         // entryFileNames: "main.admin.js",
@@ -358,7 +346,11 @@ export function getViteConfig(args) {
                             "react-dom": "window.ReactDOM",
                         },
                     }
-                    : undefined,
+                    : {
+                        codeSplitting: {
+                            groups: [{ name: "entry.client", tags: ["$initial"] }],
+                        },
+                    },
             },
         },
     };

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

@@ -0,0 +1,35 @@
+import type { InlineConfig } from "vite";
+import { EDConfig } from "../project/config.js";
+import { StatefulLog } from "../utils/stateful-log.js";
+export type ServerlessAppArgs = {
+    mode: "development" | "production";
+    publicUrl: string;
+    rootDir: string;
+    /** The WordPress origin (SITE_URL) */
+    origin: string;
+    log: StatefulLog<any>;
+    /** Nitro preset, eg. `vercel`, `node-server`, `cloudflare-module` */
+    preset?: string;
+    rpcBases?: string[];
+    config: EDConfig;
+};
+/**
+ * The Vite environments that make up the serverless app (Nitro adds its own `nitro` environment):
+ * - `client`: the public site in the browser, served from `/_build/`
+ * - `admin`: the WordPress editor bundle for proxied wp-admin pages, served from `/_admin/`
+ * - `ssr`: the server entry, rendering pages and handling data/RPC requests
+ *
+ * In dev, `admin` runs as a separate Vite server mounted at `/_admin/` instead, because a dev server
+ * only serves its `client` environment to browsers (see `adminDevServerPlugin`).
+ */
+export declare const SERVERLESS_ENVIRONMENTS: readonly ["client", "admin", "ssr"];
+/**
+ * Dev only: lets the server runtime (which runs in the same process, via Nitro's `self` runner) ask the
+ * admin dev server for the admin bundle's stylesheets. Read by the generated `manifest/assets.ts`.
+ */
+export declare const ADMIN_DEV_STYLESHEETS_HOOK = "__EDDEV_ADMIN_DEV_STYLESHEETS__";
+/**
+ * The Vite config for the serverless app, used by both `eddev dev` and `eddev build --serverless`.
+ */
+export declare function getServerlessViteConfig(args: ServerlessAppArgs): InlineConfig;
+//# sourceMappingURL=serverless-app.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"serverless-app.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/serverless-app.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAuC,MAAM,MAAM,CAAA;AAE7E,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAkBtD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,sCAAsC;IACtC,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;IACrB,qEAAqE;IACrE,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,qCAAsC,CAAA;AAI1E;;;GAGG;AACH,eAAO,MAAM,0BAA0B,oCAAoC,CAAA;AAsO3E;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,iBAAiB,GAAG,YAAY,CA0F7E"}