Skip to content

Commit 6f2a912

Browse files
committed
Work on admin scripts gulp4
1 parent b19d2d3 commit 6f2a912

6 files changed

Lines changed: 67 additions & 41 deletions

File tree

tasks/admin/distributions/create.js

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* update package.json file
1010
*/
1111

12-
var
12+
let
1313
gulp = require('gulp'),
1414

1515
// node dependencies
@@ -43,22 +43,22 @@ var
4343

4444

4545
module.exports = function(callback) {
46-
var
46+
let
4747
stream,
4848
index,
4949
tasks = []
5050
;
5151

5252
for(index in release.distributions) {
5353

54-
var
54+
let
5555
distribution = release.distributions[index]
5656
;
5757

5858
// streams... designed to save time and make coding fun...
5959
(function(distribution) {
6060

61-
var
61+
let
6262
distLowerCase = distribution.toLowerCase(),
6363
outputDirectory = path.join(release.outputRoot, distLowerCase),
6464
packageFile = path.join(outputDirectory, release.files.npm),
@@ -81,8 +81,9 @@ module.exports = function(callback) {
8181

8282
// get files for meteor
8383
gatherFiles = function(dir) {
84-
var
85-
dir = dir || path.resolve('.'),
84+
dir = dir || path.resolve('.');
85+
86+
let
8687
list = fs.readdirSync(dir),
8788
omitted = [
8889
'.git',
@@ -97,7 +98,7 @@ module.exports = function(callback) {
9798
files = []
9899
;
99100
list.forEach(function(file) {
100-
var
101+
let
101102
isOmitted = (omitted.indexOf(file) > -1),
102103
filePath = path.join(dir, file),
103104
stat = fs.statSync(filePath)
@@ -116,8 +117,8 @@ module.exports = function(callback) {
116117

117118
// spaces out list correctly
118119
createList = function(files) {
119-
var filenames = '';
120-
for(var file in files) {
120+
let filenames = '';
121+
for(let file in files) {
121122
if(file == (files.length - 1) ) {
122123
filenames += "'" + files[file] + "'";
123124
}
@@ -130,7 +131,7 @@ module.exports = function(callback) {
130131

131132

132133
gulp.task(task.meteor, function() {
133-
var
134+
let
134135
files = gatherFiles(outputDirectory),
135136
filenames = createList(files)
136137
;
@@ -146,7 +147,7 @@ module.exports = function(callback) {
146147

147148
if(distribution == 'CSS') {
148149
gulp.task(task.repo, function() {
149-
var
150+
let
150151
themes,
151152
components,
152153
releases
@@ -165,7 +166,7 @@ module.exports = function(callback) {
165166
}
166167
else if(distribution == 'LESS') {
167168
gulp.task(task.repo, function() {
168-
var
169+
let
169170
definitions,
170171
themeImport,
171172
themeConfig,
@@ -198,11 +199,11 @@ module.exports = function(callback) {
198199
gulp.task(task.package, function() {
199200
return gulp.src(packageFile)
200201
.pipe(plumber())
201-
.pipe(jsonEditor(function(package) {
202+
.pipe(jsonEditor(function(json) {
202203
if(version) {
203-
package.version = version;
204+
json.version = version;
204205
}
205-
return package;
206+
return json;
206207
}))
207208
.pipe(gulp.dest(outputDirectory))
208209
;

tasks/admin/distributions/init.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
1313
*/
1414

15-
var
15+
let
1616
gulp = require('gulp'),
1717

1818
// node dependencies
@@ -63,7 +63,7 @@ module.exports = function(callback) {
6363
return;
6464
}
6565

66-
var
66+
let
6767
component = release.distributions[index],
6868
lowerCaseComponent = component.toLowerCase(),
6969
outputDirectory = path.resolve(release.outputRoot + lowerCaseComponent),
@@ -147,7 +147,7 @@ module.exports = function(callback) {
147147
// avoid rate throttling
148148
global.clearTimeout(timer);
149149
timer = global.setTimeout(function() {
150-
stepRepo()
150+
stepRepo();
151151
}, 0);
152152
}
153153

tasks/admin/publish.js

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,23 @@
88
* Commits changes from create components to GitHub and Tags
99
1010
*/
11+
let
12+
gulp = require('gulp'),
13+
{series, parallel} = gulp,
1114

15+
updateComponents = require('../admin/components/update'),
16+
updateDistributions = require('../admin/distributions/update'),
1217

13-
/* Release All */
14-
module.exports = function(callback) {
18+
publish
19+
;
1520

16-
gulp.series(
17-
'update distributions', // commit less/css versions to github
18-
'update components', // commit components to github
19-
callback
20-
);
21+
/* Release All */
22+
publish = series(
23+
updateDistributions, // commit less/css versions to github
24+
updateComponents // commit components to github
25+
);
2126

22-
};
27+
/* Export with Metadata */
28+
publish.displayName = 'publish';
29+
publish.description = 'Publish new versions of SUI across all repos';
30+
module.exports = publish;

tasks/admin/release.js

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,23 @@
22
Release
33
*******************************/
44

5+
let
6+
gulp = require('gulp'),
7+
{series, parallel} = gulp,
8+
9+
build = require('../build'),
10+
11+
// less/css distributions
12+
initComponents = require('./components/init'),
13+
createComponents = require('./components/create'),
14+
15+
// single component releases
16+
initDistributions = require('./distributions/init'),
17+
createDistributions = require('./distributions/create'),
18+
19+
release
20+
;
21+
522
/*
623
This task update all SUI individual component repos with new versions of components
724
@@ -11,15 +28,15 @@
1128
*/
1229

1330
/* Release All */
14-
module.exports = function(callback) {
15-
16-
gulp.series(
17-
//'build', // build Semantic
18-
'init distributions', // sync with current github version
19-
'create distributions', // update each repo with changes from master repo
20-
'init components', // sync with current github version
21-
'create components', // update each repo
22-
callback
23-
);
24-
25-
};
31+
release = series(
32+
build, // build Semantic
33+
initDistributions, // sync with current github version
34+
createDistributions, // update each repo with changes from master repo
35+
initComponents, // sync with current github version
36+
createComponents // update each repo
37+
);
38+
39+
/* Export with Metadata */
40+
release.displayName = 'release';
41+
release.description = 'Release SUI across all repos';
42+
module.exports = release;

tasks/collections/admin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616

1717
module.exports = function(gulp) {
18-
var
18+
let
1919
// less/css distributions
2020
initComponents = require('../admin/components/init'),
2121
createComponents = require('../admin/components/create'),

tasks/collections/build.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
module.exports = function(gulp) {
66

7-
var
7+
let
88
// build sub-tasks
99
buildJS = require('./../build/javascript'),
1010
buildCSS = require('./../build/css'),
1111
buildAssets = require('./../build/assets')
1212
;
1313

14-
// in case these tasks are undefined during import, less make sure these are available in scope
14+
// in case these tasks are undefined during import, lets make sure these are available in scope
1515
gulp.task('build-javascript', buildJS);
1616
gulp.task('build-css', buildCSS);
1717
gulp.task('build-assets', buildAssets);

0 commit comments

Comments
 (0)