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

feat(build): add build.includeConfig to embed nuxt.config in dist after building (#2313)

Browse Source 
* feat(build): add build.includeConfig to embed nuxt.config in dist after building

* refactor: remove build.includeConfig and Options.safeKeys
This commit is contained in:
Clark Du 2017-12-05 03:52:50 +08:00 committed by Pooya Parsa
parent aeb13eb8a0
commit 99d7177d90
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/builder/builder.js
View File

@ -17,6 +17,7 @@ import serverWebpackConfig from './webpack/server.config.js'
import dllWebpackConfig from './webpack/dll.config.js' import dllWebpackConfig from './webpack/dll.config.js'
import vueLoaderConfig from './webpack/vue-loader.config' import vueLoaderConfig from './webpack/vue-loader.config'
import styleLoader from './webpack/style-loader' import styleLoader from './webpack/style-loader'
import { Options } from 'common'
const debug = Debug('nuxt:build') const debug = Debug('nuxt:build')
debug.color = 2 // Force green color debug.color = 2 // Force green color
@ -62,6 +63,8 @@ export default class Builder {
// Stop watching on nuxt.close() // Stop watching on nuxt.close()
if (this.options.dev) { if (this.options.dev) {
this.nuxt.hook('close', () => this.unwatch()) this.nuxt.hook('close', () => this.unwatch())
} else {
this.nuxt.hook('build:done', () => this.generateConfig())
} }
} }
@ -559,6 +562,12 @@ export default class Builder {
// Stop webpack middleware // Stop webpack middleware
await this.webpackDevMiddleware.close() await this.webpackDevMiddleware.close()
} }
async generateConfig() {
const config = resolve(this.options.buildDir, 'build.config.js')
const options = _.omit(this.options, Options.unsafeKeys)
await writeFile(config, `module.exports = ${JSON.stringify(options, null, ' ')}`, 'utf8')
}
} }
const STATUS = { const STATUS = {

16
lib/common/options.js
View File

@ -32,12 +32,19 @@ Options.from = function (_options) {
options.layoutTransition = { name: options.layoutTransition } options.layoutTransition = { name: options.layoutTransition }
} }
const hasValue = v => typeof v === 'string' && v
options.rootDir = hasValue(options.rootDir) ? options.rootDir : process.cwd()
// Apply defaults by ${buildDir}/dist/build.config.js
const buildDir = options.buildDir || Options.defaults.buildDir
const buildConfig = resolve(options.rootDir, buildDir, 'build.config.js')
if (existsSync(buildConfig)) {
_.defaultsDeep(options, require(buildConfig))
}
// Apply defaults // Apply defaults
_.defaultsDeep(options, Options.defaults) _.defaultsDeep(options, Options.defaults)
// Resolve dirs // Resolve dirs
const hasValue = v => typeof v === 'string' && v
options.rootDir = hasValue(options.rootDir) ? options.rootDir : process.cwd()
options.srcDir = hasValue(options.srcDir) ? resolve(options.rootDir, options.srcDir) : options.rootDir options.srcDir = hasValue(options.srcDir) ? resolve(options.rootDir, options.srcDir) : options.rootDir
options.buildDir = resolve(options.rootDir, options.buildDir) options.buildDir = resolve(options.rootDir, options.buildDir)
options.cacheDir = resolve(options.rootDir, options.cacheDir) options.cacheDir = resolve(options.rootDir, options.cacheDir)
@ -185,6 +192,11 @@ Options.modes = {
} }
} }
Options.unsafeKeys = [
'rootDir', 'srcDir', 'buildDir', 'modulesDir', 'cacheDir', 'nuxtDir',
'nuxtAppDir', 'build', 'generate', 'router.routes', 'appTemplatePath'
]
Options.defaults = { Options.defaults = {
mode: 'universal', mode: 'universal',
dev: process.env.NODE_ENV !== 'production', dev: process.env.NODE_ENV !== 'production',