Merge pull request #466 from Swiip/always-use-vendor-css-prepro

Add a vendor.cssPreprocessor in all cases

app/src/router.js

@@ -11,10 +11,10 @@ module.exports = function(GulpAngularGenerator) {
 
     if (this.props.router.module === 'ngRoute') {
       this.routerHtml = '<div ng-view></div>';
-      this.routerJs = this.fs.read(this.templatePath('src/app/__ngroute.' + this.props.jsPreprocessor.extension));
+      this.routerJs = this.fs.read(this.templatePath('src/app/_ngroute/__ngroute.' + this.props.jsPreprocessor.extension));
     } else if (this.props.router.module === 'ui.router') {
       this.routerHtml = '<div ui-view></div>';
-      this.routerJs = this.fs.read(this.templatePath('src/app/__uirouter.' + this.props.jsPreprocessor.extension));
+      this.routerJs = this.fs.read(this.templatePath('src/app/_uirouter/__uirouter.' + this.props.jsPreprocessor.extension));
     } else {
       this.routerHtml = this.fs.read(this.templatePath(routerPartialSrc));
       this.routerHtml = this.routerHtml.replace(

app/src/ui.js

@@ -55,14 +55,14 @@ module.exports = function(GulpAngularGenerator) {
     }
 
     this.files.push({
-      src: 'src/app/__' + this.props.ui.key + '-index.' + this.props.cssPreprocessor.extension,
+      src: 'src/app/_' + this.props.ui.key + '/__' + this.props.ui.key + '-index.' + this.props.cssPreprocessor.extension,
       dest: 'src/app/index.' + this.props.cssPreprocessor.extension,
       template: false
     });
 
-    if(this.isVendorStylesPreprocessed && this.props.ui.key !== 'none') {
+    if(this.props.cssPreprocessor.key !== 'none') {
       this.files.push({
-        src: 'src/app/__' + this.props.ui.key + '-vendor.' + this.props.cssPreprocessor.extension,
+        src: 'src/app/_' + this.props.ui.key + '/__' + this.props.ui.key + '-vendor.' + this.props.cssPreprocessor.extension,
         dest: 'src/app/vendor.' + this.props.cssPreprocessor.extension,
         template: true
       });
@@ -80,7 +80,7 @@ module.exports = function(GulpAngularGenerator) {
     if (this.props.ui.key === 'bootstrap') {
       if(this.props.bootstrapComponents.key !== 'official') {
         if(this.props.cssPreprocessor.extension === 'scss') {
-          this.wiredepExclusions.push('/bootstrap-sass-official/');
+          this.wiredepExclusions.push('/bootstrap-sass-official\\/.*\\.js/');
         } else {
           this.wiredepExclusions.push('/bootstrap\\.js/');
         }

app/templates/_gulpfile.js

@@ -2,7 +2,6 @@
 
 var gulp = require('gulp');
 var gutil = require('gulp-util');
-var _ = require('lodash');
 var wrench = require('wrench');
 
 var options = {
@@ -15,6 +14,12 @@ var options = {
       gutil.log(gutil.colors.red('[' + title + ']'), err.toString());
       this.emit('end');
     };
+  },
+  wiredep: {
+    directory: 'bower_components'
+<% if(wiredepExclusions.length > 0) { %>,
+    exclude: [<%= wiredepExclusions.join(', ') %>]
+<% } %>
   }
 };
 

app/templates/gulp/_inject.js

@@ -19,8 +19,8 @@ module.exports = function(options) {
       options.src + '/app/**/*.css'
     ], { read: false });
 <% } %>
-
 <% if (props.jsPreprocessor.key === 'typescript') { %>
+
     var sortOutput = require('../' + options.tmp + '/sortOutput.json');
 <% } %>
 
@@ -49,17 +49,10 @@ module.exports = function(options) {
       addRootSlash: false
     };
 
-    var wiredepOptions = {
-      directory: 'bower_components'
-<% if(wiredepExclusions.length > 0) { %>,
-      exclude: [<%= wiredepExclusions.join(', ') %>]
-<% } %>
-    };
-
     return gulp.src(options.src + '/*.html')
       .pipe($.inject(injectStyles, injectOptions))
       .pipe($.inject(injectScripts, injectOptions))
-      .pipe(wiredep(wiredepOptions))
+      .pipe(wiredep(options.wiredep))
       .pipe(gulp.dest(options.tmp + '/serve'));
 
   });

app/templates/gulp/_styles.js

@@ -5,6 +5,8 @@ var browserSync = require('browser-sync');
 
 var $ = require('gulp-load-plugins')();
 
+var wiredep = require('wiredep').stream;
+
 module.exports = function(options) {
   gulp.task('styles', function () {
 <% if (props.cssPreprocessor.key === 'less') { %>
@@ -37,6 +39,7 @@ module.exports = function(options) {
     };
 
     var indexFilter = $.filter('index.<%= props.cssPreprocessor.extension %>');
+    var vendorFilter = $.filter('vendor.<%= props.cssPreprocessor.extension %>');
 <% if (props.cssPreprocessor.key === 'ruby-sass') { %>
     var cssFilter = $.filter('**/*.css');
 <% } %>
@@ -45,28 +48,31 @@ module.exports = function(options) {
       options.src + '/app/index.<%= props.cssPreprocessor.extension %>',
       options.src + '/app/vendor.<%= props.cssPreprocessor.extension %>'
     ])
-    .pipe(indexFilter)
-    .pipe($.inject(injectFiles, injectOptions))
-    .pipe(indexFilter.restore())
+      .pipe(indexFilter)
+      .pipe($.inject(injectFiles, injectOptions))
+      .pipe(indexFilter.restore())
+      .pipe(vendorFilter)
+      .pipe(wiredep(options.wiredep))
+      .pipe(vendorFilter.restore())
 <% if (props.cssPreprocessor.key === 'ruby-sass') { %>
-    .pipe($.rubySass(sassOptions)).on('error', options.errorHandler('RubySass'))
-    .pipe(cssFilter)
-    .pipe($.sourcemaps.init({ loadMaps: true }))
+      .pipe($.rubySass(sassOptions)).on('error', options.errorHandler('RubySass'))
+      .pipe(cssFilter)
+      .pipe($.sourcemaps.init({ loadMaps: true }))
 <% } else { %>
-    .pipe($.sourcemaps.init())
+      .pipe($.sourcemaps.init())
 <% } if (props.cssPreprocessor.key === 'less') { %>
-    .pipe($.less(lessOptions)).on('error', options.errorHandler('Less'))
+      .pipe($.less(lessOptions)).on('error', options.errorHandler('Less'))
 <% } else if (props.cssPreprocessor.key === 'node-sass') { %>
-    .pipe($.sass(sassOptions)).on('error', options.errorHandler('Sass'))
+      .pipe($.sass(sassOptions)).on('error', options.errorHandler('Sass'))
 <% } else if (props.cssPreprocessor.key === 'stylus') { %>
-    .pipe($.stylus()).on('error', options.errorHandler('Stylus'))
+      .pipe($.stylus()).on('error', options.errorHandler('Stylus'))
 <% } %>
-    .pipe($.autoprefixer()).on('error', options.errorHandler('Autoprefixer'))
-    .pipe($.sourcemaps.write())
+      .pipe($.autoprefixer()).on('error', options.errorHandler('Autoprefixer'))
+      .pipe($.sourcemaps.write())
 <% if (props.cssPreprocessor.key === 'ruby-sass') { %>
-    .pipe(cssFilter.restore())
+      .pipe(cssFilter.restore())
 <% } %>
-    .pipe(gulp.dest(options.tmp + '/serve/app/'))
-    .pipe(browserSync.reload({ stream: true }));
+      .pipe(gulp.dest(options.tmp + '/serve/app/'))
+      .pipe(browserSync.reload({ stream: true }));
   });
 };

app/templates/gulp/_unit-tests.js

@@ -11,14 +11,11 @@ var _ = require('lodash');
 
 module.exports = function(options) {
   function listFiles(callback) {
-    var bowerDeps = wiredep({
-      directory: 'bower_components',
-<% if(wiredepExclusions.length > 0) { %>
-      exclude: [<%= wiredepExclusions.join(', ') %>],
-<% } %>
+    var wiredepOptions = _.extend({}, options.wiredep, {
       dependencies: true,
       devDependencies: true
     });
+    var bowerDeps = wiredep(wiredepOptions);
 
     var specFiles = [
       options.src + '/**/*.spec.js',

app/templates/src/_index.html

@@ -8,11 +8,9 @@
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
 
     <!-- build:css({<%= props.paths.tmp %>/serve,<%= props.paths.src %>}) styles/vendor.css -->
-<%   if (isVendorStylesPreprocessed) { %>
+<% if (props.cssPreprocessor.key !== 'none') { %>
     <link rel="stylesheet" href="app/vendor.css">
-<%   } else if (props.ui.key === 'bootstrap') { %>
-    <link rel="stylesheet" href="<%= computedPaths.appToBower %>/bower_components/bootstrap/dist/css/bootstrap.css">
-<%   } %>
+<% } %>
     <!-- bower:css -->
     <!-- run `gulp inject` to automatically populate bower styles dependencies -->
     <!-- endbower -->

app/templates/src/app/__angular-material-index.less → app/templates/src/app/_angular-material/__angular-material-index.less

@@ -53,5 +53,8 @@ section.jumbotron {
     }
   }
 }
+
+/* Do not remove this comments bellow. It's the markers used by gulp-inject to inject
+   all your less files automatically */
 // injector
 // endinjector

app/templates/src/app/__angular-material-index.scss → app/templates/src/app/_angular-material/__angular-material-index.scss

@@ -53,5 +53,8 @@ section.jumbotron {
     }
   }
 }
+
+/* Do not remove this comments bellow. It's the markers used by gulp-inject to inject
+   all your sass files automatically */
 // injector
 // endinjector

app/templates/src/app/__angular-material-index.styl → app/templates/src/app/_angular-material/__angular-material-index.styl

@@ -41,5 +41,8 @@ section
       &.pull-right
         float right
         width 50px
+
+/* Do not remove this comments bellow. It's the markers used by gulp-inject to inject
+   all your stylus files automatically */
 // injector
 // endinjector

app/templates/src/app/_angular-material/__angular-material-vendor.less

@@ -0,0 +1,4 @@
+/* Do not remove this comments bellow. It's the markers used by wiredep to inject
+   less dependencies when defined in the bower.json of your dependencies */
+// bower:less
+// endbower

app/templates/src/app/_angular-material/__angular-material-vendor.scss

@@ -0,0 +1,4 @@
+/* Do not remove this comments bellow. It's the markers used by wiredep to inject
+   sass dependencies when defined in the bower.json of your dependencies */
+// bower:scss
+// endbower

app/templates/src/app/_angular-material/__angular-material-vendor.styl

@@ -0,0 +1,4 @@
+/* Do not remove this comments bellow. It's the markers used by wiredep to inject
+   stylus dependencies when defined in the bower.json of your dependencies */
+// bower:styl
+// endbower

app/templates/src/app/__bootstrap-index.less → app/templates/src/app/_bootstrap/__bootstrap-index.less

@@ -12,5 +12,8 @@
     width: 50px;
   }
 }
+
+/* Do not remove this comments bellow. It's the markers used by gulp-inject to inject
+   all your less files automatically */
 // injector
 // endinjector

app/templates/src/app/__bootstrap-index.scss → app/templates/src/app/_bootstrap/__bootstrap-index.scss

@@ -12,5 +12,8 @@
     width: 50px;
   }
 }
