Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-01-30 15:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor more into defaults

Browse Source
This commit is contained in:
Pooya Parsa 2017-06-14 22:02:25 +04:30
parent 8691e21efb
commit 3747e3cc36
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/builder.js
View File

@ -9,10 +9,9 @@ import webpackDevMiddleware from 'webpack-dev-middleware'
import webpackHotMiddleware from 'webpack-hot-middleware' import webpackHotMiddleware from 'webpack-hot-middleware'
import { join, resolve, basename, dirname } from 'path' import { join, resolve, basename, dirname } from 'path'
import Tapable from 'tappable' import Tapable from 'tappable'
import { isUrl, r, wp, createRoutes } from './utils' import { r, wp, createRoutes } from './utils'
import clientWebpackConfig from './webpack/client.config.js' import clientWebpackConfig from './webpack/client.config.js'
import serverWebpackConfig from './webpack/server.config.js' import serverWebpackConfig from './webpack/server.config.js'
import defaults from './defaults'
import MFS from 'memory-fs' import MFS from 'memory-fs'
const debug = require('debug')('nuxt:build') const debug = require('debug')('nuxt:build')
@ -70,16 +69,6 @@ export default class Builder extends Tapable {
} }
_.defaultsDeep(this.options.build, extraDefaults) _.defaultsDeep(this.options.build, extraDefaults)
/* istanbul ignore if */
if (this.options.dev && isUrl(this.options.build.publicPath)) {
this.options.build.publicPath = defaults.build.publicPath
}
// If store defined, update store options to true unless explicitly disabled
if (this.options.store !== false && fs.existsSync(join(this.options.srcDir, 'store'))) {
this.options.store = true
}
// Mute stats on dev // Mute stats on dev
this.webpackStats = this.options.dev ? '' : { this.webpackStats = this.options.dev ? '' : {
chunks: false, chunks: false,

11
lib/defaults.js
View File

@ -1,6 +1,7 @@
import _ from 'lodash' import _ from 'lodash'
import { join, resolve } from 'path' import { join, resolve } from 'path'
import { existsSync } from 'fs' import { existsSync } from 'fs'
import { isUrl } from './utils'
export default function defaults (_options) { export default function defaults (_options) {
// Clone options to prevent unwanted side-effects // Clone options to prevent unwanted side-effects
@ -34,6 +35,16 @@ export default function defaults (_options) {
options.appTemplatePath = join(options.srcDir, 'app.html') options.appTemplatePath = join(options.srcDir, 'app.html')
} }
// Ignore publicPath on dev
if (options.dev && isUrl(options.build.publicPath)) {
options.build.publicPath = defaultOptions.build.publicPath
}
// If store defined, update store options to true unless explicitly disabled
if (options.store !== false && existsSync(join(options.srcDir, 'store'))) {
this.options.store = true
}
return options return options
} }