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

fix: temporary disable build.config hydration

Browse Source
This commit is contained in:
Pooya Parsa 2017-12-13 05:47:44 +03:30
parent cc74126fa6
commit 4f55aadd1e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/common/options.js
View File

@ -36,11 +36,13 @@ Options.from = function (_options) {
options.rootDir = hasValue(options.rootDir) ? options.rootDir : process.cwd() options.rootDir = hasValue(options.rootDir) ? options.rootDir : process.cwd()
// Apply defaults by ${buildDir}/dist/build.config.js // Apply defaults by ${buildDir}/dist/build.config.js
const buildDir = options.buildDir || Options.defaults.buildDir // TODO: Unsafe operation.
const buildConfig = resolve(options.rootDir, buildDir, 'build.config.js') // const buildDir = options.buildDir || Options.defaults.buildDir
if (existsSync(buildConfig)) { // const buildConfig = resolve(options.rootDir, buildDir, 'build.config.js')
_.defaultsDeep(options, require(buildConfig)) // if (existsSync(buildConfig)) {
} // _.defaultsDeep(options, require(buildConfig))
// }
// Apply defaults // Apply defaults
_.defaultsDeep(options, Options.defaults) _.defaultsDeep(options, Options.defaults)