+
+/* Do not remove this comments bellow. It's the markers used by gulp-inject to inject
+   all your sass files automatically */
 // injector
 // endinjector

app/templates/src/app/__bootstrap-index.styl → app/templates/src/app/_bootstrap/__bootstrap-index.styl

@@ -9,5 +9,8 @@
 
   img.pull-right
     width 50px
+
+/* Do not remove this comments bellow. It's the markers used by gulp-inject to inject
+   all your stylus files automatically */
 // injector
 // endinjector

app/templates/src/app/_bootstrap/__bootstrap-vendor.less

@@ -0,0 +1,6 @@
+/* Do not remove this comments bellow. It's the markers used by wiredep to inject
+   less dependencies when defined in the bower.json of your dependencies */
+// bower:less
+// endbower
+
+@icon-font-path: '../<%= computedPaths.appToBower %>/bower_components/bootstrap/fonts/';

app/templates/src/app/_bootstrap/__bootstrap-vendor.scss

@@ -0,0 +1,6 @@
+$icon-font-path: "../<%= computedPaths.appToBower %>/bower_components/bootstrap-sass-official/assets/fonts/bootstrap/";
+
+/* Do not remove this comments bellow. It's the markers used by wiredep to inject
+   sass dependencies when defined in the bower.json of your dependencies */
+// bower:scss
+// endbower

