Merge pull request #104 from eleven-labs/fix-wiredep-exclude

Fix exclude condition in wiredep for Angular-UI
Swiip · Nov 9, 2014 · c7f21f1 · c7f21f1
2 parents df4913b + d86292f
commit c7f21f1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/app/src/compile.js b/app/src/compile.js
@@ -33,10 +33,6 @@ module.exports = function () {
     this.props.jQuery
   ]);
 
-  this.model.wiredepExclusions = [
-    this.props.ui.name
-  ];
-
   this.model.modulesDependencies = _.flatten([
     angularModules,
     this.props.resource.module,

diff --git a/app/src/format.js b/app/src/format.js
@@ -24,14 +24,6 @@ module.exports = function () {
 
   this.bowerResolutions = processBowerDependencies(this.model.bowerResolutions);
 
-  this.wiredepExclusions = _.chain(this.model.wiredepExclusions)
-    .filter(_.isString)
-    .map(function (dependency) {
-      return '\'' + dependency + '\'';
-    })
-    .value()
-    .join(', ');
-
   this.modulesDependencies = _.chain(this.model.modulesDependencies)
     .filter(_.isString)
     .map(function (dependency) {

diff --git a/app/templates/gulp/_wiredep.js b/app/templates/gulp/_wiredep.js
@@ -9,7 +9,7 @@ gulp.task('wiredep', function () {
   return gulp.src('src/index.html')
     .pipe(wiredep({
       directory: 'bower_components',
-      exclude: [<%= wiredepExclusions %>],
+      exclude: [/bootstrap-sass-official/, /bootstrap.js/<% if(props.cssPreprocessor.key !== 'css') { %>, /bootstrap.css/<% } %>],
     }))
     .pipe(gulp.dest('src'));
 });