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
3c62b075
Unverified
Commit
3c62b075
authored
Dec 06, 2018
by
Tim Neutkens
Committed by
GitHub
Dec 06, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move serve-static to typescript (#5833)
parent
5d2250ac
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
21 deletions
+23
-21
package.json
packages/next-server/package.json
+1
-0
next-server.js
packages/next-server/server/next-server.js
+2
-2
render.js
packages/next-server/server/render.js
+0
-19
serve-static.ts
packages/next-server/server/serve-static.ts
+20
-0
No files found.
packages/next-server/package.json
View file @
3c62b075
...
...
@@ -41,6 +41,7 @@
"devDependencies"
:
{
"@taskr/clear"
:
"1.1.0"
,
"@taskr/watch"
:
"1.1.0"
,
"@types/send"
:
"0.14.4"
,
"taskr"
:
"1.1.0"
,
"typescript"
:
"3.1.6"
},
...
...
packages/next-server/server/next-server.js
View file @
3c62b075
...
...
@@ -6,9 +6,9 @@ import fs from 'fs'
import
{
renderToHTML
,
renderErrorToHTML
,
sendHTML
,
serveStatic
sendHTML
}
from
'./render'
import
{
serveStatic
}
from
'./serve-static'
import
Router
,
{
route
}
from
'./router'
import
{
isInternalUrl
,
isBlockedPage
}
from
'./utils'
import
loadConfig
from
'next-server/next-config'
...
...
packages/next-server/server/render.js
View file @
3c62b075
import
{
join
}
from
'path'
import
React
from
'react'
import
{
renderToString
,
renderToStaticMarkup
}
from
'react-dom/server'
import
send
from
'send'
import
generateETag
from
'etag'
import
fresh
from
'fresh'
import
requirePage
,
{
normalizePagePath
}
from
'./require'
...
...
@@ -23,9 +22,6 @@ function getDynamicImportBundles (manifest, moduleIds) {
},
[])
}
// since send doesn't support wasm yet
send
.
mime
.
define
({
'application/wasm'
:
[
'wasm'
]
})
export
function
renderToHTML
(
req
,
res
,
pathname
,
query
,
opts
)
{
return
doRender
(
req
,
res
,
pathname
,
query
,
opts
)
}
...
...
@@ -220,18 +216,3 @@ function serializeError (dev, err) {
return
{
message
:
'500 - Internal Server Error.'
}
}
export
function
serveStatic
(
req
,
res
,
path
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
send
(
req
,
path
)
.
on
(
'directory'
,
()
=>
{
// We don't allow directories to be read.
const
err
=
new
Error
(
'No directory access'
)
err
.
code
=
'ENOENT'
reject
(
err
)
})
.
on
(
'error'
,
reject
)
.
pipe
(
res
)
.
on
(
'finish'
,
resolve
)
})
}
packages/next-server/server/serve-static.ts
0 → 100644
View file @
3c62b075
import
{
IncomingMessage
,
ServerResponse
}
from
'http'
import
send
from
'send'
// since send doesn't support wasm yet
send
.
mime
.
define
({
'application/wasm'
:
[
'wasm'
]
})
export
function
serveStatic
(
req
:
IncomingMessage
,
res
:
ServerResponse
,
path
:
string
):
Promise
<
void
>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
send
(
req
,
path
)
.
on
(
'directory'
,
()
=>
{
// We don't allow directories to be read.
const
err
:
any
=
new
Error
(
'No directory access'
)
err
.
code
=
'ENOENT'
reject
(
err
)
})
.
on
(
'error'
,
reject
)
.
pipe
(
res
)
.
on
(
'finish'
,
resolve
)
})
}
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