eddev 2.0.0-beta.33 → 2.0.0-beta.34

package/dist/app/entry/MetaTags.d.ts

@@ -1,5 +1,6 @@
 import { RouteMetaTag } from "../lib/routing";
 type Props = {
+    debugKey?: string;
     tags: RouteMetaTag[];
 };
 export declare function MetaTags(props: Props): import("react/jsx-runtime").JSX.Element;

package/dist/app/entry/MetaTags.js

@@ -1,17 +1,17 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 export function MetaTags(props) {
-    return (_jsx(Fragment, { children: props.tags?.map((tag, i) => {
-            const Component = tag.tagName;
-            const props = { ...tag.attributes };
-            if (tag.inner) {
-                if (tag.tagName === "title") {
-                    props.children = tag.inner;
-                }
-                else {
-                    props.dangerouslySetInnerHTML = { __html: tag.inner };
-                }
+    return (_jsx(_Fragment, { children: props.tags?.map((tag, i) => {
+            const Tag = tag.tagName;
+            const tagProps = Array.isArray(tag.attributes) ? {} : { ...tag.attributes };
+            if (tag.tagName === "title") {
+                tagProps.children = tag.inner ?? "";
             }
-            return _jsx(Component, { ...props }, i);
+            else if (tag.tagName === "script" || !!tag.inner) {
+                tagProps.dangerouslySetInnerHTML = { __html: tag.inner ?? "" };
+            }
+            if (tagProps.async === "") {
+                tagProps.async = true;
+            }
+            return _jsx(Tag, { "data-test": props.debugKey + "_" + i, ...tagProps }, i);
         }) }));
 }

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

@@ -6,6 +6,11 @@ export type RouteMetaTag = {
     attributes: Record<string, string>;
     inner?: string;
 };
+export type TrackerTags = {
+    head?: RouteMetaTag[];
+    body?: RouteMetaTag[];
+    footer?: RouteMetaTag[];
+};
 export interface RouteData {
     view: string;
     editLink?: string;
@@ -19,6 +24,9 @@ export interface RouteData {
         footer: RouteMetaTag[];
     };
 }
+export interface RouteDataWithTrackers extends RouteData {
+    trackers?: TrackerTags;
+}
 export type RouteReturnState<T = {}> = {
     scrollTop: number;
     scrollLeft: number;

package/dist/app/server/render-ssr-page.d.ts

@@ -1,3 +1,5 @@
-import type { RouteData } from "../lib/routing/types.js";
+import type { RouteData, TrackerTags } from "../lib/routing/types.js";
 import { ServerContext } from "./server-context.js";
-export declare function renderPageToSSRStream(pathname: string, initialData: RouteData, serverContext: ServerContext): Promise<unknown>;
+export declare function renderPageToSSRStream(pathname: string, initialData: RouteData & {
+    trackers?: TrackerTags;
+}, serverContext: ServerContext): Promise<unknown>;

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

@@ -6,15 +6,11 @@ import { SSRRoot } from "../entry/ssr-root.js";
 import { RouteLoader } from "../lib/routing/loader.js";
 export async function renderPageToSSRStream(pathname, initialData, serverContext) {
     const clientManifest = serverContext.runtime.getManifest("client");
-    // console.log("Rendering to SSR Stream, get assets")
     const assets = await clientManifest.inputs[clientManifest.handler].assets();
-    // console.log("Got assets", assets)
     const jsx = (_jsx(SSRRoot, { assets: _jsx(Suspense, { children: assets.map((m) => renderAsset(m)) }), metaTags: initialData?.meta?.head || [], pathname: pathname, initialData: initialData, loader: new RouteLoader() }));
     const stream = await new Promise(async (resolve, reject) => {
-        // console.log("Rendering to pipable")
         const stream = renderToPipeableStream(jsx, {
             onShellReady() {
-                // console.log("Shell ready")
                 resolve(stream);
             },
             onShellError(err) {
@@ -26,7 +22,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())}; window._PAGE_DATA = ${JSON.stringify(initialData)}`,
+            bootstrapScriptContent: `window._PAGE_DATA = ${JSON.stringify(initialData)};`,
         });
     });
     return stream;

package/dist/app/server/server-context.d.ts

@@ -1,6 +1,7 @@
 import { RequestHeaders } from "vinxi/http";
 import { UrlReplacerConf } from "./utils/replace-host.js";
 import { Manifest } from "vinxi/dist/types/types/manifest";
+import { TrackerTags } from "../lib/routing/types.js";
 export type ServerContextArgs = {
     dev: boolean;
     origin: string;
@@ -9,6 +10,13 @@ export type ServerContextArgs = {
 export type ServerContextRuntime = {
     getManifest: (name: string) => Manifest;
 };
+/**
+ * Data returned from WordPress origin /_appdata route
+ */
+type ServerAppData = {
+    appData: any;
+    trackers: TrackerTags;
+};
 export declare class ServerContext {
     dev: boolean;
     origin: string;
@@ -26,9 +34,7 @@ export declare class ServerContext {
         headers?: RequestHeaders;
         withAppData?: boolean;
     }): Promise<Response>;
-    fetchAppData(req?: {
-        headers?: RequestHeaders;
-    }): Promise<any>;
+    fetchAppData(): Promise<ServerAppData>;
     extractRequestHeaders(req?: RequestHeaders): Partial<Record<import("vinxi/http").HTTPHeaderName, string | undefined>>;
     fetchNamedQuery(req: {
         name: string;
@@ -41,3 +47,4 @@ export declare class ServerContext {
         headers: RequestHeaders;
     }): Promise<Response>;
 }
+export {};

package/dist/app/server/server-context.js

@@ -83,13 +83,12 @@ export class ServerContext {
             headers: {
                 "Content-Type": "application/json",
                 Accept: "application/json",
-                ...this.extractRequestHeaders(req.headers),
             },
         });
         // console.log("Finished fetching route data")
         return result;
     }
-    async fetchAppData(req) {
+    async fetchAppData() {
         // console.log("Fetching app data")
         const response = await this.fetchOrigin("/_appdata", {
             cache: "no-cache",
@@ -97,7 +96,6 @@ export class ServerContext {
             headers: {
                 "Content-Type": "application/json",
                 Accept: "application/json",
-                ...(req?.headers ? this.extractRequestHeaders(req.headers) : {}),
             },
         });
         // console.log("Decoding app data")

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

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.33";
+export declare const VERSION = "2.0.0-beta.34";

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.33";
+export const VERSION = "2.0.0-beta.34";

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

@@ -261,11 +261,11 @@ export function createVinxiCodegen(opts) {
             }
 
             try {
-              const [appData, response] = await Promise.all([
+              const [{appData, trackers}, response] = await Promise.all([
                 serverContext.fetchAppData(),
                 serverContext.fetchRouteData({
                   pathname: url.pathname,
-                  withAppData: true,
+                  withAppData: false,
                   headers: {},
                   query: {},
                 }),
@@ -275,6 +275,7 @@ export function createVinxiCodegen(opts) {
               try {
                 data = await response.json()
                 data.appData = appData
+                data.trackers = trackers
               } catch (err) {
                 data = {
                   view: "_error",

package/package.json

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