update main in package.json

CHANGELOG.md

@@ -2,7 +2,13 @@
 All notable changes to this project will be documented in this file.
 
 ## [UNRELEASED]
+### Added
+- jquery.loader.js => main in package.json
+
 ### Updates
+- rename js/inputmask.dependencyLib.jquery.js to js/inputmask.dependencyLib.js
+- rename dist/inputmask.dependencyLib.jquery.js to dist/inputmask.dependencyLib.js
+- commonjs dep to inputmask.dependencyLib instead to inputmask.dependencyLib.jquery => can be symlinked to another dependencyLib
 - improve inputfallback (Android support)
 
 ### Fixed

Gruntfile.js

@@ -12,10 +12,12 @@ module.exports = function (grunt) {
 	function createUglifyConfig(path) {
 		function stripModuleLoaders(src, dst) {
 			var srcFile = grunt.file.read(src);
-			srcFile = srcFile.replace(new RegExp("\\(function\\s?\\(factory\\)[\\s\\S]*\\(function\\s?\\(\\$"), "(function ($");
-			if (src.indexOf("extensions") === -1 && src.indexOf("jquery.inputmask") === -1) {
-				srcFile = srcFile.replace(new RegExp("\\}\\)\\);[\\s]*$"), "})(jQuery);");
-			} else srcFile = srcFile.replace(new RegExp("\\}\\)\\);[\\s]*$"), "})(jQuery, Inputmask);");
+			if (src.indexOf("inputmask.config") === -1) {
+				srcFile = srcFile.replace(new RegExp("\\(function\\s?\\(factory\\)[\\s\\S]*\\(function\\s?\\(\\$"), "(function ($");
+				if (src.indexOf("extensions") === -1 && src.indexOf("jquery.inputmask") === -1) {
+					srcFile = srcFile.replace(new RegExp("\\}\\)\\);[\\s]*$"), "})(jQuery);");
+				} else srcFile = srcFile.replace(new RegExp("\\}\\)\\);[\\s]*$"), "})(jQuery, Inputmask);");
+			}
 			grunt.file.write(dst, srcFile);
 		}
 
@@ -47,6 +49,7 @@ module.exports = function (grunt) {
 
 			stripModuleLoaders("js/" + dstFile, "build/" + dstFile);
 		}
+
 		srcFiles = grunt.file.expand("build/*.extensions.js");
 		srcFiles.splice(0, 0, "build/jquery.inputmask.js");
 		srcFiles.splice(0, 0, "build/inputmask.js");
@@ -66,7 +69,7 @@ module.exports = function (grunt) {
 			src: srcFiles,
 			options: {
 				banner: createBanner("jquery.inputmask.bundle.js"),
-				preserveComments: "some",
+				preserveComments: false,
 				ASCIIOnly: true
 			}
 		};
@@ -74,7 +77,7 @@ module.exports = function (grunt) {
 		return uglifyConfig;
 	}
 
-	// Project configuration.
+// Project configuration.
 	grunt.initConfig({
 		pkg: grunt.file.readJSON("package.json"),
 		uglify: createUglifyConfig("js"),
@@ -142,7 +145,7 @@ module.exports = function (grunt) {
 			tasks: {
 				options: {
 					filter: 'exclude',
-					tasks: ['availabletasks', 'default'],
+					tasks: ['availabletasks', 'default', 'updateDistConfig'],
 					showTasks: ['user']
 				}
 			}
@@ -158,14 +161,23 @@ module.exports = function (grunt) {
 		}
 	});
 
-	// Load the plugin that provides the tasks.
+// Load the plugin that provides the tasks.
 	require('load-grunt-tasks')(grunt);
 
-	grunt.registerTask('publish:patch', ['clean', 'bump:patch', 'uglify', 'shell:gitcommitchanges', 'release', 'nugetpack', 'nugetpush']);
-	grunt.registerTask('publish:minor', ['clean', 'bump:minor', 'uglify', 'shell:gitcommitchanges', 'release', 'nugetpack', 'nugetpush']);
-	grunt.registerTask('publish:major', ['clean', 'bump:major', 'uglify', 'shell:gitcommitchanges', 'release', 'nugetpack', 'nugetpush']);
+	grunt.registerTask('publish:patch', ['clean', 'bump:patch', 'uglify', 'updateDistLoader', 'shell:gitcommitchanges', 'release', 'nugetpack', 'nugetpush']);
+	grunt.registerTask('publish:minor', ['clean', 'bump:minor', 'uglify', 'updateDistLoader', 'shell:gitcommitchanges', 'release', 'nugetpack', 'nugetpush']);
+	grunt.registerTask('publish:major', ['clean', 'bump:major', 'uglify', 'updateDistLoader', 'shell:gitcommitchanges', 'release', 'nugetpack', 'nugetpush']);
 	grunt.registerTask('validate', ['eslint', 'browserify', 'karma']);
-	grunt.registerTask('build', ['bump:prerelease', 'clean', 'uglify']);
+	grunt.registerTask('build', ['bump:prerelease', 'clean', 'uglify', 'updateDistLoader']);
 	grunt.registerTask('default', ["availabletasks"]);
-
+	grunt.registerTask('updateDistLoader', "Update the inputmask.loader in the dist folder", function () {
+		var configjs = grunt.file.read("dist/inputmask/inputmask.loader.js");
+		configjs = configjs.replace(/\/js\//, "/dist/inputmask/");
+		grunt.file.write("dist/inputmask/inputmask.loader.js", configjs);
+		console.log("dist/inputmask.loader.js updated");
+		var configjs = grunt.file.read("dist/min/inputmask/inputmask.loader.min.js");
+		configjs = configjs.replace(/\/js\//, "/dist/min/inputmask/");
+		grunt.file.write("dist/min/inputmask/inputmask.loader.min.js", configjs);
+		console.log("dist/min/inputmask/inputmask.loader.js updated");
+	});
 };

bower.json

@@ -1,8 +1,8 @@
 {
   "name": "jquery.inputmask",
-  "version": "3.3.4-2",
+  "version": "3.3.4-15",
   "main": [
-    "./dist/inputmask/inputmask.js"
+	  "./dist/inputmask/inputmask.loader.js"
   ],
   "keywords": ["jquery", "plugins", "input", "form", "inputmask", "mask"],
   "description": "jquery.inputmask is a jquery plugin which create an input mask.",

component.json

@@ -2,9 +2,9 @@
   "name": "jquery_inputmask",
   "repository": "robinherbots/jquery.inputmask",
   "description": "jquery.inputmask is a jquery plugin which create an input mask.",
-  "version": "3.3.4-2",
+  "version": "3.3.4-15",
   "keywords": ["jquery", "plugins", "input", "form", "inputmask", "mask"],
-  "main": "./dist/jquery.inputmask.bundle.js",
+  "main": "./dist/inputmask/inputmask.loader.js",
   "scripts": [
     "./dist/inputmask/inputmask.dependencyLib.jquery.js",
     "./dist/inputmask/inputmask.js",

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "robinherbots/jquery.inputmask",
   "description": "jquery.inputmask is a jquery plugin which create an input mask.",
-  "version": "3.3.4-2",
+  "version": "3.3.4-15",
   "type": "library",
   "keywords": ["jquery", "plugins", "input", "form", "inputmask", "mask"],
   "homepage": "http://robinherbots.github.io/jquery.inputmask",

dist/inputmask/inputmask.date.extensions.js

@@ -3,10 +3,10 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.4-2
+* Version: 3.3.4-15
 */
 !function(factory) {
-    "function" == typeof define && define.amd ? define([ "inputmask.dependencyLib", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib.jquery"), require("./inputmask")) : factory(window.dependencyLib || jQuery, window.Inputmask);
+    "function" == typeof define && define.amd ? define([ "inputmask.dependencyLib", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib"), require("./inputmask")) : factory(window.dependencyLib || jQuery, window.Inputmask);
 }(function($, Inputmask) {
     return Inputmask.extendDefinitions({
         h: {

dist/inputmask/inputmask.dependencyLib.jquery.js

@@ -1,12 +1,12 @@
 /*!
-* inputmask.dependencyLib.jquery.js
+* inputmask.dependencyLib.js
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.4-2
+* Version: 3.3.4-15
 */
 !function(factory) {
-    "function" == typeof define && define.amd ? define([ "jquery" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery")) : factory(jQuery);
+    "function" == typeof define && define.amd ? define("inputmask.dependencyLib", [ "jquery" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery")) : factory(jQuery);
 }(function($) {
     return window.dependencyLib = $, $;
 });

dist/inputmask/inputmask.extensions.js

@@ -3,10 +3,10 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.4-2
+* Version: 3.3.4-15
 */
 !function(factory) {
-    "function" == typeof define && define.amd ? define([ "inputmask.dependencyLib", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib.jquery"), require("./inputmask")) : factory(window.dependencyLib || jQuery, window.Inputmask);
+    "function" == typeof define && define.amd ? define([ "inputmask.dependencyLib", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib"), require("./inputmask")) : factory(window.dependencyLib || jQuery, window.Inputmask);
 }(function($, Inputmask) {
     return Inputmask.extendDefinitions({
         A: {

dist/inputmask/inputmask.js

@@ -3,10 +3,10 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.4-2
+* Version: 3.3.4-15
 */
 !function(factory) {
-    "function" == typeof define && define.amd ? define([ "inputmask.dependencyLib" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib.jquery")) : factory(window.dependencyLib || jQuery);
+    "function" == typeof define && define.amd ? define("inputmask", [ "inputmask.dependencyLib" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib")) : factory(window.dependencyLib || jQuery);
 }(function($) {
     function Inputmask(alias, options) {
         return this instanceof Inputmask ? ($.isPlainObject(alias) ? options = alias : (options = options || {}, 

dist/inputmask/inputmask.numeric.extensions.js

@@ -3,10 +3,10 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.4-2
+* Version: 3.3.4-15
 */
 !function(factory) {
-    "function" == typeof define && define.amd ? define([ "inputmask.dependencyLib", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib.jquery"), require("./inputmask")) : factory(window.dependencyLib || jQuery, window.Inputmask);
+    "function" == typeof define && define.amd ? define([ "inputmask.dependencyLib", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib"), require("./inputmask")) : factory(window.dependencyLib || jQuery, window.Inputmask);
 }(function($, Inputmask) {
     return Inputmask.extendAliases({
         numeric: {

dist/inputmask/inputmask.phone.extensions.js

@@ -3,10 +3,10 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.4-2
+* Version: 3.3.4-15
 */
 !function(factory) {
-    "function" == typeof define && define.amd ? define([ "inputmask.dependencyLib", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib.jquery"), require("./inputmask")) : factory(window.dependencyLib || jQuery, window.Inputmask);
+    "function" == typeof define && define.amd ? define([ "inputmask.dependencyLib", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib"), require("./inputmask")) : factory(window.dependencyLib || jQuery, window.Inputmask);
 }(function($, Inputmask) {
     return Inputmask.extendAliases({
         abstractphone: {

dist/inputmask/inputmask.regex.extensions.js

@@ -3,10 +3,10 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.4-2
+* Version: 3.3.4-15
 */
 !function(factory) {
-    "function" == typeof define && define.amd ? define([ "inputmask.dependencyLib", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib.jquery"), require("./inputmask")) : factory(window.dependencyLib || jQuery, window.Inputmask);
+    "function" == typeof define && define.amd ? define([ "inputmask.dependencyLib", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib"), require("./inputmask")) : factory(window.dependencyLib || jQuery, window.Inputmask);
 }(function($, Inputmask) {
     return Inputmask.extendAliases({
         Regex: {

dist/inputmask/jquery.inputmask.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.4-2
+* Version: 3.3.4-15
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "jquery", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery, window.Inputmask);

dist/jquery.inputmask.bundle.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.4-2
+* Version: 3.3.4-15
 */
 !function($) {
     function Inputmask(alias, options) {

dist/min/inputmask/inputmask.dependencyLib.jquery.min.js

@@ -1,8 +0,0 @@
-/*!
-* inputmask.dependencyLib.jquery.min.js
-* https://github.com/RobinHerbots/jquery.inputmask
-* Copyright (c) 2010 - 2016 Robin Herbots
-* Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.4-2
-*/
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){return window.dependencyLib=a,a});

dist/min/inputmask/inputmask.dependencyLib.min.js

@@ -0,0 +1,8 @@
+/*!
+* inputmask.dependencyLib.min.js
+* https://github.com/RobinHerbots/jquery.inputmask
+* Copyright (c) 2010 - 2016 Robin Herbots
+* Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
+* Version: 3.3.4-15
+*/
+!function(a){"function"==typeof define&&define.amd?define("inputmask.dependencyLib",["jquery"],a):"object"==typeof exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){return window.dependencyLib=a,a});

extra/dependencyLibs/inputmask.dependencyLib.jqlite.js

@@ -6,7 +6,7 @@
  */
 (function (factory) {
 	if (typeof define === "function" && define.amd) {
-		define(["jqlite"], factory);
+		define("inputmask.dependencyLib", ["jqlite"], factory);
 	} else if (typeof exports === "object") {
 		module.exports = factory(require("jqlite"));
 	} else {

js/inputmask.dependencyLib.jquery.js

@@ -1,6 +1,6 @@
 (function (factory) {
 	if (typeof define === "function" && define.amd) {
-		define(["jquery"], factory);
+		define("inputmask.dependencyLib", ["jquery"], factory);
 	} else if (typeof exports === "object") {
 		module.exports = factory(require("jquery"));
 	} else {

extra/dependencyLibs/inputmask.dependencyLib.js

@@ -6,7 +6,7 @@
  */
 (function (factory) {
 	if (typeof define === "function" && define.amd) {
-		define(factory);
+		define("inputmask.dependencyLib", factory);
 	} else if (typeof exports === "object") {
 		module.exports = factory();
 	} else {

js/inputmask.date.extensions.js

@@ -11,7 +11,7 @@
 	if (typeof define === "function" && define.amd) {
 		define(["inputmask.dependencyLib", "inputmask"], factory);
 	} else if (typeof exports === "object") {
-		module.exports = factory(require("./inputmask.dependencyLib.jquery"), require("./inputmask"));
+		module.exports = factory(require("./inputmask.dependencyLib"), require("./inputmask"));
 	} else {
 		factory(window.dependencyLib || jQuery, window.Inputmask);
 	}

js/inputmask.dependencyLib.js

@@ -0,0 +1,13 @@
+(function (factory) {
+	if (typeof define === "function" && define.amd) {
+		define("inputmask.dependencyLib", ["jquery"], factory);
+	} else if (typeof exports === "object") {
+		module.exports = factory(require("jquery"));
+	} else {
+		factory(jQuery);
+	}
+}
+(function ($) {
+	window.dependencyLib = $;
+	return $;
+}));

js/inputmask.extensions.js

@@ -11,7 +11,7 @@
 	if (typeof define === "function" && define.amd) {
 		define(["inputmask.dependencyLib", "inputmask"], factory);
 	} else if (typeof exports === "object") {
-		module.exports = factory(require("./inputmask.dependencyLib.jquery"), require("./inputmask"));
+		module.exports = factory(require("./inputmask.dependencyLib"), require("./inputmask"));
 	} else {
 		factory(window.dependencyLib || jQuery, window.Inputmask);
 	}

js/inputmask.js

@@ -7,9 +7,9 @@
  */
 (function (factory) {
 	if (typeof define === "function" && define.amd) {
-		define(["inputmask.dependencyLib"], factory);
+		define("inputmask", ["inputmask.dependencyLib"], factory);
 	} else if (typeof exports === "object") {
-		module.exports = factory(require("./inputmask.dependencyLib.jquery"));
+		module.exports = factory(require("./inputmask.dependencyLib"));
 	} else {
 		factory(window.dependencyLib || jQuery);
 	}

js/inputmask.loader.js

@@ -0,0 +1,46 @@
+(function (factory) {
+	if (typeof define === "function" && define.amd) {
+		define([
+			"./inputmask.dependencyLib",
+			"./inputmask",
+			"./inputmask.extensions",
+			"./inputmask.date.extensions",
+			"./inputmask.numeric.extensions",
+			"./inputmask.phone.extensions",
+			"./inputmask.regex.extensions",
+			"./jquery.inputmask"
+		], factory);
+	} else if (typeof exports === "object") {
+		module.exports = factory(
+			require("./inputmask.dependencyLib"),
+			require("./inputmask"),
+			require("./inputmask.extensions"),
+			require("./inputmask.date.extensions"),
+			require("./inputmask.numeric.extensions"),
+			require("./inputmask.phone.extensions"),
+			require("./inputmask.regex.extensions"),
+			require("./jquery.inputmask")
+		);
+	} else {
+		window.InputmaskLoader = jQuery.Deferred();
+		jQuery.getScript("./js/inputmask.dependencyLib.js").done(function () {
+			jQuery.getScript("./js/inputmask.js").done(function () {
+				jQuery.getScript("./js/inputmask.extensions.js").done(function () {
+					jQuery.getScript("./js/inputmask.date.extensions.js").done(function () {
+						jQuery.getScript("./js/inputmask.numeric.extensions.js").done(function () {
+							jQuery.getScript("./js/inputmask.phone.extensions.js").done(function () {
+								jQuery.getScript("./js/inputmask.regex.extensions.js").done(function () {
+									jQuery.getScript("./js/jquery.inputmask.js").done(function () {
+										window.InputmaskLoader.resolve();
+									})
+								})
+							})
+						})
+					})
+				})
+			})
+		});
+	}
+}(function ($, Inputmask) {
+	return Inputmask;
+}));

js/inputmask.numeric.extensions.js

@@ -11,7 +11,7 @@
 	if (typeof define === "function" && define.amd) {
 		define(["inputmask.dependencyLib", "inputmask"], factory);
 	} else if (typeof exports === "object") {
-		module.exports = factory(require("./inputmask.dependencyLib.jquery"), require("./inputmask"));
+		module.exports = factory(require("./inputmask.dependencyLib"), require("./inputmask"));
 	} else {
 		factory(window.dependencyLib || jQuery, window.Inputmask);
 	}

js/inputmask.phone.extensions.js

@@ -12,7 +12,7 @@
 	if (typeof define === "function" && define.amd) {
 		define(["inputmask.dependencyLib", "inputmask"], factory);
 	} else if (typeof exports === "object") {
-		module.exports = factory(require("./inputmask.dependencyLib.jquery"), require("./inputmask"));
+		module.exports = factory(require("./inputmask.dependencyLib"), require("./inputmask"));
 	} else {
 		factory(window.dependencyLib || jQuery, window.Inputmask);
 	}

js/inputmask.regex.extensions.js

@@ -12,7 +12,7 @@
 	if (typeof define === "function" && define.amd) {
 		define(["inputmask.dependencyLib", "inputmask"], factory);
 	} else if (typeof exports === "object") {
-		module.exports = factory(require("./inputmask.dependencyLib.jquery"), require("./inputmask"));
+		module.exports = factory(require("./inputmask.dependencyLib"), require("./inputmask"));
 	} else {
 		factory(window.dependencyLib || jQuery, window.Inputmask);
 	}

package.json

@@ -1,8 +1,8 @@
 {
   "name": "jquery.inputmask",
-  "version": "3.3.4-2",
+  "version": "3.3.4-15",
   "description": "jquery.inputmask is a jquery plugin which create an input mask.",
-  "main": "./dist/inputmask/jquery.inputmask.js",
+  "main": "./dist/inputmask/inputmask.loader.js",
   "files": [
     "dist/inputmask/",
     "extra/",

qunit/config.js

@@ -4,8 +4,8 @@ require.config({
 		"jquery": "../node_modules/jquery/dist/jquery",
 		"jqlite": "../node_modules/jqlite/jqlite",
 		"qunit": "../node_modules/qunitjs/qunit/qunit",
-		"inputmask.dependencyLib": "../dist/inputmask/inputmask.dependencyLib.jquery",
-		//"inputmask.dependencyLib": "../extra/dependencyLibs/inputmask.dependencyLib",
+		"inputmask.dependencyLib": "../extra/dependencyLibs/inputmask.dependencyLib.jquery",
+		// "inputmask.dependencyLib": "../extra/dependencyLibs/inputmask.dependencyLib",
 		// "inputmask.dependencyLib": "../extra/dependencyLibs/inputmask.dependencyLib.jqlite",
 		"inputmask": "../dist/inputmask/inputmask"
 		// "inputmask": "../js/inputmask"