Version 2.5.0

Author: mistic100

.github/CONTRIBUTING.md

@@ -3,6 +3,8 @@
 ## Work on `dev`
 Any merge request should be created from and issued to the `dev` branch.
 
+Do not add the `dist` files to your pull request. The directory is ignored for a reason: it is generated and pushed only when doing a release on `master`.
+
 ## Core vs Plugins
 I want to keep the core clean of extra (and certainly awesome) functionalities. That includes, but is not limited to, export/import plugins, visual aids, etc.
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,6 +2,7 @@
 
 - [ ] I read the [guidelines for contributing](https://github.com/mistic100/jQuery-QueryBuilder/blob/master/.github/CONTRIBUTING.md)
 - [ ] I created my branch from `dev` and I am issuing the PR to `dev`
+- [ ] I didn't pushed the `dist` directory
 - [ ] Unit tests are OK
 - [ ] If it's a new feature, I added the necessary unit tests
 - [ ] If it's a new language, I filled the `__locale` and `__author` fields

.npmignore

@@ -2,4 +2,4 @@
 build
 composer.json
 Gruntfile.js
-bower_components
+tests/

.travis.yml

@@ -1,9 +1,6 @@
 language: node_js
 node_js:
-  - "5"
+  - "8"
 before_install:
   - npm install -g grunt-cli
-  - npm install -g bower
-before_script:
-  - bower install
 after_success: grunt coveralls

Gruntfile.js

@@ -27,8 +27,8 @@ module.exports = function(grunt) {
             'src/jquery.js'
         ],
         js_files_for_standalone: [
-            'bower_components/jquery-extendext/jQuery.extendext.js',
-            'bower_components/doT/doT.js',
+            'node_modules/jquery-extendext/jQuery.extendext.js',
+            'node_modules/dot/doT.js',
             'dist/js/query-builder.js'
         ]
     });
@@ -57,6 +57,11 @@ module.exports = function(grunt) {
                     port: 9000,
                     livereload: true
                 }
+            },
+            test: {
+                options: {
+                    port: 9001
+                }
             }
         },
 
