From: Daniel Ruf <827205+DanielRuf@users.noreply.github.com>
Date: Sat, 28 Mar 2020 20:21:19 +0000 (+0100)
Subject: Merge branch 'develop' into build/add-github-actions
X-Git-Tag: v6.6.3^2~8^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F11839%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'develop' into build/add-github-actions
---

c2dac7cd4bb3f4d49aa3b4c30be6a0f88aa14698
diff --cc README.md
index 17f59936f,88c124ff6..f7aed3a01
--- a/README.md
+++ b/README.md
@@@ -16,10 -13,9 +13,9 @@@
  
  ---
  
- 
 -[![Build Status](https://travis-ci.org/foundation/foundation-sites.svg?branch=develop)](https://travis-ci.org/foundation/foundation-sites)
 +[![Build Status](https://github.com/foundation/foundation-sites/workflows/CI/badge.svg)](https://github.com/foundation/foundation-sites/actions?workflow=CI)
- [![dependencies Status](https://david-dm.org/zurb/foundation-sites/status.svg)](https://david-dm.org/zurb/foundation-sites)
- [![devDependencies Status](https://david-dm.org/zurb/foundation-sites/dev-status.svg)](https://david-dm.org/zurb/foundation-sites?type=dev)
+ [![dependencies Status](https://david-dm.org/foundation/foundation-sites/status.svg)](https://david-dm.org/foundation/foundation-sites)
+ [![devDependencies Status](https://david-dm.org/foundation/foundation-sites/dev-status.svg)](https://david-dm.org/foundation/foundation-sites?type=dev)
  [![npm version](https://badge.fury.io/js/foundation-sites.svg)](https://badge.fury.io/js/foundation-sites)
  [![Bower version](https://badge.fury.io/bo/foundation-sites.svg)](https://badge.fury.io/bo/foundation-sites)
  [![Gem Version](https://badge.fury.io/rb/foundation-rails.svg)](https://badge.fury.io/rb/foundation-rails)
diff --cc bower.json
index c583624a6,2213bea5c..d4da581af
--- a/bower.json
+++ b/bower.json
@@@ -42,8 -42,8 +42,7 @@@
      ".editorconfig",
      ".eslintrc",
      ".huskyrc.yml",
-     ".jshintrc",
      ".sass-lint.yml",
 -    ".travis.yml",
      ".versions",
      "bower.json",
      "browserstack.json",
diff --cc package.json
index 07d75c221,cf6aa6fae..93b6c5815
--- a/package.json
+++ b/package.json
@@@ -7,24 -7,21 +7,24 @@@
    "esnext": "dist/js/foundation.es6.js",
    "typings": "dist/js/foundation.d.ts",
    "description": "The most advanced responsive front-end framework in the world.",
-   "author": "ZURB <foundation@zurb.com> (http://foundation.zurb.com)",
-   "homepage": "http://foundation.zurb.com/sites",
+   "author": "Foundation Yetinauts <contact@get.foundation> (https://get.foundation)",
+   "homepage": "https://get.foundation/sites",
    "scripts": {
      "start": "gulp",
 -    "test": "npm run test:sass && npm run test:javascript:units && npm run test:bundle",
 -    "test:ci": "npm run test:sass && npm run test:javascript:ci",
 +    "test": "yarn test:sass && yarn test:javascript:units && yarn test:bundle",
 +    "test:single-process": "yarn test:sass && yarn test:javascript:units:single-process && yarn test:bundle:single-process",
 +    "test:ci": "yarn test:sass && yarn test:javascript:ci",
 +    "test:ci:single-process": "yarn test:sass && yarn test:javascript:ci:single-process",
      "test:sass": "mocha test/sass/test_sass.js --colors",
      "test:javascript:transpile": "gulp sass:foundation --color && gulp test:transpile-js --color",
 -    "test:javascript:units": "npm run test:javascript:transpile && mocha-headless-chrome -a ignore-resource-errors -a no-sandbox -f test/javascript/index.html",
 -    "test:javascript:browserstack": "npm run test:javascript:transpile && browserstack-runner",
 -    "test:javascript:ci": "npm run test:javascript:transpile && mocha-headless-chrome -a ignore-resource-errors -a no-sandbox -f test/javascript/index.html && browserstack-runner",
 -    "test:bundle": "mocha-headless-chrome -a ignore-resource-errors -a no-sandbox -f test/bundle/index.html",
 +    "test:javascript:units": "yarn test:javascript:transpile && mocha-headless-chrome -a ignore-resource-errors -a no-sandbox -a disable-setuid-sandbox -a disable-dev-shm-usage -f test/javascript/index.html",
 +    "test:javascript:units:single-process": "yarn test:javascript:transpile && mocha-headless-chrome -a single-process -a ignore-resource-errors -a no-sandbox -a disable-setuid-sandbox -a disable-dev-shm-usage -f test/javascript/index.html",
 +    "test:javascript:browserstack": "yarn test:javascript:transpile && browserstack-runner",
 +    "test:javascript:ci": "yarn test:javascript:transpile && mocha-headless-chrome -a ignore-resource-errors -a no-sandbox -a disable-setuid-sandbox -a disable-dev-shm-usage -f test/javascript/index.html && browserstack-runner",
 +    "test:javascript:ci:single-process": "yarn test:javascript:transpile && mocha-headless-chrome -a single-process -a ignore-resource-errors -a no-sandbox -a disable-setuid-sandbox -a disable-dev-shm-usage -f test/javascript/index.html && browserstack-runner",
 +    "test:bundle": "mocha-headless-chrome -a ignore-resource-errors -a no-sandbox -a disable-setuid-sandbox -a disable-dev-shm-usage -f test/bundle/index.html",
 +    "test:bundle:single-process": "mocha-headless-chrome -a ignore-resource-errors -a single-process -a no-sandbox -a disable-setuid-sandbox -a disable-dev-shm-usage -f test/bundle/index.html",
      "test:visual": "gulp test --color",
 -    "lockdeps": "npm i && npm-force-resolutions && rimraf yarn.lock && yarn import && rimraf shrinkwrap.yaml && pnpm import",
 -    "relockdeps": "rimraf package-lock.json && npm run lockdeps",
      "deploy": "gulp deploy --color",
      "deploy:prep": "gulp deploy:prep --color",
      "deploy:docs": "gulp deploy:docs --color",