From 879288942ca57ebeedd0a74089ec45443bf1511a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2019 14:02:44 +0630 Subject: [PATCH] =?UTF-8?q?chore(deps):=20update=20dependency=20gulp=20to?= =?UTF-8?q?=20version=20.x=20=F0=9F=8C=9F=20(major)=20(#4816)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update gulp to 4.0.2 🌟 * remove unused gulp-typescript package * rename gulpDebug dep for consistency * remove run-sequence dep - replace with new gulp.sequence and gulp.parallel * pass new sourcemaps arg through to gulp-coffee * fix favicon task that I broke. :grimacing: * fix extension gulpfile - needed those returns :P - also update vinyl-source-stream to avoid vinyl errors during gulp tasks * Fix example gulpfile to allow empty sources Co-authored-by: Renovate Bot Co-authored-by: Jennifer Shehane --- package.json | 9 +++-- packages/example/gulpfile.js | 13 +++----- packages/example/package.json | 5 ++- packages/extension/gulpfile.js | 38 ++++++++-------------- packages/extension/package.json | 5 ++- packages/static/gulpfile.js | 2 +- packages/static/package.json | 2 +- scripts/binary/build.coffee | 3 +- scripts/binary/upload-npm-package.coffee | 4 +-- scripts/binary/upload-unique-binary.coffee | 4 +-- scripts/binary/upload.coffee | 4 +-- 11 files changed, 34 insertions(+), 55 deletions(-) diff --git a/package.json b/package.json index c6aad4ed85..ba5fe2cd2c 100644 --- a/package.json +++ b/package.json @@ -118,12 +118,11 @@ "find-package-json": "1.2.0", "fs-extra": "8.1.0", "gift": "0.10.2", - "gulp": "3.9.1", - "gulp-awspublish": "3.4.0", - "gulp-coffee": "2.3.5", - "gulp-debug": "3.2.0", + "gulp": "4.0.2", + "gulp-awspublish": "4.0.0", + "gulp-coffee": "3.0.3", + "gulp-debug": "4.0.0", "gulp-rename": "1.4.0", - "gulp-typescript": "3.2.4", "hasha": "5.0.0", "human-interval": "0.1.6", "husky": "2.4.1", diff --git a/packages/example/gulpfile.js b/packages/example/gulpfile.js index 02b676bde8..8943c01c94 100644 --- a/packages/example/gulpfile.js +++ b/packages/example/gulpfile.js @@ -2,7 +2,6 @@ let gulp = require('gulp') let ghPages = require('gulp-gh-pages-will') let clean = require('gulp-clean') let RevAll = require('gulp-rev-all') -let runSequence = require('run-sequence') gulp.task('assets', function () { let revAllOpts = { @@ -23,12 +22,12 @@ gulp.task('cname', function () { }) gulp.task('gitignore', function () { - return gulp.src('.gitignore') + return gulp.src('.gitignore', { allowEmpty: true }) .pipe(gulp.dest('build')) }) gulp.task('clean', function () { - return gulp.src('./build') + return gulp.src('./build', { allowEmpty: true }) .pipe(clean()) }) @@ -37,10 +36,6 @@ gulp.task('push-gh-pages', function () { .pipe(ghPages()) }) -gulp.task('build', function (cb) { - return runSequence('clean', ['assets', 'cname', 'gitignore'], cb) -}) +gulp.task('build', gulp.series('clean', gulp.parallel('assets', 'cname', 'gitignore'))) -gulp.task('deploy', function (cb) { - return runSequence('build', 'push-gh-pages', cb) -}) +gulp.task('deploy', gulp.series('build', 'push-gh-pages')) diff --git a/packages/example/package.json b/packages/example/package.json index 1d163451e9..a2882a5abb 100644 --- a/packages/example/package.json +++ b/packages/example/package.json @@ -30,12 +30,11 @@ "chai": "3.5.0", "cross-env": "5.2.0", "cypress-example-kitchensink": "1.5.6", - "gulp": "3.9.1", + "gulp": "4.0.2", "gulp-clean": "0.4.0", "gulp-gh-pages-will": "0.5.5", - "gulp-rev-all": "0.9.8", + "gulp-rev-all": "2.0.2", "mocha": "2.5.3", - "run-sequence": "1.2.2", "shelljs": "0.8.3" } } diff --git a/packages/extension/gulpfile.js b/packages/extension/gulpfile.js index cd544e64b6..0f843b0a42 100644 --- a/packages/extension/gulpfile.js +++ b/packages/extension/gulpfile.js @@ -2,32 +2,23 @@ @cypress/dev/no-return-before, no-unused-vars, */ -// TODO: This file was created by bulk-decaffeinate. -// Fix any style issues and re-enable lint. -/* - * decaffeinate suggestions: - * DS102: Remove unnecessary code created because of implicit returns - * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md - */ const fs = require('fs-extra') const pkg = require('./package.json') const gulp = require('gulp') const clean = require('gulp-clean') const rename = require('gulp-rename') -const runSeq = require('run-sequence') const source = require('vinyl-source-stream') -const Promise = require('bluebird') const coffeeify = require('coffeeify') const browserify = require('browserify') const icons = require('@cypress/icons') gulp.task('clean', () => { - return gulp.src('dist') + return gulp.src('dist', { allowEmpty: true }) .pipe(clean()) }) gulp.task('manifest', (done) => { - gulp.src('app/manifest.json') + return gulp.src('app/manifest.json') .pipe(gulp.dest('dist')) .on('end', () => { return fs.readJson('dist/manifest.json', (err, json) => { @@ -36,8 +27,6 @@ gulp.task('manifest', (done) => { return fs.writeJson('dist/manifest.json', json, { spaces: 2 }, done) }) }) - - return null }) gulp.task('backup', () => { @@ -84,17 +73,16 @@ gulp.task('logos', () => { .pipe(gulp.dest('dist/logos')) }) -gulp.task('watch', ['build'], () => { - return gulp.watch('app/**/*', ['build']) -}) +gulp.task('build', gulp.series('clean', gulp.parallel( + 'icons', + 'logos', + 'manifest', + 'background', + 'html', + 'css', +))) -gulp.task('build', () => { - return runSeq('clean', [ - 'icons', - 'logos', - 'manifest', - 'background', - 'html', - 'css', - ]) +gulp.task('watch', gulp.series('build'), (done) => { + gulp.watch('app/**/*', gulp.series('build')) + done() }) diff --git a/packages/extension/package.json b/packages/extension/package.json index 7075cf7418..0e284e7cdb 100644 --- a/packages/extension/package.json +++ b/packages/extension/package.json @@ -32,13 +32,12 @@ "cross-env": "5.2.0", "eol": "0.9.1", "fs-extra": "8.1.0", - "gulp": "3.9.1", + "gulp": "4.0.2", "gulp-clean": "0.4.0", "gulp-rename": "1.4.0", - "run-sequence": "1.2.2", "sinon": "1.17.7", "sinon-chai": "3.3.0", - "vinyl-source-stream": "1.1.2" + "vinyl-source-stream": "2.0.0" }, "files": [ "app", diff --git a/packages/static/gulpfile.js b/packages/static/gulpfile.js index 71e6132a19..a356a30e96 100644 --- a/packages/static/gulpfile.js +++ b/packages/static/gulpfile.js @@ -6,4 +6,4 @@ gulp.task('favicon', () => { .pipe(gulp.dest('./dist')) }) -gulp.task('build', ['favicon']) +gulp.task('build', gulp.parallel('favicon')) diff --git a/packages/static/package.json b/packages/static/package.json index 49f1a1aac8..c252044d59 100644 --- a/packages/static/package.json +++ b/packages/static/package.json @@ -16,7 +16,7 @@ }, "devDependencies": { "@cypress/icons": "0.7.0", - "gulp": "3.9.1" + "gulp": "4.0.2" }, "files": [ "dist", diff --git a/scripts/binary/build.coffee b/scripts/binary/build.coffee index 6c6806f8d3..daaed5c0ef 100644 --- a/scripts/binary/build.coffee +++ b/scripts/binary/build.coffee @@ -9,7 +9,6 @@ chalk = require("chalk") Promise = require("bluebird") gulpDebug = require("gulp-debug") gulpCoffee = require("gulp-coffee") -gulpTypeScript = require("gulp-typescript") pluralize = require("pluralize") vinylPaths = require("vinyl-paths") coffee = require("@packages/coffee") @@ -195,7 +194,7 @@ buildCypressApp = (platform, version, options = {}) -> ## except those in node_modules "!" + distDir("**", "node_modules", "**", "*.coffee") - ]) + ], { sourcemaps: true }) .pipe vinylPaths(del) .pipe(gulpDebug()) .pipe gulpCoffee({ diff --git a/scripts/binary/upload-npm-package.coffee b/scripts/binary/upload-npm-package.coffee index 7be6116046..7dd011341c 100644 --- a/scripts/binary/upload-npm-package.coffee +++ b/scripts/binary/upload-npm-package.coffee @@ -6,7 +6,7 @@ fs = require("fs") path = require("path") awspublish = require('gulp-awspublish') rename = require('gulp-rename') -debug = require('gulp-debug') +gulpDebug = require('gulp-debug') gulp = require("gulp") human = require("human-interval") R = require("ramda") @@ -53,7 +53,7 @@ uploadFile = (options) -> la(check.unemptyString(p.basename), "missing basename") la(check.unemptyString(p.dirname), "missing dirname") p - .pipe debug() + .pipe gulpDebug() .pipe publisher.publish(headers) .pipe awspublish.reporter() .on "error", reject diff --git a/scripts/binary/upload-unique-binary.coffee b/scripts/binary/upload-unique-binary.coffee index 12cbec09f5..03183e6d4e 100644 --- a/scripts/binary/upload-unique-binary.coffee +++ b/scripts/binary/upload-unique-binary.coffee @@ -6,7 +6,7 @@ fs = require("fs") path = require("path") awspublish = require('gulp-awspublish') rename = require('gulp-rename') -debug = require('gulp-debug') +gulpDebug = require('gulp-debug') gulp = require("gulp") human = require("human-interval") R = require("ramda") @@ -83,7 +83,7 @@ uploadFile = (options) -> la(check.unemptyString(p.dirname), "missing dirname") key = p.dirname + uploadFileName p - .pipe debug() + .pipe gulpDebug() .pipe publisher.publish(headers) .pipe awspublish.reporter() .on "error", reject diff --git a/scripts/binary/upload.coffee b/scripts/binary/upload.coffee index 67407cd878..5da4b3373f 100644 --- a/scripts/binary/upload.coffee +++ b/scripts/binary/upload.coffee @@ -1,6 +1,6 @@ awspublish = require('gulp-awspublish') rename = require('gulp-rename') -debug = require('gulp-debug') +gulpDebug = require('gulp-debug') fs = require("fs-extra") cp = require("child_process") path = require("path") @@ -118,7 +118,7 @@ module.exports = { .pipe rename (p) -> p.dirname = aws.folder + "/" + p.dirname p - .pipe debug() + .pipe gulpDebug() .pipe publisher.publish(headers) .pipe awspublish.reporter() .on "error", reject