From: Nicolas Coden <nicolas@ncoden.fr>
Date: Sat, 16 Jun 2018 07:14:09 +0000 (+0200)
Subject: Use pull request #10911 from ncoden/fix/temporary-disable-umd-bundling for v6.5.0
X-Git-Tag: v6.5.0-rc.1^2~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fd195d58bf5f5faf7fd5ab2035e98cd235e92d7;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Use pull request #10911 from ncoden/fix/temporary-disable-umd-bundling for v6.5.0

c2acd0c14 fix: export Foundation in `foundation.core` entry for usage in other entries
fe895f5f5 fix: fix `Object.assign` usage in `javascript:plugins` gulp task
568a9a589 fix: temporary disable UMD bundling

Signed-off-by: Nicolas Coden <nicolas@ncoden.fr>
---

diff --git a/gulp/tasks/javascript.js b/gulp/tasks/javascript.js
index 782497be9..7632a9c85 100644
--- a/gulp/tasks/javascript.js
+++ b/gulp/tasks/javascript.js
@@ -55,7 +55,12 @@ var webpackConfig = {
     ]
   },
   output: {
-    libraryTarget: 'umd',
+    // ---
+    // FIXME: to resolve before the next release
+    // Temporary disable UMD bundling, waiting for a way to import plugins are externals
+    // See https://github.com/zurb/foundation-sites/pull/10903
+    // ---
+    // libraryTarget: 'umd',
   }
 }
 
@@ -71,7 +76,7 @@ gulp.task('javascript:plugin-core', function() {
 gulp.task('javascript:plugins', ['javascript:plugin-core'], function () {
   return gulp.src(['js/entries/plugins/*.js', '!js/entries/plugins/foundation.core.js'])
     .pipe(named())
-    .pipe(webpackStream(Object.assign({ externals: pluginsAsExternals }, webpackConfig), webpack2))
+    .pipe(webpackStream(Object.assign({}, webpackConfig, { externals: pluginsAsExternals }), webpack2))
     .pipe(gulp.dest('_build/assets/js/plugins'));
 });
 
diff --git a/js/entries/plugins/foundation.core.js b/js/entries/plugins/foundation.core.js
index 16b2556ad..cf4afd9cb 100644
--- a/js/entries/plugins/foundation.core.js
+++ b/js/entries/plugins/foundation.core.js
@@ -20,3 +20,5 @@ Foundation.Plugin = Plugin;
 
 
 window.Foundation = Foundation;
+
+export { Foundation }