Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-11 08:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

add router base to all middleware

Browse Source
This commit is contained in:
Pooya Parsa 2017-08-25 16:31:16 +04:30
parent 7bc1b35b21
commit 1ca5739a2f
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/builder/builder.js
View File

@ -518,7 +518,7 @@ export default class Builder extends Tapable {
this.webpackHotMiddleware = pify(webpackHotMiddleware(this.compiler.client, Object.assign({ this.webpackHotMiddleware = pify(webpackHotMiddleware(this.compiler.client, Object.assign({
log: false, log: false,
heartbeat: 2500 heartbeat: 1000
}, this.options.build.hotMiddleware))) }, this.options.build.hotMiddleware)))
// Inject to renderer instance // Inject to renderer instance

6
lib/builder/webpack/client.config.js
View File

@ -151,7 +151,11 @@ export default function webpackClientConfig () {
config.plugins.push(new webpack.NamedModulesPlugin()) config.plugins.push(new webpack.NamedModulesPlugin())
// Add HMR support // Add HMR support
config.entry.app = ['webpack-hot-middleware/client?name=client&reload=true', config.entry.app] config.entry.app = [
// https://github.com/glenjamin/webpack-hot-middleware#config
`webpack-hot-middleware/client?name=client&reload=true&timeout=3000&path=${this.options.router.base}/__webpack_hmr`.replace(/\/\//g, '/'),
config.entry.app
]
config.plugins.push( config.plugins.push(
new webpack.HotModuleReplacementPlugin(), new webpack.HotModuleReplacementPlugin(),
new webpack.NoEmitOnErrorsPlugin() new webpack.NoEmitOnErrorsPlugin()

12
lib/core/renderer.js
View File

@ -179,11 +179,9 @@ export default class Renderer extends Tapable {
m.handler = require(this.nuxt.resolvePath(m.handler)) m.handler = require(this.nuxt.resolvePath(m.handler))
} }
// Use middleware // Use middleware
if (m instanceof Function) { const handler = m.handler || m
this.app.use(m) const path = (this.options.router.base + (m.path ? m.path : '')).replace(/\/\//g, '/')
} else if (m && m.path && m.handler) { this.app.use(path, handler)
this.app.use(m.path, m.handler)
}
} }
async setupMiddleware () { async setupMiddleware () {
@ -197,10 +195,6 @@ export default class Renderer extends Tapable {
// Common URL checks // Common URL checks
this.useMiddleware((req, res, next) => { this.useMiddleware((req, res, next) => {
// If base in req.url, remove it for the middleware and vue-router
if (this.options.router.base !== '/' && req.url.indexOf(this.options.router.base) === 0) {
req.url = req.url.replace(this.options.router.base, '/')
}
// Prevent access to SSR resources // Prevent access to SSR resources
if (ssrResourceRegex.test(req.url)) { if (ssrResourceRegex.test(req.url)) {
res.statusCode = 404 res.statusCode = 404

9
test/with-config.test.js
View File

@ -90,11 +90,16 @@ test('Check stats.json generated by build.analyze', t => {
t.is(stats.assets.length, 28) t.is(stats.assets.length, 28)
}) })
test('Check /test.txt with custom serve-static options', async t => { test('Check /test/test.txt with custom serve-static options', async t => {
const { headers } = await rp(url('/test.txt'), { resolveWithFullResponse: true }) const { headers } = await rp(url('/test/test.txt'), { resolveWithFullResponse: true })
t.is(headers['cache-control'], 'public, max-age=31536000') t.is(headers['cache-control'], 'public, max-age=31536000')
}) })
test('Check /test.txt should return 404', async t => {
const err = await t.throws(rp(url('/test.txt')))
t.is(err.response.statusCode, 404)
})
// Close server and ask nuxt to stop listening to file changes // Close server and ask nuxt to stop listening to file changes
test.after('Closing server and nuxt.js', t => { test.after('Closing server and nuxt.js', t => {
nuxt.close() nuxt.close()