Fix to allow specification of html lang #56

qrac · Jun 28, 2022 · 8b953a7 · 8b953a7
1 parent 3788484
commit 8b953a7
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "minista",
   "description": "Next.js Like Development with 100% Static Generate",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "bin": {
     "minista": "./bin/minista.js"
   },

diff --git a/src/render.tsx b/src/render.tsx
@@ -12,9 +12,15 @@ export async function renderHtml(
   const staticHelmet = (data: string) => {
     return data.replace(/data-react-helmet="true"/g, "")
   }
+  const htmlAttributes = Object.hasOwn(
+    helmet.htmlAttributes.toComponent(),
+    "lang"
+  )
+    ? helmet.htmlAttributes.toString()
+    : `lang="ja" ${helmet.htmlAttributes.toString()}`
   return `
     <!doctype html>
-    <html lang="ja" ${helmet.htmlAttributes.toString()}>
+    <html ${htmlAttributes}>
       <head>
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />

diff --git a/user/src/pages/index.tsx b/user/src/pages/index.tsx
@@ -6,6 +6,9 @@ const PageHome = () => {
         <li>
           <a href="/about/">About</a>
         </li>
+        <li>
+          <a href="/lang/">Lang</a>
+        </li>
         <li>
           <a href="/entry/">Entry</a>
         </li>

diff --git a/user/src/pages/lang/index.tsx b/user/src/pages/lang/index.tsx
@@ -0,0 +1,14 @@
+import { Head } from "minista"
+
+const PageLang = () => {
+  return (
+    <>
+      <Head htmlAttributes={{ lang: "en" }}>
+        <title>Lang</title>
+      </Head>
+      <h1>Lang</h1>
+    </>
+  )
+}
+
+export default PageLang
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,9 @@ const PageHome = () => { @@
             <li>
               <a href="/about/">About</a>
             </li>
+            <li>
+              <a href="/lang/">Lang</a>
+            </li>
             <li>
               <a href="/entry/">Entry</a>
             </li>
@@ Expand Down @@