resolve conflicts

Author: IegorKozakov

.jshintignore

@@ -0,0 +1 @@
+src/plugins/jquery.ajax.js

gulpfile.js

@@ -8,6 +8,12 @@ var source = require('vinyl-source-stream');
 var connect = require('gulp-connect');
 var notify = require('gulp-notify');
 
+var uglify = require('gulp-uglify');
+var pump = require('pump');
+
+var fs = require('fs');
+var builder = require('jquery-custom');
+
 gulp.task('build', function () {
     var isDevelopment = process.env.NODE_ENV === 'develop',
         browserifyOpts = {
@@ -18,12 +24,21 @@ gulp.task('build', function () {
     return browserify('./src/qbMain.js', browserifyOpts)
         .bundle()
         .on('error', function(error) {
-            notify('Failed when create a bundle <%= error.message %>')
+            notify('Failed when create a bundle <%= error.message %>');
             this.emit('end');
         })
         .pipe(source('quickblox.min.js'))
-        .pipe(notify('Build task is finished.'))
-        .pipe(gulp.dest('./'));
+        .pipe(gulp.dest('./'))
+        .pipe(notify('Build task is finished.'));
+});
+
+gulp.task('minify', function () {
+    pump([
+        gulp.src('./quickblox.min.js'),
+        uglify(),
+        notify('Minify task is finished.'),
+        gulp.dest('./')
+    ]);
 });
 
 gulp.task('connect', function() {
@@ -33,6 +48,62 @@ gulp.task('connect', function() {
     });
 });
 
+gulp.task('generate-build_version', function() {
+    var fs = require('fs');
+    const configPath = './src/qbConfig.js';
+
+    function incBuildNumber(foundedString, p1, buildNumber, p2) {
+        var oldBuildNumber = +buildNumber;
+
+        return p1 + (oldBuildNumber + 1) + p2;
+    }
+
+    fs.readFile(configPath, 'utf8', function (error, config) {
+        if (error) {
+            throw new Error(error);
+        }
+        var result = config.replace(/(buildNumber:\s\')(\d{4})(')/g, incBuildNumber);
+
+        fs.writeFile(configPath, result, 'utf8', function (error) {
+            if (error) {
+                throw new Error(error);
+            }
+        });
+    });
+});
+
+gulp.task('jquery', function () {
+    return builder({
+        flags: [
+            '-deprecated',
+            '-dimensions',
+            '-effects',
+            '-event',
+            '-event/alias',
+            '-event/focusin',
+            '-event/trigger',
+            '-offset',
+            '-wrap',
+            '-core/ready',
+            '-exports/global',
+            '-sizzle'
+        ],
+    }, function (err, compiledContent) {
+        if (err){
+            notify('Can\'t build jquery lib.');
+            return console.error(err);
+        }
+
+        fs.writeFile('./src/plugins/jquery.ajax.js', compiledContent, function (err) {
+            if (err){
+                notify('Can\'t build jquery lib.');
+                return console.error(err);
+            }
+            notify('Jquery task is finished.');
+        })
+    })
+});
+
 gulp.task('watch', function () {
   gulp.watch(['./src/**/*.js'], ['build']);
 });

package.json

@@ -52,11 +52,14 @@
     "gulp": "^3.9.1",
     "gulp-connect": "^5.0.0",
     "gulp-notify": "^2.2.0",
+    "gulp-uglify": "^2.0.0",
     "jaguarjs-jsdoc": "^1.0.1",
-    "jasmine": "^2.4.1",
     "jsdoc": "^3.4.3",
+    "jasmine": "^2.4.1",
+    "jquery-custom": "^1.1.1",
     "jshint": "^2.9.3",
     "jshint-stylish": "^2.2.1",
+    "pump": "^1.0.1",
     "vinyl-source-stream": "^1.1.0"
   },
   "autoupdate": {
@@ -76,9 +79,8 @@
   "scripts": {
     "setDependencies": "npm i && npm install -g gulp-cli && npm install -g jasmine",
     "lint": "jshint src --reporter=node_modules/jshint-stylish",
-    "build": "npm run lint && gulp build && npm run doc",
+    "build": "npm run lint && gulp generate-build_version && gulp build && gulp minify && npm run doc",
     "develop": "cross-env NODE_ENV=develop gulp",
-    "start": "gulp connect",
-    "doc": "rm -r doc || mkdir doc && jsdoc -c ./jsdoc.conf.json"
+    "start": "gulp connect"
   }
 }