terribleplan/next.js
1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into v3-beta

Browse source
This commit is contained in:
Arunoda Susiripala 2017-07-09 09:57:56 +05:30
parent 871bc4e06b 9cc8d26a68
commit 783ecdefd2
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/page-loader.js
View file

@ -21,7 +21,7 @@ export default class PageLoader {
if (route[0] !== '/') { if (route[0] !== '/') {
throw new Error(`Route name should start with a "/", got "${route}"`) throw new Error(`Route name should start with a "/", got "${route}"`)
} }
route = route.replace(/index$/, '') route = route.replace(/\/index$/, '/')
if (route === '/') return route if (route === '/') return route
return route.replace(/\/$/, '') return route.replace(/\/$/, '')

4
server/build/plugins/pages-plugin.js
View file

@ -14,7 +14,7 @@ export default class PagesPlugin {
pages.forEach((chunk) => { pages.forEach((chunk) => {
const page = compilation.assets[chunk.name] const page = compilation.assets[chunk.name]
const pageName = MATCH_ROUTE_NAME.exec(chunk.name)[1] const pageName = MATCH_ROUTE_NAME.exec(chunk.name)[1]
let routeName = `/${pageName.replace(/[/\\]?index$/, '')}` let routeName = pageName
// We need to convert \ into / when we are in windows // We need to convert \ into / when we are in windows
// to get the proper route name // to get the proper route name
@ -26,6 +26,8 @@ export default class PagesPlugin {
routeName = routeName.replace(/\\/g, '/') routeName = routeName.replace(/\\/g, '/')
} }
routeName = `/${routeName.replace(/(^|\/)index$/, '')}`
const content = page.source() const content = page.source()
const newContent = ` const newContent = `
window.__NEXT_REGISTER_PAGE('${routeName}', function() { window.__NEXT_REGISTER_PAGE('${routeName}', function() {