eddev 2.3.31 → 2.4.0-beta.2

package/dist/node/compiler/dev-css-links.js

@@ -0,0 +1,87 @@
+import { isCSSRequest } from "vite";
+const DIRECT_REQUEST_RE = /[?&]direct\b/;
+const SPECIAL_CSS_QUERY_RE = /[?&](url|inline|raw)(\b|=|&|$)/;
+/**
+ * Lets stylesheets that are rendered as `<link rel="stylesheet" data-vite-dev-id>` hot reload.
+ *
+ * A `<link>` request is a separate "direct" CSS module from the copy the JS imports. Marking it as
+ * self-accepting makes Vite send a `css-update` when the file (or Tailwind's output) changes, and the
+ * client swaps the link's `href`: the new sheet loads before the old one is removed, so there's no flash.
+ * The JS-imported copy stays out of the page, because Vite's client skips injecting a `<style>` for an
+ * id that a link already owns.
+ *
+ * This is the same approach Nitro's assets plugin uses for the main dev server's client environment.
+ */
+export function cssLinkHmrPlugin() {
+    return {
+        name: "eddev:css-link-hmr",
+        apply: "serve",
+        transform: {
+            order: "post",
+            handler(_code, id) {
+                if (this.environment.mode !== "dev" || !isCSSRequest(id) || !DIRECT_REQUEST_RE.test(id))
+                    return;
+                const mod = this.environment.moduleGraph.getModuleById(id);
+                if (mod && !mod.isSelfAccepting)
+                    mod.isSelfAccepting = true;
+            },
+        },
+    };
+}
+/**
+ * Finds every stylesheet imported (statically or dynamically) by an entry, in import order, by
+ * transforming the entry's module graph in a dev environment.
+ */
+export async function collectDevStylesheets(environment, entryUrl) {
+    const isWalkable = (dep) => !!dep.id && !isCSSRequest(dep.id) && !dep.url.includes("/node_modules/.vite/");
+    const load = async (url) => {
+        let mod = await environment.moduleGraph.getModuleByUrl(url);
+        if (!mod?.transformResult) {
+            await environment.transformRequest(url).catch(() => null);
+            mod = await environment.moduleGraph.getModuleByUrl(url);
+        }
+        return mod;
+    };
+    // Warm the graph breadth-first, transforming each level in parallel. (Breadth-first, rather than
+    // awaiting each module's imports, so import cycles can't make a module wait on itself.)
+    const seen = new Set([entryUrl]);
+    let frontier = [entryUrl];
+    while (frontier.length) {
+        const next = [];
+        await Promise.all(frontier.map(async (url) => {
+            const mod = await load(url);
+            for (const dep of mod?.importedModules ?? []) {
+                if (isWalkable(dep) && !seen.has(dep.url)) {
+                    seen.add(dep.url);
+                    next.push(dep.url);
+                }
+            }
+        }));
+        frontier = next;
+    }
+    const entry = await environment.moduleGraph.getModuleByUrl(entryUrl);
+    if (!entry)
+        return [];
+    // Walk the warmed graph depth-first, so stylesheets are listed in import order.
+    const visited = new Set();
+    const stylesheets = new Map();
+    const walk = (mod) => {
+        if (visited.has(mod))
+            return;
+        visited.add(mod);
+        for (const dep of mod.importedModules) {
+            if (!dep.id)
+                continue;
+            if (isCSSRequest(dep.id)) {
+                if (!SPECIAL_CSS_QUERY_RE.test(dep.id) && !stylesheets.has(dep.id)) {
+                    stylesheets.set(dep.id, { id: dep.id, url: dep.url });
+                }
+            }
+            else if (isWalkable(dep)) {
+                walk(dep);
+            }
+        }
+    };
+    walk(entry);
+    return [...stylesheets.values()];
+}

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

