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

Merge pull request #3030 from williamchong007/dev

Browse Source 
Add redirect support in extendRoutes
This commit is contained in:
Sébastien Chopin 2018-03-16 15:18:06 +01:00 committed by GitHub
commit 298c386213
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/app/router.js
View File

@ -7,8 +7,9 @@ import Router from 'vue-router'
route._name = '_' + hash(route.component)
components.push({ _name: route._name, component: route.component, name: route.name, chunkName: route.chunkName })
res += tab + '{\n'
res += tab + '\tpath: ' + JSON.stringify(route.path) + ',\n'
res += tab + '\tcomponent: ' + (splitPages ? route._name : `() => ${route._name}.default || ${route._name}`)
res += tab + '\tpath: ' + JSON.stringify(route.path)
res += (route.component) ? ',\n\t' + tab + 'component: ' + (splitPages ? route._name : `() => ${route._name}.default || ${route._name}`) : ''
res += (route.redirect) ? ',\n\t' + tab + 'redirect: ' + JSON.stringify(route.redirect) : ''
res += (route.name) ? ',\n\t' + tab + 'name: ' + JSON.stringify(route.name) : ''
res += (route.children) ? ',\n\t' + tab + 'children: [\n' + recursiveRoutes(routes[i].children, tab + '\t\t', components) + '\n\t' + tab + ']' : ''
res += '\n' + tab + '}' + (i + 1 === routes.length ? '' : ',\n')
@ -18,6 +19,7 @@ import Router from 'vue-router'
const _components = []
const _routes = recursiveRoutes(router.routes, '\t\t', _components)
%><%= uniqBy(_components, '_name').map((route) => {
if (!route.component) return ''
const path = relativeToBuild(route.component)
const chunkName = wChunk(route.chunkName)
const name = route._name

4
test/fixtures/with-config/nuxt.config.js vendored
View File

@ -12,6 +12,10 @@ module.exports = {
name: 'about-bis',
path: '/about-bis',
component: '~/pages/about.vue'
},
{
path: '/redirect/about-bis',
redirect: '/about-bis'
}
]
}

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

@ -171,6 +171,21 @@ test.serial('/test/about-bis (added with extendRoutes)', async t => {
t.true(html.includes('<h1>About page</h1>'))
})
test.serial('/test/redirect/about-bis (redirect with extendRoutes)', async t => {
const logSpy = await interceptLog()
const window = await nuxt.renderAndGetWindow(url('/test/redirect/about-bis'))
t.true(logSpy.calledOnce)
t.is(logSpy.args[0][0], 'Test plugin!')
release()
const windowHref = window.location.href
t.true(windowHref.includes('/test/about-bis'))
const html = window.document.body.innerHTML
t.true(html.includes('<h1>Custom layout</h1>'))
t.true(html.includes('<h1>About page</h1>'))
})
test('Check stats.json generated by build.analyze', t => {
const stats = require(resolve(
__dirname,