@@ -238,7 +243,7 @@ module.exports = function(grunt) {
         uglify: {
             options: {
                 banner: '<%= banner %>\n',
-                mangle: { except: ['$'] }
+                mangle: { reserved: ['$'] }
             },
             dist: {
                 files: [{
@@ -346,7 +351,7 @@ module.exports = function(grunt) {
         qunit: {
             all: {
                 options: {
-                    urls: ['tests/index.html?coverage=true'],
+                    urls: ['http://localhost:<%= connect.test.options.port %>/tests/index.html?coverage=true'],
                     noGlobals: true
                 }
             }
@@ -360,7 +365,8 @@ module.exports = function(grunt) {
                     src: ['src/*.js', 'src/plugins/**/plugin.js']
                 }],
                 options: {
-                    dest: '.coverage-results/all.lcov'
+                    dest: '.coverage-results/all.lcov',
+                    prefix: 'http://localhost:<%= connect.test.options.port %>/'
                 }
             }
         },
@@ -414,6 +420,7 @@ module.exports = function(grunt) {
         'build_css',
         'injector:testSrc',
         'injector:testModules',
+        'connect:test',
         'qunit_blanket_lcov',
         'qunit'
     ]);
@@ -423,7 +430,7 @@ module.exports = function(grunt) {
         'build_css',
         'injector:example',
         'open',
-        'connect',
+        'connect:dev',
         'watch'
     ]);
 

README.md

@@ -5,6 +5,7 @@
 [![jsDelivr CDN](https://data.jsdelivr.com/v1/package/npm/jQuery-QueryBuilder/badge)](https://www.jsdelivr.com/package/npm/jQuery-QueryBuilder)
 [![Build Status](https://img.shields.io/travis/mistic100/jQuery-QueryBuilder.svg?style=flat-square)](https://travis-ci.org/mistic100/jQuery-QueryBuilder)
 [![Coverage Status](https://img.shields.io/coveralls/mistic100/jQuery-QueryBuilder/master.svg?style=flat-square)](https://coveralls.io/r/mistic100/jQuery-QueryBuilder)
+[![Dependencies Status](https://david-dm.org/mistic100/jQuery-QueryBuilder/status.svg?style=flat-square)](https://david-dm.org/mistic100/jQuery-QueryBuilder)
 
 jQuery plugin offering an simple interface to create complex queries.
 
@@ -39,11 +40,12 @@ $ npm install jQuery-QueryBuilder
 
 jQuery-QueryBuilder is available on [jsDelivr](https://www.jsdelivr.com/package/npm/jQuery-QueryBuilder).
 ### Dependencies
- * jQuery >= 1.10
- * Bootstrap >= 3.1 (CSS only)
+ * [jQuery 3](https://jquery.com)
+ * [Bootstrap 3](https://getbootstrap.com/docs/3.3) (CSS only)
  * [jQuery.extendext](https://github.com/mistic100/jQuery.extendext)
- * [doT.js >= 1.0.3](http://olado.github.io/doT)
+ * [doT.js](http://olado.github.io/doT)
  * [MomentJS](http://momentjs.com) (optional, for Date/Time validation)
+ * [SQL Parser](https://github.com/mistic100/sql-parser) (optional, for SQL methods)
  * Other Bootstrap/jQuery plugins used by plugins
 
 ($.extendext and doT.js are directly included in the [standalone](https://github.com/mistic100/jQuery-QueryBuilder/blob/master/dist/js/query-builder.standalone.js) file)
@@ -60,11 +62,10 @@ jQuery-QueryBuilder is available on [jsDelivr](https://www.jsdelivr.com/package/
 
  * NodeJS + NPM: `apt-get install nodejs-legacy npm`
  * Grunt CLI: `npm install -g grunt-cli`
- * Bower: `npm install -g bower`
 
 #### Run
 
-Install Node and Bower dependencies `npm install & bower install` then run `grunt` in the root directory to generate production files inside `dist`.
+Install Node and Bower dependencies `npm install` then run `grunt` in the root directory to generate production files inside `dist`.
 
 #### Options
 

bower.json

@@ -13,22 +13,12 @@
     "dist/css/query-builder.default.css"
   ],
   "dependencies": {
-    "jquery": ">=1.9.0",
+    "jquery": ">=1.10.0",
     "bootstrap": ">=3.1.0 <4",
     "moment": ">=2.6.0",
     "jquery-extendext": ">=0.1.2",
     "doT": ">=1.0.3"
   },
-  "devDependencies": {
-    "blanket": "^1.1.0",
-    "qunit": "^1.23.0",
-    "bootstrap-select": "^1.10.0",
-    "bootbox": "^4.4.0",
-    "awesome-bootstrap-checkbox": "^0.3.0",
-    "sql-parser": "^1.1.0",
-    "bind-polyfill": "~1.0.0",
-    "interact": "^1.2.6"
-  },
   "keywords": [
     "jquery",
     "query",

composer.json

@@ -9,7 +9,7 @@
   "description": "jQuery plugin for user friendly query/filter creator",
   "require": {
     "robloach/component-installer": "*",
-    "components/jquery": ">=1.9.0",
+    "components/jquery": ">=1.10.0",
     "moment/moment": ">=2.6.0",
     "components/bootstrap": ">=3.1.0 <4"
   },

dist/css/query-builder.dark.css

@@ -1,6 +1,6 @@
 /*!
- * jQuery QueryBuilder 2.4.5
- * Copyright 2014-2017 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
+ * jQuery QueryBuilder 2.5.0
+ * Copyright 2014-2018 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */
 .query-builder .rules-group-container, .query-builder .rule-container, .query-builder .rule-placeholder {