amendment to #98

mwaylabs · Jan 7, 2015 · ee920a2 · ee920a2
1 parent 56ff471
commit ee920a2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 41 deletions.
diff --git a/app/index.js b/app/index.js
@@ -122,7 +122,6 @@ var GulpIonicGenerator = yeoman.generators.Base.extend({
     }
     // save appModule in answers
     this.answers.appModule = utils.modularize(this.answers.appName);
-    this.answers.includeSass = true; // TODO: set to true for now
 
     // store answers in .yo-rc.json
     this.config.set('answers', this.answers);
@@ -183,8 +182,7 @@ var GulpIonicGenerator = yeoman.generators.Base.extend({
       this.template('_gulpfile.js', 'gulpfile.js');
       this.write('app/index.html', indexFile);
 
-      var css = 'main.' + (this.answers.includeSass ? 's' : '') + 'css';
-      this.copy(css, 'app/styles/' + css);
+      this.copy('main.scss', 'app/styles/main.scss');
     },
 
     projectfiles: function () {

diff --git a/app/sources/sample-answers.js b/app/sources/sample-answers.js
@@ -24,8 +24,7 @@ module.exports = {
     plugins: [
       'org.apache.cordova.device',
       'org.apache.cordova.dialogs'
-    ],
-    includeSass: true
+    ]
   },
 
   /**

diff --git a/app/templates/_gulpfile.js b/app/templates/_gulpfile.js
@@ -122,7 +122,7 @@ gulp.task('connect', function () {
     });
 });
 
-gulp.task('serve', ['connect', 'inject'<% if (answers.includeSass) { %>, 'styles'<% } %>], function () {
+gulp.task('serve', ['connect', 'inject', 'styles'], function () {
   require('opn')('http://localhost:9000');
 });
 
@@ -153,11 +153,9 @@ gulp.task('serve-build', ['connect-build'], function () {
 gulp.task('wiredep', function () {
   var wiredep = require('wiredep').stream;
 // TODO:
-//<% if (answers.includeSass) { %>
 //   gulp.src('app/styles/*.scss') // into main.scss
 //     .pipe(wiredep())
 //     .pipe(gulp.dest('app/styles'));
-//<% } %>
   return gulp.src('app/*.html') // into index.html
     .pipe(wiredep({exclude: ['bower_components/ionic/release/css']}))
        // exclude ionic scss since we're using ionic sass
@@ -194,8 +192,8 @@ gulp.task('watch', ['connect', 'serve'], function () {
     // FIXME: not watching new files?!
   });
 
-  // watch for changes in css/scss
-  gulp.watch('app/styles/**/*.<%= answers.includeSass ? 'scss' : 'css' %>', ['styles']);
+  // watch for changes in scss
+  gulp.watch('app/styles/**/*.scss', ['styles']);
   // watch for changes in bower.json
   gulp.watch('bower.json', ['wiredep']);
 });

diff --git a/app/templates/_package.json b/app/templates/_package.json
@@ -21,9 +21,9 @@
     "gulp-jshint": "^1.5.3",
     "gulp-livereload": "^2.0.0",
     "gulp-load-plugins": "^0.5.0",
-    "gulp-ng-annotate": "^0.3.3",<% if (answers.includeSass) { %>
+    "gulp-ng-annotate": "^0.3.3",
     "gulp-plumber": "^0.6.3",
-    "gulp-ruby-sass": "^0.5.0",<% } %>
+    "gulp-ruby-sass": "^0.5.0",
     "gulp-shell": "^0.2.9",
     "gulp-size": "^0.4.0",
     "gulp-uglify": "^0.3.0",

diff --git a/app/templates/main.css b/app/templates/main.css