eddev 2.0.0-beta.44 → 2.0.0-beta.46

package/dist/app/entry/ssr-root-client.js

@@ -1,16 +1,27 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { QueryClientProvider } from "@tanstack/react-query";
-import { Suspense, useRef } from "react";
-import { getQueryClient } from "../utils/query-client.js";
-import { BrowserRouter } from "../lib/routing/components/BrowserRouter.js";
+import { Suspense, useEffect, useState } from "react";
 import { DevUILoader } from "../lib/devtools/loader.js";
+import { BrowserRouter } from "../lib/routing/components/BrowserRouter.js";
+import { getQueryClient } from "../utils/query-client.js";
 import { MetaTags } from "./MetaTags.js";
-import { useRouteMeta } from "../lib/routing/hooks/useRouteMeta.js";
+import { useSnapshot } from "valtio";
+import { clientMetaTags } from "../lib/routing/context.js";
 export function SSRClientRoot(props) {
-    const router = useRef(null);
-    return (_jsxs("html", { lang: "en", children: [_jsxs("head", { children: [_jsx("link", { rel: "icon", href: "/favicon.ico" }), _jsx(DynamicMetaTags, { tags: props.metaTags, router: router }), props.assets] }), _jsx("body", { children: _jsxs(QueryClientProvider, { client: getQueryClient(), children: [_jsx(Suspense, { children: _jsx(BrowserRouter, { routerRef: router }) }), _jsx(DevUILoader, {})] }) })] }));
+    return (_jsxs("html", { lang: "en", children: [_jsxs("head", { children: [_jsx(DynamicMetaTags, { tags: props.metaTags }), _jsx(Trackers, { position: "head" }), props.assets] }), _jsxs("body", { children: [_jsx(Trackers, { position: "body" }), _jsxs(QueryClientProvider, { client: getQueryClient(), children: [_jsx(Suspense, { children: _jsx(BrowserRouter, {}) }), _jsx(DevUILoader, {})] }), _jsx(Trackers, { position: "footer" })] })] }));
 }
 function DynamicMetaTags(props) {
-    const data = useRouteMeta();
-    return _jsx(MetaTags, { tags: data.tags ?? [] });
+    const dynamicTags = useSnapshot(clientMetaTags).tags;
+    return _jsx(MetaTags, { tags: dynamicTags ?? props.tags ?? [] });
+}
+function Trackers(props) {
+    const [render, setRender] = useState(false);
+    // @ts-ignore
+    const trackers = window._TRACKERS;
+    useEffect(() => {
+        setRender(true);
+    }, []);
+    if (!render || !trackers || typeof trackers !== "object")
+        return null;
+    return (_jsx(_Fragment, { children: _jsx(MetaTags, { tags: trackers[props.position] ?? [] }) }));
 }

package/dist/app/entry/ssr-root.d.ts

@@ -1,6 +1,6 @@
 import { type ReactNode } from "react";
-import type { RouteData, RouteMetaTag } from "../lib/routing/types.js";
 import type { RouteLoader } from "../lib/routing/loader.js";
