Unverified Commit 3c62b075 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Move serve-static to typescript (#5833)

parent 5d2250ac
......@@ -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"
},
......
......@@ -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'
......
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)
})
}
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)
})
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment