eddev 2.3.29 → 2.3.31

package/dist/app/lib/routing/components/BrowserRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BrowserRouter.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/BrowserRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAOlB,MAAM,OAAO,CAAA;AAKd,OAAO,EAGL,cAAc,EAId,KAAK,SAAS,EAGf,MAAM,aAAa,CAAA;AAYpB,KAAK,KAAK,GAAG,iBAAiB,CAAC;IAC7B,SAAS,CAAC,EAAE,KAAK,CAAC,gBAAgB,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;IACpD,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CACrB,CAAC,CAAA;AAiFF,wBAAgB,eAAe;WAFJ,cAAc;SAAO,SAAS;SAIxD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,+BAsezC"}
+{"version":3,"file":"BrowserRouter.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/BrowserRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAOlB,MAAM,OAAO,CAAA;AAKd,OAAO,EAGL,cAAc,EAId,KAAK,SAAS,EAGf,MAAM,aAAa,CAAA;AAYpB,KAAK,KAAK,GAAG,iBAAiB,CAAC;IAC7B,SAAS,CAAC,EAAE,KAAK,CAAC,gBAAgB,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;IACpD,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CACrB,CAAC,CAAA;AAiFF,wBAAgB,eAAe;WAFJ,cAAc;SAAO,SAAS;SAIxD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,+BA0ezC"}

package/dist/app/lib/routing/components/BrowserRouter.js

@@ -9,7 +9,7 @@ import { AppRenderer } from "./RouteRenderer.js";
 // Create a global RouteLoader instance
 const loader = new RouteLoader();
 // Create a unique ID for each history entry
