WIP

src/package.json

@@ -62,6 +62,7 @@
     "fotorama": "^4.6.4",
     "gulp-derequire": "^2.1.0",
     "jquery": "3.1.1",
+    "jquery-browserify": "^1.8.1",
     "jquery-validation": "^1.17.0",
     "jquery.maskedinput": "^1.4.1",
     "material-design-lite": "^1.3.0",

src/site/html/about.ejs

@@ -561,7 +561,6 @@
         </div>
       </div>
     </nav>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
   <script src="bundle.min.js"></script>
   </body>
 </html>

src/site/html/contact.ejs

@@ -304,7 +304,6 @@
         </div>
       </div>
     </nav>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
   <script src="bundle.min.js"></script>
   </body>
 </html>

src/site/html/index.ejs

@@ -292,7 +292,6 @@
         </div>
       </div>
     </nav>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
     <script src="bundle.min.js"></script>
   </body>
 </html>

src/site/scripts/main.js

@@ -1,10 +1,13 @@
 'use strict';
-import fotorama from 'fotorama/fotorama.js'
-import plyr from 'plyr'
-import noUiSlider from 'nouislider'
-import material from 'material-design-lite'
-import mask from 'jquery.maskedinput/src/jquery.maskedinput.js'
-import validation from 'jquery-validation'
+
+import $ from 'jquery';
+import jQb from 'jquery-browserify';
+import fotorama from 'fotorama/fotorama.js';
+import plyr from 'plyr';
+import noUiSlider from 'nouislider';
+import material from 'material-design-lite';
+import mask from 'jquery.maskedinput/src/jquery.maskedinput.js';
+import validation from 'jquery-validation';
 
 var Main = {
   init: function(){
@@ -78,7 +81,7 @@ var Main = {
   },
 
   initTestimonials: function(){
-    var $fotoramaDiv = $('.fotorama').fotorama({
+    var $fotoramaDiv = jQb('.fotorama').fotorama({
       autoplay: false,
       shadows: false,
       width: '100%',

src/tasks/scripts.js

@@ -6,18 +6,13 @@ import browserify from 'browserify';
 import watchify from 'watchify';
 import source from 'vinyl-source-stream';
 import buffer from 'vinyl-buffer';
-import browserifyGlobal from 'browserify-global-shim';
 import { join } from 'path';
-import derequire from 'derequire';
 
 import browserSync from './connect';
 import { libraries, server, browserify as blabla } from '../config';
 
 const { dest } = server
 const config = Object.assign({}, watchify.args, blabla);
-const globalShim = browserifyGlobal.configure({
-  'jQuery': '$'
-})
 const bundler = watchify(browserify(config));
 const buildBundler = browserify(config);