JS Build optimizations: changed r.js - now use amd optimizer

Author: DevilRep

gulpfile.js

@@ -1,20 +1,21 @@
 {
   "private": true,
-  "devDependencies": {
-  },
+  "devDependencies": {},
   "dependencies": {
     "laravel-elixir": "^2.0.0",
-    "gulp": "^3.8.8",
     "gulp-uglify": "~1.4.0",
     "run-sequence": "~1.1.2",
     "gulp-concat": "~2.6.0",
-    "through2": "~2.0.0",
     "path": "~0.11.14",
     "event-stream": "~3.3.1",
     "fs": "0.0.2",
     "object-assign": "~4.0.1",
-    "gulp-clean": "~0.3.1",
     "gulp-util": "~3.0.6",
-    "requirejs": "~2.1.20"
+    "amd-optimize": "~0.6.0",
+    "del": "~2.0.2",
+    "gulp": "~3.9.0",
+    "gulp-tmpl": "0.0.3",
+    "gulp-declare": "~0.3.0",
+    "gulp-wrap-amd": "~0.5.0"
   }
 }

package.json

@@ -2,10 +2,11 @@ define([
     'marionette',
     'backbone',
     'bootstrap',
+    'underscore',
+    'tpl',
     'validation-model',
     'jquery.scroll',
-    'paginator',
-    'updown'
+    'paginator'
 ], function (Marionette, Backbone) {
     var App = new Marionette.Application();
     App.queryFlag = [];

public/js/app.js

@@ -9,7 +9,6 @@ requirejs.config({
     },
     paths: {
         backbone: 'vendor/backbone/backbone',
-        'backbone.syphon': 'vendor/backbone/backbone.syphon',
         jquery: 'vendor/jquery/jquery',
         'jquery.scroll': 'vendor/jquery/jquery.scrollTo',
         'jquery.elastic': 'vendor/jquery/jquery.elastic.source.antarus66fork',
@@ -27,42 +26,20 @@ requirejs.config({
         ckeditor: 'vendor/ckeditor/ckeditor',
         'ckeditor.custom.settings': 'vendor/ckeditor/custom-instance-settings',
         'ckeditor.adapter': 'vendor/ckeditor/adapters/jquery',
-        'highlight': 'vendor/ckeditor/plugins/codesnippet/lib/highlight/highlight.pack',
-        'moment': 'vendor/moment/moment-with-locales',
-        'progressbar': 'vendor/progressbar/progressbar',
+        highlight: 'vendor/ckeditor/plugins/codesnippet/lib/highlight/highlight.pack',
+        moment: 'vendor/moment/moment-with-locales',
+        progressbar: 'vendor/progressbar/progressbar',
         i18next: 'vendor/i18next/i18next-1.10.1',
         updown: 'vendor/updown/updown'
     },
     shim: {
-        underscore: {
-            exports: '_'
-        },
-        backbone: {
-            deps: ['jquery', 'underscore'],
-            exports: 'Backbone'
-        },
-        'backbone.syphon': ['backbone'],
-        marionette: {
-            deps: ['backbone'],
-            exports: 'Marionette'
-        },
-        bootstrap: ['jquery'],
-        validation: ['backbone'],
-        tpl: ['text'],
-        syphon: ['backbone'],
         'ckeditor.adapter': ['ckeditor'],
-        select2: {
-            deps: ['jquery'],
-            exports: '$.fn.select2'
-        },
-        'jquery.scroll': ['jquery'],
-        'jquery.elastic': ['jquery'],
-        'jquery.iframe-resizer': ['jquery'],
-        updown: ['jquery.scroll']
+        i18next: ['jquery'],
+        'jquery.elastic': ['jquery']
     }
 });
 
-require(['app', 'routes', 'i18next'], function (App) {
+require(['i18next', 'app', 'routes'], function (Lang, App) {
     // App in i18next context for inserting _t() helper inside the all templates
     var i18nOptions = {
         useCookie: true,

public/js/require-main.js

@@ -1,4 +1,4 @@
-require(['app', 'jquery', 'jquery.scroll'], function (App) {
+define(['jquery', 'jquery.scroll'], function (App) {
     jQuery.extend(jQuery.fn, {
         toplinkwidth: function () {
             var totalContentWidth = jQuery('#page-content-wrapper').outerWidth();

public/js/vendor/updown/updown.js

@@ -25,7 +25,7 @@ define([
         className: 'folder-select',
         template: SelectTpl,
         childView: App.Folder.Views.FolderSelectRow,
-        childViewContainer: "#folder-options",
+        childViewContainer: '#folder-options',
 
         onShow: function () {
             var lang = i18n.lng().substr(0, 2);

public/js/views/folder/select.js

@@ -5,8 +5,7 @@ define([
     'views/menu/mock',
     'tpl!views/templates/main-layout.tpl',
     'moment',
-    'syphon',
-    'updown'
+    'syphon'
 ], function (
     App,
     Marionette,

public/js/views/main-layout.js

@@ -4,17 +4,24 @@ define([
     'backbone',
     'tpl!views/templates/paginator/collection.tpl',
     'tpl!views/templates/paginator/row.tpl',
+    'tpl!views/templates/paginator/more.tpl',
     'marionette'
 ], function (
     App,
     Marionette,
     Backbone,
     PaginatorTpl,
-    PaginatorRowTpl
+    PaginatorRowTpl,
+    PaginatorMoreTpl
 ) {
     App.Paginator.Views.PaginatorCollectionRow = Marionette.ItemView.extend({
         tagName: 'li',
-        template: PaginatorRowTpl,
+        getTemplate: function () {
+            if (this.model.type === 'more') {
+                return PaginatorMoreTpl;
+            }
+            return PaginatorRowTpl;
+        },
         initialize: function (options) {
             this.$el.addClass(this.model.get('type'));
             if (this.model.get('is_disabled')) {

public/js/views/paginator/paginator.js

@@ -0,0 +1 @@
+<a><%= title %></a>

public/js/views/templates/paginator/more.tpl

@@ -1,5 +1 @@
-<% if (type === 'more') %>
-    <a><%= title %></a>
-<% else %>
-    <a href="#"><%= title %></a>
-
+<a href="#"><%= title %></a>