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

Merge pull request #51 from nuxt/pr/44

Browse Source 
PR #44
This commit is contained in:
Sébastien Chopin 2016-12-08 21:15:00 +01:00 committed by GitHub
commit e254e11177
4 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/build/index.js
View File

@ -91,15 +91,15 @@ exports.build = function * () {
/*
** Check if pages dir exists and warn if not
*/
if (!fs.existsSync(join(this.dir, 'pages'))) {
if (fs.existsSync(join(this.dir, '..', 'pages'))) {
if (!fs.existsSync(join(this.srcDir, 'pages'))) {
if (fs.existsSync(join(this.srcDir, '..', 'pages'))) {
console.error('> No `pages` directory found. Did you mean to run `nuxt` in the parent (`../`) directory?') // eslint-disable-line no-console
} else {
console.error('> Couldn\'t find a `pages` directory. Please create one under the project root') // eslint-disable-line no-console
}
process.exit(1)
}
debug(`App root: ${this.dir}`)
debug(`App root: ${this.srcDir}`)
debug('Generating .nuxt/ files...')
/*
** Create .nuxt/, .nuxt/components and .nuxt/dist folders
@ -114,7 +114,7 @@ exports.build = function * () {
if (route.component.slice(-4) !== '.vue') {
route.component = route.component + '.vue'
}
route.component = r(this.dir, route.component)
route.component = r(this.srcDir, route.component)
})
// Generate routes and interpret the template files
yield generateRoutesAndFiles.call(this)
@ -141,13 +141,13 @@ function * generateRoutesAndFiles () {
/*
** Generate routes based on files
*/
const files = yield glob('pages/**/*.vue', { cwd: this.dir })
const files = yield glob('pages/**/*.vue', { cwd: this.srcDir })
let routes = []
files.forEach((file) => {
let path = file.replace(/^pages/, '').replace(/index\.vue$/, '/').replace(/\.vue$/, '').replace(/\/{2,}/g, '/')
let name = file.replace(/^pages/, '').replace(/\.vue$/, '').replace(/\/{2,}/g, '/').split('/').slice(1).join('-')
if (basename(path)[0] === '_') return
routes.push({ path: path, component: r(this.dir, file), name: name })
routes.push({ path: path, component: r(this.srcDir, file), name: name })
})
// Concat pages routes and custom routes in this.routes
this.routes = routes.concat(this.options.router.routes)
@ -177,9 +177,9 @@ function * generateRoutesAndFiles () {
head: this.options.head,
store: this.options.store,
css: this.options.css,
plugins: this.options.plugins.map((p) => r(this.dir, p)),
plugins: this.options.plugins.map((p) => r(this.srcDir, p)),
appPath: './App.vue',
loading: (typeof this.options.loading === 'string' ? r(this.dir, this.options.loading) : this.options.loading),
loading: (typeof this.options.loading === 'string' ? r(this.srcDir, this.options.loading) : this.options.loading),
transition: this.options.transition,
components: {
Loading: r(__dirname, '..', 'app', 'components', 'nuxt-loading.vue'),
@ -199,15 +199,15 @@ function * generateRoutesAndFiles () {
return r
})
if (files.includes('pages/_app.vue')) {
templateVars.appPath = r(this.dir, 'pages/_app.vue')
templateVars.appPath = r(this.srcDir, 'pages/_app.vue')
}
if (fs.existsSync(join(this.dir, 'layouts', 'app.vue'))) {
templateVars.appPath = r(this.dir, 'layouts/app.vue')
if (fs.existsSync(join(this.srcDir, 'layouts', 'app.vue'))) {
templateVars.appPath = r(this.srcDir, 'layouts/app.vue')
}
if (files.includes('pages/_error.vue')) {
templateVars.components.ErrorPage = r(this.dir, 'pages/_error.vue')
templateVars.components.ErrorPage = r(this.srcDir, 'pages/_error.vue')
}
if (fs.existsSync(join(this.dir, 'layouts', 'error.vue'))) {
if (fs.existsSync(join(this.srcDir, 'layouts', 'error.vue'))) {
templateVars.components.ErrorPage = r(this.dir, 'layouts/error.vue')
}
let moveTemplates = templatesFiles.map((file) => {
@ -316,7 +316,7 @@ function createRenderer (bundle) {
}
function watchPages () {
const patterns = [ r(this.dir, 'pages/*.vue'), r(this.dir, 'pages/**/*.vue') ]
const patterns = [ r(this.srcDir, 'pages/*.vue'), r(this.srcDir, 'pages/**/*.vue') ]
const options = {
// ignored: '**/_*.vue',
ignoreInitial: true

18
lib/build/webpack/base.config.js
View File

@ -26,16 +26,16 @@ module.exports = function () {
resolve: {
// Disable for now
alias: {
'~': join(this.dir),
'static': join(this.dir, 'static'), // use in template with <img src="~static/nuxt.png" />
'~static': join(this.dir, 'static'),
'assets': join(this.dir, 'assets'), // use in template with <img src="~static/nuxt.png" />
'~assets': join(this.dir, 'assets'),
'~plugins': join(this.dir, 'plugins'),
'~store': join(this.dir, 'store'),
'~': join(this.srcDir),
'static': join(this.srcDir, 'static'), // use in template with <img src="~static/nuxt.png" />
'~static': join(this.srcDir, 'static'),
'assets': join(this.srcDir, 'assets'), // use in template with <img src="~static/nuxt.png" />
'~assets': join(this.srcDir, 'assets'),
'~plugins': join(this.srcDir, 'plugins'),
'~store': join(this.srcDir, 'store'),
'~router': join(this.dir, '.nuxt/router'),
'~pages': join(this.dir, 'pages'),
'~components': join(this.dir, 'components')
'~pages': join(this.srcDir, 'pages'),
'~components': join(this.srcDir, 'components')
},
modules: [
nodeModulesDir,

2
lib/generate.js
View File

@ -34,7 +34,7 @@ module.exports = function () {
*/
this.options.generate = _.defaultsDeep(this.options.generate, defaults)
var self = this
var srcStaticPath = resolve(this.dir, 'static')
var srcStaticPath = resolve(this.srcDir, 'static')
var srcBuiltPath = resolve(this.dir, '.nuxt', 'dist')
var distPath = resolve(this.dir, this.options.generate.dir)
var distNuxtPath = resolve(distPath, '_nuxt')

5
lib/nuxt.js
View File

@ -51,8 +51,9 @@ class Nuxt {
// Env variables
this.dev = this.options.dev
this.dir = (typeof options.rootDir === 'string' && options.rootDir ? options.rootDir : process.cwd())
this.srcDir = (typeof options.srcDir === 'string' && options.srcDir ? resolve(this.dir, options.srcDir) : this.dir)
// If store defined, update store options to true
if (fs.existsSync(join(this.dir, 'store', 'index.js'))) {
if (fs.existsSync(join(this.srcDir, 'store', 'index.js'))) {
this.options.store = true
}
// Template
@ -65,7 +66,7 @@ class Nuxt {
// renderer used by Vue.js (via createBundleRenderer)
this.renderer = null
// For serving static/ files to /
this.serveStatic = pify(serveStatic(resolve(this.dir, 'static')))
this.serveStatic = pify(serveStatic(resolve(this.srcDir, 'static')))
// For serving .nuxt/dist/ files
this._nuxtRegexp = /^\/_nuxt\//
this.serveStaticNuxt = pify(serveStatic(resolve(this.dir, '.nuxt', 'dist')))