@@ -18,7 +18,8 @@ module.exports = function () {
1818 this . props . resource . module ,
1919 this . props . router . module ,
2020 this . props . ui . module ,
21- this . props . bootstrapComponents . module
21+ this . props . bootstrapComponents . module ,
22+ this . props . foundationComponents . module
2223 ] ) ;
2324
2425 this . modulesDependencies = _ . chain ( ngModules )
@@ -37,6 +38,7 @@ module.exports = function () {
3738 this . props . jQuery . name ,
3839 this . props . ui . key ,
3940 this . props . bootstrapComponents . key ,
41+ this . props . foundationComponents . key ,
4042 this . props . cssPreprocessor . key
4143 ]
4244 . filter ( _ . isString )
@@ -86,16 +88,29 @@ module.exports = function () {
8688
8789 // Wiredep exclusions
8890 this . wiredepExclusions = [ ] ;
89- if ( this . props . bootstrapComponents . key !== 'official' ) {
90- if ( this . props . cssPreprocessor . extension === 'scss' ) {
91- this . wiredepExclusions . push ( '/bootstrap-sass-official/' ) ;
92- } else {
93- this . wiredepExclusions . push ( '/bootstrap\\.js/' ) ;
91+ if ( this . props . ui . key === 'bootstrap' ) {
92+ if ( this . props . bootstrapComponents . key !== 'official' ) {
93+
94+ if ( this . props . cssPreprocessor . extension === 'scss' ) {
95+ this . wiredepExclusions . push ( '/bootstrap-sass-official/' ) ;
96+ } else {
97+ this . wiredepExclusions . push ( '/bootstrap\\.js/' ) ;
98+ }
99+ }
100+
101+ if ( this . props . cssPreprocessor . key !== 'css' ) {
102+ this . wiredepExclusions . push ( '/bootstrap\\.css/' ) ;
103+ }
104+
105+ } else if ( this . props . ui . key === 'foundation' ) {
106+
107+ if ( this . props . foundationComponents . key !== 'official' ) {
108+ this . wiredepExclusions . push ( '/foundation\\.js/' ) ;
109+ }
110+
111+ if ( this . props . cssPreprocessor . key !== 'css' ) {
112+ this . wiredepExclusions . push ( '/foundation\\.css/' ) ;
94113 }
95- }
96- if ( this . props . cssPreprocessor . key !== 'css' ) {
97- this . wiredepExclusions . push ( '/bootstrap\\.css/' ) ;
98- this . wiredepExclusions . push ( '/foundation\\.css/' ) ;
99114 }
100115
101116 // Format choice UI Framework
0 commit comments