app/templates/src/app/_bootstrap/__bootstrap-vendor.styl

@@ -0,0 +1,4 @@
+/* Do not remove this comments bellow. It's the markers used by wiredep to inject
+   stylus dependencies when defined in the bower.json of your dependencies */
+// bower:styl
+// endbower

app/templates/src/app/__foundation-index.less → app/templates/src/app/_foundation/__foundation-index.less

@@ -17,5 +17,8 @@
     width: 50px;
   }
 }
+
+/* Do not remove this comments bellow. It's the markers used by gulp-inject to inject
+   all your less files automatically */
 // injector
 // endinjector

app/templates/src/app/__foundation-index.scss → app/templates/src/app/_foundation/__foundation-index.scss

@@ -17,5 +17,8 @@
     width: 50px;
   }
 }
+
+/* Do not remove this comments bellow. It's the markers used by gulp-inject to inject
+   all your sass files automatically */
 // injector
 // endinjector

app/templates/src/app/__foundation-index.styl → app/templates/src/app/_foundation/__foundation-index.styl

@@ -13,5 +13,8 @@
 
   img.right
     width 50px
+
+/* Do not remove this comments bellow. It's the markers used by gulp-inject to inject
+   all your stylus files automatically */
 // injector
 // endinjector

app/templates/src/app/_foundation/__foundation-vendor.less