+import type { RouteData, RouteMetaTag } from "../lib/routing/types.js";
 export declare function SSRRoot(props: {
     pathname: string;
     initialData: RouteData;

package/dist/app/entry/ssr-root.js

@@ -1,15 +1,15 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Suspense } from "react";
 import { QueryClientProvider } from "@tanstack/react-query";
-import { getQueryClient } from "../utils/query-client.js";
+import { Suspense } from "react";
 import { SSRRouter } from "../lib/routing/components/SSRRouter.js";
 import { getRouteMeta, normalizeRoute } from "../lib/routing/utils.js";
+import { getQueryClient } from "../utils/query-client.js";
 import { MetaTags } from "./MetaTags.js";
 export function SSRRoot(props) {
     const loader = props.loader;
     loader.setAppData(props.initialData.appData.data);
     loader.populateRouteData(props.pathname, props.initialData);
-    return (_jsxs("html", { lang: "en", children: [_jsxs("head", { children: [_jsx("link", { rel: "icon", href: "/favicon.ico" }), _jsx(MetaTags, { tags: props.metaTags }), props.assets] }), _jsx("body", { children: _jsx(QueryClientProvider, { client: getQueryClient(), children: _jsx(Suspense, { children: _jsx(SSRRouter, { loader: loader, route: normalizeRoute({
+    return (_jsxs("html", { lang: "en", children: [_jsxs("head", { children: [_jsx(MetaTags, { tags: props.metaTags }), props.assets] }), _jsx("body", { children: _jsx(QueryClientProvider, { client: getQueryClient(), children: _jsx(Suspense, { children: _jsx(SSRRouter, { loader: loader, route: normalizeRoute({
                                 id: "initial",
                                 component: loader.getRouteComponent(props.initialData.view),
                                 key: "",

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

@@ -1,8 +1,8 @@
 import { useMemo } from "react";
+import { useRoute } from "../hooks/useRoute";
 import { useRouter } from "../hooks/useRouter";
 import { useRouterState } from "../hooks/useRouterState";
 import { getLinkHandlerMode } from "../utils";
-import { useRoute } from "../hooks/useRoute";
 /**
  * Display a back button that will navigate to the previous page in the router's history.
  *

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

@@ -1,11 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useMemo, useRef, useState, useTransition } from "react";
 import { isEqual, isRelative, parseURL, resolveURL } from "ufo";
-import { RouterContext, RouterStateContext } from "../context.js";
+import { clientMetaTags, RouterContext, RouterStateContext } from "../context.js";
+import { $routeMetaStore } from "../hooks/useRouteMeta.js";
 import { RouteLoader } from "../loader.js";
 import { getLinkHandlerMode, getRouteMeta, isSamePathname, normalizeRoute, parseQuery, stringifyRouteLink, } from "../utils.js";
 import { AppRenderer } from "./RouteRenderer.js";
-import { $routeMetaStore } from "../hooks/useRouteMeta.js";
 // Create a global RouteLoader instance
 const loader = new RouteLoader();
 // Create a unique ID for each history entry
@@ -86,6 +86,7 @@ export function BrowserRouter(props) {
                 ...state,
                 ...update,
             };
+            clientMetaTags.setMetaTags(state.activeRoute.meta.tags ?? []);
             setRouterState(state);
         };
         const internals = {

package/dist/app/lib/routing/context.d.ts

@@ -1,5 +1,8 @@
-import { Context } from "react";
-import { RouterAPI, RouterAPIState } from "./types.js";
-export declare const RouterContext: Context<RouterAPI>;
-export declare const RouterStateContext: Context<RouterAPIState>;
-export declare const RouteItemContext: Context<import("./types.js").TypedRouteState<"_unknown", {}>>;
+import { RouteMetaTag, RouterAPI, RouterAPIState } from "./types.js";
+export declare const RouterContext: import("react").Context<RouterAPI>;
+export declare const RouterStateContext: import("react").Context<RouterAPIState>;
+export declare const RouteItemContext: import("react").Context<import("./types.js").TypedRouteState<"_unknown", {}>>;
+export declare const clientMetaTags: {
+    tags: null | RouteMetaTag[];
+    setMetaTags(tags: RouteMetaTag[]): void;
+};

package/dist/app/lib/routing/context.js

@@ -1,5 +1,6 @@
 import { createContext } from "react";
 import { RouteLoader } from "./loader.js";
+import { proxy } from "valtio";
 const NOOP_ROUTE = {
     component: () => null,
     id: "initial",
@@ -37,3 +38,9 @@ export const RouterStateContext = createContext({
     blockers: [],
 });
 export const RouteItemContext = createContext(NOOP_ROUTE);
+export const clientMetaTags = proxy({
+    tags: null,
+    setMetaTags(tags) {
+        clientMetaTags.tags = tags;
+    },
+});

package/dist/app/lib/routing/utils.js

@@ -1,5 +1,5 @@
+import { parse as qsParse, stringify as qsStringify } from "qs";
 import { parseURL, resolveURL, stringifyParsedURL, withoutTrailingSlash } from "ufo";
-import { stringify as qsStringify, parse as qsParse } from "qs";
 export function isSameOrigin(url) {
     if (typeof document === "undefined") {
         return url.startsWith("/");

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

@@ -24,7 +24,7 @@ export async function renderPageToSSRStream(pathname, initialData, serverContext
                 console.error(err);
             },
             bootstrapModules: [clientManifest.inputs[clientManifest.handler].output.path],
-            bootstrapScriptContent: `window.manifest = ${JSON.stringify(await clientManifest.json())};\nwindow._PAGE_DATA = ${JSON.stringify(initialData)};`,
+            bootstrapScriptContent: `window.manifest = ${JSON.stringify(await clientManifest.json())};\nwindow._PAGE_DATA = ${JSON.stringify(initialData)};\nwindow._TRACKERS = ${JSON.stringify(initialData.trackers)}`,
         });
     });
     return stream;

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

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.44";
+export declare const VERSION = "2.0.0-beta.46";

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.44";
+export const VERSION = "2.0.0-beta.46";

package/dist/node/compiler/vinxi-app.js

@@ -25,6 +25,14 @@ export function createVinxiApp(args) {
                         varies: [],
                     },
                 },
+                "/favicon**": {
+                    proxy: joinURL(args.origin, "**"),
+                    static: true,
+                    cache: {
+                        maxAge: 3600,
+                        varies: [],
+                    },
+                },
                 "/wp-content/plugins/**": {
                     proxy: joinURL(args.origin, "wp-content/plugins/**"),
                     headers: {

package/dist/node/project/config.d.ts

@@ -5,31 +5,25 @@ export declare const EDConfigSchema: z.ZodObject<{
     version: z.ZodEffects<z.ZodEnum<["1", "2"]>, "2", "1" | "2">;
     legacyMetadata: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     legacyStitches: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    tracking: z.ZodOptional<z.ZodObject<{
-        tagManagerID: z.ZodOptional<z.ZodString>;
-        ga: z.ZodOptional<z.ZodObject<{
-            trackingID: z.ZodOptional<z.ZodString>;
-            version: z.ZodEnum<["3", "4"]>;
-        }, "strip", z.ZodTypeAny, {
-            version: "3" | "4";
-            trackingID?: string | undefined;
-        }, {
-            version: "3" | "4";
-            trackingID?: string | undefined;
-        }>>;
+    trackers: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<"provider", [z.ZodObject<{
+        provider: z.ZodLiteral<"ga4">;
+        id: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        tagManagerID?: string | undefined;
-        ga?: {
-            version: "3" | "4";
-            trackingID?: string | undefined;
-        } | undefined;
+        provider: "ga4";
+        id: string;
     }, {
-        tagManagerID?: string | undefined;
-        ga?: {
-            version: "3" | "4";
-            trackingID?: string | undefined;
-        } | undefined;
-    }>>;
+        provider: "ga4";
+        id: string;
+    }>, z.ZodObject<{
+        provider: z.ZodLiteral<"gtm">;
+        id: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        provider: "gtm";
+        id: string;
+    }, {
+        provider: "gtm";
+        id: string;
+    }>]>, "many">>;
     serverless: z.ZodObject<{
         enabled: z.ZodDefault<z.ZodBoolean>;
         uploads: z.ZodEnum<["proxy", "remote"]>;
@@ -85,13 +79,13 @@ export declare const EDConfigSchema: z.ZodObject<{
     };
     devUI: "enabled" | "disabled";
     $schema?: string | undefined;
-    tracking?: {
-        tagManagerID?: string | undefined;
-        ga?: {
-            version: "3" | "4";
-            trackingID?: string | undefined;
-        } | undefined;
-    } | undefined;
+    trackers?: ({
+        provider: "ga4";
+        id: string;
+    } | {
+        provider: "gtm";
+        id: string;
+    })[] | undefined;
     cache?: Record<string, {
         props: number;
         queries: number;
@@ -111,13 +105,13 @@ export declare const EDConfigSchema: z.ZodObject<{
     $schema?: string | undefined;
     legacyMetadata?: boolean | undefined;
     legacyStitches?: boolean | undefined;
-    tracking?: {
-        tagManagerID?: string | undefined;
-        ga?: {
-            version: "3" | "4";
-            trackingID?: string | undefined;
-        } | undefined;
-    } | undefined;
+    trackers?: ({
+        provider: "ga4";
+        id: string;
+    } | {
+        provider: "gtm";
+        id: string;
+    })[] | undefined;
     cache?: Record<string, {
         props: number;
         queries: number;

package/dist/node/project/config.js

@@ -15,16 +15,18 @@ export const EDConfigSchema = z.object({
         .default(false)
         .describe("Whether to use legacy comments or exported JSON for block and view metadata"),
     legacyStitches: z.boolean().optional().default(true).describe("Whether this site is using Stitches"),
-    tracking: z
-        .object({
-        tagManagerID: z.string().optional(),
-        ga: z
-            .object({
-            trackingID: z.string().optional(),
-            version: z.enum(["3", "4"]),
-        })
-            .optional(),
-    })
+    trackers: z
+        .array(z.discriminatedUnion("provider", [
+        z.object({
+            provider: z.literal("ga4"),
+            id: z.string().describe("The Google Analytics 4 tracking ID"),
+        }),
+        z.object({
+            provider: z.literal("gtm"),
+            id: z.string().describe("The Google Tag Manager project ID (eg. GTM-XXXXXXX)"),
+        }),
+    ]))
+        .describe("An array of standard tracking codes to embed")
         .optional(),
     serverless: z.object({
         enabled: z.boolean().default(true).describe("Whether to deploy the site as a serverless app"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.0.0-beta.44",
+  "version": "2.0.0-beta.46",
   "description": "",
   "main": "index.js",
   "type": "module",