fix(server, vue-app): allow unicode page names (#4402)

This commit is contained in:
Dmitry Molotkov 2018-11-25 17:52:37 +03:00 committed by Pooya Parsa
parent e1c1240b8d
commit d1877935a3
9 changed files with 41 additions and 6 deletions

View File

@ -7,11 +7,12 @@ import { getContext } from '@nuxt/common'
export default ({ options, nuxt, renderRoute, resources }) => async function nuxtMiddleware(req, res, next) { export default ({ options, nuxt, renderRoute, resources }) => async function nuxtMiddleware(req, res, next) {
// Get context // Get context
const context = getContext(req, res) const context = getContext(req, res)
const url = req.url
res.statusCode = 200 res.statusCode = 200
try { try {
const result = await renderRoute(req.url, context) const result = await renderRoute(url, context)
await nuxt.callHook('render:route', req.url, result, context) await nuxt.callHook('render:route', url, result, context)
const { const {
html, html,
cspScriptSrcHashSet, cspScriptSrcHashSet,
@ -21,7 +22,7 @@ export default ({ options, nuxt, renderRoute, resources }) => async function nux
} = result } = result
if (redirected) { if (redirected) {
nuxt.callHook('render:routeDone', req.url, result, context) nuxt.callHook('render:routeDone', url, result, context)
return html return html
} }
if (error) { if (error) {
@ -34,7 +35,7 @@ export default ({ options, nuxt, renderRoute, resources }) => async function nux
if (fresh(req.headers, { etag })) { if (fresh(req.headers, { etag })) {
res.statusCode = 304 res.statusCode = 304
res.end() res.end()
nuxt.callHook('render:routeDone', req.url, result, context) nuxt.callHook('render:routeDone', url, result, context)
return return
} }
res.setHeader('ETag', etag) res.setHeader('ETag', etag)
@ -73,7 +74,7 @@ export default ({ options, nuxt, renderRoute, resources }) => async function nux
res.setHeader('Accept-Ranges', 'none') // #3870 res.setHeader('Accept-Ranges', 'none') // #3870
res.setHeader('Content-Length', Buffer.byteLength(html)) res.setHeader('Content-Length', Buffer.byteLength(html))
res.end(html, 'utf8') res.end(html, 'utf8')
nuxt.callHook('render:routeDone', req.url, result, context) nuxt.callHook('render:routeDone', url, result, context)
return html return html
} catch (err) { } catch (err) {
/* istanbul ignore if */ /* istanbul ignore if */

View File

@ -8,6 +8,7 @@
"template" "template"
], ],
"main": "dist/vue-app.js", "main": "dist/vue-app.js",
"typings": "types/index.d.ts",
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"
}, },

View File

@ -242,7 +242,7 @@ export function getLocation(base, mode) {
if (base && path.indexOf(base) === 0) { if (base && path.indexOf(base) === 0) {
path = path.slice(base.length) path = path.slice(base.length)
} }
return (path || '/') + window.location.search + window.location.hash return decodeURI(path || '/') + window.location.search + window.location.hash
} }
export function urlJoin() { export function urlJoin() {

View File

@ -31,6 +31,7 @@ export default {
'/store-module', '/store-module',
'/users/1', '/users/1',
'/users/2', '/users/2',
'/тест雨',
{ route: '/users/3', payload: { id: 3000 } } { route: '/users/3', payload: { id: 3000 } }
], ],
interval: 200, interval: 200,

View File

@ -0,0 +1,3 @@
<template>
<div>Hello unicode!</div>
</template>

11
test/fixtures/spa/pages/тест雨.vue vendored Normal file
View File

@ -0,0 +1,11 @@
<template>
<div>Hello unicode SPA!</div>
</template>
<script>
export default {
mounted() {
window.indexMounted = (+window.indexMounted) + 1
console.log('mounted') // eslint-disable-line no-console
}
}
</script>

View File

@ -129,6 +129,12 @@ describe('basic generate', () => {
expect(html).toContain('<p>Nuxt.js</p>') expect(html).toContain('<p>Nuxt.js</p>')
}) })
test('/тест雨 (test non ascii route)', async () => {
const window = await generator.nuxt.server.renderAndGetWindow(url('/тест雨'))
const html = window.document.body.innerHTML
expect(html).toContain('Hello unicode')
})
test('/users/1/index.html', async () => { test('/users/1/index.html', async () => {
const html = await rp(url('/users/1/index.html')) const html = await rp(url('/users/1/index.html'))
expect(html).toContain('<h1>User: 1</h1>') expect(html).toContain('<h1>User: 1</h1>')

View File

@ -314,6 +314,11 @@ describe('basic ssr', () => {
expect(html).toContain('<h1>vue file is first-class</h1>') expect(html).toContain('<h1>vue file is first-class</h1>')
}) })
test('/тест雨 (test non ascii route)', async () => {
const { html } = await nuxt.server.renderRoute('/тест雨')
expect(html).toMatch('Hello unicode')
})
// Close server and ask nuxt to stop listening to file changes // Close server and ask nuxt to stop listening to file changes
afterAll(async () => { afterAll(async () => {
await nuxt.close() await nuxt.close()

View File

@ -60,6 +60,13 @@ describe('spa', () => {
expect(html).toMatch('error handler triggered: asyncData error!') expect(html).toMatch('error handler triggered: asyncData error!')
}) })
test('/тест雨 (test non ascii route)', async () => {
const { html } = await renderRoute('/тест雨')
expect(html).toMatch('Hello unicode SPA!')
expect(consola.log).not.toHaveBeenCalledWith('created')
expect(consola.log).toHaveBeenCalledWith('mounted')
consola.log.mockClear()
})
// Close server and ask nuxt to stop listening to file changes // Close server and ask nuxt to stop listening to file changes
afterAll(async () => { afterAll(async () => {
await nuxt.close() await nuxt.close()