mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-23 22:25:12 +00:00
call .nuxt directory buildDir
This commit is contained in:
parent
b2ef8c320f
commit
923f907442
12
lib/build.js
12
lib/build.js
@ -112,10 +112,10 @@ export async function build () {
|
|||||||
debug(`App root: ${this.srcDir}`)
|
debug(`App root: ${this.srcDir}`)
|
||||||
debug('Generating .nuxt/ files...')
|
debug('Generating .nuxt/ files...')
|
||||||
// Create .nuxt/, .nuxt/components and .nuxt/dist folders
|
// Create .nuxt/, .nuxt/components and .nuxt/dist folders
|
||||||
await remove(r(this.dir, '.nuxt'))
|
await remove(r(this.buildDir))
|
||||||
await mkdirp(r(this.dir, '.nuxt/components'))
|
await mkdirp(r(this.buildDir, 'components'))
|
||||||
if (!this.dev) {
|
if (!this.dev) {
|
||||||
await mkdirp(r(this.dir, '.nuxt/dist'))
|
await mkdirp(r(this.buildDir, 'dist'))
|
||||||
}
|
}
|
||||||
// Generate routes and interpret the template files
|
// Generate routes and interpret the template files
|
||||||
await generateRoutesAndFiles.call(this)
|
await generateRoutesAndFiles.call(this)
|
||||||
@ -139,7 +139,7 @@ async function buildFiles () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function addAppTemplate () {
|
function addAppTemplate () {
|
||||||
let templatePath = resolve(this.dir, '.nuxt', 'dist', 'index.html')
|
let templatePath = resolve(this.buildDir, 'dist', 'index.html')
|
||||||
if (fs.existsSync(templatePath)) {
|
if (fs.existsSync(templatePath)) {
|
||||||
this.appTemplate = _.template(fs.readFileSync(templatePath, 'utf8'), {
|
this.appTemplate = _.template(fs.readFileSync(templatePath, 'utf8'), {
|
||||||
interpolate: /{{([\s\S]+?)}}/g
|
interpolate: /{{([\s\S]+?)}}/g
|
||||||
@ -209,7 +209,7 @@ async function generateRoutesAndFiles () {
|
|||||||
}
|
}
|
||||||
// If no default layout, create its folder and add the default folder
|
// If no default layout, create its folder and add the default folder
|
||||||
if (!templateVars.layouts.default) {
|
if (!templateVars.layouts.default) {
|
||||||
await mkdirp(r(this.dir, '.nuxt/layouts'))
|
await mkdirp(r(this.buildDir, 'layouts'))
|
||||||
templatesFiles.push('layouts/default.vue')
|
templatesFiles.push('layouts/default.vue')
|
||||||
templateVars.layouts.default = r(__dirname, 'app', 'layouts', 'default.vue')
|
templateVars.layouts.default = r(__dirname, 'app', 'layouts', 'default.vue')
|
||||||
}
|
}
|
||||||
@ -284,7 +284,7 @@ async function generateRoutesAndFiles () {
|
|||||||
src,
|
src,
|
||||||
dst
|
dst
|
||||||
}))
|
}))
|
||||||
const path = r(this.dir, '.nuxt', dst)
|
const path = r(this.buildDir, dst)
|
||||||
// Ensure parent dir exits
|
// Ensure parent dir exits
|
||||||
await mkdirp(dirname(path))
|
await mkdirp(dirname(path))
|
||||||
// Write file
|
// Write file
|
||||||
|
@ -46,7 +46,7 @@ export default async function () {
|
|||||||
*/
|
*/
|
||||||
this.options.generate = _.defaultsDeep(this.options.generate, defaults)
|
this.options.generate = _.defaultsDeep(this.options.generate, defaults)
|
||||||
var srcStaticPath = resolve(this.srcDir, 'static')
|
var srcStaticPath = resolve(this.srcDir, 'static')
|
||||||
var srcBuiltPath = resolve(this.dir, '.nuxt', 'dist')
|
var srcBuiltPath = resolve(this.buildDir, 'dist')
|
||||||
var distPath = resolve(this.dir, this.options.generate.dir)
|
var distPath = resolve(this.dir, this.options.generate.dir)
|
||||||
var distNuxtPath = join(distPath, (isUrl(this.options.build.publicPath) ? '' : this.options.build.publicPath))
|
var distNuxtPath = join(distPath, (isUrl(this.options.build.publicPath) ? '' : this.options.build.publicPath))
|
||||||
/*
|
/*
|
||||||
|
@ -74,11 +74,13 @@ class Nuxt {
|
|||||||
this.options = _.defaultsDeep(options, defaults)
|
this.options = _.defaultsDeep(options, defaults)
|
||||||
// Env variables
|
// Env variables
|
||||||
this.dev = this.options.dev
|
this.dev = this.options.dev
|
||||||
// Explicit srcDir and rootDir
|
// Explicit srcDir, rootDir and buildDir
|
||||||
this.dir = (typeof options.rootDir === 'string' && options.rootDir ? options.rootDir : process.cwd())
|
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)
|
this.srcDir = (typeof options.srcDir === 'string' && options.srcDir ? resolve(this.dir, options.srcDir) : this.dir)
|
||||||
|
this.buildDir = resolve(this.dir, '.nuxt')
|
||||||
options.rootDir = this.dir
|
options.rootDir = this.dir
|
||||||
options.srcDir = this.srcDir
|
options.srcDir = this.srcDir
|
||||||
|
options.buildDir = this.buildDir
|
||||||
// If store defined, update store options to true
|
// If store defined, update store options to true
|
||||||
if (fs.existsSync(join(this.srcDir, 'store'))) {
|
if (fs.existsSync(join(this.srcDir, 'store'))) {
|
||||||
this.options.store = true
|
this.options.store = true
|
||||||
@ -93,7 +95,7 @@ class Nuxt {
|
|||||||
// For serving static/ files to /
|
// For serving static/ files to /
|
||||||
this.serveStatic = pify(serveStatic(resolve(this.srcDir, 'static'), this.options.render.static))
|
this.serveStatic = pify(serveStatic(resolve(this.srcDir, 'static'), this.options.render.static))
|
||||||
// For serving .nuxt/dist/ files (only when build.publicPath is not an URL)
|
// For serving .nuxt/dist/ files (only when build.publicPath is not an URL)
|
||||||
this.serveStaticNuxt = pify(serveStatic(resolve(this.dir, '.nuxt', 'dist'), {
|
this.serveStaticNuxt = pify(serveStatic(resolve(this.buildDir, 'dist'), {
|
||||||
maxAge: (this.dev ? 0 : '1y') // 1 year in production
|
maxAge: (this.dev ? 0 : '1y') // 1 year in production
|
||||||
}))
|
}))
|
||||||
// gzip middleware for production
|
// gzip middleware for production
|
||||||
|
@ -40,8 +40,8 @@ export default function ({ isClient, isServer }) {
|
|||||||
'assets': join(this.srcDir, 'assets'), // use in template with <img src="~assets/nuxt.png" />
|
'assets': join(this.srcDir, 'assets'), // use in template with <img src="~assets/nuxt.png" />
|
||||||
'~assets': join(this.srcDir, 'assets'),
|
'~assets': join(this.srcDir, 'assets'),
|
||||||
'~plugins': join(this.srcDir, 'plugins'),
|
'~plugins': join(this.srcDir, 'plugins'),
|
||||||
'~store': join(this.dir, '.nuxt/store'),
|
'~store': join(this.buildDir, 'store'),
|
||||||
'~router': join(this.dir, '.nuxt/router'),
|
'~router': join(this.buildDir, 'router'),
|
||||||
'~pages': join(this.srcDir, 'pages'),
|
'~pages': join(this.srcDir, 'pages'),
|
||||||
'~components': join(this.srcDir, 'components')
|
'~components': join(this.srcDir, 'components')
|
||||||
},
|
},
|
||||||
|
@ -25,7 +25,7 @@ export default function () {
|
|||||||
let config = base.call(this, { isClient: true })
|
let config = base.call(this, { isClient: true })
|
||||||
|
|
||||||
// Entry
|
// Entry
|
||||||
config.entry.app = resolve(this.dir, '.nuxt', 'client.js')
|
config.entry.app = resolve(this.buildDir, 'client.js')
|
||||||
|
|
||||||
// Add vendors
|
// Add vendors
|
||||||
if (this.options.store) {
|
if (this.options.store) {
|
||||||
@ -34,7 +34,7 @@ export default function () {
|
|||||||
config.entry.vendor = config.entry.vendor.concat(this.options.build.vendor)
|
config.entry.vendor = config.entry.vendor.concat(this.options.build.vendor)
|
||||||
|
|
||||||
// Output
|
// Output
|
||||||
config.output.path = resolve(this.dir, '.nuxt', 'dist')
|
config.output.path = resolve(this.buildDir, 'dist')
|
||||||
config.output.filename = this.options.build.filenames.app
|
config.output.filename = this.options.build.filenames.app
|
||||||
|
|
||||||
// env object defined in nuxt.config.js
|
// env object defined in nuxt.config.js
|
||||||
|
@ -24,9 +24,9 @@ export default function () {
|
|||||||
config = Object.assign(config, {
|
config = Object.assign(config, {
|
||||||
target: 'node',
|
target: 'node',
|
||||||
devtool: (this.dev ? 'source-map' : false),
|
devtool: (this.dev ? 'source-map' : false),
|
||||||
entry: resolve(this.dir, '.nuxt', 'server.js'),
|
entry: resolve(this.buildDir, 'server.js'),
|
||||||
output: Object.assign({}, config.output, {
|
output: Object.assign({}, config.output, {
|
||||||
path: resolve(this.dir, '.nuxt', 'dist'),
|
path: resolve(this.buildDir, 'dist'),
|
||||||
filename: 'server-bundle.js',
|
filename: 'server-bundle.js',
|
||||||
libraryTarget: 'commonjs2'
|
libraryTarget: 'commonjs2'
|
||||||
}),
|
}),
|
||||||
|
Loading…
Reference in New Issue
Block a user