Skip to content

Commit

Permalink
Merge branch 'release/6.6.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
joeworkman committed Mar 27, 2020
2 parents 291d8e3 + 268bb91 commit 2cca132
Show file tree
Hide file tree
Showing 310 changed files with 2,264 additions and 6,967 deletions.
3 changes: 3 additions & 0 deletions .commitlintrc.yml
@@ -1,2 +1,5 @@
extends:
- '@commitlint/config-conventional'
rules:
subject-case: [0, always]
subject-full-stop: [0, always]
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Expand Up @@ -3,7 +3,7 @@
│ For more information, see the CONTRIBUTING.md document
│ ⚠ Only submit bug or feature requests here. For help or questions
│ to the community, see the forum: https://foundation.zurb.com/forum
│ to the community, see the forum: https://foundation.discourse.group
└------------------------------------------------------------------------------>

## Expected Behavior
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/1-bug-report.md
Expand Up @@ -9,7 +9,7 @@ about: Something is broken or doesn't work as expected
│ For more information, see the CONTRIBUTING.md document
│ ⚠ Only submit bug reports here. For help or questions to the
│ community, see the forum: https://foundation.zurb.com/forum
│ community, see the forum: https://foundation.discourse.group
└------------------------------------------------------------------------------>

## What should happen?
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/2-feature-request.md
Expand Up @@ -9,7 +9,7 @@ about: Something is missing or could be improved
│ For more information, see the CONTRIBUTING.md document
│ ⚠ Only submit feature requests here. For help or questions to
│ the community, see the forum: https://foundation.zurb.com/forum
│ the community, see the forum: https://foundation.discourse.group
└------------------------------------------------------------------------------>

## What is missing?
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/3-documentation.md
Expand Up @@ -9,7 +9,7 @@ about: Typo mistakes, gaps or inconsistencies in docs or website
│ For more information, see the CONTRIBUTING.md document
│ ⚠ Only submit documentation issues here. For help or questions to
│ the community, see the forum: https://foundation.zurb.com/forum
│ the community, see the forum: https://foundation.discourse.group
└------------------------------------------------------------------------------>

## Description
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/4-maintainance.md
Expand Up @@ -9,7 +9,7 @@ about: Tests, dependencies, workflow...
│ For more information, see the CONTRIBUTING.md document
│ ⚠ Only submit maintainance issues here. For help or questions to
│ the community, see the forum: https://foundation.zurb.com/forum
│ the community, see the forum: https://foundation.discourse.group
└------------------------------------------------------------------------------>

## Description
Expand Down
3 changes: 1 addition & 2 deletions .huskyrc.yml
@@ -1,6 +1,5 @@
hooks:
commit-msg: >
node ./script/husky-commit-lint.js --color -e $GIT_PARAMS &&
node ./script/husky-commit-test.js --color
node ./script/husky-commit-lint.js --color -e $GIT_PARAMS
pre-push:
node ./script/husky-push-test.js --color
3 changes: 0 additions & 3 deletions .jshintrc

This file was deleted.

Empty file added .sonarcloud.properties
Empty file.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -15,6 +15,7 @@ node_js:
env:
global:
- YARN_GPG=no
- SNYK_TOKEN=18718bf9-b4b2-463f-b727-e9eb06e336bf
matrix:
- ZF_TRAVIS_COMMAND=test

Expand Down
24 changes: 12 additions & 12 deletions CONTRIBUTING.md
Expand Up @@ -4,41 +4,41 @@ Although Foundation was built and maintained by ZURB for years, it is today a co

## Issues

