Commit0ef28be

committed

update config

1 parentd33b2c2 commit0ef28beCopy full SHA for 0ef28be

File tree

+19

-12

lines changed

+19

-12

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,29 +19,29 @@ devConfig.devServer = {`
`19`	`19`	`hot:true,`
`20`	`20`	`noInfo:false,`
`21`	`21`	`quite:false,`
`22`		`-port:3000,`
	`22`	`+port:config.dev.port,`
`23`	`23`	`debug:true,`
`24`	`24`	`inline:true,`
`25`	`25`	`progress:true,`
`26`	`26`	`historyApiFallback:true,`
`27`	`27`	`colors:true,`
`28`	`28`	`stats:'normal',`
`29`		`-contentBase:'/',`
`30`		`-publicPath:"/"`
	`29`	`+contentBase:config.dev.assetsPublicPath,`
	`30`	`+publicPath:config.dev.assetsPublicPath`
`31`	`31`	`};`
`32`	`32`
`33`	`33`	`module.exports=Object.assign({},devConfig,{`
`34`	`34`	`entry:{`
`35`	`35`	`app:[`
`36`	`36`	`"webpack/hot/dev-server",`
`37`		`-"webpack-dev-server/client?http://localhost:3000/",`
	`37`	+`webpack-dev-server/client?http://localhost:${config.dev.port}/`,
`38`	`38`	`path.resolve(__dirname,'../src/index.js')`
`39`	`39`	`]`
`40`	`40`	`},`
`41`	`41`	`output:{`
`42`	`42`	`filename:'[name].js',`
`43`		`-path:path.resolve(__dirname,'../assets/'),`
`44`		`-publicPath:"/",`
	`43`	`+path:config.dev.assetsRoot,`
	`44`	`+publicPath:config.dev.assetsPublicPath,`
`45`	`45`	`sourceMapFilename:'[file].map'`
`46`	`46`	`},`
`47`	`47`	`devtool:'#cheap-module-eval-source-map'`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ let config = require('../config');`
`9`	`9`	`prodConfig.plugins=(prodConfig.plugins\|\|[]).concat([`
`10`	`10`	`newwebpack.optimize.DedupePlugin(),`
`11`	`11`	`newwebpack.DefinePlugin({`
`12`		`-'process.env':config.prod.env`
	`12`	`+'process.env':config.build.env`
`13`	`13`	`}),`
`14`	`14`	`newwebpack.optimize.UglifyJsPlugin({`
`15`	`15`	`compress:{`
`@@ -29,8 +29,8 @@ module.exports = Object.assign({},prodConfig,{`
`29`	`29`	`},`
`30`	`30`	`output:{`
`31`	`31`	`filename:'[name].js',`
`32`		`-path:path.resolve(__dirname,'../assets/'),`
`33`		`-publicPath:'/',`
	`32`	`+path:config.build.assetsRoot,`
	`33`	`+publicPath:config.build.assetsPublicPath,`
`34`	`34`	`sourceMapFilename:'[file].map'`
`35`	`35`	`},`
`36`	`36`	`devtool:'#source-map'`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,16 @@ let path = require('path');`
`4`	`4`
`5`	`5`	`module.exports={`
`6`	`6`	`dev:{`
`7`		`-env:require('./dev.env.js')`
	`7`	`+env:require('./dev.env.js'),`
	`8`	`+assetsRoot:path.resolve(__dirname,'../dist'),`
	`9`	`+assetsPublicPath:'/',`
	`10`	`+assetsSubDirectory:'static',`
	`11`	`+port:3000`
`8`	`12`	`},`
`9`		`-prod:{`
`10`		`-env:require('./prod.env.js')`
	`13`	`+build:{`
	`14`	`+env:require('./prod.env.js'),`
	`15`	`+assetsRoot:path.resolve(__dirname,'../dist'),`
	`16`	`+assetsPublicPath:'/',`
	`17`	`+assetsSubDirectory:'static'`
`11`	`18`	`}`
`12`	`19`	`}`

Comments

(0)