Merge remote-tracking branch 'zurb/develop' into fix/fix-es6-plugins-webpack-build-2

diff --cc gulp/config.js
Simple merge

diff --cc gulp/tasks/customizer.js
Simple merge

diff --cc js/entries/foundation.js
Simple merge

diff --cc js/entries/plugins/foundation.core.js
index 7c1d639a4dbb98114e6b1eb4751bb269334cc0bd,06bc55e24d5b3b02affa62910a2498aa8d3b25b6..81aa5ec264297783565215bdcc07ce393084c5c4
--- 1/js/entries/plugins/foundation.core.js
--- 2/js/entries/plugins/foundation.core.js
+++ b/js/entries/plugins/foundation.core.js
@@@ -1,17 -1,8 +1,17 @@@
 +// --- Foundation Core API ---
 +// Initialize Foundation and add some utilities to its public API for backward compatibility.
 +// Please note that every utility do not have to be added to the core API.
  import $ from 'jquery';
 -
  import { Foundation } from '../../foundation.core';
- import { rtl, GetYoDigits, transitionend, RegExpEscape } from '../../foundation.core.utils';
 +import { Plugin } from '../../foundation.core.plugin';
++import { rtl, GetYoDigits, transitionend, RegExpEscape, onLoad } from '../../foundation.core.utils';
 +
  Foundation.addToJquery($);
  
 +// Every plugin depends on plugin now, we can include that on the core for the
 +// script inclusion path.
 +Foundation.Plugin = Plugin;
 +
  // These are now separated out, but historically were a part of this module,
  // and since this is here for backwards compatibility we include them in
  // this entry.
@@@ -19,13 -11,15 +19,14 @@@ Foundation.rtl = rtl
  Foundation.GetYoDigits = GetYoDigits;
  Foundation.transitionend = transitionend;
  Foundation.RegExpEscape = RegExpEscape;
+ Foundation.onLoad = onLoad;
  
 -// Every plugin depends on plugin now, we can include that on the core for the
 -// script inclusion path.
 -
 -import { Plugin } from '../../foundation.plugin';
 -Foundation.Plugin = Plugin;
 -
 -
  window.Foundation = Foundation;
  
 -export { Foundation }
 +// --- Foundation Core exports ---
 +// Export "Plugin" and all core utilities, since the `foundation.core` entry plays the role of
 +// all core source files.
 +
 +export { Foundation };
 +export * from '../../foundation.core.plugin';
 +export * from '../../foundation.core.utils';

diff --cc js/foundation.accordion.js
index 13427718c0f37950998020a64f0e4cc5ef6da3e1,282a2a54a8fc9063da60a6ef88cc29962caacf29..34cb84f70879a3993d8b4848ec468f9f1cbed500
--- 1/js/foundation.accordion.js
--- 2/js/foundation.accordion.js
+++ b/js/foundation.accordion.js
@@@ -1,9 -1,9 +1,9 @@@
  'use strict';
  
  import $ from 'jquery';
- import { Keyboard } from './foundation.util.keyboard';
- import { GetYoDigits } from './foundation.core.utils';
 -import { onLoad, GetYoDigits } from './foundation.util.core';
 +import { Plugin } from './foundation.core.plugin';