For **bugs**, **feature requests**, **incorrect documentation** or any problem you have with Foundation, you can open a new issue. If you need help to use Foundation, the [Foundation Forum](https://foundation.zurb.com/forum) would be more appropriate. If you aren't sure if your issue is a bug or not, don’t worry! Post your problem on GitHub and the team will help you along.
For **bugs**, **feature requests**, **incorrect documentation** or any problem you have with Foundation, you can open a new issue. If you need help to use Foundation, the [Foundation Forum](https://foundation.discourse.group) would be more appropriate. If you aren't sure if your issue is a bug or not, don’t worry! Post your problem on GitHub and the team will help you along.

Every participant is expected to follow the project's [Code of Conduct](code-of-conduct.md) so please be courteous and respectful.

### Report a bug

1. **Search for similar opened or closed issues** ([link](https://github.com/zurb/foundation-sites/issues?utf8=%E2%9C%93&q=is%3Aissue)).
1. **Search for similar opened or closed issues** ([link](https://github.com/foundation/foundation-sites/issues?utf8=%E2%9C%93&q=is%3Aissue)).
It is likely that someone else got the same problem as you before and already reported it.
2. **Make sure of the following:**
* [ ] There are no [opened or closed issues](https://github.com/zurb/foundation-sites/issues?utf8=%E2%9C%93&q=is%3Aissue) similar to this bug
* [ ] There are no [opened or closed issues](https://github.com/foundation/foundation-sites/issues?utf8=%E2%9C%93&q=is%3Aissue) similar to this bug
* [ ] This is a bug and not a missing feature
* [ ] This bug comes from Foundation and not the browser or an other library
* [ ] This bug is still present in the latest Foundation release
3. **Prepare a test case with your bug** ([link](https://codepen.io/ncoden/pen/dQmVgg)).
Trying to reproduce a bug is often time-consuming. Please isolate your bug in a dedicated test case. The simpler is the test case, the best it is.
4. **Create your issue** ([link](https://github.com/zurb/foundation-sites/issues/new)).
4. **Create your issue** ([link](https://github.com/foundation/foundation-sites/issues/new)).
Please provide a complete description of your bug: What do you expect? What happens instead? Which version of Foundation do you use, which ones are affected by the bug? Keep in mind that someone will spend a lot of time to understand your issue, make the task easy for him/her.

### Request for a new feature
1. **Search for similar opened or closed issues** ([link](https://github.com/zurb/foundation-sites/issues?utf8=%E2%9C%93&q=is%3Aissue)).
1. **Search for similar opened or closed issues** ([link](https://github.com/foundation/foundation-sites/issues?utf8=%E2%9C%93&q=is%3Aissue)).
It is likely that someone else needed a similar feature as yours and already requested it.
2. **Make sure of the following:**
* [ ] There are no [opened or closed issues](https://github.com/zurb/foundation-sites/issues?utf8=%E2%9C%93&q=is%3Aissue) similar to your request
* [ ] There are no [opened or closed issues](https://github.com/foundation/foundation-sites/issues?utf8=%E2%9C%93&q=is%3Aissue) similar to your request
* [ ] This is a missing feature and not a bug
3. **Prepare a clear use case for the requested feature**.
This will help you to make sure that this is the feature you want, and us to better understand your needs and how it would benefit to everyone the best way.
4. **Create your issue** ([link](https://github.com/zurb/foundation-sites/issues/new)).
4. **Create your issue** ([link](https://github.com/foundation/foundation-sites/issues/new)).
Please provide a complete description of the feature you want, the use case you prepared will help you for that. After you created your issue, if you feel ready, you can start working on a pull request (please tell us so). See [Contributions](#contributions) below.

## Contributions

All new features and bug fixes should be submitted as pull requests, so the community can review and discuss them. The rule is the same for everyone, for new contributors as for Core Team members.

Before working on a bug fix or a new feature, please make sure of the following:
* [ ] **There is no similar pull request that was rejected or is not merged yet** ([link](https://github.com/zurb/foundation-sites/issues?utf8=%E2%9C%93&q=is%3Apr)).
* [ ] **There is no similar pull request that was rejected or is not merged yet** ([link](https://github.com/foundation/foundation-sites/issues?utf8=%E2%9C%93&q=is%3Apr)).
Add a comment on this pull request otherwise. Explain us why this pull request is urgent or important to you.
* [ ] **There is an open issue related to this bug or feature**.
Please create one otherwise. It is often useful to talk about the bug fix or feature and the best way to implement it before working on it. You can skip this step for obvious changes (like typo in the documentation).
Expand All @@ -53,8 +53,8 @@ After you made these checks, please follow these advices to create your pull req
4. **Provide a clear and readable code**.
Make sure that the code you changed is consistent across components and that anyone can easily understand its behavior. Split it in abstract functions, avoid code duplication and add comments when needed. You can open a "work-in-progress" pull request (prefix it with "[WIP]") if you need any help with that.
5. **Make sure that everything works and tests pass**.
You must absolutely check that everything still works after your changes. Please also add tests for features you added or uncovered bugs you fixed. See the [Testing](https://github.com/zurb/foundation-sites#testing) section.
6. **Create your pull request** ([link](https://github.com/zurb/foundation-sites/compare)).
You must absolutely check that everything still works after your changes. Please also add tests for features you added or uncovered bugs you fixed. See the [Testing](https://github.com/foundation/foundation-sites#testing) section.
6. **Create your pull request** ([link](https://github.com/foundation/foundation-sites/compare)).
Make sure it targets the right branch: most often `develop`, unless you provide a fix for an older version and it should be `develop-v...`. Take a look at our [Git Workflow](#git-workflow) below.

When you submit a pull request, @mention a few people you’d like to help you review it. Once those people have signed off on it, the pull request can be merged! Core Team members will handle the merge itself.
Expand Down Expand Up @@ -85,13 +85,13 @@ This git workflow was fully adopted as of `v6.5`, so `v6.4` and previous version

## Coding Standards

If you aren't sure how a feature should be implemented, we recommend checking out our [standards document](https://github.com/zurb/foundation-standards), which outlines every aspect of writing framework features, from Sass to JavaScript.
If you aren't sure how a feature should be implemented, we recommend checking out our [standards document](https://github.com/foundation/foundation-standards), which outlines every aspect of writing framework features, from Sass to JavaScript.

## Core Team

Want to help us making Foundation the best framework ever? The Core Team is inviting active community members to join it. If you want to become a contributor, engage the community on the Foundation Forum, help us close issues on GitHub, and review pull requests from other contributors.

If you’ve made substantial contributions to a Foundation framework and haven’t heard from us yet, you can reach out at foundation@zurb.com.
If you’ve made substantial contributions to a Foundation framework and haven’t heard from us yet, you can reach out at contact@get.foundation.

Contributors are expected to:

Expand Down
10 changes: 4 additions & 6 deletions bower.json
@@ -1,8 +1,8 @@
{
"name": "foundation-sites",
"version": "6.6.1",
"version": "6.6.2",
"description": "The most advanced responsive front-end framework in the world.",
"homepage": "http://foundation.zurb.com/sites",
"homepage": "https://get.foundation/sites",
"license": "MIT",
"keywords": [
"css",
Expand All @@ -15,7 +15,7 @@
"eyeglass-module"
],
"authors": [
"ZURB <foundation@zurb.com> (http://foundation.zurb.com)"
"Foundation Yetinauts <contact@get.foundation> (https://get.foundation)"
],
"main": [
"scss/foundation.scss",
Expand All @@ -29,7 +29,7 @@
],
"repository": {
"type": "git",
"url": "https://github.com/zurb/foundation-sites"
"url": "https://github.com/foundation/foundation-sites"
},
"dependencies": {
"jquery": ">=2.2.0",
Expand All @@ -42,7 +42,6 @@
".editorconfig",
".eslintrc",
".huskyrc.yml",
".jshintrc",
".sass-lint.yml",
".travis.yml",
".versions",
Expand All @@ -51,7 +50,6 @@
"code-of-conduct.md",
"composer.json",
"CONTRIBUTING.md",
"docslink.sh",
"gulpfile.js",
"meteor-README.md",
"package.js",
Expand Down
34 changes: 26 additions & 8 deletions browserstack.json
@@ -1,4 +1,6 @@
{
"username": "joeworkman",
"key": "vutaD3ypYamTHAHQxP5Z",
"test_path": "test/javascript/index.html",
"test_framework": "mocha",
"exit_with_fail": true,
Expand All @@ -11,17 +13,33 @@
"safari_previous",
"opera_latest",
"opera_previous",

"edge_latest",
"edge_previous",
"ie_11",
"ie_10",
"ie_9",

"mobile_safari_latest",
"mobile_safari_7_0",
"android_browser_latest",
"android_browser_4_4",
"ie_mobile_latest"
{
"os": "ios",
"os_version": "12.4",
"device": "iPhone XS",
"real_mobile": "true"
},
{
"os": "ios",
"os_version": "11.0",
"device": "iPhone 8 Plus",
"real_mobile": "true"
},
{
"os": "android",
"os_version": "9.0",
"device": "Google Pixel 3",
"real_mobile": "true"
},
{
"os": "android",
"os_version": "4.4",
"device": "Google Nexus 5",
"real_mobile": "true"
}
]
}
2 changes: 1 addition & 1 deletion code-of-conduct.md
Expand Up @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at foundation@zurb.com. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at contact@get.foundation. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Contributors who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

Expand Down
8 changes: 4 additions & 4 deletions composer.json
Expand Up @@ -13,13 +13,13 @@
"homepage": "https://get.foundation",
"authors": [
{
"name": "ZURB, Inc.",
"homepage": "http://zurb.com",
"email": "foundation@zurb.com"
"name": "Foundation Yetinauts",
"homepage": "https://get.foundation",
"email": "contact@get.foundation"
}
],
"support": {
"email": "foundation@zurb.com",
"email": "contact@get.foundation",
"issues": "https://github.com/foundation/foundation-sites/issues",
"forum": "https://foundation.discourse.group"
},
Expand Down
8 changes: 4 additions & 4 deletions customizer/index.html
Expand Up @@ -24,18 +24,18 @@ <h3>We&rsquo;re stoked you want to try Foundation! </h3>
<p>Once you've exhausted the fun in this document, you should check out:</p>
<div class="grid-x grid-padding-x">
<div class="large-4 medium-4 cell">
<p><a href="http://foundation.zurb.com/docs">Foundation Documentation</a><br />Everything you need to know about using the framework.</p>
<p><a href="https://get.foundation/docs">Foundation Documentation</a><br />Everything you need to know about using the framework.</p>
</div>
<div class="large-4 medium-4 cell">
<p><a href="http://zurb.com/university/code-skills">Foundation Code Skills</a><br />These online courses offer you a chance to better understand how Foundation works and how you can master it to create awesome projects.</p>
</div>
<div class="large-4 medium-4 cell">
<p><a href="http://foundation.zurb.com/forum">Foundation Forum</a><br />Join the Foundation community to ask a question or show off your knowledge.</p>
<p><a href="https://get.foundation/forum">Foundation Forum</a><br />Join the Foundation community to ask a question or show off your knowledge.</p>
</div>
</div>
<div class="grid-x grid-padding-x">
<div class="large-4 medium-4 medium-push-2 cell">
<p><a href="http://github.com/zurb/foundation">Foundation on Github</a><br />Latest code, issue reports, feature requests and more.</p>
<p><a href="http://github.com/foundation/foundation">Foundation on Github</a><br />Latest code, issue reports, feature requests and more.</p>
</div>
<div class="large-4 medium-4 medium-pull-2 cell">
<p><a href="https://twitter.com/ZURBfoundation">@zurbfoundation</a><br />Ping us on Twitter if you have questions. When you build something with this we'd love to see it (and send you a totally boss sticker).</p>
Expand Down Expand Up @@ -157,7 +157,7 @@ <h5>Try one of these buttons:</h5>
<div class="callout">
<h5>So many components, girl!</h5>
<p>A whole kitchen sink of goodies comes with Foundation. Check out the docs to see them all, along with details on making them your own.</p>
<a href="http://foundation.zurb.com/sites/docs/" class="small button">Go to Foundation Docs</a>
<a href="https://get.foundation/sites/docs/" class="small button">Go to Foundation Docs</a>
</div>
</div>
</div>
Expand Down
21 changes: 10 additions & 11 deletions customizer/lib/js.js
@@ -1,6 +1,5 @@
var empty = require('is-empty-object');
var unique = require('array-uniq');
var path = require('path');
const empty = require('is-empty-object');
const path = require('path');

// custom module names where needed
const MODULES = {
Expand All @@ -15,7 +14,7 @@ const MODULES = {
*/

module.exports = function(config, modules) {
var dir = path.resolve(__dirname, '../../js/');
const dir = path.resolve(__dirname, '../../js/');
var entry = "import $ from 'jquery';\n" +
"import { Foundation } from '" + dir + "/foundation.core';\n" +
"Foundation.addToJquery($);\n" +
Expand All @@ -24,16 +23,16 @@ module.exports = function(config, modules) {
"import { Triggers } from '" + dir + "/foundation.util.triggers';\n" +
"Triggers.init($, Foundation);\n";

// last 2 pieces work around https://github.com/zurb/foundation-sites/issues/10287
// last 2 pieces work around https://github.com/foundation/foundation-sites/issues/10287

var libraries = [];
const libraries = [];

if (empty(modules)) {
modules = Object.keys(config);
}

for (var i in modules) {
var name = modules[i];
for (let i in modules) {
let name = modules[i];

// Check if the module has JS files
if (config[name] && config[name].js) {
Expand All @@ -42,9 +41,9 @@ module.exports = function(config, modules) {
}

// add plugins into entry
for (var i in libraries) {
var file = libraries[i];
var moduleName = MODULES[file] || file.charAt(0).toUpperCase() + file.slice(1);
for (let i in libraries) {
let file = libraries[i];
let moduleName = MODULES[file] || file.charAt(0).toUpperCase() + file.slice(1);
entry = entry + "import { " + moduleName + " } from '" + dir + "/foundation." + file + "';\n";
entry = entry + "Foundation.plugin(" + moduleName + ", '" + moduleName + "');\n";
}
Expand Down

0 comments on commit 2cca132

Please sign in to comment.