From: Kevin Ball <kmball11@gmail.com>
Date: Wed, 18 Jan 2017 00:55:05 +0000 (-0800)
Subject: Change main foundation gulp build to webpack
X-Git-Tag: v6.4.0-rc1~51^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dadfc1dfa2e05f335dcc72b50b8d360428e6b216;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Change main foundation gulp build to webpack
---

diff --git a/gulp/tasks/javascript.js b/gulp/tasks/javascript.js
index 052c3ed71..f13c6134a 100644
--- a/gulp/tasks/javascript.js
+++ b/gulp/tasks/javascript.js
@@ -2,6 +2,9 @@ var gulp = require('gulp');
 var concat = require('gulp-concat');
 var babel = require('gulp-babel');
 var onBabelError = require('./babel-error.js');
+var rename = require('gulp-rename');
+var webpackStream = require('webpack-stream');
+var webpack2 = require('webpack');
 
 var CONFIG = require('../config.js');
 
@@ -9,13 +12,19 @@ var CONFIG = require('../config.js');
 gulp.task('javascript', ['javascript:foundation', 'javascript:deps', 'javascript:docs']);
 
 gulp.task('javascript:foundation', function() {
-  return gulp.src(CONFIG.JS_FILES)
-    .pipe(babel()
-      .on('error', onBabelError))
-    .pipe(gulp.dest('_build/assets/js/plugins'))
-    .pipe(concat('foundation.js'))
+  return gulp.src('js/entries/all.js')
+    .pipe(webpackStream({/* options */}, webpack2))
+    .pipe(rename('foundation.js'))
     .pipe(gulp.dest('_build/assets/js'));
 });
+//gulp.task('javascript:foundation', function() {
+//  return gulp.src(CONFIG.JS_FILES)
+//    .pipe(babel()
+//      .on('error', onBabelError))
+//    .pipe(gulp.dest('_build/assets/js/plugins'))
+//    .pipe(concat('foundation.js'))
+//    .pipe(gulp.dest('_build/assets/js'));
+//});
 
 gulp.task('javascript:deps', function() {
   return gulp.src(CONFIG.JS_DEPS)
diff --git a/package.json b/package.json
index fbe6bd522..9c6f56b60 100644
--- a/package.json
+++ b/package.json
@@ -94,6 +94,7 @@
     "vinyl": "^2.0.1",
     "vinyl-source-stream": "^1.1.0",
     "webpack": "^2.2.0-rc.7",
+    "webpack-stream": "^3.2.0",
     "yargs": "^6.5.0"
   },
   "engines": {