@@ -1,3 +1,4 @@
+import { type ViteDevServer } from "vite";
 import { Project } from "../project/project.js";
 export type ServerlessDevStatus = {
     serverlessUrl: string;
@@ -14,6 +15,7 @@ export declare class DevServer {
     hostname: string;
     hostOrigin: string;
     port: number;
+    server?: ViteDevServer;
     constructor(project: Project, opts: Options);
     start(): Promise<void>;
 }

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

@@ -1 +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;IACb,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,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;CA8GZ"}
+{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/dev-server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,KAAK,aAAa,EAAE,MAAM,MAAM,CAAA;AAEvD,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;IACb,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAcD,qBAAa,SAAS;IAQX,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,OAAO;IARtB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,SAAO;IACX,MAAM,CAAC,EAAE,aAAa,CAAA;gBAGb,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO;IAUhB,KAAK;CAgEZ"}

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

@@ -1,13 +1,26 @@
+import chalk from "chalk";
+import { createServer as createNetServer } from "node:net";
 import { parseURL } from "ufo";
-import { createDevServer } from "vinxi/dev-server";
+import { createServer } from "vite";
 import { ProjectEnvUtils } from "../project/env.js";
-import { ensureSelfSignedCert, isCertificateTrusted } from "../utils/self-signed-cert.js";
 import { listenWithHttpRedirect } from "../utils/http-to-https-redirect.js";
+import { ensureSelfSignedCert, isCertificateTrusted } from "../utils/self-signed-cert.js";
 import { createConsole } from "../utils/stateful-log.js";
-import { createVinxiApp } from "./vinxi-app.js";
-import chalk from "chalk";
+import { getServerlessPreset } from "./build-serverless.js";
+import { getServerlessViteConfig } from "./serverless-app.js";
 const console = createConsole("Dev Server", "dev");
 export const serverlessLog = console;
+/** Finds a free local port, for the internal HTTPS server behind the public redirect socket. */
+function getFreePort(host) {
+    return new Promise((resolve, reject) => {
+        const server = createNetServer();
+        server.once("error", reject);
+        server.listen(0, host, () => {
+            const address = server.address();
+            server.close(() => (typeof address === "object" && address ? resolve(address.port) : reject()));
+        });
+    });
+}
 export class DevServer {
     project;
     opts;
@@ -15,6 +28,7 @@ export class DevServer {
     hostname;
     hostOrigin;
     port = 8080;
+    server;
     constructor(project, opts) {
         this.project = project;
         this.opts = opts;
@@ -26,30 +40,20 @@ export class DevServer {
     }
     async start() {
         console.setWorking(true);
-        const app = createVinxiApp({
+        const config = getServerlessViteConfig({
             mode: "development",
             origin: this.origin,
             publicUrl: this.project.publicUrl,
             rootDir: this.project.rootDir,
             log: console,
             rpcBases: (await this.project.serverRoutes.get()).bases,
+            preset: getServerlessPreset({ dev: true }),
             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");
-        let httpsConfig;
+        let https;
         if (this.opts.https) {
             const keys = await ensureSelfSignedCert(this.hostname, this.project.rootDir);
-            httpsConfig = {
-                cert: keys.certFile,
-                key: keys.keyFile,
-                domains: [this.hostname, "localhost"],
-            };
+            https = { cert: keys.cert, key: keys.key };
             isCertificateTrusted(keys.certFile).then((trusted) => {
                 if (!trusted) {
                     serverlessLog.warn(`The certificate for ${chalk.bold(this.hostname)} is not trusted.`);
@@ -57,68 +61,32 @@ export class DevServer {
                 }
             });
         }
-        else {
-            httpsConfig = false;
-        }
-        let devApp = null;
-        app.hooks.addHooks({
-            "app:dev:start": async ({ app, serveConfig }) => {
-                serveConfig.https = httpsConfig;
-                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.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")
         // HTTPS needs an internal port so the public socket can redirect plain HTTP first.
-        const listener = await devApp.listen(this.opts.https ? 0 : this.port, {
-            hostname: this.opts.https ? "127.0.0.1" : undefined,
-            port: this.opts.https ? 0 : this.port,
-            https: httpsConfig,
-            qr: false,
-            showURL: false,
-            public: !this.opts.https,
+        const internalHost = "127.0.0.1";
+        const port = this.opts.https ? await getFreePort(internalHost) : this.port;
+        this.server = await createServer({
+            ...config,
+            server: {
+                ...config.server,
+                host: this.opts.https ? internalHost : true,
+                port,
+                strictPort: true,
+                https,
+            },
         });
+        await this.server.listen();
         if (this.opts.https) {
-            try {
-                const redirectListener = await listenWithHttpRedirect({
-                    hostname: this.hostname,
-                    port: this.port,
-                    httpsPort: listener.address.port,
-                    httpsOrigin: this.hostOrigin,
-                });
-                listener.server.once("close", () => redirectListener.close());
-            }
-            catch (error) {
-                await listener.close();
+            const redirectListener = await listenWithHttpRedirect({
+                hostname: this.hostname,
+                port: this.port,
+                httpsPort: port,
+                httpsOrigin: this.hostOrigin,
+            }).catch(async (error) => {
+                await this.server?.close();
                 throw error;
-            }
+            });
+            this.server.httpServer?.once("close", () => redirectListener.close());
         }
-        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

@@ -1,5 +1,6 @@
 import { InlineConfig, PluginOption } from "vite";
 import { StatefulLog } from "../utils/stateful-log.js";
+import { type TransformsPluginOptions, type TransformTarget } from "./transforms/index.js";
 export type Args = {
     mode: "development" | "production";
     serverless: boolean;
@@ -9,24 +10,54 @@ export type Args = {
     publicUrl: string;
     console: StatefulLog<any>;
     client: boolean;
+    /**
+     * Shared build status, for when several builds report into one log (eg. the SPA client builds
+     * frontend and cms together). Defaults to a tracker for this build alone.
+     */
+    status?: BuildStatusTracker;
+    /** Prefix for log lines from this build, eg. "frontend". */
+    logLabel?: string;
 };
 export declare function envPlugin(args: Args): PluginOption;
-type ReactPluginArgs = {
-    retainBlockMeta?: boolean;
-};
-export declare function reactPlugin(args?: ReactPluginArgs): PluginOption[];
+/** Maps the bundler args to the target used by eddev's source transforms. */
+export declare function getTransformTarget(args: Pick<Args, "target" | "client">): TransformTarget;
+/**
+ * React (JSX, Fast Refresh) plus eddev's block/view source transforms.
+ * See `./transforms` for what the transforms do.
+ */
+export declare function reactPlugin(args: {
+    target: TransformsPluginOptions["target"];
+}): PluginOption[];
 /**
  * Turns on SSR module proxying,
  */
 export declare function ssrPlugin(): PluginOption;
+export type BuildStatusTracker = {
+    start(id: string): void;
+    end(id: string, failed?: boolean): void;
+};
+/**
+ * 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 declare function createBuildStatusTracker(console: StatefulLog<any>): BuildStatusTracker;
 export declare function workersPlugin(): PluginOption;
+/**
+ * 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 declare function baseConfigPlugin(): 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>;
-    completeOnError?: boolean;
+    /** Prefix added to each line, eg. "frontend" → "[frontend] ..." */
+    label?: string;
+    /** Called when Vite logs an error */
+    onError?: () => void;
 }): 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

@@ -1 +1 @@
-{"version":3,"file":"get-vite-config.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/get-vite-config.ts"],"names":[],"mappings":"AAMA,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,CAuDlD;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,CA6CxC;AA4BD,wBAAgB,aAAa,IAAI,YAAY,CAW5C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,EAAE,CAatD;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,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,YAAY,CA6BzG;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CAkEtD"}
+{"version":3,"file":"get-vite-config.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/get-vite-config.ts"],"names":[],"mappings":"AAIA,OAAO,EAA0C,YAAY,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAEzF,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAoB,KAAK,uBAAuB,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE5G,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;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,kBAAkB,CAAA;IAC3B,4DAA4D;IAC5D,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CAuDlD;AAED,6EAA6E;AAC7E,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAC,GAAG,eAAe,CAGzF;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE;IAAE,MAAM,EAAE,uBAAuB,CAAC,QAAQ,CAAC,CAAA;CAAE,GAAG,YAAY,EAAE,CAE/F;AAED;;GAEG;AACH,wBAAgB,SAAS,IAAI,YAAY,CA0CxC;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAAA;CACxC,CAAA;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,kBAAkB,CA0BtF;AAqBD,wBAAgB,aAAa,IAAI,YAAY,CAW5C;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,IAAI,YAAY,CAU/C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,EAAE,CAatD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,EAAE,CAE/D;AAgBD,wBAAgB,wBAAwB,IAAI,YAAY,CA8BvD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE;IACjC,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;IACzB,mEAAmE;IACnE,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,qCAAqC;IACrC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CACrB,GAAG,YAAY,CA+Bf;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,YAAY,CA0EtD"}