mirror of
https://github.com/nuxt/nuxt.git
synced 2025-02-07 17:32:31 +00:00
Fix duplicate routes and hidden files
This commit is contained in:
parent
8cbbaeaf83
commit
b8436b067f
@ -1,7 +1,7 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
router: {
|
router: {
|
||||||
routes: [
|
routes: [
|
||||||
{ name: 'user', path: '/users/:id', component: '~pages/_user' }
|
{ name: 'user', path: '/users/:id', component: 'pages/_user' }
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,7 @@ import Router from 'vue-router'
|
|||||||
|
|
||||||
Vue.use(Router)
|
Vue.use(Router)
|
||||||
|
|
||||||
<% router.routes.forEach(function (route) { %>
|
<% uniqBy(router.routes, '_name').forEach((route) => { %>
|
||||||
const <%= route._name %> = process.BROWSER ? () => System.import('<%= route._component %>') : require('<%= route._component %>')
|
const <%= route._name %> = process.BROWSER ? () => System.import('<%= route._component %>') : require('<%= route._component %>')
|
||||||
<% }) %>
|
<% }) %>
|
||||||
|
|
||||||
|
@ -10,7 +10,8 @@ const hash = require('hash-sum')
|
|||||||
const pify = require('pify')
|
const pify = require('pify')
|
||||||
const webpack = require('webpack')
|
const webpack = require('webpack')
|
||||||
const { createBundleRenderer } = require('vue-server-renderer')
|
const { createBundleRenderer } = require('vue-server-renderer')
|
||||||
const { join, resolve, sep } = require('path')
|
const { join, resolve, sep, posix } = require('path')
|
||||||
|
const basename = posix.basename
|
||||||
const remove = pify(fs.remove)
|
const remove = pify(fs.remove)
|
||||||
const readFile = pify(fs.readFile)
|
const readFile = pify(fs.readFile)
|
||||||
const writeFile = pify(fs.writeFile)
|
const writeFile = pify(fs.writeFile)
|
||||||
@ -140,7 +141,7 @@ function * generateRoutesAndFiles () {
|
|||||||
let routes = []
|
let routes = []
|
||||||
files.forEach((file) => {
|
files.forEach((file) => {
|
||||||
let path = file.replace(/^pages/, '').replace(/index\.vue$/, '/').replace(/\.vue$/, '').replace(/\/{2,}/g, '/')
|
let path = file.replace(/^pages/, '').replace(/index\.vue$/, '/').replace(/\.vue$/, '').replace(/\/{2,}/g, '/')
|
||||||
if (path[1] === '_') return
|
if (basename(path)[0] === '_') return
|
||||||
routes.push({ path: path, component: r(this.dir, file) })
|
routes.push({ path: path, component: r(this.dir, file) })
|
||||||
})
|
})
|
||||||
// Concat pages routes and custom routes in this.routes
|
// Concat pages routes and custom routes in this.routes
|
||||||
@ -161,6 +162,7 @@ function * generateRoutesAndFiles () {
|
|||||||
'components/nuxt-loading.vue'
|
'components/nuxt-loading.vue'
|
||||||
]
|
]
|
||||||
let templateVars = {
|
let templateVars = {
|
||||||
|
uniqBy: _.uniqBy,
|
||||||
isDev: this.dev,
|
isDev: this.dev,
|
||||||
router: {
|
router: {
|
||||||
base: this.options.router.base,
|
base: this.options.router.base,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "nuxt",
|
"name": "nuxt",
|
||||||
"version": "0.5.1",
|
"version": "0.5.2",
|
||||||
"description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
|
"description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
Loading…
Reference in New Issue
Block a user