Skip to content

Commit dea2abf

Browse files
authored
Merge pull request #17 from jermbo/dev
Dev
2 parents 1ccd3b7 + 0ba965c commit dea2abf

File tree

14 files changed

+115
-136
lines changed

14 files changed

+115
-136
lines changed

Generic_Starter_Gulp4/example.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
ENV=development
2+
PORT=5000

Generic_Starter_Gulp4/gulp-config.js

Lines changed: 0 additions & 43 deletions
This file was deleted.

Generic_Starter_Gulp4/gulp-env.js

Lines changed: 0 additions & 11 deletions
This file was deleted.

Generic_Starter_Gulp4/gulp/_config.js

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,46 @@
11
const yargs = require("yargs");
2-
const env = process.env.NODE_ENV;
3-
const port = process.env.PORT || 3000;
42

5-
const isDev = env === "development";
6-
const isProd = env === "production";
7-
const isTest = env === "test";
3+
const env = process.env.ENV;
84

5+
const srcPath = "./src";
6+
const buildPath = "./build";
7+
const tmpPath = "./_tmp";
98
const siteInstanceName = "./";
109

1110
module.exports = {
11+
srcPath,
12+
buildPath,
13+
tmpPath,
14+
siteInstanceName,
1215
env,
13-
isDev,
14-
isProd,
15-
isTest,
16-
input: "./src",
17-
output: "./build",
18-
imageSizes: [400, 900, 1300],
16+
html: {
17+
source: `${srcPath}/**/*.{html,htm,php,cshtml}`,
18+
build: `${buildPath}/`,
19+
},
20+
styles: {
21+
source: `${srcPath}/sass/**/*.{sass,scss,css}`,
22+
build: `${buildPath}/styles/`,
23+
options: {
24+
sass: {outputStyle: "compressed"},
25+
autoPrefixer: { browsers: ["last 4 versions"], grid: false },
26+
},
27+
},
28+
scripts: {
29+
source: `${srcPath}/scripts/**/*.js`,
30+
build: `${buildPath}/scripts/`,
31+
},
32+
images: {
33+
source: `${srcPath}/images/**/*`,
34+
build: `${buildPath}/images/`,
35+
options: {
36+
sizes: [400, 900, 1300]
37+
},
38+
},
39+
1940
devURL: yargs.url ? yargs.url : siteInstanceName,
20-
browserSync: {
21-
port: port,
41+
42+
browserSyncSettings: {
43+
port: yargs.port ? yargs.port : process.env.PORT || 3000,
2244
ghostMode: {
2345
clicks: true,
2446
location: true,

Generic_Starter_Gulp4/gulp/browser-sync.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
const browserSync = require("browser-sync").create();
2-
const config = require("./_config");
2+
const {siteInstanceName, browserSyncSettings, buildPath} = require("./_config");
33

4-
function startServer(next){
5-
if( config.devURL == "./") {
6-
config.browserSync["server"] = {
7-
baseDir: config.output
4+
function startServer(next) {
5+
if( siteInstanceName == "./") {
6+
browserSyncSettings["server"] = {
7+
baseDir: buildPath
88
};
99
} else {
10-
config.browserSync["proxy"] = config.devURL;
10+
browserSyncSettings["proxy"] = siteInstanceName;
1111
}
1212

13-
browserSync.init(null, config.browserSync);
13+
browserSync.init(null, browserSyncSettings);
1414

1515
next();
1616
}

Generic_Starter_Gulp4/gulp/clean.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
1-
const config = require("./_config");
1+
const { buildPath, tmpPath } = require("./_config");
22
const del = require("del");
33

4-
const clean = () => {
4+
function cleanAll() {
55
return del([
6-
config.output,
7-
"./_tmp"
6+
buildPath,
7+
tmpPath
88
]);
9-
};
9+
}
1010

11-
module.exports = clean;
11+
function cleanTmp() {
12+
return del([
13+
tmpPath
14+
]);
15+
}
16+
17+
exports.cleanTmp = cleanTmp;
18+
exports.cleanAll = cleanAll;

Generic_Starter_Gulp4/gulp/html.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
const gulp = require("gulp");
22
const $ = require("gulp-load-plugins")({ lazy: true });
33

4-
const { input, output } = require("./_config");
4+
const { html } = require("./_config");
55

6-
const src = `${input}/**/*.{html,htm,php,cshtml}`;
7-
const dest = `${output}`;
6+
const src = html.source;
7+
const build = html.build;
88

9-
function html() {
9+
function compileHTML() {
1010
return gulp
1111
.src(src)
12-
.pipe($.changed(dest))
13-
.pipe(gulp.dest(dest));
12+
.pipe($.changed(build))
13+
.pipe(gulp.dest(build));
1414
}
1515

1616
exports.src = src;
17-
exports.default = html;
17+
exports.default = compileHTML;

Generic_Starter_Gulp4/gulp/images.js

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,34 @@ const gulp = require("gulp");
22
const $ = require("gulp-load-plugins")({ lazy: true });
33
const resizer = require("@zellwk/resize-images");
44

5+
const { images, tmpPath } = require("./_config");
56

6-
const {input, output, imageSizes } = require("./_config");
7+
const src = images.source;
8+
const build = images.build;
9+
const imageSizes = images.options.sizes;
710

8-
const imageInput = `${input}/images/**/*`;
9-
const tmpOutput = "./_tmp/minified";
10-
const tmpOutput2 = "./_tmp/resized";
11-
const imageOutput = `${output}/images`;
11+
const tmpOutput = `${tmpPath}/minified`;
12+
const tmpOutput2 = `${tmpPath}/resized`;
1213

1314
function jpegToWebp () {
1415
return gulp
15-
.src(`${imageInput}.{jpeg,jpg}`)
16+
.src(`${src}.{jpeg,jpg}`)
1617
.pipe($.newer({ dest: tmpOutput, ext: ".webp" }))
1718
.pipe($.webp({ quality: 80 }))
1819
.pipe(gulp.dest(tmpOutput));
1920
}
2021

2122
function pngToWebp() {
2223
return gulp
23-
.src(`${imageInput}.png`)
24+
.src(`${src}.png`)
2425
.pipe($.newer({ dest: tmpOutput, ext: ".webp" }))
2526
.pipe($.webp({ lossless: true }))
2627
.pipe(gulp.dest(tmpOutput));
2728
}
2829

2930
function minifyImages() {
3031
return gulp
31-
.src(`${imageInput}.{png,jpg,jpeg,gif}`)
32+
.src(`${src}.{png,jpg,jpeg,gif}`)
3233
.pipe($.newer(tmpOutput))
3334
.pipe($.imagemin([
3435
$.imagemin.jpegtran({ progressive: true }),
@@ -48,20 +49,20 @@ function resizeImages() {
4849
function copyImagesToDist() {
4950
return gulp
5051
.src(`${tmpOutput2}/**/*`)
51-
.pipe(gulp.dest(imageOutput));
52+
.pipe(gulp.dest(build));
5253
}
5354

5455
function copySvgToDist() {
5556
return gulp
56-
.src(`${imageInput}/**/*.svg`)
57-
.pipe(gulp.dest(imageOutput));
57+
.src(`${src}/**/*.svg`)
58+
.pipe(gulp.dest(build));
5859
}
5960

60-
const images = gulp.series(
61+
const compileImages = gulp.series(
6162
gulp.parallel(jpegToWebp, pngToWebp, minifyImages),
6263
gulp.parallel(resizeImages),
6364
gulp.parallel(copyImagesToDist, copySvgToDist)
6465
);
6566

66-
exports.src = imageInput;
67-
exports.default = images;
67+
exports.src = src;
68+
exports.default = compileImages;

Generic_Starter_Gulp4/gulp/sass.js

Lines changed: 0 additions & 21 deletions
This file was deleted.

Generic_Starter_Gulp4/gulp/styles.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
const gulp = require("gulp");
2+
const $ = require("gulp-load-plugins")({ lazy: true });
3+
4+
const { styles } = require("./_config");
5+
6+
const src = styles.source;
7+
const build = styles.build;
8+
9+
function compileStyles() {
10+
return gulp
11+
.src(src)
12+
.pipe($.sourcemaps.init())
13+
.pipe($.sass(styles.options.sass))
14+
.pipe($.autoprefixer(styles.options.autoPrefixer))
15+
.pipe($.sourcemaps.write("./"))
16+
.pipe($.size({title: "Styles"}))
17+
.pipe(gulp.dest(build));
18+
}
19+
20+
exports.src = src;
21+
exports.default = compileStyles;

0 commit comments

Comments
 (0)