Skip to content

Commit 137ce79

Browse files
ncodenncoden
authored
Merge pull request #11389 from ncoden/chore/update-dependencies-2018-07-06
chore: update dependencies (2018-07-06)
2 parents b233985 + 229ec50 commit 137ce79

14 files changed

+8595
-9427
lines changed

‎gulp/tasks/check.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@ var gulp = require('gulp');
44
var checkDeps = require('gulp-check-deps');
55
var postcss = require('gulp-postcss');
66
var doiuse = require('doiuse');
7-
var sequence = require('run-sequence');
87
var CONFIG = require('../config.js');
98

10-
gulp.task('check', function(cb) {
11-
sequence('check:deps', 'check:browserSupport', cb)
12-
});
9+
gulp.task('check', gulp.series('check:deps', 'check:browserSupport'));
1310

1411
// Check npm dependencies
1512
gulp.task('check:deps', function() {
16-
return gulp.src('package.json').pipe(checkDeps());
13+
return gulp.src('package.json').pipe(checkDeps());
1714
});
1815

1916
// Check browser support

‎gulp/tasks/clean.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var gulp = require('gulp');
2-
var rimraf = require('rimraf').sync;
2+
var rimraf = require('rimraf');
33

44
// Erases the dist folder
5-
gulp.task('clean', function() {
6-
rimraf('_build');
5+
gulp.task('clean', function(done) {
6+
rimraf('_build', done);
77
});

‎gulp/tasks/copy.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ var CONFIG = require('../config.js');
44

55
// Copies static assets
66
gulp.task('copy', function() {
7-
gulp.src(CONFIG.ASSETS_FILES)
7+
return gulp.src(CONFIG.ASSETS_FILES)
88
.pipe(gulp.dest('_build/assets'));
99
});

‎gulp/tasks/customizer.js

+38-47
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
var addSrc = require('gulp-add-src');
2-
var babel = require('gulp-babel');
3-
var concat = require('gulp-concat');
42
var cleancss = require('gulp-clean-css');
53
var customizer = require('../../customizer/lib');
64
var Vinyl = require('vinyl');
75
var fs = require('fs');
86
var gulp = require('gulp');
9-
var sequence = require('run-sequence');
107
var If = require('gulp-if');
118
var path = require('path');
129
var Readable = require('stream').Readable;
@@ -23,7 +20,6 @@ var postcss = require('gulp-postcss');
2320
var autoprefixer = require('autoprefixer');
2421
var webpackStream = require('webpack-stream');
2522
var webpack = require('webpack');
26-
var named = require('vinyl-named');
2723

2824
var utils = require('../utils.js');
2925

@@ -84,38 +80,35 @@ gulp.task('customizer:prepareSassDeps', function() {
8480
});
8581

8682
// Creates a Sass file from the module/variable list and creates foundation.css and foundation.min.css
87-
gulp.task('customizer:sass', function(done) {
88-
sequence('customizer:loadConfig', 'customizer:prepareSassDeps', function() {
89-
var sassFile = customizer.sass(CUSTOMIZER_CONFIG, MODULE_LIST, VARIABLE_LIST);
90-
var stream = createStream('foundation.scss', sassFile);
91-
92-
return stream
93-
.pipe(sass({
94-
includePaths: [
95-
'scss',
96-
'node_modules/motion-ui/src'
97-
]
98-
}))
99-
.pipe(postcss([autoprefixer()])) // uses ".browserslistrc"
100-
.pipe(gulp.dest(path.join(OUTPUT_DIR, 'css')))
101-
.pipe(cleancss({ compatibility: 'ie9' }))
102-
.pipe(rename('foundation.min.css'))
103-
.pipe(gulp.dest(path.join(OUTPUT_DIR, 'css')))
104-
.on('finish', done);
105-
});
106-
});
83+
gulp.task('customizer:sass', gulp.series('customizer:loadConfig', 'customizer:prepareSassDeps', function() {
84+
var sassFile = customizer.sass(CUSTOMIZER_CONFIG, MODULE_LIST, VARIABLE_LIST);
85+
var stream = createStream('foundation.scss', sassFile);
86+
87+
return stream
88+
.pipe(sass({
89+
includePaths: [
90+
'scss',
91+
'node_modules/motion-ui/src'
92+
]
93+
}))
94+
.pipe(postcss([autoprefixer()])) // uses ".browserslistrc"
95+
.pipe(gulp.dest(path.join(OUTPUT_DIR, 'css')))
96+
.pipe(cleancss({ compatibility: 'ie9' }))
97+
.pipe(rename('foundation.min.css'))
98+
.pipe(gulp.dest(path.join(OUTPUT_DIR, 'css')))
99+
}));
107100

108101
// Creates a Foundation JavaScript file from the module list, and also copies dependencies (jQuery, what-input)
109-
gulp.task('customizer:javascript-entry', ['customizer:loadConfig'], function() {
102+
gulp.task('customizer:javascript-entry', gulp.series('customizer:loadConfig', function() {
110103
var entryFile = customizer.js(CUSTOMIZER_CONFIG, MODULE_LIST);
111104
// Create a stream with our entry file
112105
var stream = createStream('foundation.js', entryFile);
113106

114107
return stream
115108
.pipe(gulp.dest(path.join(OUTPUT_DIR, 'js/vendor')));
116-
});
109+
}));
117110

118-
gulp.task('customizer:javascript', ['customizer:javascript-entry'], function() {
111+
gulp.task('customizer:javascript', gulp.series('customizer:javascript-entry', function() {
119112
return gulp.src(path.join(OUTPUT_DIR, 'js/vendor/foundation.js'))
120113
.pipe(webpackStream(WEBPACK_CONFIG, webpack))
121114
.pipe(rename('foundation.js'))
@@ -127,40 +120,38 @@ gulp.task('customizer:javascript', ['customizer:javascript-entry'], function() {
127120
'node_modules/what-input/dist/what-input.js'
128121
]))
129122
.pipe(gulp.dest(path.join(OUTPUT_DIR, 'js/vendor')));
130-
});
123+
}));
131124

132125
// Copies the boilerplate index.html to the custom download folder
133-
gulp.task('customizer:html', ['customizer:loadConfig'], function() {
126+
gulp.task('customizer:html', gulp.series('customizer:loadConfig', function() {
134127
var rtlEnabled = VARIABLE_LIST['global-text-direction'] && VARIABLE_LIST['global-text-direction'] === 'rtl';
135128

136129
return gulp.src('customizer/index.html')
137130
.pipe(If(rtlEnabled, replace('ltr', 'rtl')))
138131
.pipe(gulp.dest(OUTPUT_DIR));
139-
});
132+
}));
140133

141134
// Creates a custom build by:
142135
// - Generating a CSS file
143136
// - Generating a JS file
144137
// - Copying the index.html file
145138
// - Creating a blank app.css file
146139
// - Creating an app.js file with Foundation initialization code
147-
gulp.task('customizer', function(done) {
148-
sequence('customizer:sass', 'customizer:javascript', 'customizer:html', function() {
149-
var outputFolder = path.dirname(OUTPUT_DIR);
150-
var outputFileName = path.basename(OUTPUT_DIR);
151-
152-
touch(path.join(OUTPUT_DIR, 'css/app.css'));
153-
touch(path.join(OUTPUT_DIR, 'js/app.js'));
154-
fs.writeFileSync(path.join(OUTPUT_DIR, 'js/app.js'), '$(document).foundation()\n');
155-
156-
gulp.src(path.join(OUTPUT_DIR, '/**/*'))
157-
.pipe(zip(path.basename(outputFileName) + '.zip'))
158-
.pipe(gulp.dest(outputFolder))
159-
.on('finish', function() {
160-
rimraf(OUTPUT_DIR, done);
161-
});
162-
});
163-
});
140+
gulp.task('customizer', gulp.series('customizer:sass', 'customizer:javascript', 'customizer:html', function(done) {
141+
var outputFolder = path.dirname(OUTPUT_DIR);
142+
var outputFileName = path.basename(OUTPUT_DIR);
143+
144+
touch(path.join(OUTPUT_DIR, 'css/app.css'));
145+
touch(path.join(OUTPUT_DIR, 'js/app.js'));
146+
fs.writeFileSync(path.join(OUTPUT_DIR, 'js/app.js'), '$(document).foundation()\n');
147+
148+
gulp.src(path.join(OUTPUT_DIR, '/**/*'))
149+
.pipe(zip(path.basename(outputFileName) + '.zip'))
150+
.pipe(gulp.dest(outputFolder))
151+
.on('finish', function() {
152+
rimraf(OUTPUT_DIR, done);
153+
});
154+
}));
164155

165156
function createStream(name, content) {
166157
// Create a stream with our entry file

‎gulp/tasks/deploy.js

+24-33
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ var confirm = require('gulp-prompt').confirm;
77
var rsync = require('gulp-rsync');
88
var replace = require('gulp-replace');
99
var octophant = require('octophant');
10-
var sequence = require('run-sequence');
1110
var inquirer = require('inquirer');
1211
var exec = require('child_process').execSync;
1312
var plumber = require('gulp-plumber');
@@ -17,17 +16,10 @@ var CONFIG = require('../config.js');
1716
var CURRENT_VERSION = require('../../package.json').version;
1817
var NEXT_VERSION;
1918

20-
gulp.task('deploy', function(cb) {
21-
sequence('deploy:prompt', 'deploy:version', 'deploy:dist', 'deploy:plugins', 'deploy:settings', 'deploy:commit', 'deploy:templates', cb);
22-
});
23-
24-
gulp.task('deploy:prep', function(cb) {
25-
sequence('deploy:prompt', 'deploy:version', 'deploy:dist', 'deploy:plugins', 'deploy:settings', cb);
26-
});
19+
gulp.task('deploy', gulp.series('deploy:prompt', 'deploy:version', 'deploy:dist', 'deploy:plugins', 'deploy:settings', 'deploy:commit', 'deploy:templates'));
2720

28-
gulp.task('deploy:dist', function (cb) {
29-
sequence('sass:foundation', 'javascript:foundation', 'deploy:dist:files', cb);
30-
});
21+
gulp.task('deploy:prep', gulp.series('deploy:prompt', 'deploy:version', 'deploy:dist', 'deploy:plugins', 'deploy:settings'));
22+
gulp.task('deploy:dist', gulp.series('sass:foundation', 'javascript:foundation', 'deploy:dist:files'));
3123

3224
gulp.task('deploy:prompt', function(cb) {
3325
inquirer.prompt([{
@@ -102,15 +94,15 @@ gulp.task('deploy:dist:files', function() {
10294

10395
// Copies standalone JavaScript plugins to dist/ folder
10496
gulp.task('deploy:plugins', function() {
105-
gulp.src('_build/assets/js/plugins/*.js')
97+
return gulp.src('_build/assets/js/plugins/*.js')
10698
.pipe(gulp.dest('dist/js/plugins'))
10799
.pipe(uglify())
108100
.pipe(rename({ suffix: '.min' }))
109101
.pipe(gulp.dest('dist/js/plugins'));
110102
});
111103

112104
// Generates a settings file
113-
gulp.task('deploy:settings', function(cb) {
105+
gulp.task('deploy:settings', function(done) {
114106
var options = {
115107
title: 'Foundation for Sites Settings',
116108
output: './scss/settings/_settings.scss',
@@ -130,38 +122,37 @@ gulp.task('deploy:settings', function(cb) {
130122
_foundationShim: true
131123
}
132124

133-
octophant('./scss', options, cb);
125+
octophant('./scss', options, done);
134126
});
135127

136128
// Writes a commit with the changes to the version numbers
137-
gulp.task('deploy:commit', function(cb) {
129+
gulp.task('deploy:commit', function() {
138130
exec('git commit -am "Bump to version "' + NEXT_VERSION);
139131
exec('git tag v' + NEXT_VERSION);
140132
exec('git push origin develop --follow-tags');
141-
cb();
142133
});
143134

144135
// Uploads the documentation to the live server
145-
gulp.task('deploy:docs', ['build'], function() {
136+
gulp.task('deploy:docs', gulp.series('build', function() {
146137
return gulp.src('./_build/**')
147138
.pipe(confirm('Make sure everything looks right before you deploy.'))
148139
.pipe(rsync({
149140
root: './_build',
150141
hostname: '[email protected]',
151142
destination: '/home/deployer/sites/foundation-sites-6-docs'
152143
}));
153-
});
144+
}));
154145

155146
// Uploads the documentation to the live server in beta env
156-
gulp.task('deploy:beta', ['build'], function() {
147+
gulp.task('deploy:beta', gulp.series('build', function() {
157148
return gulp.src('./_build/**')
158149
.pipe(confirm('Make sure everything looks right before you deploy.'))
159150
.pipe(rsync({
160151
root: './_build',
161152
hostname: '[email protected]',
162153
destination: '/home/deployer/sites/scalingsexiness/foundation-sites-6-docs'
163154
}));
164-
});
155+
}));
165156

166157

167158

@@ -186,17 +177,17 @@ gulp.task('deploy:templates', function(done) {
186177
});
187178

188179
// The Customizer runs this function to generate files it needs
189-
gulp.task('deploy:custom', function(done) {
190-
sequence('sass:foundation', 'javascript:foundation', function() {
191-
gulp.src('./_build/assets/css/foundation.css')
192-
.pipe(cleancss({ compatibility: 'ie9' }))
193-
.pipe(rename('foundation.min.css'))
194-
.pipe(gulp.dest('./_build/assets/css'));
195-
180+
gulp.task('deploy:custom', gulp.series('sass:foundation', 'javascript:foundation', gulp.parallel(
181+
function () {
182+
return gulp.src('./_build/assets/css/foundation.css')
183+
.pipe(cleancss({ compatibility: 'ie9' }))
184+
.pipe(rename('foundation.min.css'))
185+
.pipe(gulp.dest('./_build/assets/css'));
186+
},
187+
function () {
196188
return gulp.src('_build/assets/js/foundation.js')
197-
.pipe(uglify())
198-
.pipe(rename('foundation.min.js'))
199-
.pipe(gulp.dest('./_build/assets/js'))
200-
.on('finish', done);
201-
});
202-
});
189+
.pipe(uglify())
190+
.pipe(rename('foundation.min.js'))
191+
.pipe(gulp.dest('./_build/assets/js'));
192+
}
193+
)));

‎gulp/tasks/docs.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function buildSearch() {
7474
supercollider.buildSearch('_build/data/search.json', function() {});
7575
}
7676

77-
gulp.task('docs:debug', ['docs:all'], function(cb) {
77+
gulp.task('docs:debug', gulp.series('docs:all', function(done) {
7878
var output = JSON.stringify(supercollider.tree, null, ' ');
79-
require('fs').writeFile('./_debug.json', output, cb);
80-
});
79+
require('fs').writeFile('./_debug.json', output, done);
80+
}));

‎gulp/tasks/javascript.js

+5-11
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
var gulp = require('gulp');
22
var concat = require('gulp-concat');
3-
var babel = require('gulp-babel');
4-
var onBabelError = require('./babel-error.js');
5-
var rename = require('gulp-rename');
63
var webpackStream = require('webpack-stream');
74
var webpack = require('webpack');
85
var named = require('vinyl-named');
9-
var sequence = require('run-sequence');
106
var sourcemaps = require('gulp-sourcemaps');
117

128
var utils = require('../utils.js');
@@ -84,9 +80,7 @@ var webpackConfig = {
8480
//
8581

8682
// Compiles JavaScript into a single file
87-
gulp.task('javascript', function(cb) {
88-
sequence('javascript:foundation', 'javascript:deps', 'javascript:docs', cb)
89-
});
83+
gulp.task('javascript', gulp.series('javascript:foundation', 'javascript:deps', 'javascript:docs'));
9084

9185
// Core has to be dealt with slightly differently due to bootstrapping externals
9286
// and the dependency on foundation.core.utils
@@ -101,7 +95,7 @@ gulp.task('javascript:plugin-core', function() {
10195
.pipe(sourcemaps.write('.'))
10296
.pipe(gulp.dest('_build/assets/js/plugins'));
10397
});
104-
gulp.task('javascript:plugins', ['javascript:plugin-core'], function () {
98+
gulp.task('javascript:plugins', gulp.series('javascript:plugin-core', function () {
10599
return gulp.src(['js/entries/plugins/*.js', '!js/entries/plugins/foundation.core.js'])
106100
.pipe(named())
107101
.pipe(sourcemaps.init())
@@ -111,16 +105,16 @@ gulp.task('javascript:plugins', ['javascript:plugin-core'], function () {
111105
}), webpack))
112106
.pipe(sourcemaps.write('.'))
113107
.pipe(gulp.dest('_build/assets/js/plugins'));
114-
});
108+
}));
115109

116-
gulp.task('javascript:foundation', ['javascript:plugins'], function() {
110+
gulp.task('javascript:foundation', gulp.series('javascript:plugins', function() {
117111
return gulp.src('js/entries/foundation.js')
118112
.pipe(named())
119113
.pipe(sourcemaps.init())
120114
.pipe(webpackStream(webpackConfig, webpack))
121115
.pipe(sourcemaps.write('.'))
122116
.pipe(gulp.dest('_build/assets/js'));
123-
});
117+
}));
124118

125119
gulp.task('javascript:deps', function() {
126120
return gulp.src(CONFIG.JS_DEPS)

‎gulp/tasks/lint.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@ var gulp = require('gulp');
22
var plumber = require('gulp-plumber');
33
var sassLint = require('gulp-sass-lint');
44
var eslint = require('gulp-eslint');
5-
var sequence = require('run-sequence');
65
var CONFIG = require('../config.js');
76

87
// Lints Sass and JavaScript files for formatting issues
9-
gulp.task('lint', function(cb) {
10-
sequence('lint:sass', 'lint:javascript', cb)
11-
});
8+
gulp.task('lint', gulp.series('lint:sass', 'lint:javascript'));
129

1310
gulp.task('lint:sass', function() {
1411
return gulp.src(CONFIG.SASS_LINT_FILES)

0 commit comments

Comments
 (0)