Fix initial wiredep run

yeoman · Jun 28, 2015 · 5fb6e01 · 5fb6e01
1 parent e41368f
commit 5fb6e01
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/app/index.js b/app/index.js
@@ -318,19 +318,17 @@ module.exports = generators.Base.extend({
     // wire Bower packages to .html
     wiredep({
       bowerJson: bowerJson,
-      directory: 'bower_components',
-      exclude: ['bootstrap-sass', 'bootstrap.js'],
-      ignorePath: /^(\.\.\/)*\.\./,
-      src: 'app/index.html'
+      src: 'app/index.html',
+      exclude: ['bootstrap.js'],
+      ignorePath: /^app\/|\.\.\//
     });
 
     if (this.includeSass) {
       // wire Bower packages to .scss
       wiredep({
         bowerJson: bowerJson,
-        directory: 'bower_components',
-        ignorePath: /^(\.\.\/)+/,
-        src: 'app/styles/*.scss'
+        src: 'app/styles/*.scss',
+        ignorePath: /(\.\.\/){1,2}bower_components\//
       });
     }
   }

diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
@@ -236,10 +236,11 @@ module.exports = function (grunt) {
     // Automatically inject Bower components into the HTML file
     wiredep: {
       app: {
-        ignorePath: /^<%%= config.app %>\/|\.\.\//,
-        src: ['<%%= config.app %>/index.html']<% if (includeBootstrap) { %>,<% if (includeSass) { %>
-        exclude: ['bower_components/bootstrap-sass/assets/javascripts/bootstrap.js']<% } else { %>
-        exclude: ['bower_components/bootstrap/dist/js/bootstrap.js']<% } } %>
+        src: ['<%%= config.app %>/index.html'],
+<% if (includeBootstrap) { -%>
+        exclude: ['bootstrap.js'],
+<% } -%>
+        ignorePath: /^<%%= config.app %>\/|\.\.\//
       }<% if (includeSass) { %>,
       sass: {
         src: ['<%%= config.app %>/styles/{,*/}*.{scss,sass}'],