Update meta logic
This commit is contained in:
parent
86d4bb8d6c
commit
d6985b3335
@ -9,6 +9,7 @@ import { log } from "../../../utils/log";
|
|||||||
import { AppData } from "../../../data/app-data";
|
import { AppData } from "../../../data/app-data";
|
||||||
import { readFileSync } from "fs";
|
import { readFileSync } from "fs";
|
||||||
import path from "path";
|
import path from "path";
|
||||||
|
import _ from "lodash";
|
||||||
let _reactVersion = "19";
|
let _reactVersion = "19";
|
||||||
try {
|
try {
|
||||||
_reactVersion = JSON.parse(readFileSync(path.join(process.cwd(), "node_modules/react/package.json"), "utf-8")).version;
|
_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({
|
const importMap = JSON.stringify({
|
||||||
imports: browser_imports,
|
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}`,
|
__html: `window.${ClientWindowPagePropsName} = ${serializedProps}`,
|
||||||
} }), bundledMap?.path ? (_jsxs(_Fragment, { children: [_jsx("script", { type: "importmap", dangerouslySetInnerHTML: {
|
} }), bundledMap?.path ? (_jsxs(_Fragment, { children: [_jsx("script", { type: "importmap", dangerouslySetInnerHTML: {
|
||||||
__html: importMap,
|
__html: importMap,
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
"name": "@moduletrace/bunext",
|
"name": "@moduletrace/bunext",
|
||||||
"module": "index.ts",
|
"module": "index.ts",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"version": "1.0.42",
|
"version": "1.0.43",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"types": "dist/index.d.ts",
|
"types": "dist/index.d.ts",
|
||||||
"exports": {
|
"exports": {
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import { log } from "../../../utils/log";
|
|||||||
import { AppData } from "../../../data/app-data";
|
import { AppData } from "../../../data/app-data";
|
||||||
import { readFileSync } from "fs";
|
import { readFileSync } from "fs";
|
||||||
import path from "path";
|
import path from "path";
|
||||||
|
import _ from "lodash";
|
||||||
|
|
||||||
let _reactVersion = "19";
|
let _reactVersion = "19";
|
||||||
try {
|
try {
|
||||||
@ -86,6 +87,8 @@ export default async function genWebHTML({
|
|||||||
imports: browser_imports,
|
imports: browser_imports,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const final_meta = _.merge(root_meta, page_meta);
|
||||||
|
|
||||||
let final_component = (
|
let final_component = (
|
||||||
<html {...html_props}>
|
<html {...html_props}>
|
||||||
<head>
|
<head>
|
||||||
@ -95,8 +98,7 @@ export default async function genWebHTML({
|
|||||||
content="width=device-width, initial-scale=1.0"
|
content="width=device-width, initial-scale=1.0"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{root_meta ? grabWebMetaHTML({ meta: root_meta }) : null}
|
{final_meta ? grabWebMetaHTML({ meta: final_meta }) : null}
|
||||||
{page_meta ? grabWebMetaHTML({ meta: page_meta }) : null}
|
|
||||||
|
|
||||||
{bundledMap?.css_path ? (
|
{bundledMap?.css_path ? (
|
||||||
<link rel="stylesheet" href={`/${bundledMap.css_path}`} />
|
<link rel="stylesheet" href={`/${bundledMap.css_path}`} />
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user