Merge branch 'develop' into gh-pages

* develop: v3.2.121 chore(package): update command-line-usage to version 2.0.4 (#730) Fix (biblio): Edge doesn't support includes yet (#728) chore(package): update karma-mocha to version 1.0.1 (#729) chore(package): update karma-chrome-launcher to version 1.0.1 (#731) Fix(respec-ready): s/respectIsReady/respecIsReady/ typo chore(package): update whatwg-fetch to version 1.0.0 (#725) Update fs-extra to version 0.30.0 🚀 Feat(package): run tests in Safari Tech Preview (#719) chore(package): update promise-polyfill to version 5.0.0 (#717) Chore(package): make Node 5 min engine requirement (#703) Update fs-extra to version 0.29.0 🚀 promise-polyfill@4.0.4 breaks build 🚨 Chore(package): update dependencies
w3c · May 3, 2016 · 80fefd0 · 80fefd0
2 parents 049def8 + 9e682cf
commit 80fefd0
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 49 deletions.
diff --git a/builds/respec-w3c-common-3.2.121.build.js.map b/builds/respec-w3c-common-3.2.121.build.js.map
diff --git a/builds/respec-w3c-common-3.2.121.js b/builds/respec-w3c-common-3.2.121.js
diff --git a/builds/respec-w3c-common.build.js.map b/builds/respec-w3c-common.build.js.map
diff --git a/builds/respec-w3c-common.js b/builds/respec-w3c-common.js
diff --git a/js/core/biblio.js b/js/core/biblio.js
@@ -175,7 +175,7 @@ define(
                     .concat(localAliases)
                     // remove duplicates
                     .reduce(function(collector, item){
-                        if(!collector.includes(item)){
+                        if(collector.indexOf(item) === -1){
                             collector.push(item);
                         }
                         return collector;

diff --git a/js/core/respec-ready.js b/js/core/respec-ready.js
@@ -1,38 +1,39 @@
 /**
- * This Module adds a `respectIsReady` property to the document object.
- * The property returns a promise.
+ * This Module adds a `respecIsReady` property to the document object.
+ * The property returns a promise that settles when ReSpec finishes
+ * processing the document.
  */
 
 "use strict";
-define(["Promise"], function() {
+define([], function () {
   var respecDone = false;
   var doneResolver;
   var doneRejector;
-  var respecDonePromise = new Promise(function(resolve, reject) {
+  var respecDonePromise = new Promise(function (resolve, reject) {
     doneResolver = resolve;
     doneRejector = reject;
   });
   Object.defineProperty(document, "respecDone", {
-    get: function() {
-      var warn = "document.respecDone is deprecated, use document.respectIsReady instead.";
+    get: function () {
+      var warn = "document.respecDone is deprecated, use document.respecIsReady instead.";
       console.warn(warn);
       return respecDone;
     },
-    set: function(value) {
+    set: function (value) {
       if (typeof value === "boolean" && value) {
-	respecDone = value;
-	doneResolver(respecConfig);
+        respecDone = value;
+        doneResolver(respecConfig);
       }
       if (value instanceof Error) {
-	doneRejector(value)
+        doneRejector(value)
       }
       return value;
     }
   });
-  Object.defineProperty(document, "respectIsReady", {
-    get: function() {
+  Object.defineProperty(document, "respecIsReady", {
+    get: function () {
       return respecDonePromise;
     },
   });
   return {};
-});
+});
diff --git a/js/profile-w3c-common.js b/js/profile-w3c-common.js
@@ -79,7 +79,7 @@ define([
       ui.addCommand("Search Specref DB", "ui/search-specref", "Ctrl+Shift+Alt+space");
       runner
         .runAll(args)
-        .then(document.respectIsReady)
+        .then(document.respecIsReady)
         .then(ui.show)
         .catch(function(err){
           console.error(err);

diff --git a/package.json b/package.json
@@ -1,8 +1,11 @@
 {
   "name": "respec",
-  "version": "3.2.120",
+  "version": "3.2.121",
   "license": "W3C",
   "description": "Specification Edition Support Tool.",
+  "engines": {
+    "node": ">=5"
+  },
   "bin": {
     "respec2html": "./tools/respec2html.js"
   },
@@ -18,36 +21,37 @@
     "command-line-args": "^2.1.6",
     "epipebomb": "^0.1.1",
     "express": "^4.13.4",
-    "fs-extra": "^0.28.0",
+    "fs-extra": "^0.30.0",
     "fs-promise": "^0.5.0",
     "handlebars": "^4.0.5",
     "jasmine-core": "^2.4.1",
     "jasmine-reporters": "^2.1.1",
     "jquery": "^2.2.3",
-    "jscs": "^3.0.1",
-    "jshint": "^2.9.1",
+    "jscs": "^3.0.3",
+    "jshint": "^2.9.2",
     "karma": "^0.13.22",
-    "karma-chrome-launcher": "^0.2.3",
+    "karma-chrome-launcher": "^1.0.1",
     "karma-detect-browsers": "^2.1.0",
     "karma-firefox-launcher": "^0.1.7",
     "karma-ie-launcher": "^0.2.0",
     "karma-jasmine": "^0.3.8",
-    "karma-mocha": "^0.2.2",
-    "karma-mocha-reporter": "^2.0.0",
+    "karma-mocha": "^1.0.1",
+    "karma-mocha-reporter": "^2.0.2",
     "karma-opera-launcher": "^0.3.0",
     "karma-requirejs": "^0.2.6",
     "karma-safari-launcher": "^0.1.1",
+    "karma-safaritechpreview-launcher": "0.0.4",
     "karma-verbose-summary-reporter": "0.0.1",
     "marcosc-async": "^1.1.3",
     "mocha": "^2.4.5",
-    "moment": "^2.12.0",
+    "moment": "^2.13.0",
     "mozilla-download": "^1.1.1",
-    "nightmare": "^2.3.2",
-    "promise-polyfill": "^4.0.3",
+    "nightmare": "^2.3.3",
+    "promise-polyfill": "^5.0.0",
     "prompt": "^1.0.0",
     "requirejs": "^2.2.0",
     "webidl2": "^2.0.11",
-    "whatwg-fetch": "^0.11.0"
+    "whatwg-fetch": "^1.0.0"
   },
   "scripts": {
     "karma": "karma start --single-run",
@@ -64,9 +68,9 @@
   "dependencies": {
     "colors": "^1.1.2",
     "command-line-args": "^2.1.6",
-    "command-line-usage": "^2.0.3",
+    "command-line-usage": "^2.0.4",
     "fs-promise": "^0.5.0",
     "marcosc-async": "^1.1.3",
-    "nightmare": "^2.3.2"
+    "nightmare": "^2.3.3"
   }
 }
diff --git a/tests/spec/core/ready-promise-spec.js b/tests/spec/core/ready-promise-spec.js
@@ -1,19 +1,19 @@
 "use strict";
-describe("respectIsReady promise", function() {
+describe("respecIsReady promise", function() {
   it("should settle when processing is done", function(done) {
     var ops = makeStandardOps();
     makeRSDoc(ops, function(doc) {
       var props = new Set(Object.getOwnPropertyNames(doc));
-      expect(props.has("respectIsReady")).toBeTruthy();
-      expect(doc.respectIsReady instanceof doc.defaultView.Promise).toBeTruthy();
-      doc.respectIsReady.then(done);
+      expect(props.has("respecIsReady")).toBeTruthy();
+      expect(doc.respecIsReady instanceof doc.defaultView.Promise).toBeTruthy();
+      doc.respecIsReady.then(done);
     });
   });
 
   it("should resolve with the resulting respecConfig", function(done) {
     var ops = makeStandardOps();
     makeRSDoc(ops, function(doc) {
-      doc.respectIsReady.then(function(resultingConfig) {
+      doc.respecIsReady.then(function(resultingConfig) {
         // previousPublishDate gets changed to a Date object by ReSpec,
         // so not worth checking for equality.
         delete resultingConfig.previousPublishDate;

diff --git a/tools/respecDocWriter.js b/tools/respecDocWriter.js
@@ -102,7 +102,7 @@ const tasks = {
           return document.readyState === "complete";
         }) 
         .evaluate(function(){
-          if(document.hasOwnProperty("respectIsReady")){
+          if(document.hasOwnProperty("respecIsReady")){
             return true;
           }
           // does it try to load ReSpec locally or remotely