++import { onLoad, GetYoDigits } from './foundation.core.utils';
+ import { Keyboard } from './foundation.util.keyboard';
 -import { Plugin } from './foundation.plugin';
  
  /**
   * Accordion module.

diff --cc js/foundation.core.utils.js
Simple merge

diff --cc js/foundation.magellan.js
index 6eabf61111fa6be35feca10a15df353009852cdd,288729a63596d9ad9a08408b289a5485d9a89465..7c19cbb136b95ed9757181fb97422644de19f838
--- 1/js/foundation.magellan.js
--- 2/js/foundation.magellan.js
+++ b/js/foundation.magellan.js
@@@ -2,8 -2,8 +2,8 @@@
  
  
  import $ from 'jquery';
- import { GetYoDigits } from './foundation.core.utils';
 -import { onLoad, GetYoDigits } from './foundation.util.core';
 -import { Plugin } from './foundation.plugin';
 +import { Plugin } from './foundation.core.plugin';
++import { onLoad, GetYoDigits } from './foundation.core.utils';
  import { SmoothScroll } from './foundation.smoothScroll';
  
  /**

diff --cc js/foundation.offcanvas.js
index 27be380f3a8ab6de39eb7f69906e30b43619af6e,150b35ac229f14912eeece29b88478ee2868ffc8..38720e858350a3f72ea2510b0641f479a0f1c330
--- 1/js/foundation.offcanvas.js
--- 2/js/foundation.offcanvas.js
+++ b/js/foundation.offcanvas.js
@@@ -1,10 -1,10 +1,10 @@@
  'use strict';
  
  import $ from 'jquery';
 -import { onLoad, transitionend, RegExpEscape } from './foundation.util.core';
++import { Plugin } from './foundation.core.plugin';
++import { onLoad, transitionend, RegExpEscape } from './foundation.core.utils';
  import { Keyboard } from './foundation.util.keyboard';
  import { MediaQuery } from './foundation.util.mediaQuery';
- import { transitionend, RegExpEscape } from './foundation.core.utils';
- import { Plugin } from './foundation.core.plugin';
 -import { Plugin } from './foundation.plugin';
  
  import { Triggers } from './foundation.util.triggers';
  

diff --cc js/foundation.reveal.js
index 710393bec6d95f1c7be74c23854bd1dd44ce70d5,4c5557a5f86fb0fd425f11b5ca0cd03b6e91e39b..21da73182ff0a362f053be48650799bfc2032df6
--- 1/js/foundation.reveal.js
--- 2/js/foundation.reveal.js
+++ b/js/foundation.reveal.js
@@@ -1,10 -1,11 +1,11 @@@
  'use strict';
  
  import $ from 'jquery';
 -import { onLoad } from './foundation.util.core';
++import { Plugin } from './foundation.core.plugin';
++import { onLoad } from './foundation.core.utils';
  import { Keyboard } from './foundation.util.keyboard';
  import { MediaQuery } from './foundation.util.mediaQuery';
  import { Motion } from './foundation.util.motion';
- import { Plugin } from './foundation.core.plugin';
 -import { Plugin } from './foundation.plugin';
  import { Triggers } from './foundation.util.triggers';
  
  /**

diff --cc js/foundation.sticky.js
index d77ded6cec6c50e82ebe9e00703a56ee0c816600,b95eccd8a6197a0c648a9f966374cdef2cdbf810..ed406af26204b64aa5ae723b642e9af37be8c53d
--- 1/js/foundation.sticky.js
--- 2/js/foundation.sticky.js
+++ b/js/foundation.sticky.js
@@@ -1,9 -1,9 +1,9 @@@
  'use strict';
  
  import $ from 'jquery';
- import { GetYoDigits } from './foundation.core.utils';
- import { MediaQuery } from './foundation.util.mediaQuery';
 -import { onLoad, GetYoDigits } from './foundation.util.core';
 +import { Plugin } from './foundation.core.plugin';
++import { onLoad, GetYoDigits } from './foundation.core.utils';
+ import { MediaQuery } from './foundation.util.mediaQuery';
 -import { Plugin } from './foundation.plugin';
  import { Triggers } from './foundation.util.triggers';
  
  /**

diff --cc js/foundation.tabs.js
index 014629f4f7309bce3015c19d2a0d8b44b487ed99,1b32f890c322b712b0067a10094005e176322d59..a0a1b77f3d08217bd98d4c3c82117f272cb99c99
--- 1/js/foundation.tabs.js
--- 2/js/foundation.tabs.js
+++ b/js/foundation.tabs.js
@@@ -1,9 -1,10 +1,10 @@@
  'use strict';
  
  import $ from 'jquery';
 -import { onLoad } from './foundation.util.core';
++import { Plugin } from './foundation.core.plugin';
++import { onLoad } from './foundation.core.utils';
  import { Keyboard } from './foundation.util.keyboard';
  import { onImagesLoaded } from './foundation.util.imageLoader';
- import { Plugin } from './foundation.core.plugin';
 -import { Plugin } from './foundation.plugin';
  /**
   * Tabs module.
   * @module foundation.tabs

diff --cc js/foundation.toggler.js
Simple merge

diff --cc js/foundation.util.triggers.js
index cbe9e642c94bc3a829771b18cb9c6a2f52e46420,ed717f14f0d1769a2eea095c29067029ed655f6a..3a21e36f586759a78f08c01502a6f3253f4cee0e
--- 1/js/foundation.util.triggers.js
--- 2/js/foundation.util.triggers.js
+++ b/js/foundation.util.triggers.js
@@@ -1,6 -1,7 +1,7 @@@
  'use strict';
  
  import $ from 'jquery';
 -import { onLoad } from './foundation.util.core';
++import { onLoad } from './foundation.core.utils';
  import { Motion } from './foundation.util.motion';
  
  const MutationObserver = (function () {

diff --cc test/javascript/core/core.js
Simple merge