wip

vikejs · Apr 30, 2024 · 0501496 · 0501496
1 parent 23ebba9
commit 0501496
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/examples/full/.test.ts b/examples/full/.test.ts
@@ -1,4 +1,4 @@
-import {test, expect, run, fetchHtml, page, getServerUrl, autoRetry, partRegex} from '@brillout/test-e2e'
+import { test, expect, run, fetchHtml, page, getServerUrl, autoRetry, partRegex } from '@brillout/test-e2e'
 
 runTest()
 
@@ -92,7 +92,7 @@ function testUrl({
   text,
   counter,
   noSSR
-}: {url: string; title: string; text: string; counter?: true; noSSR?: true}) {
+}: { url: string; title: string; text: string; counter?: true; noSSR?: true }) {
   test(url + ' (HTML)', async () => {
     const html = await fetchHtml(url)
     if (!noSSR) {
@@ -123,7 +123,7 @@ async function testCounter() {
       await page.click('button')
       expect(await page.textContent('button')).toContain('Counter 1')
     },
-    {timeout: 5 * 1000}
+    { timeout: 5 * 1000 }
   )
 }
 

diff --git a/packages/vike-react/src/renderer/getHtmlTags.ts b/packages/vike-react/src/renderer/getHtmlTags.ts
@@ -12,7 +12,7 @@ function getHtmlTags(pageContext: PageContextServer) {
   const viewportContent = getViewportContent(document.viewport)
 
   const htmlTagAttributes = document.htmlTagAttributes ?? {}
-  if (!htmlTagAttributes.lang) htmlTagAttributes.lang = lang
+  if (!htmlTagAttributes.lang) htmlTagAttributes.lang = lang ?? 'en'
   const htmlAttr = getTagAttributesString(htmlTagAttributes)
   const bodyAttr = getTagAttributesString(document.bodyTagAttributes ?? {})
   const rootAttr = getTagAttributesString(document.rootTagAttributes ?? {})
@@ -76,6 +76,6 @@ function getTagAttributesString(attributes: Record<string, string>): string {
 }
 
 function ensureIsValidAttributeName(str: string): string {
-  if (/^[a-Z][a-Z0-9-]*$/.test(str) || str.endsWith('-')) throw new Error(`Invalid HTML attribute name ${str}`)
+  if (!/^[a-z][a-z0-9\-]*$/i.test(str) || str.endsWith('-')) throw new Error(`Invalid HTML attribute name ${str}`)
   return str
 }
diff --git a/packages/vike-react/src/types/Document.ts b/packages/vike-react/src/types/Document.ts
@@ -33,7 +33,7 @@ type Document = {
    *
    * @default null
    */
-  viewport?: 'responsive' |  number | { raw: string } | null
+  viewport?: 'responsive' | number | { raw: string } | null
 
   /**
    *
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ type Document = { @@
        *
        * @default null
        */
-      viewport?: 'responsive' |  number | { raw: string } | null
+      viewport?: 'responsive' | number | { raw: string } | null
       /**
        *
@@ Expand Down @@