diff --git a/dist/functions/server/web-pages/generate-web-html.js b/dist/functions/server/web-pages/generate-web-html.js index bdc074a..3357716 100644 --- a/dist/functions/server/web-pages/generate-web-html.js +++ b/dist/functions/server/web-pages/generate-web-html.js @@ -9,6 +9,7 @@ import { log } from "../../../utils/log"; import { AppData } from "../../../data/app-data"; import { readFileSync } from "fs"; import path from "path"; +import _ from "lodash"; let _reactVersion = "19"; try { _reactVersion = JSON.parse(readFileSync(path.join(process.cwd(), "node_modules/react/package.json"), "utf-8")).version; @@ -58,7 +59,8 @@ export default async function genWebHTML({ component, pageProps, bundledMap, mod const importMap = JSON.stringify({ imports: browser_imports, }); - let final_component = (_jsxs("html", { ...html_props, children: [_jsxs("head", { children: [_jsx("meta", { charSet: "utf-8" }), _jsx("meta", { name: "viewport", content: "width=device-width, initial-scale=1.0" }), root_meta ? grabWebMetaHTML({ meta: root_meta }) : null, page_meta ? grabWebMetaHTML({ meta: page_meta }) : null, bundledMap?.css_path ? (_jsx("link", { rel: "stylesheet", href: `/${bundledMap.css_path}` })) : null, _jsx("script", { dangerouslySetInnerHTML: { + const final_meta = _.merge(root_meta, page_meta); + let final_component = (_jsxs("html", { ...html_props, children: [_jsxs("head", { children: [_jsx("meta", { charSet: "utf-8" }), _jsx("meta", { name: "viewport", content: "width=device-width, initial-scale=1.0" }), final_meta ? grabWebMetaHTML({ meta: final_meta }) : null, bundledMap?.css_path ? (_jsx("link", { rel: "stylesheet", href: `/${bundledMap.css_path}` })) : null, _jsx("script", { dangerouslySetInnerHTML: { __html: `window.${ClientWindowPagePropsName} = ${serializedProps}`, } }), bundledMap?.path ? (_jsxs(_Fragment, { children: [_jsx("script", { type: "importmap", dangerouslySetInnerHTML: { __html: importMap, diff --git a/package.json b/package.json index 4b417f7..20d8543 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@moduletrace/bunext", "module": "index.ts", "type": "module", - "version": "1.0.42", + "version": "1.0.43", "main": "dist/index.js", "types": "dist/index.d.ts", "exports": { diff --git a/src/functions/server/web-pages/generate-web-html.tsx b/src/functions/server/web-pages/generate-web-html.tsx index 26e9fc1..0b65222 100644 --- a/src/functions/server/web-pages/generate-web-html.tsx +++ b/src/functions/server/web-pages/generate-web-html.tsx @@ -9,6 +9,7 @@ import { log } from "../../../utils/log"; import { AppData } from "../../../data/app-data"; import { readFileSync } from "fs"; import path from "path"; +import _ from "lodash"; let _reactVersion = "19"; try { @@ -86,6 +87,8 @@ export default async function genWebHTML({ imports: browser_imports, }); + const final_meta = _.merge(root_meta, page_meta); + let final_component = ( @@ -95,8 +98,7 @@ export default async function genWebHTML({ content="width=device-width, initial-scale=1.0" /> - {root_meta ? grabWebMetaHTML({ meta: root_meta }) : null} - {page_meta ? grabWebMetaHTML({ meta: page_meta }) : null} + {final_meta ? grabWebMetaHTML({ meta: final_meta }) : null} {bundledMap?.css_path ? (