@@ -0,0 +1,4 @@
+/* Do not remove this comments bellow. It's the markers used by wiredep to inject
+   less dependencies when defined in the bower.json of your dependencies */
+// bower:less
+// endbower

app/templates/src/app/_foundation/__foundation-vendor.scss

@@ -0,0 +1,8 @@
+/* The import of foundation is made manually because there is still no links of the
+   sass version in theit bower.json... */
+@import '../<%= computedPaths.appToBower %>/bower_components/foundation/scss/foundation';
+
+/* Do not remove this comments bellow. It's the markers used by wiredep to inject
+   sass dependencies when defined in the bower.json of your dependencies */
+// bower:scss
+// endbower

app/templates/src/app/_foundation/__foundation-vendor.styl

@@ -0,0 +1,4 @@
+/* Do not remove this comments bellow. It's the markers used by wiredep to inject
+   stylus dependencies when defined in the bower.json of your dependencies */
+// bower:styl
+// endbower

app/templates/src/app/__none-index.less → app/templates/src/app/_none/__none-index.less

@@ -114,5 +114,8 @@ a {
 hr {
   clear: both;
 }
+
+/* Do not remove this comments bellow. It's the markers used by gulp-inject to inject
+   all your less files automatically */
 // injector
 // endinjector

app/templates/src/app/__none-index.scss → app/templates/src/app/_none/__none-index.scss

@@ -114,5 +114,8 @@ a {
 hr {
   clear: both;
 }
+
+/* Do not remove this comments bellow. It's the markers used by gulp-inject to inject
+   all your sass files automatically */
 // injector
 // endinjector

app/templates/src/app/__none-index.styl → app/templates/src/app/_none/__none-index.styl

@@ -112,5 +112,8 @@ a
 
 hr
   clear both
+
+/* Do not remove this comments bellow. It's the markers used by gulp-inject to inject
+   all your stylus files automatically */
 // injector
 // endinjector

app/templates/src/app/_none/__none-vendor.less

@@ -0,0 +1,4 @@
+/* Do not remove this comments bellow. It's the markers used by wiredep to inject
+   less dependencies when defined in the bower.json of your dependencies */
+// bower:less
+// endbower

app/templates/src/app/_none/__none-vendor.scss

@@ -0,0 +1,4 @@
+/* Do not remove this comments bellow. It's the markers used by wiredep to inject
+   sass dependencies when defined in the bower.json of your dependencies */
+// bower:scss
+// endbower

app/templates/src/app/_none/__none-vendor.styl

@@ -0,0 +1,4 @@
+/* Do not remove this comments bellow. It's the markers used by wiredep to inject
+   stylus dependencies when defined in the bower.json of your dependencies */
+// bower:styl
+// endbower

test/node/test-router.js

@@ -30,14 +30,14 @@ describe('gulp-angular generator techs script', function () {
       ui: { key: 'testUi' },
       jsPreprocessor: { extension: 'testExtension' }
     };
-    read.withArgs('template/src/app/__ngroute.testExtension')
+    read.withArgs('template/src/app/_ngroute/__ngroute.testExtension')
       .returns('my test content 1');
     generator.computeRouter();
     generator.routerHtml.should.match(/ng-view/);
     generator.routerJs.should.equal('my test content 1');
 
     generator.props.router.module = 'ui.router';
-    read.withArgs('template/src/app/__uirouter.testExtension')
+    read.withArgs('template/src/app/_uirouter/__uirouter.testExtension')
       .returns('my test content 2');
     generator.computeRouter();
     generator.routerHtml.should.match(/ui-view/);