Send correct Content-Type headers for all resources (#52)

* Relocated JS and CSS URLs to /app.js and /app.css

* Content-Type will now be properly set to text/html for all React-served HTML outputs

Closes #46.
pull/54/head
Pascal Mathis 9 years ago committed by Alex Kern
parent 0313102f3f
commit 042df20da7

@ -41,10 +41,10 @@ export default class App extends React.Component {
<title>FilePizza - Your files, delivered.</title> <title>FilePizza - Your files, delivered.</title>
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Quicksand:300,400,700|Lobster+Two" /> <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Quicksand:300,400,700|Lobster+Two" />
<link rel="stylesheet" href="/css" /> <link rel="stylesheet" href="/app.css" />
<Bootstrap data={this.props.data} /> <Bootstrap data={this.props.data} />
<script src="/js" /> <script src="/app.js" />
</FrozenHead> </FrozenHead>

@ -10,7 +10,7 @@ if (process.env.NODE_ENV === 'production') {
const webpackMiddleware = require('webpack-dev-middleware') const webpackMiddleware = require('webpack-dev-middleware')
const webpack = require('webpack') const webpack = require('webpack')
const config = require('../../webpack.config.js') const config = require('../../webpack.config.js')
config.output.filename = '/js' config.output.filename = '/app.js'
config.output.path = '/' config.output.path = '/'
module.exports = webpackMiddleware(webpack(config)) module.exports = webpackMiddleware(webpack(config))
} }

@ -20,6 +20,7 @@ module.exports = function (req, res) {
var html = React.renderToString(<Handler data={alt.takeSnapshot()} />) var html = React.renderToString(<Handler data={alt.takeSnapshot()} />)
alt.flush() alt.flush()
res.setHeader('Content-Type', 'text/html');
if (isNotFound(state)) res.status(404) if (isNotFound(state)) res.status(404)
res.write('<!DOCTYPE html>\n') res.write('<!DOCTYPE html>\n')
res.end(html) res.end(html)

@ -79,8 +79,8 @@ if (process.env.FORCE_SSL) {
app.use(forceSSL) app.use(forceSSL)
} }
app.get('/js', require('./middleware/javascript')) app.get('/app.js', require('./middleware/javascript'))
app.get('/css', require('./middleware/css')) app.get('/app.css', require('./middleware/css'))
app.use(require('./middleware/static')) app.use(require('./middleware/static'))
app.use([ app.use([

Loading…
Cancel
Save