From: Joe Workman Date: Tue, 21 Jul 2020 17:38:39 +0000 (-0700) Subject: upgrade dependencies X-Git-Tag: v2.3.0^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=586dbcbe7420b809b69eb49a1fafee7f63304a18;p=thirdparty%2Ffoundation%2Ffoundation-emails.git upgrade dependencies --- diff --git a/gulpfile.js b/gulpfile.js index 6287e7e7..21083df6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -104,12 +104,12 @@ gulp.task('javascript:docs', function() { }); // Generates a Sass settings file from the current codebase -gulp.task('settings', function() { - octophant('scss/**/*.scss', { +gulp.task('settings', function(cb) { + return octophant('scss/**/*.scss', { title: 'Foundation for Emails Settings', output: 'scss/settings/_settings.scss', sort: ['global', 'grid', 'block-grid', 'type'] - }); + }, cb); }); // Lints the Sass codebase @@ -131,22 +131,22 @@ gulp.task('server', gulp.series('build', function(){ })); // Uploads the documentation to the live server -gulp.task('deploy:docs', gulp.series('build'), function() { - return gulp.src('./_build/**') - .pipe($.prompt.confirm('Make sure everything looks right before you deploy.')) - .pipe($.rsync({ - root: './_build', - hostname: 'deployer@72.32.134.77', - destination: '/home/deployer/sites/foundation-emails-march16' - })); -}); +// gulp.task('deploy:docs', gulp.series('build'), function() { +// return gulp.src('./_build/**') +// .pipe($.prompt.confirm('Make sure everything looks right before you deploy.')) +// .pipe($.rsync({ +// root: './_build', +// hostname: 'deployer@72.32.134.77', +// destination: '/home/deployer/sites/foundation-emails-march16' +// })); +// }); // Runs the build process, spins up a server, and watches for file changes gulp.task('default', gulp.series('server', function() { - gulp.watch('docs/**/*', ['html', browser.reload]); - gulp.watch(['docs/assets/scss/**/*', 'node_modules/foundation-docs/scss/**/*'], ['sass:docs', browser.reload]); - gulp.watch('scss/**/*.scss', ['sass:foundation', browser.reload]); + gulp.watch('docs/**/*', gulp.series('html', browser.reload)); + gulp.watch(['docs/assets/scss/**/*', 'node_modules/foundation-docs/scss/**/*'], gulp.series('sass:docs', browser.reload)); + gulp.watch('scss/**/*.scss', gulp.series('sass:foundation', browser.reload)); })); gulp.task('test:compile', function() { @@ -197,13 +197,13 @@ gulp.task('download:build', gulp.series('download:build:index', 'download:build: .pipe(gulp.dest('.')); })); -gulp.task('download', gulp.series('download:build', function(done) { - return gulp.src('foundation-emails.zip') - .pipe($.rsync({ - hostname: 'deployer@72.32.134.77', - destination: '/home/deployer/sites/foundation-sites-6-marketing/downloads/' - })); -})); +// gulp.task('download', gulp.series('download:build', function(done) { +// return gulp.src('foundation-emails.zip') +// .pipe($.rsync({ +// hostname: 'deployer@72.32.134.77', +// destination: '/home/deployer/sites/foundation-sites-6-marketing/downloads/' +// })); +// })); gulp.task('dist', gulp.series('sass:foundation', function() { return gulp.src('_build/assets/css/foundation-emails.css') diff --git a/package.json b/package.json index c7d58153..d98e63d7 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "test:visual": "gulp test", "deploy:dist": "gulp dist", "deploy:settings": "gulp settings", - "deploy:download": "gulp download", + "deploy:download": "gulp download:build", "deploy:templates": "gulp templates", "deploy:docs": "gulp deploy:docs" }, @@ -26,7 +26,7 @@ "clipboard-js": "^0.3.6", "cssnano": "^4.1.10", "foundation-docs": "foundation/foundation-docs", - "foundation-sites": "^6.2.0", + "foundation-sites": "foundation/foundation-sites#master", "gulp": "^4.0.2", "gulp-autoprefixer": "^7.0.1", "gulp-cached": "^1.1.0", @@ -46,7 +46,7 @@ "gulp-sourcemaps": "^2.6.5", "gulp-wrap": "^0.15.0", "gulp-zip": "^5.0.1", - "inky": "foundation/inky#develop", + "inky": "foundation/inky#master", "js-yaml": "^3.14.0", "lazypipe": "^1.0.1", "marked": "^1.1.1", @@ -54,11 +54,11 @@ "multiline": "^2.0.0", "node-sass": "^4.14.1", "octophant": "^1.0.0", - "panini": "foundation/panini#develop", + "panini": "foundation/panini#master", "rimraf": "^3.0.0", "run-sequence": "^2.2.1", "siphon-media-query": "^1.0.0", - "supercollider": "foundation/supercollider#develop", + "supercollider": "foundation/supercollider#master", "typeahead.js": "^0.11.1", "yargs": "^14.2.0", "zeroclipboard": "^2.2.0" diff --git a/yarn.lock b/yarn.lock index a3755ff1..cac70c05 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2823,10 +2823,9 @@ foundation-emails@^2.2.0: resolved "https://registry.yarnpkg.com/foundation-emails/-/foundation-emails-2.2.1.tgz#1f3442762395d063d5a62d790740b2433aab1747" integrity sha1-HzRCdiOV0GPVpi15B0CyQzqrF0c= -foundation-sites@^6.2.0: +foundation-sites@foundation/foundation-sites#master: version "6.6.3" - resolved "https://registry.yarnpkg.com/foundation-sites/-/foundation-sites-6.6.3.tgz#8ca5f246357db69e6a0e73351ce06aa8acce6540" - integrity sha512-8X93wUAmUg1HhVv8uWMWnwoBLSQWSmFImJencneIZDctswn724Bq/MV1cbPZN/GFWGOB/9ngoQHztfzd4+ovCg== + resolved "https://codeload.github.com/foundation/foundation-sites/tar.gz/ce28d43c7cae21a66f5b9dfa2105d5adbb79842a" fragment-cache@^0.2.1: version "0.2.1" @@ -3844,9 +3843,9 @@ inky@^1.2.6: through2 "^2.0.0" vinyl-fs "^2.3.0" -inky@foundation/inky#develop: - version "1.3.7" - resolved "https://codeload.github.com/foundation/inky/tar.gz/dfd77d5eb20d465699fa5114a48105273cac6097" +inky@foundation/inky#master: + version "1.4.1" + resolved "https://codeload.github.com/foundation/inky/tar.gz/25342d6a221195f0ee69acfd232fa7fd15747280" dependencies: cheerio "^0.20.0" foundation-emails "^2.2.0" @@ -5991,9 +5990,9 @@ package-json@^4.0.0: registry-url "^3.0.3" semver "^5.1.0" -panini@foundation/panini#develop: - version "1.6.3" - resolved "https://codeload.github.com/foundation/panini/tar.gz/7c878b44bfb6d2d3e454b3cc23d6ca044c2c3e03" +panini@foundation/panini#master: + version "1.7.0" + resolved "https://codeload.github.com/foundation/panini/tar.gz/f31eb07a309a3aa1206de57be71c26b3b64ad30b" dependencies: deepmerge "^1.5.2" front-matter "^2.0.5" @@ -7933,9 +7932,9 @@ superagent@^5.2.1: readable-stream "^3.6.0" semver "^7.3.2" -supercollider@foundation/supercollider#develop: - version "1.4.6" - resolved "https://codeload.github.com/foundation/supercollider/tar.gz/9c090a609abc252fe024e94fedbdece7378ba972" +supercollider@foundation/supercollider#master: + version "1.5.0" + resolved "https://codeload.github.com/foundation/supercollider/tar.gz/c99f3bc8e689295899bf8c6fd80b2f64a5bdb782" dependencies: async "^0.9.0" chalk "^1.1.1"