-let historyStamp = String(new Date().getTime());
+const historyStamp = String(new Date().getTime());
 let historyIndex = 0;
 function getHistoryId() {
     return historyStamp + historyIndex++;
@@ -34,7 +34,7 @@ if (env.client && !env.admin) {
     loader.populateRouteData(document.location.pathname, initialData);
     const initialURL = parseURL(document.location.href);
     initialRoute = normalizeRoute({
-        id: "initial",
+        id: getHistoryId(),
         component: loader.getRouteComponent(initialData.view),
         pathname: initialURL.pathname,
         hash: "",
@@ -144,7 +144,7 @@ export function BrowserRouter(props) {
                 ...route,
             }, false);
         };
-        const historyCache = new Map();
+        const historyCache = new Map([[initialRoute.id, initialRoute]]);
         function setHistory(history) {
             setState({
                 history,
@@ -156,8 +156,9 @@ export function BrowserRouter(props) {
         }
         internals.poppedState = (href, data) => {
             const stack = state.history;
+            const uri = stringifyRouteLink(parseRouteLink(href));
             // Is the route in our history stack? (going back)
-            const index = stack.findIndex((item) => item.id === data.id);
+            const index = stack.findIndex((item) => item.id === data.id && isEqual(item.uri, uri));
             if (index >= 0) {
                 const route = stack[index];
                 return doRouteTransition({
@@ -170,8 +171,9 @@ export function BrowserRouter(props) {
                 });
             }
             // Is the route in our history _cache_? (probably going forward)
-            if (historyCache.has(data.id)) {
-                const route = historyCache.get(data.id);
+            const cachedRoute = historyCache.get(data.id);
+            if (cachedRoute && isEqual(cachedRoute.uri, uri)) {
+                const route = cachedRoute;
                 return doRouteTransition({
                     url: route.uri,
                     route,
@@ -185,6 +187,7 @@ export function BrowserRouter(props) {
                 url: href,
                 goingBack: true,
                 history: [],
+                historyId: typeof data.id === "string" ? data.id : undefined,
                 restoreState: data.state,
                 shouldPush: false,
             });
@@ -248,7 +251,7 @@ export function BrowserRouter(props) {
             }
             const route = args.route ??
                 normalizeRoute({
-                    id: getHistoryId(),
+                    id: args.historyId ?? getHistoryId(),
                     hash: link.hash,
                     search: "",
                     query: link.query,

package/dist/app/server/render-ssr-page.js

@@ -41,7 +41,7 @@ export async function getSsrStream(args) {
             })};\n`,
         });
     });
-    const [initial, middle, end] = renderToString(_jsxs("html", { lang: "en", children: [_jsxs("head", { children: ["%%$%%", _jsx(MetaTags, { tags: args.initialData.meta?.head ?? [] }), "%%trackers_head%%"] }), _jsxs("body", { children: ["%%trackers_body%%", _jsx("div", { id: "root", children: "%%$%%" }), "%%trackers_footer%%"] })] }))
+    const [initial, middle, end] = renderToString(_jsxs("html", { lang: "en", className: "frontend", children: [_jsxs("head", { children: ["%%$%%", _jsx(MetaTags, { tags: args.initialData.meta?.head ?? [] }), "%%trackers_head%%"] }), _jsxs("body", { children: ["%%trackers_body%%", _jsx("div", { id: "root", children: "%%$%%" }), "%%trackers_footer%%"] })] }))
         .replace(/%%trackers_(head|body|footer)%%/g, (_, name) => {
         return args.initialData.trackers?.[name] || "";
     })

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

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

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.3.28";
+export const VERSION = "2.3.31";

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;AAM/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;CA+FZ"}
+{"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"}

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

@@ -2,6 +2,7 @@ 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 { listenWithHttpRedirect } from "../utils/http-to-https-redirect.js";
 import { createConsole } from "../utils/stateful-log.js";
 import { createVinxiApp } from "./vinxi-app.js";
 import chalk from "chalk";
@@ -88,14 +89,30 @@ export class DevServer {
             devApp,
         });
         // console.log("Creating another listener")
-        const listener = await devApp.listen(this.port, {
-            hostname: this.opts.https ? this.hostname : undefined,
-            port: this.port,
+        // 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: true,
+            public: !this.opts.https,
         });
+        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();
+                throw error;
+            }
+        }
         await app.hooks.callHook("app:dev:server:listener:created", {
             app,
             devApp,

package/dist/node/utils/http-to-https-redirect.d.ts

@@ -0,0 +1,10 @@
+import { type Server } from "node:net";
+type Options = {
+    hostname: string;
+    port: number;
+    httpsPort: number;
+    httpsOrigin: string;
+};
+export declare function listenWithHttpRedirect(options: Options): Promise<Server>;
+export {};
+//# sourceMappingURL=http-to-https-redirect.d.ts.map

package/dist/node/utils/http-to-https-redirect.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"http-to-https-redirect.d.ts","sourceRoot":"","sources":["../../../src/node/utils/http-to-https-redirect.ts"],"names":[],"mappings":"AACA,OAAO,EAA4C,KAAK,MAAM,EAAE,MAAM,UAAU,CAAA;AAEhF,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAgD9E"}

package/dist/node/utils/http-to-https-redirect.js

@@ -0,0 +1,49 @@
+import { createServer as createHttpServer } from "node:http";
+import { connect, createServer as createNetServer } from "node:net";
+export async function listenWithHttpRedirect(options) {
+    const redirectServer = createHttpServer((request, response) => {
+        let path = "/";
+        try {
+            const url = new URL(request.url ?? "/", options.httpsOrigin);
+            path = url.pathname + url.search;
+        }
+        catch {
+            // A malformed request target still redirects to the configured origin.
+        }
+        response.writeHead(308, {
+            Location: options.httpsOrigin + path,
+            Connection: "close",
+            "Cache-Control": "no-store",
+        });
+        response.end();
+    });
+    const server = createNetServer((socket) => {
+        socket.once("data", (firstChunk) => {
+            socket.pause();
+            // A TLS ClientHello starts with a handshake record (0x16).
+            if (firstChunk[0] !== 0x16) {
+                socket.unshift(firstChunk);
+                redirectServer.emit("connection", socket);
+                socket.resume();
+                return;
+            }
+            const upstream = connect(options.httpsPort, "127.0.0.1", () => {
+                upstream.write(firstChunk);
+                socket.pipe(upstream);
+                upstream.pipe(socket);
+                socket.resume();
+            });
+            socket.on("error", () => upstream.destroy());
+            upstream.on("error", () => socket.destroy());
+            socket.on("close", () => upstream.destroy());
+            upstream.on("close", () => socket.destroy());
+        });
+    });
+    return new Promise((resolve, reject) => {
+        server.once("error", reject);
+        server.listen(options.port, options.hostname, () => {
+            server.off("error", reject);
+            resolve(server);
+        });
+    });
+}

package/dist/node/utils/self-signed-cert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"self-signed-cert.d.ts","sourceRoot":"","sources":["../../../src/node/utils/self-signed-cert.ts"],"names":[],"mappings":"AAKA,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;;;;;;GA6C3E;AAWD,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,oBAOtD"}
+{"version":3,"file":"self-signed-cert.d.ts","sourceRoot":"","sources":["../../../src/node/utils/self-signed-cert.ts"],"names":[],"mappings":"AAKA,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;;;;;;GA0D3E;AAWD,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,oBAOtD"}

package/dist/node/utils/self-signed-cert.js

@@ -3,6 +3,19 @@ import { fs } from "./fs.js";
 import { createCA, createCert } from "mkcert";
 import { execa } from "execa";
 export async function ensureSelfSignedCert(hostname, rootDir) {
+    const localCertDir = `${(await import("node:os")).homedir()}/Library/Application Support/Local/run/router/nginx/certs`;
+    try {
+        return {
+            created: false,
+            ...(await loadCert({
+                certFile: `${localCertDir}/${hostname}.crt`,
+                keyFile: `${localCertDir}/${hostname}.key`,
+            })),
+        };
+    }
+    catch {
+        // Fall back to eddev's certificates when Local's pair is missing or unreadable.
+    }
     const certFile = `${rootDir}/.eddev/certs/${hostname}.crt`;
     const keyFile = `${rootDir}/.eddev/certs/${hostname}.key`;
     if ((await fs.exists(certFile)) && (await fs.exists(keyFile))) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.3.29",
+  "version": "2.3.31",
   "description": "",
   "main": "index.js",
   "type": "module",