Skip to content

Commit c15069b

Browse files
committed
Added sass glob for scsss-files in components folder
1 parent 1b95da3 commit c15069b

File tree

6 files changed

+56
-25
lines changed

6 files changed

+56
-25
lines changed

gulpfile.js

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -76,25 +76,27 @@ var banner = {
7676

7777
// General
7878
var {gulp, src, dest, watch, series, parallel} = require('gulp');
79-
var del = require('del');
80-
var flatmap = require('gulp-flatmap');
81-
var lazypipe = require('lazypipe');
82-
var rename = require('gulp-rename');
83-
var header = require('gulp-header');
84-
var package = require('./package.json');
79+
80+
var del = require('del'),
81+
flatmap = require('gulp-flatmap'),
82+
lazypipe = require('lazypipe'),
83+
rename = require('gulp-rename'),
84+
header = require('gulp-header'),
85+
package = require('./package.json');
8586

8687
// Scripts
87-
var jshint = require('gulp-jshint');
88-
var stylish = require('jshint-stylish');
89-
var concat = require('gulp-concat');
90-
var uglify = require('gulp-terser');
91-
var optimizejs = require('gulp-optimize-js');
88+
var jshint = require('gulp-jshint'),
89+
stylish = require('jshint-stylish'),
90+
concat = require('gulp-concat'),
91+
uglify = require('gulp-terser'),
92+
optimizejs = require('gulp-optimize-js');
9293

9394
// Styles
94-
var sass = require('gulp-sass');
95-
var sourcemaps = require('gulp-sourcemaps');
96-
var prefix = require('gulp-autoprefixer');
97-
var minify = require('gulp-cssnano');
95+
var sass = require('gulp-sass'),
96+
sassGlob = require('gulp-sass-glob'),
97+
sourcemaps = require('gulp-sourcemaps'),
98+
prefix = require('gulp-autoprefixer'),
99+
minify = require('gulp-cssnano');
98100

99101
// Templates
100102
var twig = require('gulp-twig'),
@@ -148,8 +150,8 @@ var cleanDist = function (done) {
148150
var jsTasks = lazypipe()
149151
.pipe(header, banner.full, {package: package})
150152
.pipe(optimizejs)
151-
.pipe(dest, paths.scripts.output)
152-
.pipe(rename, {suffix: '.min'})
153+
//.pipe(dest, paths.scripts.output)
154+
//.pipe(rename, {suffix: '.min'})
153155
.pipe(uglify)
154156
.pipe(optimizejs)
155157
.pipe(header, banner.min, {package: package})
@@ -223,6 +225,7 @@ var buildStyles = function (done) {
223225
// Run tasks on all Sass files
224226
return src(paths.styles.input)
225227
.pipe(sourcemaps.init())
228+
.pipe(sassGlob())
226229
.pipe(sass({
227230
includePaths: require('node-normalize-scss').includePaths,
228231
outputStyle: 'expanded',
@@ -234,15 +237,16 @@ var buildStyles = function (done) {
234237
remove: true
235238
}))
236239
.pipe(header(banner.full, { package : package }))
237-
.pipe(sourcemaps.write())
238-
.pipe(dest(paths.styles.output))
239-
.pipe(rename({suffix: '.min'}))
240+
//.pipe(sourcemaps.write('./maps'))
241+
//.pipe(dest(paths.styles.output))
242+
//.pipe(rename({suffix: '.min'}))
240243
.pipe(minify({
241244
discardComments: {
242245
removeAll: true
243246
}
244247
}))
245248
.pipe(header(banner.min, { package : package }))
249+
.pipe(sourcemaps.write('.'))
246250
.pipe(dest(paths.styles.output));
247251

248252
};

package-lock.json

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "project-name",
33
"version": "0.0.2",
44
"description": "A description for your project.",
5-
"main": "./dist/your-main-js-file.js",
5+
"main": "./dist/index.html",
66
"author": {
77
"name": "Ryan Grønborg",
88
"url": "http://www.dotslash.dk"
@@ -32,6 +32,7 @@
3232
"gulp-optimize-js": "1.1.0",
3333
"gulp-rename": "1.4.0",
3434
"gulp-sass": "4.0.2",
35+
"gulp-sass-glob": "^1.0.9",
3536
"gulp-sourcemaps": "^2.6.5",
3637
"gulp-svgmin": "2.2.0",
3738
"gulp-terser": "1.2.0",

src/components/list/_list.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
body {
2+
background-color: pink;
3+
}

src/components/list/list.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
console.log('List is here.')

src/sass/app.scss

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
// NORMALIZE
1+
// Normalize
22
@import "normalize"; // File and path handled by Gulp
33

4-
// BASE
4+
// Base
55
@import 'base/variables';
66
@import 'base/base';
77
@import 'base/layout';
88
@import 'base/fonts';
99
@import 'base/typography';
1010

11-
// HELPERS
12-
@import 'helpers/mixins';
11+
// Helpers
12+
@import 'helpers/mixins';
13+
14+
// Components
15+
@import "../components/**/*.scss";

0 commit comments

Comments
 (0)