Merge pull request #96 from eleven-labs/fix

Mehdy Dara · Mehdy Dara · commit 7c23411c12de · 2014-11-05T22:59:53.000+01:00
Fix usage of useref, wiredep with bower_components
diff --git a/app/src/compile.js b/app/src/compile.js
@@ -64,9 +64,9 @@ module.exports = function () {
   } else {
     this.model.cssLinks = [];
     if(this.props.ui.key === 'bootstrap') {
-      this.model.cssLinks.push('bower_components/bootstrap/dist/css/bootstrap.css');
+      this.model.cssLinks.push('../bower_components/bootstrap/dist/css/bootstrap.css');
     } else if(this.props.ui.key === 'foundation') {
-      this.model.cssLinks.push('bower_components/foundation/css/foundation.css');
+      this.model.cssLinks.push('../bower_components/foundation/css/foundation.css');
     }
   }
 
diff --git a/app/src/format.js b/app/src/format.js
@@ -111,13 +111,11 @@ module.exports = function () {
   var styleAppDest = 'src/app/index.' + this.props.cssPreprocessor.extension;
   var styleCopies = {};
   styleCopies[styleAppSource] = styleAppDest;
-  this.styleVendorPosition = '.';
 
   if(this.model.vendorStylesPreprocessed) {
     var styleVendorSource = 'src/app/__' + this.props.ui.key + '-vendor.' + this.props.cssPreprocessor.extension;
     var styleVendorDest = 'src/app/vendor.' + this.props.cssPreprocessor.extension;
     styleCopies[styleVendorSource] = styleVendorDest;
-    this.styleVendorPosition = '{.tmp,app}';
   }
 
   this.optionalFiles.push({ copies: styleCopies });
diff --git a/app/templates/gulp/_wiredep.js b/app/templates/gulp/_wiredep.js
@@ -6,18 +6,10 @@ var gulp = require('gulp');
 gulp.task('wiredep', function () {
   var wiredep = require('wiredep').stream;
 
-  gulp.src('src/{app,components}/*.scss')
-    .pipe(wiredep({
-      directory: 'bower_components',
-      ignorePath: /^\/|\.\.\//
-    }))
-    .pipe(gulp.dest('src'));
-
-  gulp.src('src/*.html')
+  return gulp.src('src/index.html')
     .pipe(wiredep({
       directory: 'bower_components',
       exclude: [<%= wiredepExclusions %>],
-      ignorePath: /^\/|\.\.\//
     }))
     .pipe(gulp.dest('src'));
 });
diff --git a/app/templates/src/_index.html b/app/templates/src/_index.html
@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width">
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
 
-    <!-- build:css(<%= styleVendorPosition %>) styles/vendor.css -->
+    <!-- build:css({.tmp,src}) styles/vendor.css -->
     <%= cssLinks %>
 
     <!-- bower:css -->
@@ -19,8 +19,8 @@
     <link rel="stylesheet" href="app/index.css">
     <!-- endbuild -->
 
-    <!-- build:js(.) scripts/modernizr.js -->
-    <script src="bower_components/modernizr/modernizr.js"></script>
+    <!-- build:js scripts/modernizr.js -->
+    <script src="../bower_components/modernizr/modernizr.js"></script>
     <!-- endbuild -->
   </head>
   <body>
@@ -40,13 +40,13 @@
       ga('create','UA-XXXXX-X');ga('send','pageview');
     </script>
 
-    <!-- build:js(.) scripts/vendor.js -->
+    <!-- build:js scripts/vendor.js -->
     <!-- bower:js -->
     <!-- run `gulp wiredep` to automaticaly populate bower script dependencies -->
     <!-- endbower -->
     <!-- endbuild -->
 
-    <!-- build:js({src,.tmp}) scripts/app.js -->
+    <!-- build:js({.tmp,src}) scripts/app.js -->
     <script src="app/index.js"></script>
     <script src="app/main/main.controller.js"></script>
     <script src="components/navbar/navbar.controller.js"></script>

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,9 @@ module.exports = function () {`
`64`	`64`	`} else {`
`65`	`65`	`this.model.cssLinks = [];`
`66`	`66`	`if(this.props.ui.key === 'bootstrap') {`
`67`		`- this.model.cssLinks.push('bower_components/bootstrap/dist/css/bootstrap.css');`
	`67`	`+ this.model.cssLinks.push('../bower_components/bootstrap/dist/css/bootstrap.css');`
`68`	`68`	`} else if(this.props.ui.key === 'foundation') {`
`69`		`- this.model.cssLinks.push('bower_components/foundation/css/foundation.css');`
	`69`	`+ this.model.cssLinks.push('../bower_components/foundation/css/foundation.css');`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`