Skip to content

Commit 741354e

Browse files
authored
Merge pull request #1 from jermbo/generic-update
updating files
2 parents 7b95383 + 655dc49 commit 741354e

File tree

5 files changed

+102
-101
lines changed

5 files changed

+102
-101
lines changed

Generic_Starter/gulp-config.js

Lines changed: 5 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ const env = require('./gulp-env')();
33
module.exports = () => {
44
const config = {
55
html: {
6-
source: `${env.srcPath}/**/*.{html, htm, php}`,
6+
source: `${env.srcPath}/**/*.{html,htm,php,cshtml}`,
77
lintPath: `${env.srcPath}/`,
88
build: `${env.buildPath}/`
99
},
1010
styles: {
11-
source: `${env.srcPath}/styles/**/*.{scss, sass, css}`,
11+
source: `${env.srcPath}/styles/**/*.{scss,sass,css}`,
1212
lintPath: `${env.srcPath}/styles/`,
1313
build: `${env.buildPath}/styles/`
1414
},
@@ -18,7 +18,7 @@ module.exports = () => {
1818
build: `${env.buildPath}/scripts/`
1919
},
2020
images: {
21-
source: `${env.srcPath}/images/**/*.{jpg, JPG, jpeg, JPEG, png, PNG, gif, GIF, svg}`,
21+
source: `${env.srcPath}/images/**/*.{jpg,JPG,jpeg,JPEG,png,PNG,gif,GIF,svg}`,
2222
build: `${env.buildPath}/images/`
2323
},
2424
browserSync: {
@@ -46,7 +46,7 @@ module.exports = () => {
4646
plugins: ['transform-object-rest-spread']
4747
},
4848
sass: {
49-
outputStyle: 'compressed' // 'expanded'
49+
outputStyle: 'compressed'
5050
},
5151
formatting: {
5252
'indent_size': 4,
@@ -174,7 +174,7 @@ module.exports = () => {
174174
},
175175
sass: {
176176
options: {
177-
formatter: 'stylish',
177+
'formatter': 'stylish',
178178
'merge-default-rules': true
179179
},
180180
rules: {
@@ -207,56 +207,6 @@ module.exports = () => {
207207
'single-line-per-selector': 0,
208208
'force-pseudo-nesting': 0
209209
}
210-
},
211-
html: {
212-
rules: {
213-
"attr-bans": 0,
214-
"attr-name-ignore-regex": 0,
215-
"attr-name-style": 0,
216-
"attr-new-line": 0,
217-
"attr-no-dup": 0,
218-
"attr-no-unsafe-char": 0,
219-
"attr-order": 0,
220-
"attr-quote-style": 0,
221-
"attr-req-value": 0,
222-
"class-no-dup": 0,
223-
"class-style": 0,
224-
"doctype-first": 0,
225-
"doctype-html5": 0,
226-
"fig-req-figcaption": 0,
227-
"focusable-tabindex-style": 0,
228-
"head-req-title": 0,
229-
"head-valid-content-model": 0,
230-
"href-style": 0,
231-
"html-req-lang": 0,
232-
"html-valid-content-model": 0,
233-
"id-class-ignore-regex": 0,
234-
"id-class-no-ad": 0,
235-
"id-class-style": 0,
236-
"id-no-dup": 0,
237-
"img-req-alt": 0,
238-
"img-req-src": 0,
239-
"indent-style": 0,
240-
"indent-width": 0,
241-
"indent-width-cont": 0,
242-
"input-radio-req-name": 0,
243-
"input-req-label": 0,
244-
"label-req-for": 0,
245-
"lang-style": 0,
246-
"line-end-style": 0,
247-
"line-max-len": 0,
248-
"line-max-len-ignore-regex": 0,
249-
"spec-char-escape": 0,
250-
"table-req-caption": 0,
251-
"table-req-header": 0,
252-
"tag-bans": 0,
253-
"tag-close": 0,
254-
"tag-name-lowercase": 0,
255-
"tag-name-match": 0,
256-
"tag-self-close": 0,
257-
"title-max-len": 0,
258-
"title-no-dup": 0
259-
}
260210
}
261211
}
262212
}

Generic_Starter/gulpfile.js

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const env = require('./gulp-env')();
44
const browserSync = require('browser-sync').create();
55
const runSequence = require('run-sequence').use(gulp);
66
const $ = require('gulp-load-plugins')({ lazy: true });
7+
const del = require('del');
78

89
////////////////
910
// Default Tasks
@@ -12,12 +13,22 @@ gulp.task('help', $.taskListing);
1213

1314
///////////////
1415
// Global Jobs
15-
gulp.task('__start-local__', ['task:compile-styles', 'task:compile-scripts', 'task:compile-html', 'task:compile-images', 'task:start-watch']);
16-
gulp.task('__compile-assets__', ['task:compile-styles', 'task:compile-scripts', 'task:compile-html', 'task:compile-images']);
17-
gulp.task('__lint-everything__', ['_lint-styles_', '_lint-scripts_']);
16+
gulp.task('__start-local__', () => {
17+
runSequence('clean:build', 'task:compile-styles', 'task:compile-scripts', 'task:compile-html', 'task:compile-images', 'task:start-watch');
18+
});
19+
gulp.task('__compile-assets__', () => {
20+
runSequence('clean:build', 'task:compile-styles', 'task:compile-scripts', 'task:compile-html', 'task:compile-images');
21+
});
22+
gulp.task('__lint-everything__', () => {
23+
runSequence('_lint-styles_', '_lint-scripts_');
24+
});
1825

1926
////////////////
2027
// Local Tasks
28+
gulp.task('clean:build', () => {
29+
return del([env.buildPath]);
30+
});
31+
2132
gulp.task('task:compile-styles', () => {
2233
return gulp
2334
.src(config.styles.source)
@@ -133,7 +144,7 @@ gulp.task('lint:js', () => {
133144
///////////////////////////
134145
function errorHandler() {
135146
return $.plumber({
136-
errorHandler: function (err) {
147+
errorHandler: function(err) {
137148
$.notify.onError({
138149
title: `Error : ${err.plugin}`,
139150
message: `Issue : ${err}`,

0 commit comments

Comments
 (0)