Fix #1082 exclude global styles by parameter

Author: junaidrsd

gulpfile.babel.js

@@ -36,9 +36,6 @@ gulp.task('js:app', () => {
   .pipe(gulp.dest(distPath + '/js'));
 });
 
-/*jshint camelcase: false */
-var excludeDefaultStyles = process.env.npm_config_excludeDefaultStyles || false;
-
 gulp.task('js:vendor', ['bower'], () => {
   return gulp.src(['lib/app/js/vendor/**/*.js'].concat(mainBowerFiles({filter: /\.js/})))
     .pipe(plumber())
@@ -50,7 +47,7 @@ gulp.task('bower', () => {
   return bower();
 });
 
-gulp.task('copy:css', ['build:styleguide-app'], () => {
+gulp.task('copy:css', () => {
   return gulp.src('lib/app/css/**/*')
     .pipe(gulp.dest(distPath + '/css'));
 });
@@ -94,6 +91,7 @@ gulp.task('dev:generate', () => {
       rootPath: outputPath,
       overviewPath: 'README.md',
       styleVariables: 'lib/app/css/_styleguide_variables.css',
+      excludeDefaultStyles: true,
       parsers: {
         css: 'postcss'
       }
@@ -127,19 +125,6 @@ gulp.task('dev:applystyles', () => {
     .pipe(gulp.dest(outputPath));
 });
 
-gulp.task('build:styleguide-app', () => {
-  var srcFiles = ['lib/app/css/_fontpath_and_mixin_definition.css'];
-
-  if (!excludeDefaultStyles) {
-    srcFiles.push('lib/app/css/_styleguide_default_styles.css');
-  }
-
-  srcFiles.push('lib/app/css/_custom_styles_mixin.css');
-  return gulp.src(srcFiles)
-    .pipe(concat('lib/app/css/styleguide-app.css'))
-    .pipe(gulp.dest('.'));
-});
-
 gulp.task('dev', ['dev:doc', 'dev:static', 'dev:applystyles'], () => {
   //Do intial full build and create styleguide
   runSequence('build:dist', 'dev:generate');

lib/modules/common.js

@@ -31,6 +31,7 @@ function sanitizeOptions(opt) {
     basicAuth: opt.basicAuth || null,
     rootPath: opt.rootPath,
     readOnly: opt.readOnly || false,
+    excludeDefaultStyles: opt.excludeDefaultStyles || false,
     parsers: opt.parsers || {
       sass: 'sass',
       scss: 'scss',

lib/styleguide.js

@@ -13,6 +13,7 @@
 var path = require('path'),
   pug = require('pug'),
   through = require('through2'),
+  concat = require('concat-files'),
   gulp = require('gulp'),
   rename = require('gulp-rename'),
   mustache = require('gulp-mustache'),
@@ -37,6 +38,7 @@ var path = require('path'),
   addSection = require('./modules/helpers/add-section'),
   sgServer = require('./server'),
   distPath = path.join(__dirname, 'dist'),
+  libPath = path.join(__dirname, 'lib'),
   fileHashes = {},
   pugCache,
   sgOptions, // global object for options
@@ -150,7 +152,7 @@ function replaceSectionReferences(json) {
 }
 
 function copyUsedOptionsToJsonConfig(opt, json) {
-  var used = ['appRoot', 'extraHead', 'beforeBody', 'afterBody', 'commonClass', 'title', 'disableEncapsulation', 'disableHtml5Mode', 'readOnly', 'sideNav', 'afterSections', 'showMarkupSection', 'hideSubsectionsOnMainSection', 'additionalNgDependencies'];
+  var used = ['appRoot', 'extraHead', 'beforeBody', 'afterBody', 'commonClass', 'title', 'disableEncapsulation', 'disableHtml5Mode', 'readOnly', 'sideNav', 'afterSections', 'showMarkupSection', 'hideSubsectionsOnMainSection', 'excludeDefaultStyles','additionalNgDependencies'];
   json.config = {};
   used.forEach(function(prop) {
     json.config[prop] = _.cloneDeep(opt[prop]);
@@ -329,7 +331,18 @@ module.exports.generate = function(options) {
           overviewProcessed,
           filesCopied,
           favIcon,
-          indexHtmlProcessed;
+          indexHtmlProcessed,
+          srcFiles;
+
+        srcFiles = [distPath + '/css/_fontpath_and_mixin_definition.css'];
+
+        if (!opt.excludeDefaultStyles) {
+          srcFiles.push(distPath + '/css/_styleguide_default_styles.css');
+        }
+
+        srcFiles.push(distPath + '/css/_custom_styles_mixin.css');
+        concat(srcFiles, libPath + '/app/css/styleguide-app.css');
+        concat(srcFiles, distPath + '/css/styleguide-app.css');
 
         overviewProcessed = processOverviewMarkdown(opt);
         var cssSrc = [distPath + '/css/styleguide-app.css', distPath + '/css/styleguide_helper_elements.css'];
@@ -339,7 +352,7 @@ module.exports.generate = function(options) {
           //gulp.src([distPath + '/**', '!' + distPath + '/index.html', + '!' + distPath + '**/*.css'])
           var copySrc = [distPath + '/**', '!' + distPath + '/index.html'];
 
-          copySrc = copySrc.concat(cssSrc.map(function(item){
+          copySrc = copySrc.concat(cssSrc.map(function(item) {
             return '!' + item;
           }));