From: Nicolas Coden <nicolas@ncoden.fr>
Date: Wed, 28 Mar 2018 21:00:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'zurb/develop' into fix/fix-es6-plugins-webpack-build-2
X-Git-Tag: v6.6.0~3^2~259^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10930%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

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

c4602f01b475b1775cd75a55b39b86a2f7b264ba
diff --cc js/entries/plugins/foundation.core.js
index 7c1d639a4,06bc55e24..81aa5ec26
--- a/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 { Plugin } from '../../foundation.core.plugin';
- import { rtl, GetYoDigits, transitionend, RegExpEscape } from '../../foundation.core.utils';
++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 13427718c,282a2a54a..34cb84f70
--- a/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.magellan.js
index 6eabf6111,288729a63..7c19cbb13
--- a/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 27be380f3,150b35ac2..38720e858
--- a/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 710393bec,4c5557a5f..21da73182
--- a/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 d77ded6ce,b95eccd8a..ed406af26
--- a/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 014629f4f,1b32f890c..a0a1b77f3
--- a/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.util.triggers.js
index cbe9e642c,ed717f14f..3a21e36f5
--- a/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 () {