remove rubySass option

lightingbeetle · Oct 4, 2016 · e0e4c93 · e0e4c93
1 parent e803eff
commit e0e4c93
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 96 deletions.
diff --git a/app/index.js b/app/index.js
@@ -187,30 +187,6 @@ module.exports = class Generator extends Base {
           }
         });
       },
-      askForSassCompilator: function() {
-        const prompts = [{
-          type: 'list',
-          name: 'sassCompilator',
-          message: 'What SASS compilator do you want to use?',
-          choices: [{
-            name: 'LibSass - Node.js',
-            value: 'libSass',
-          }, {
-            name: 'Compass - Ruby',
-            value: 'rubySass',
-          }],
-          default: 0
-        }];
-
-        return this.prompt(prompts).then((props) => {
-          this.includeRubySass = hasFeature('rubySass', props.sassCompilator);
-          this.includeLibSass = hasFeature('libSass', props.sassCompilator);
-
-          this.insight.track('sass', props.sassCompilator);
-
-          this.config.set('sassCompilator', props.sassCompilator);
-        });
-      },
       askForMultiLanguage: function() {
         const prompts = [{
           type: 'confirm',

diff --git a/app/templates/_package.json b/app/templates/_package.json
@@ -43,19 +43,18 @@
     "gulp-rev": "~7.1.2",
     "gulp-rev-replace": "~0.4.0",
     "gulp-rollup": "~2.5.1",
-    "gulp-rsync": "~0.0.5",<% if (includeRubySass) { %>
-    "gulp-ruby-sass": "~2.0.4",<% } %>
-    "gulp-size": "~2.1.0",<% if (includeLibSass) { %>
-    "gulp-sass": "~2.3.2",<% } %>
+    "gulp-rsync": "~0.0.5",
+    "gulp-size": "~2.1.0",
+    "gulp-sass": "~2.3.2",
     "gulp-sourcemaps": "~1.6.0",
     "gulp-util": "~3.0.4",<% if (includeDataYAML) { %>
     "gulp-yaml-merge": "adammockor/gulp-yaml-merge",<% } %>
     "pug": "2.0.0-beta6",<% if (includeDataYAML) { %>
     "js-yaml": "~3.6.0",<% } %>
     "map-stream": "~0.0.5",<% if (includeMultiLanguage) { %>
     "merge-stream": "~1.0.0",<% } %>
-    "node-notifier": "~4.6.1",<% if (includeLibSass) { %>
-    "node-sass": "~3.10.1",<% } %>
+    "node-notifier": "~4.6.1",
+    "node-sass": "~3.10.1",
     "require-dir": "~0.3.0",
     "rollup": "~0.36.1",
     "rollup-plugin-babel": "~2.6.1",

diff --git a/app/templates/gulp/_config.js b/app/templates/gulp/_config.js
@@ -217,14 +217,10 @@ module.exports.styles = {
   src: path.join(app, styles, '*.scss'),
   dest: path.join(tmp,styles),
   destBuild: path.join(dist, styles),
-  sassCfg: <% if (includeRubySass) { %>{
-    sourcemap: true,
-    style: 'expanded',
-    lineNumbers: true
-  }, <% } else if (includeLibSass) { %>{
+  sassCfg: {
     includePaths: 'node_modules',
     outputStyle: 'expanded'
-  }, <% } %>
+  },
   autoprefixerCfg: {
     browsers: ['last 2 version']
   }

diff --git a/app/templates/gulp/tasks/_styles.js b/app/templates/gulp/tasks/_styles.js
@@ -2,11 +2,7 @@
 
 var gulp = require('gulp-help')(require('gulp'));
 var gulpif = require('gulp-if');
-<% if (includeRubySass) { %>
-var rubySass = require('gulp-ruby-sass');
-<% } else if (includeLibSass) { %>
 var sass = require('gulp-sass');
-<% } %>
 var sourcemaps = require('gulp-sourcemaps');
 var postcss = require('gulp-postcss');
 var plumber = require('gulp-plumber');
@@ -20,25 +16,6 @@ var reload = require('./browserSync.js').reload;
 var handleError = require('./../utils/handleError.js');
 var build = require('./../utils/buildHelper.js');
 
-<% if (includeRubySass) { %>
-// Compile scss using ruby sass
-
-gulp.task('styles', 'Compile Sass to CSS', function () {
-  var dest = build.isBuild() ? config.styles.destBuild : config.styles.dest;
-
-  return rubySass(config.styles.src, config.styles.sassCfg)
-    .on('error', handleError)
-    <% if (includeBootstrap) { %>.pipe(replace('bootstrap-sass/assets/fonts/bootstrap/', '../fonts/'))<% } %>
-    .pipe(postcss([
-      autoprefixer(config.styles.autoprefixerCfg),
-      build.isBuild() ? cssnano() : function() {}
-    ]))
-    .pipe(gulpif(config.sourceMaps && !build.isBuild(), sourcemaps.write('.')))
-    .pipe(gulp.dest(dest))
-    .pipe(reload({stream:true}));
-});
-
-<% } else if (includeLibSass) { %>
 // Complie scss using libsass
 
 gulp.task('styles', 'Compile Sass to CSS', function () {
@@ -57,4 +34,3 @@ gulp.task('styles', 'Compile Sass to CSS', function () {
     .pipe(gulp.dest(dest))
     .pipe(reload({stream:true}));
 });
-<% } %>
diff --git a/test/generator-spec.js b/test/generator-spec.js
@@ -7,7 +7,6 @@ const defaultPrompt = {
   optIn: false,
   name: 'test of generator',
   features: [],
-  sassCompilator: 'libSass',
   includeMultiLanguage: false,
   dataFormat: 'yaml',
 };
@@ -200,41 +199,6 @@ test('generator-lb:lightingFly', (t) => {
     .catch((err) => handleError(err, t));
 });
 
-test('generator-lb:libSass', (t) => {
-  const prompt = Object.assign(defaultPrompt, {
-    sassCompilator: ['libSass']
-  });
-
-  const expected = [
-    ['package.json', /gulp-sass/],
-    ['package.json', /node-sass/],
-  ];
-
-  runTest(prompt)
-    .then(() => {
-      t.doesNotThrow(() => testExpected(expected), null, 'libSass present');
-      t.end();
-    })
-    .catch((err) => handleError(err, t));
-});
-
-test('generator-lb:rubySass', (t) => {
-  const prompt = Object.assign(defaultPrompt, {
-    sassCompilator: ['rubySass']
-  });
-
-  const expected = [
-    ['package.json', /gulp-ruby-sass/],
-  ];
-
-  runTest(prompt)
-    .then(() => {
-      t.doesNotThrow(() => testExpected(expected), null, 'rubySass present');
-      t.end();
-    })
-    .catch((err) => handleError(err, t));
-});
-
 test('generator-lb:multiLanguage', (t) => {
   const prompt = Object.assign(defaultPrompt, {
     includeMultiLanguage: true,