fc0e19d74da50f4629cc620fddf993a94622d4cd 1.4.1 release

Sync to source repo @fc0e19d74da50f4629cc620fddf993a94622d4cd

datatables.json

@@ -15,5 +15,5 @@
     ],
     "src-repo": "http://github.com/DataTables/SearchBuilder",
     "last-tag": "1.4.0",
-    "last-sync": "de6f8c99ee28cc8514572b5897e3de2006f2e65f"
+    "last-sync": "fc0e19d74da50f4629cc620fddf993a94622d4cd"
 }

js/searchBuilder.bootstrap.js

@@ -11,29 +11,37 @@
 	}
 	else if ( typeof exports === 'object' ) {
 		// CommonJS
-		module.exports = function (root, $) {
-			if ( ! root ) {
-				// CommonJS environments without a window global must pass a
-				// root. This will give an error otherwise
-				root = window;
-			}
-
-			if ( ! $ ) {
-				$ = typeof window !== 'undefined' ? // jQuery's factory checks for a global window
-					require('jquery') :
-					require('jquery')( root );
-			}
-
+		var jq = require('jquery');
+		var cjsRequires = function (root, $) {
 			if ( ! $.fn.dataTable ) {
 				require('datatables.net-bs')(root, $);
 			}
 
 			if ( ! $.fn.dataTable.SearchBuilder ) {
 				require('datatables.net-searchbuilder')(root, $);
 			}
-
-			return factory( $, root, root.document );
 		};
+
+		if (typeof window !== 'undefined') {
+			module.exports = function (root, $) {
+				if ( ! root ) {
+					// CommonJS environments without a window global must pass a
+					// root. This will give an error otherwise
+					root = window;
+				}
+
+				if ( ! $ ) {
+					$ = jq( root );
+				}
+
+				cjsRequires( root, $ );
+				return factory( $, root, root.document );
+			};
+		}
+		else {
+			cjsRequires( window, jq );
+			module.exports = factory( jq, window, window.document );
+		}
 	}
 	else {
 		// Browser

js/searchBuilder.bootstrap.mjs

@@ -6,7 +6,6 @@ import $ from 'jquery';
 import DataTable from 'datatables.net-bs';
 import SearchBuilder from 'datatables.net-searchbuilder';
 
-
 $.extend(true, DataTable.SearchBuilder.classes, {
     clearAll: 'btn btn-default dtsb-clearAll'
 });