rjs -> webpack

gulp/build.js

@@ -2,12 +2,11 @@ var gulp = require('gulp');
 var runSequence = require('run-sequence');
 
 require('./clean');
-require('./requirejs');
 require('./less');
 require('./handlebars');
 require('./copy');
 
 gulp.task('build', function () {
     return  runSequence('clean',
-        ['requireJs', 'less', 'handlebars', 'copyHtml', 'copyContent']);
+        ['webpack', 'less', 'handlebars', 'copyHtml', 'copyContent', 'copyJs']);
 });

gulp/copy.js

@@ -5,7 +5,12 @@ var cache = require('gulp-cached');
 var paths = require('./paths.js');
 
 gulp.task('copyJs', function () {
-    return gulp.src(paths.src.scripts)
+    return gulp.src(
+      [
+        paths.src.root + "piwikCheck.js",
+        paths.src.root + "polyfills.js",
+        paths.src.root + "JsLibraries\\handlebars.runtime.js",
+      ])
         .pipe(cache('copyJs'))
         .pipe(print())
         .pipe(gulp.dest(paths.dest.root));

gulp/gulpFile.js

@@ -1,12 +1,12 @@
 require('./watch.js');
 require('./build.js');
 require('./clean.js');
-require('./requirejs.js');
 require('./jshint.js');
 require('./handlebars.js');
 require('./copy.js');
 require('./less.js');
 require('./stripBom.js');
 require('./imageMin.js');
+require('./webpack.js');
 
 

gulp/handlebars.js

@@ -2,7 +2,6 @@ var gulp = require('gulp');
 var handlebars = require('gulp-handlebars');
 var declare = require('gulp-declare');
 var concat = require('gulp-concat');
-var wrapAmd = require('gulp-wrap-amd');
 var wrap = require("gulp-wrap");
 var path = require('path');
 var streamqueue = require('streamqueue');
@@ -48,10 +47,6 @@ gulp.task('handlebars', function () {
         partialStream,
         coreStream
     ).pipe(concat('templates.js'))
-        .pipe(wrapAmd({
-            deps: ['handlebars'],
-            params: ['Handlebars'],
-            exports: 'this["T"]'
-        }))
+
         .pipe(gulp.dest(paths.dest.root));
 });

gulp/jshint.js

@@ -15,6 +15,7 @@ gulp.task('jshint', function () {
             '-W100': false, //Silently deleted characters (in locales)
             'undef': true,
             'globals': {
+                'module': true,
                 'require': true,
                 'define': true,
                 'window': true,

gulp/requirejs.js

@@ -1,32 +0,0 @@
-var gulp = require('gulp');
-var requirejs = require('requirejs');
-var paths = require('./paths');
-
-require('./handlebars.js');
-require('./jshint.js');
-
-
-gulp.task('requireJs', ['jshint'], function (cb) {
-
-    var config = {
-        mainConfigFile: 'src/UI/app.js',
-        fileExclusionRegExp: /^.*\.(?!js$)[^.]+$/,
-        preserveLicenseComments: false,
-        dir: paths.dest.root,
-        optimize: 'none',
-        removeCombined: true,
-        inlineText: false,
-        keepBuildDir: true,
-        modules: [
-            {
-                name: 'app',
-                exclude: ['templates.js']
-            }
-        ]};
-
-    requirejs.optimize(config, function (buildResponse) {
-        console.log(buildResponse);
-        cb();
-    });
-
-});

gulp/watch.js

@@ -8,17 +8,19 @@ require('./jshint.js');
 require('./handlebars.js');
 require('./less.js');
 require('./copy.js');
+require('./webpack.js');
 
 
-gulp.task('watch', ['jshint', 'handlebars', 'less', 'copyJs', 'copyHtml', 'copyContent'], function () {
-    gulp.watch([paths.src.scripts, paths.src.exclude.libs], ['jshint', 'copyJs']);
+gulp.task('watch', ['jshint', 'handlebars', 'less','copyHtml', 'copyContent','copyJs'], function () {
+    gulp.start('webpackWatch');
+    gulp.watch([paths.src.scripts, paths.src.exclude.libs], ['jshint','copyJs']);
     gulp.watch(paths.src.templates, ['handlebars']);
     gulp.watch([paths.src.less, paths.src.exclude.libs], ['less']);
     gulp.watch([paths.src.html], ['copyHtml']);
     gulp.watch([paths.src.content + '**/*.*', '!**/*.less'], ['copyContent']);
 });
 
-gulp.task('liveReload', ['jshint', 'handlebars', 'less', 'copyJs'], function () {
+gulp.task('liveReload', ['jshint', 'handlebars', 'less', 'webPack'], function () {
     var server = livereload();
     gulp.watch([
         'app/**/*.js',

gulp/webpack.js

@@ -0,0 +1,20 @@
+var gulp = require('gulp');
+
+var gulpWebpack = require('gulp-webpack');
+var webpack = require('webpack');
+var webpackConfig = require('../webpack.config');
+
+webpackConfig.devtool = "#source-map";
+
+gulp.task('webpack', function() {
+  return gulp.src('main.js')
+    .pipe(gulpWebpack(webpackConfig, webpack))
+    .pipe(gulp.dest(''));
+});
+
+gulp.task('webpackWatch', function() {
+  webpackConfig.watch = true;
+  return gulp.src('main.js')
+    .pipe(gulpWebpack(webpackConfig, webpack))
+    .pipe(gulp.dest(''));
+});