Skip to content

Commit ab79b42

Browse files
committed
Improved Gulpfile and added semver
1 parent 04f2c82 commit ab79b42

17 files changed

+1212
-932
lines changed

.browserslistrc

+11-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
1-
last 10 versions
1+
# https://github.com/browserslist/browserslist#readme
2+
3+
>= 0.5%
4+
last 2 major versions
5+
not dead
6+
Chrome >= 60
7+
Firefox >= 60
8+
Firefox ESR
9+
iOS >= 12
10+
Safari >= 12
11+
not Explorer <= 11

config.json

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"name": "FlatifyCSS",
3+
"version": "0.6.0",
4+
"enableLogging": true,
5+
"isLTR": true,
6+
"dropdownOffset": [0, 20],
7+
"navDropdownOffset": [0, 0],
8+
"popoverOffset": [0, 10]
9+
}

dist/css/flatify-min.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/flatify-noprefix-min.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/flatify.css

+240-693
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/flatify-min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/flatify.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/maps/flatify-min.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/maps/flatify-min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/maps/flatify-noprefix-min.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/maps/flatify.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/maps/flatify.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gulpfile.js

+42-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
// Initial modules
22
const distFileName = "flatify";
3-
const { src, dest, watch, series, parallel } = require("gulp");
3+
const bumpVersionFiles = ["./package.json"];
4+
5+
const { src, dest, watch, series, parallel, task } = require("gulp");
6+
const argv = require("yargs").argv;
47
const autoprefixer = require("autoprefixer");
8+
const bump = require("gulp-bump");
59
const cssnano = require("cssnano");
610
const concat = require("gulp-concat");
11+
const fs = require("fs");
712
const noop = require("gulp-noop");
813
const postcss = require("gulp-postcss");
914
const rename = require("gulp-rename");
1015
const sass = require("gulp-sass")(require("sass"));
16+
const semver = require("semver");
1117
const sourcemaps = require("gulp-sourcemaps");
1218
const uglify = require("gulp-uglify");
13-
1419
const webpack = require("webpack-stream");
1520

1621
// File path variables
@@ -49,7 +54,7 @@ function scssTask(file, fileName, minify = true, prefixed = true) {
4954
.pipe(dest("dist/css"));
5055
}
5156

52-
function jsTask(file, fileName, minify = true, production = true) {
57+
function jsTask(file, fileName, minify = true, production = true, isLtr = true) {
5358
return src(file)
5459
.pipe(
5560
webpack({
@@ -71,6 +76,19 @@ function jsTask(file, fileName, minify = true, production = true) {
7176
.pipe(dest("dist/js"));
7277
}
7378

79+
// bump version
80+
function bumper(files, type = "patch", value) {
81+
// command gulp release --ver 1.0.0
82+
// OR
83+
// command gulp release --type major | minor | patch | prerelease
84+
const pkg = JSON.parse(fs.readFileSync(files[0], "utf8"));
85+
const newVer = semver.inc(pkg.version, argv.type || type);
86+
87+
return src(files)
88+
.pipe(bump({ version: value || argv.ver || newVer }))
89+
.pipe(dest("./"));
90+
}
91+
7492
// Watch task
7593
function watchTask(filesArr, tasksArr) {
7694
if (filesArr && tasksArr) {
@@ -88,12 +106,17 @@ const mainJsTask_dev = () => jsTask(files.jsMain, distFileName, false, false);
88106
const mainJsTask_production = () => jsTask(files.jsMain, distFileName, false, true);
89107
const mainJsTask__minified_production = () => jsTask(files.jsMain, distFileName, true, true);
90108

109+
const bumpVersionDefault = () => bumper(bumpVersionFiles, "prerelease");
110+
const bumpVersionRelease = () => bumper(bumpVersionFiles, "patch");
111+
91112
// Watch
92113
const defaultWatchTasks = () => watchTask([files.scssMain, files.jsMain], [mainScssTask__noprefix, mainJsTask_dev]);
114+
exports.watch = series(parallel(mainScssTask__noprefix, mainJsTask_dev), defaultWatchTasks);
93115

94116
// Default
95117
exports.default = series(
96118
parallel(
119+
bumpVersionDefault,
97120
// css
98121
mainScssTask__noprefix,
99122
mainScssTask__prefixed,
@@ -104,4 +127,19 @@ exports.default = series(
104127
mainJsTask__minified_production
105128
)
106129
);
107-
exports.watch = series(parallel(mainScssTask__noprefix, mainJsTask_dev), defaultWatchTasks);
130+
131+
// Release
132+
exports.release = series(
133+
parallel(
134+
bumpVersionRelease,
135+
// css
136+
mainScssTask__noprefix,
137+
mainScssTask__prefixed,
138+
mainScssTask__minified__noprefix,
139+
mainScssTask__minified__prefixed,
140+
// js
141+
mainJsTask_production,
142+
mainJsTask__minified_production
143+
)
144+
);
145+

js/config.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"name": "FlatifyCSS",
3-
"version": "1.0.0",
43
"enableLogging": true,
54
"isLTR": true,
65
"dropdownOffset": [0, 20],

0 commit comments

Comments
 (0)