File tree Expand file tree Collapse file tree 3 files changed +446
-37
lines changed Expand file tree Collapse file tree 3 files changed +446
-37
lines changed Original file line number Diff line number Diff line change 11{
22 "name" : " vuefront-nuxt" ,
3- "version" : " 0.3.8 " ,
3+ "version" : " 0.3.9 " ,
44 "description" : " vuefront-nuxt" ,
55 "repository" : {
66 "type" : " git" ,
1818 "typings" : " types/index.d.ts" ,
1919 "peerDependencies" : {},
2020 "dependencies" : {
21- "@types/node" : " ^13.7.4 " ,
21+ "@types/node" : " ^13.9.1 " ,
2222 "apollo-boost" : " ^0.4.7" ,
2323 "cookie-universal" : " ^2.1.1" ,
2424 "graphql" : " ^14.6.0" ,
2525 "isomorphic-fetch" : " ^2.2.1" ,
2626 "lodash" : " ^4.17.15" ,
2727 "vue" : " ^2.6.11" ,
2828 "vue-graphql-loader" : " ^0.3.3" ,
29- "vue-i18n" : " ^8.15.3 " ,
30- "vuefront" : " ^0.3.4 "
29+ "vue-i18n" : " ^8.15.5 " ,
30+ "vuefront" : " ^0.3.5 "
3131 }
3232}
Original file line number Diff line number Diff line change @@ -129,6 +129,13 @@ export default (rootDir) => {
129129 themeOptions = { ...themeOptions , ...convertPath ( themeOptions ) }
130130 let config = require ( rootDir + '/vuefront.config' ) . default
131131 config = { ...config , ...convertPath ( config ) }
132+ if ( typeof config . app !== 'undefined' ) {
133+ for ( const key in config . app ) {
134+ let customAppOptions = require ( config . app [ key ] ) . default
135+ customAppOptions = { ...customAppOptions , ...convertPath ( customAppOptions ) }
136+ themeOptions = _ . mergeWith ( themeOptions , customAppOptions , mergeConfig )
137+ }
138+ }
132139 if ( typeof config . theme !== 'undefined' ) {
133140 let customThemeOptions = require ( config . theme ) . default
134141 customThemeOptions = { ...customThemeOptions , ...convertPath ( customThemeOptions ) }
You can’t perform that action at this time.
0 commit comments