From: Joe Workman <joe@workmanmail.com>
Date: Mon, 20 Jul 2020 19:54:14 +0000 (-0700)
Subject: Merge branch 'chore/upgrade-dependencies' into develop
X-Git-Tag: v2.3.0^2~9
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7f17302cb75ad5a8fba4a163a92ef213250fe585;p=thirdparty%2Ffoundation%2Ffoundation-emails.git

Merge branch 'chore/upgrade-dependencies' into develop

# Conflicts:
#	gem/foundation-emails.gemspec
#	package.json
#	yarn.lock
---

7f17302cb75ad5a8fba4a163a92ef213250fe585
diff --cc package.json
index 61b3e630,458b6c2d..b2af6ca9
--- a/package.json
+++ b/package.json
@@@ -18,41 -18,41 +18,41 @@@
      "deploy:templates": "gulp templates",
      "deploy:docs": "gulp deploy:docs"
    },
 -  "repository": "https://github.com/zurb/foundation-emails",
 -  "bugs": "https://github.com/zurb/foundation-emails/issues",
 +  "repository": "https://github.com/foundation/foundation-emails",
 +  "bugs": "https://github.com/foundation/foundation-emails/issues",
    "devDependencies": {
      "browser-sync": "^2.9.10",
-     "cheerio": "^0.19.0",
-     "clipboard-js": "^0.2.0",
-     "foundation-docs": "foundation/foundation-docs",
+     "cheerio": "^1.0.0-rc.3",
+     "clipboard-js": "^0.3.6",
+     "foundation-docs": "zurb/foundation-docs",
      "foundation-sites": "^6.2.0",
-     "gulp": "^3.8.11",
-     "gulp-autoprefixer": "^2.3.1",
+     "gulp": "^4.0.2",
+     "gulp-autoprefixer": "^7.0.1",
      "gulp-cached": "^1.1.0",
      "gulp-concat": "^2.6.0",
-     "gulp-cssnano": "^2.1.1",
-     "gulp-htmlmin": "^1.3.0",
-     "gulp-if": "^2.0.0",
+     "gulp-cssnano": "^2.1.3",
+     "gulp-htmlmin": "^5.0.1",
+     "gulp-if": "^3.0.0",
      "gulp-inject-string": "^1.1.0",
-     "gulp-inline-css": "^2.0.0",
-     "gulp-load-plugins": "^1.0.0-rc.1",
-     "gulp-prettify": "^0.4.0",
-     "gulp-prompt": "^0.1.2",
+     "gulp-inline-css": "^3.4.0",
+     "gulp-load-plugins": "^2.0.1",
+     "gulp-prettify": "^0.5.0",
+     "gulp-prompt": "^1.2.0",
      "gulp-rename": "^1.2.2",
-     "gulp-rsync": "0.0.5",
-     "gulp-sass": "^2.1.0",
+     "gulp-rsync": "0.0.8",
+     "gulp-sass": "^4.0.2",
      "gulp-sass-lint": "^1.1.1",
-     "gulp-sourcemaps": "^1.6.0",
-     "gulp-wrap": "^0.11.0",
-     "gulp-zip": "^3.2.0",
+     "gulp-sourcemaps": "^2.6.5",
+     "gulp-wrap": "^0.15.0",
+     "gulp-zip": "^5.0.1",
 -    "inky": "zurb/inky#browser-build",
 +    "inky": "foundation/inky#browser-build",
      "lazypipe": "^1.0.1",
-     "motion-ui": "^1.1.1",
-     "multiline": "^1.0.2",
+     "motion-ui": "^2.0.3",
+     "multiline": "^2.0.0",
      "octophant": "^1.0.0",
      "panini": "^1.2.0",
-     "rimraf": "^2.4.2",
-     "run-sequence": "^1.1.2",
+     "rimraf": "^3.0.0",
+     "run-sequence": "^2.2.1",
      "siphon-media-query": "^1.0.0",
      "supercollider": "^1.4.0",
      "typeahead.js": "^0.11.1",