Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
e0455823
Commit
e0455823
authored
Nov 17, 2016
by
zpnk
Committed by
Guillermo Rauch
Nov 17, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add default utf-8 charset. (#270)
parent
3af5a018
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
2 deletions
+10
-2
head.js
lib/head.js
+5
-0
render.js
server/render.js
+2
-2
head.js
test/fixtures/basic/pages/head.js
+1
-0
index.js
test/index.js
+2
-0
No files found.
lib/head.js
View file @
e0455823
...
@@ -11,6 +11,10 @@ class Head extends React.Component {
...
@@ -11,6 +11,10 @@ class Head extends React.Component {
}
}
}
}
export
function
defaultHead
()
{
return
[
<
meta
charSet
=
'utf-8'
className
=
'next-head'
/>
]
}
function
reduceComponents
(
components
)
{
function
reduceComponents
(
components
)
{
return
components
return
components
.
map
((
c
)
=>
c
.
props
.
children
)
.
map
((
c
)
=>
c
.
props
.
children
)
...
@@ -18,6 +22,7 @@ function reduceComponents (components) {
...
@@ -18,6 +22,7 @@ function reduceComponents (components) {
.
map
((
children
)
=>
React
.
Children
.
toArray
(
children
))
.
map
((
children
)
=>
React
.
Children
.
toArray
(
children
))
.
reduce
((
a
,
b
)
=>
a
.
concat
(
b
),
[])
.
reduce
((
a
,
b
)
=>
a
.
concat
(
b
),
[])
.
reverse
()
.
reverse
()
.
concat
(...
defaultHead
())
.
filter
(
unique
())
.
filter
(
unique
())
.
reverse
()
.
reverse
()
.
map
((
c
)
=>
{
.
map
((
c
)
=>
{
...
...
server/render.js
View file @
e0455823
...
@@ -8,7 +8,7 @@ import read from './read'
...
@@ -8,7 +8,7 @@ import read from './read'
import
getConfig
from
'./config'
import
getConfig
from
'./config'
import
Router
from
'../lib/router'
import
Router
from
'../lib/router'
import
Document
from
'../lib/document'
import
Document
from
'../lib/document'
import
Head
from
'../lib/head'
import
Head
,
{
defaultHead
}
from
'../lib/head'
import
App
from
'../lib/app'
import
App
from
'../lib/app'
export
async
function
render
(
url
,
ctx
=
{},
{
export
async
function
render
(
url
,
ctx
=
{},
{
...
@@ -33,7 +33,7 @@ export async function render (url, ctx = {}, {
...
@@ -33,7 +33,7 @@ export async function render (url, ctx = {}, {
return
(
staticMarkup
?
renderToStaticMarkup
:
renderToString
)(
app
)
return
(
staticMarkup
?
renderToStaticMarkup
:
renderToString
)(
app
)
})
})
const
head
=
Head
.
rewind
()
||
[]
const
head
=
Head
.
rewind
()
||
defaultHead
()
const
config
=
await
getConfig
(
dir
)
const
config
=
await
getConfig
(
dir
)
const
doc
=
createElement
(
Document
,
{
const
doc
=
createElement
(
Document
,
{
...
...
test/fixtures/basic/pages/head.js
View file @
e0455823
...
@@ -4,6 +4,7 @@ import Head from 'next/head'
...
@@ -4,6 +4,7 @@ import Head from 'next/head'
export
default
()
=>
<
div
>
export
default
()
=>
<
div
>
<
Head
>
<
Head
>
<
meta
charSet
=
'iso-8859-5'
/>
<
meta
content
=
'my meta'
/>
<
meta
content
=
'my meta'
/>
<
/Head
>
<
/Head
>
<
h1
>
I
can
haz
meta
tags
<
/h1
>
<
h1
>
I
can
haz
meta
tags
<
/h1
>
...
...
test/index.js
View file @
e0455823
...
@@ -9,6 +9,7 @@ test.before(() => build(dir))
...
@@ -9,6 +9,7 @@ test.before(() => build(dir))
test
(
async
t
=>
{
test
(
async
t
=>
{
const
html
=
await
render
(
'/stateless'
)
const
html
=
await
render
(
'/stateless'
)
t
.
true
(
html
.
includes
(
'<meta charset="utf-8" class="next-head"/>'
))
t
.
true
(
html
.
includes
(
'<h1>My component!</h1>'
))
t
.
true
(
html
.
includes
(
'<h1>My component!</h1>'
))
})
})
...
@@ -25,6 +26,7 @@ test(async t => {
...
@@ -25,6 +26,7 @@ test(async t => {
test
(
async
t
=>
{
test
(
async
t
=>
{
const
html
=
await
(
render
(
'/head'
))
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
(
'<meta content="my meta" class="next-head"/>'
))
t
.
true
(
html
.
includes
(
'<div><h1>I can haz meta tags</h1></div>'
))
t
.
true
(
html
.
includes
(
'<div><h1>I can haz meta tags</h1></div>'
))
})
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment