terribleplan/next.js
1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Code Issues Releases Wiki Activity

Add default utf-8 charset. (#270)

Browse source
This commit is contained in:
zpnk 2016-11-17 15:06:54 -08:00 committed by Guillermo Rauch
parent 3af5a0188a
commit e0455823a0
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/head.js
View file

@ -11,6 +11,10 @@ class Head extends React.Component {
}
}
export function defaultHead () {
return [<meta charSet='utf-8' className='next-head' />]
}
function reduceComponents (components) {
return components
.map((c) => c.props.children)
@ -18,6 +22,7 @@ function reduceComponents (components) {
.map((children) => React.Children.toArray(children))
.reduce((a, b) => a.concat(b), [])
.reverse()
.concat(...defaultHead())
.filter(unique())
.reverse()
.map((c) => {

4
server/render.js
View file

@ -8,7 +8,7 @@ import read from './read'
import getConfig from './config'
import Router from '../lib/router'
import Document from '../lib/document'
import Head from '../lib/head'
import Head, {defaultHead} from '../lib/head'
import App from '../lib/app'
export async function render (url, ctx = {}, {
@ -33,7 +33,7 @@ export async function render (url, ctx = {}, {
return (staticMarkup ? renderToStaticMarkup : renderToString)(app)
})
const head = Head.rewind() || []
const head = Head.rewind() || defaultHead()
const config = await getConfig(dir)
const doc = createElement(Document, {

1
test/fixtures/basic/pages/head.js vendored
View file

@ -4,6 +4,7 @@ import Head from 'next/head'
export default () => <div>
<Head>
<meta charSet='iso-8859-5' />
<meta content='my meta' />
</Head>
<h1>I can haz meta tags</h1>

2
test/index.js
View file

@ -9,6 +9,7 @@ test.before(() => build(dir))
test(async t => {
const html = await render('/stateless')
t.true(html.includes('<meta charset="utf-8" class="next-head"/>'))
t.true(html.includes('<h1>My component!</h1>'))
})
@ -25,6 +26,7 @@ test(async t => {
test(async t => {
const html = await (render('/head'))
t.true(html.includes('<meta charset="iso-8859-5" class="next-head"/>'))
t.true(html.includes('<meta content="my meta" class="next-head"/>'))
t.true(html.includes('<div><h1>I can haz meta tags</h1></div>'))
})