update to es6 Promise

Author: clmath

.travis.yml

@@ -5,6 +5,7 @@ before_script:
 - npm install -g bower
 - npm install
 - bower install
+- bower install jquery
 script:
 - grunt travis
 env:

Gruntfile.js

@@ -62,7 +62,7 @@ module.exports = function (grunt) {
 			// Delete files created by the "testBuild" target.
 			testBuild: [
 				"tests/functional/jqueryApp/{bower_components,node_modules,build,tmp}",
-				"tests/jquery.js"	// work around grunt-amd-build bug where it puts files outside of tmp/ dir
+				"tests/jquery.js" // work around grunt-amd-build bug where it puts files outside of tmp/ dir
 			]
 		}
 	});
@@ -76,7 +76,7 @@ module.exports = function (grunt) {
 
 
 	// By default, lint and run all tests.
-	grunt.registerTask("default", ["jsbeautifier", "lineending", "jshint", "intern:remote"]);
+	grunt.registerTask("default", ["jsbeautifier", "lineending", "jshint", "test:remote"]);
 
 	// Just lint
 	grunt.registerTask("lint", ["jsbeautifier", "lineending", "jshint"]);
@@ -116,7 +116,16 @@ module.exports = function (grunt) {
 				opts: {
 					cwd: appRootDir
 				}
-			}, done.bind(null, true));
+			}, finish);
+		}
+
+		function finish(error, buildResults) {
+			if (error !== null) {
+				grunt.log.writeln(buildResults.stdout);
+				done(error);
+				return;
+			}
+			done(true);
 		}
 
 		grunt.util.spawn({
@@ -158,7 +167,7 @@ module.exports = function (grunt) {
 			addReporter("console");
 		}
 
-		// First create the test builds.  These are referenced from the intern tests.
+		// First create the test builds. These are referenced from the intern tests.
 		grunt.task.run("testBuild");
 
 		// Then run the intern tests.

README.md

@@ -24,6 +24,7 @@ All contributions require a [Dojo Foundation CLA](http://dojofoundation.org/abou
 _Bower_ release installation:
 
     $ bower install requirejs-dplugins
+    $ bower install jquery (if you are using the jquery plugin)
 
 _Manual_ master installation:
 

bower.json

@@ -3,7 +3,7 @@
 	"version": "0.4.1",
 	"description": "AMD plugins for RequireJS",
 	"dependencies": {
-		"jquery": ">=2.1",
+		"lie": ">=2.8",
 		"requirejs": "2.1.x"
 	},
 	"devDependencies": {},

css.js

@@ -30,9 +30,9 @@
 
 define([
 	"./has",
-	"./jquery!deferred",
+	"lie/dist/lie",
 	"module"
-], function (has, $, module) {
+], function (has, Promise, module) {
 	"use strict";
 
 	has.add("event-link-onload-api", function (global) {
@@ -49,30 +49,30 @@ define([
 	 * @private
 	 */
 	var listenOnLoad = function (link) {
-		var def = new $.Deferred(),
-			loadHandler = has("event-link-onload-api") ?
-				function () {
-					// We're using "readystatechange" because IE happily support both
-					link.onreadystatechange = link.onload = function () {
-						if (!link.readyState || link.readyState === "complete") {
-							link.onreadystatechange = link.onload = null;
-							def.resolve();
-						}
-					};
-				} :
-				function () {
-					// watches a stylesheet for loading signs.
-					var sheet = link.sheet || link.styleSheet,
-						styleSheets = document.styleSheets;
-					if (sheet && Array.prototype.lastIndexOf.call(styleSheets, sheet) !== -1) {
-						def.resolve();
-					} else {
-						setTimeout(loadHandler, 25);
+		var loadHandler = has("event-link-onload-api") ?
+			function (resolve) {
+				// We're using "readystatechange" because IE happily support both
+				link.onreadystatechange = link.onload = function () {
+					if (!link.readyState || link.readyState === "complete") {
+						link.onreadystatechange = link.onload = null;
+						resolve();
 					}
 				};
+			} :
+			function (resolve) {
+				// watches a stylesheet for loading signs.
+				var sheet = link.sheet || link.styleSheet,
+					styleSheets = document.styleSheets;
+				if (sheet && Array.prototype.lastIndexOf.call(styleSheets, sheet) !== -1) {
+					resolve();
+				} else {
+					setTimeout(loadHandler, 25, resolve);
+				}
+			};
 
-		loadHandler();
-		return def.promise();
+		return new Promise(function (resolve) {
+			loadHandler(resolve);
+		});
 	};
 
 	var loadCss = {

docs/jquery.md

@@ -11,8 +11,7 @@ library via a `<script>` tag, in which case it just returns a pointer to the alr
 
 It's useful to avoid loading jQuery twice.
 
-When using this plugin, you can use the provided jquery (installed as a `requirejs-dplugins` bower dependency)
-or use your own version, either via `bower install jquery` or via
+When using this plugin, you must manually include jquery into your app via `bower install jquery` or via
 a script tag (ex: `<script src="https://code.jquery.com/jquery-2.1.1.min.js">`).
 
 ## Example

jquery.js

@@ -23,7 +23,7 @@ define([], function () {
 	require.config({
 		map: {
 			jquery: {
-				"jquery/src/selector": "jquery/src/selector-native"     // don't pull in sizzle
+				"jquery/src/selector": "jquery/src/selector-native" // don't pull in sizzle
 			}
 		}
 	});

package.json

@@ -11,11 +11,9 @@
 		"intern": "2.1.x",
 		"grunt-lineending": "^0.2.2"
 	},
-	"licenses": [
-		{
-			"type": "BSD",
-			"url": "https://github.com/ibm-js/requirejs-dplugins/blob/master/LICENSE"
-		}
-	],
+	"licenses": [{
+		"type": "BSD",
+		"url": "https://github.com/ibm-js/requirejs-dplugins/blob/master/LICENSE"
+	}],
 	"private": true
 }

tests/functional/jqueryApp/Gruntfile.js

@@ -11,18 +11,13 @@ module.exports = function (grunt) {
 	var outdir = "./build/";
 	var tmpdir = "./tmp/";
 
-	var common = {
-		options: { banner: "<%= " + outprop + ".header%>" },
-		src: "<%= " + outprop + ".modules.abs %>",
-		dest: outdir + "<%= " + outprop + ".layerPath %>"
-	};
-
 	grunt.initConfig({
 		amdloader: {
 			baseUrl: ".",
 
 			paths: {
 				jquery: "bower_components/jquery",
+				lie: "bower_components/lie",
 				"requirejs-dplugins": "../../.."
 			},
 

tests/functional/jqueryApp/bower.json

@@ -3,6 +3,7 @@
 	"version": "0.1.0",
 	"description": "Test application using jquery! plugin",
 	"dependencies": {
+		"lie": ">=2.8",
 		"jquery": ">=2.1",
 		"requirejs": "2.1.x"
 	}