Merge branch 'develop' into gh-pages

* develop:
  v3.3.3
  chore(package): update karma to version 1.0.0
  chore(package): update snyk to version 1.16.0
  fix: package.json & .snyk to reduce vulnerabilities
  chore(utils): fix style
  chore(package): update jscs to version 3.0.5
  chore(package): update jasmine-reporters to version 2.2.0
  chore(deps): move dependencies to js/deps (closes #633)
  chore(markdown): tell hljs about xquery+http+markdown
  Feat(package): adds xquery to highlight build
  Feat(highlight): build custom highlighter
  Fix(biblio): use herokuapp instead of w3c proxy
  chore(CHANGELOG): generate changelog for 3.3.2

.jshintrc

@@ -1,3 +1,4 @@
 {
-  "globalstrict": true
+  "globalstrict": true,
+  "esnext": "true"
 }

.snyk

@@ -0,0 +1,6 @@
+version: v1.5.0
+ignore: {}
+patch:
+  'npm:marked:20150520':
+    - marked:
+        patched: '2016-06-23T16:23:03.425Z'

CHANGELOG.md

@@ -1,11 +1,57 @@
 # Change Log
 
+## [v3.3.2](https://github.com/w3c/respec/tree/v3.3.2) (2016-06-14)
+[Full Changelog](https://github.com/w3c/respec/compare/v3.2.134...v3.3.2)
+
+**Fixed bugs:**
+
+- No URL decoding from URL params  [\#807](https://github.com/w3c/respec/issues/807)
+
+**Merged pull requests:**
+
+- Update jquery to version 3.0.0 🚀 [\#823](https://github.com/w3c/respec/pull/823) ([greenkeeperio-bot](https://github.com/greenkeeperio-bot))
+- Fix\(override-configuration\):decode URL params correctly \(closes \#807\) [\#816](https://github.com/w3c/respec/pull/816) ([marcoscaceres](https://github.com/marcoscaceres))
+- Feat\(respec2html\): upgrade to command-line-usage V3 [\#815](https://github.com/w3c/respec/pull/815) ([marcoscaceres](https://github.com/marcoscaceres))
+- Changed default diff tool URI to use https [\#813](https://github.com/w3c/respec/pull/813) ([halindrome](https://github.com/halindrome))
+- Update marcosc-async to version 2.0.0 🚀 [\#812](https://github.com/w3c/respec/pull/812) ([greenkeeperio-bot](https://github.com/greenkeeperio-bot))
+
+## [v3.2.134](https://github.com/w3c/respec/tree/v3.2.134) (2016-06-07)
+[Full Changelog](https://github.com/w3c/respec/compare/v3.2.133...v3.2.134)
+
+**Fixed bugs:**
+
+- Syntax highlighting issue for interfaces with a "Constructor" [\#806](https://github.com/w3c/respec/issues/806)
+
+**Merged pull requests:**
+
+- Dont hightlight idl [\#811](https://github.com/w3c/respec/pull/811) ([marcoscaceres](https://github.com/marcoscaceres))
+
+## [v3.2.133](https://github.com/w3c/respec/tree/v3.2.133) (2016-06-01)
+[Full Changelog](https://github.com/w3c/respec/compare/v3.2.132...v3.2.133)
+
+**Merged pull requests:**
+
+- Add forEach to iterable methods list [\#804](https://github.com/w3c/respec/pull/804) ([mwatson2](https://github.com/mwatson2))
+- Update command-line-usage to version 3.0.1 🚀 [\#802](https://github.com/w3c/respec/pull/802) ([greenkeeperio-bot](https://github.com/greenkeeperio-bot))
+
+## [v3.2.132](https://github.com/w3c/respec/tree/v3.2.132) (2016-05-27)
+[Full Changelog](https://github.com/w3c/respec/compare/v3.2.131...v3.2.132)
+
+**Fixed bugs:**
+
+- Inserted stylesheets move charset declaration too far down [\#791](https://github.com/w3c/respec/issues/791)
+
+**Merged pull requests:**
+
+- nightmare@2.5.0 breaks build 🚨 [\#800](https://github.com/w3c/respec/pull/800) ([greenkeeperio-bot](https://github.com/greenkeeperio-bot))
+- Fix\(ui,utils\): firstElementChild not in Edge \(closes \#798\) [\#799](https://github.com/w3c/respec/pull/799) ([marcoscaceres](https://github.com/marcoscaceres))
+
 ## [v3.2.131](https://github.com/w3c/respec/tree/v3.2.131) (2016-05-27)
 [Full Changelog](https://github.com/w3c/respec/compare/v3.2.129...v3.2.131)
 
 **Fixed bugs:**
 
-- Inserted stylesheets move charset declaration too far down [\#791](https://github.com/w3c/respec/issues/791)
+- firstElementChild is affecting MS Edge  [\#798](https://github.com/w3c/respec/issues/798)
 
 **Merged pull requests:**
 
@@ -59,16 +105,7 @@
 [Full Changelog](https://github.com/w3c/respec/compare/v3.2.124...v3.2.125)
 
 ## [v3.2.124](https://github.com/w3c/respec/tree/v3.2.124) (2016-05-23)
-[Full Changelog](https://github.com/w3c/respec/compare/v3.3.0...v3.2.124)
-
-**Merged pull requests:**
-
-- Fix\(ui\): close ui when doc is clicked \(closes \#772\) [\#774](https://github.com/w3c/respec/pull/774) ([marcoscaceres](https://github.com/marcoscaceres))
-- Fix \(SpecHelper\): reduce dependece on jQuery [\#770](https://github.com/w3c/respec/pull/770) ([marcoscaceres](https://github.com/marcoscaceres))
-- Fix\(style\): reduce ReSpec FOUC \(relates to \#326\) [\#768](https://github.com/w3c/respec/pull/768) ([marcoscaceres](https://github.com/marcoscaceres))
-
-## [v3.3.0](https://github.com/w3c/respec/tree/v3.3.0) (2016-05-22)
-[Full Changelog](https://github.com/w3c/respec/compare/v3.2.123...v3.3.0)
+[Full Changelog](https://github.com/w3c/respec/compare/v3.2.123...v3.2.124)
 
 **Implemented enhancements:**
 
@@ -89,6 +126,9 @@
 
 - Fix bad tests [\#779](https://github.com/w3c/respec/pull/779) ([marcoscaceres](https://github.com/marcoscaceres))
 - Feat\(markdown\): disable md linking via 'nolinks' class \(closes \#777\) [\#778](https://github.com/w3c/respec/pull/778) ([marcoscaceres](https://github.com/marcoscaceres))
+- Fix\(ui\): close ui when doc is clicked \(closes \#772\) [\#774](https://github.com/w3c/respec/pull/774) ([marcoscaceres](https://github.com/marcoscaceres))
+- Fix \(SpecHelper\): reduce dependece on jQuery [\#770](https://github.com/w3c/respec/pull/770) ([marcoscaceres](https://github.com/marcoscaceres))
+- Fix\(style\): reduce ReSpec FOUC \(relates to \#326\) [\#768](https://github.com/w3c/respec/pull/768) ([marcoscaceres](https://github.com/marcoscaceres))
 - Feat\(hightlight\): use new highlighter [\#767](https://github.com/w3c/respec/pull/767) ([marcoscaceres](https://github.com/marcoscaceres))
 - Feat\(utils\): add makeOwnerSwapper\(\) [\#766](https://github.com/w3c/respec/pull/766) ([marcoscaceres](https://github.com/marcoscaceres))
 - Beautify \(X\)HTML output [\#761](https://github.com/w3c/respec/pull/761) ([marcoscaceres](https://github.com/marcoscaceres))
@@ -1607,7 +1647,10 @@
 - Add ref for: WEBAPPS-MANIFEST-API [\#41](https://github.com/w3c/respec/pull/41) ([tobie](https://github.com/tobie))
 
 ## [v3.1.1](https://github.com/w3c/respec/tree/v3.1.1) (2012-06-18)
-[Full Changelog](https://github.com/w3c/respec/compare/v3.1.0...v3.1.1)
+[Full Changelog](https://github.com/w3c/respec/compare/v3.3.1...v3.1.1)
+
+## [v3.3.1](https://github.com/w3c/respec/tree/v3.3.1) (2012-06-18)
+[Full Changelog](https://github.com/w3c/respec/compare/v3.1.0...v3.3.1)
 
 **Fixed bugs:**
 

examples/PresentationAPI.html

@@ -5,7 +5,7 @@
     <title>
       Presentation API
     </title>
-    <script src='/node_modules/requirejs/require.js' data-main='/js/profile-w3c-common' async class='remove'></script>
+    <script src='/js/deps/require.js' data-main='/js/profile-w3c-common' async class='remove'></script>
     <script class="remove">
     var respecConfig = {
         specStatus: 'ED',

examples/basic.html

@@ -4,7 +4,7 @@
     <meta charset='utf-8'/>
     <title>Basic ReSpec Evolution Example</title>
     <!-- // <script src='http://w3.dev/2009/dap/ReSpec.js/js/respec.js' class='remove'></script> -->
-    <script src='/node_modules/requirejs/require.js' data-main='/js/profile-w3c-common' async class='remove'></script>
+    <script src='/js/deps/require.js' data-main='/js/profile-w3c-common' async class='remove'></script>
     <!-- // <script src='../builds/respec-w3c-common.js' async class='remove'></script> -->
     <!-- // <script src='respec-debug.js' async class='remove'></script> -->
     <!-- // <script src='//www.w3.org/Tools/respec/respec-w3c-common' async class='remove'></script> -->

examples/coremob2012.html

@@ -37,7 +37,7 @@
       };
     </script>
     <!-- // <script src='http://www.w3.org/Tools/respec/respec-w3c-common' class='remove' async></script> -->
-    <script src='/node_modules/requirejs/require.js' data-main='/js/profile-w3c-common' async class='remove'></script>
+    <script src='/js/deps/require.js' data-main='/js/profile-w3c-common' async class='remove'></script>
     <style>
     table {border-collapse: collapse; border: 1px solid #bec9d9}
     td, th {padding: 3px 0.5em; border-left:1px solid black; border-right: 1px solid black; border-bottom:1px solid #E2EDFE;}

examples/embedder.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset='utf-8'/>
     <title>Embedded Specification for Reuse</title>
-    <script src='/node_modules/requirejs/require.js'></script>
+    <script src='/js/deps/require.js'></script>
     <script>
       window.addEventListener("message", function (ev) {
           console.log("ev", ev.data.topic, ev.data.args);

examples/experimental.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset='utf-8'/>
     <title>Experimental Style tester</title>
-    <script src='/node_modules/requirejs/require.js' data-main='/js/profile-w3c-common' async class='remove'></script>
+    <script src='/js/deps/require.js' data-main='/js/profile-w3c-common' async class='remove'></script>
     <script class='remove'>
       var respecConfig = {
         specStatus: "FPWD",

examples/getusermedia.html

@@ -12,7 +12,7 @@
    To publish this document, see instructions in README
    -->
 
-   <script src='/node_modules/requirejs/require.js' data-main='/js/profile-w3c-common' async class='remove'></script>
+   <script src='/js/deps/require.js' data-main='/js/profile-w3c-common' async class='remove'></script>
   <script class="remove" src="getusermedia.js" type="text/javascript">
   <!-- keep this comment -->
   </script>

examples/otherLinks.html

@@ -4,7 +4,7 @@
     <meta charset='utf-8'/>
     <title>Adding more links to header!</title>
     <!-- // <script src='http://w3.dev/2009/dap/ReSpec.js/js/respec.js' class='remove'></script> -->
-    <script src='/node_modules/requirejs/require.js' data-main='/js/profile-w3c-common' async class='remove'></script>
+    <script src='/js/deps/require.js' data-main='/js/profile-w3c-common' async class='remove'></script>
     <!-- // <script src='../builds/respec-w3c-common.js' async class='remove'></script> -->
     <!-- // <script src='//www.w3.org/Tools/respec/respec-w3c-common' async class='remove'></script> -->
     <!-- // <script src='http://darobin.github.com/respec/builds/respec-w3c-common.js' async class='remove'></script> -->

examples/previousVersions.html

@@ -4,7 +4,7 @@
     <meta charset='utf-8'/>
     <title>Basic ReSpec Evolution Example</title>
     <!-- // <script src='http://w3.dev/2009/dap/ReSpec.js/js/respec.js' class='remove'></script> -->
-    <script src='/node_modules/requirejs/require.js' data-main='/js/profile-w3c-common' async class='remove'></script>
+    <script src='/js/deps/require.js' data-main='/js/profile-w3c-common' async class='remove'></script>
     <!-- // <script src='../builds/respec-w3c-common.js' async class='remove'></script> -->
     <!-- // <script src='//www.w3.org/Tools/respec/respec-w3c-common' async class='remove'></script> -->
     <!-- // <script src='http://darobin.github.com/respec/builds/respec-w3c-common.js' async class='remove'></script> -->

examples/prtest.html

@@ -4,7 +4,7 @@
     <meta charset='utf-8'/>
     <title>PR ReSpec Example</title>
     <!-- // <script src='http://w3.dev/2009/dap/ReSpec.js/js/respec.js' class='remove'></script> -->
-    <script src='/node_modules/requirejs/require.js' data-main='/js/profile-w3c-common' async class='remove'></script>
+    <script src='/js/deps/require.js' data-main='/js/profile-w3c-common' async class='remove'></script>
     <!-- // <script src='../builds/respec-w3c-common.js' async class='remove'></script> -->
     <!-- // <script src='//www.w3.org/Tools/respec/respec-w3c-common' async class='remove'></script> -->
     <!-- // <script src='http://darobin.github.com/respec/builds/respec-w3c-common.js' async class='remove'></script> -->

examples/webidl-contiguous.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset='utf-8'/>
     <title>WebIDL Tests</title>
-    <script src='/node_modules/requirejs/require.js' data-main='../js/profile-w3c-common' async class='remove'></script>
+    <script src='/js/deps/require.js' data-main='/js/profile-w3c-common' async class='remove'></script>
     <script class='remove'>
       var respecConfig = {
               specStatus:   "ED"

js/core/base-runner.js

@@ -42,7 +42,7 @@ define(
                         try {
                             respecConfig.preProcess[i].apply(this); }
                         catch (e) {
-                            window.console.error(e);
+                            window.console.error(e.stack || JSON.stringify(e));
                         }
                     }
                 }

js/core/best-practices.js

@@ -5,7 +5,7 @@
 // Best practices are marked up with span.practicelab.
 
 define(
-    ["text!core/css/bp.css", "core/pubsubhub"],
+    ["deps/text!core/css/bp.css", "core/pubsubhub"],
     function (css, pubsubhub) {
         return {
             run:    function (conf, doc, cb) {

js/core/biblio.js

@@ -183,7 +183,7 @@ define(
                     cb();
                     return;
                 }
-                var url = "https://labs.w3.org/specrefs/bibrefs?refs=" + externalRefs.join(",");
+                var url = "https://specref.herokuapp.com/bibrefs?refs=" + externalRefs.join(",");
                 fetch(url)
                     .then(function(response) {
                         return response.json();

js/core/css/github.css

@@ -1 +1 @@
-../../../node_modules/highlightjs/styles/github.css
+../../../node_modules/highlight.js/src/styles/github.css

js/core/examples.js

@@ -7,8 +7,11 @@
 // be used by a containing shell to extract all examples.
 
 define(
-    ["text!core/css/examples.css", "core/pubsubhub"],
-    function (css, pubsubhub) {
+    [
+        "core/pubsubhub",
+        "deps/text!core/css/examples.css",
+    ],
+    function (pubsubhub, css) {
         var makeTitle = function (conf, $el, num, report) {
             var txt = (num > 0) ? " " + num : ""
             ,   $tit = $("<div class='example-title'><span>Example" + txt + "</span></div>");

js/core/highlight.js

@@ -6,8 +6,8 @@ define(
   [
     "core/pubsubhub",
     "core/utils",
-    "highlight",
-    "text!highlightStyles/github.css",
+    "deps/highlight",
+    "deps/text!core/css/github.css",
   ],
   function(pubsubhub, utils, hljs, ghCss) {
     // Opportunistically insert the style into the head to reduce FOUC.

js/core/issues-notes.js

@@ -11,9 +11,12 @@
 // If the configuration has issueBase set to a non-empty string, and issues are
 // manually numbered, a link to the issue is created using issueBase and the issue number
 "use strict";
-define(
-  ["text!core/css/issues-notes.css", "github", "core/pubsubhub"],
-  function(css, github, pubsubhub) {
+define([
+    "core/pubsubhub",
+    "deps/text!core/css/issues-notes.css",
+    "github",
+  ],
+  function(pubsubhub, css, github) {
     return {
       run: function(conf, doc, cb) {
         function handleIssues($ins, ghIssues, issueBase) {

js/core/jquery-enhanced.js

@@ -1,4 +1,8 @@
-define(["jquery","core/utils", "core/pubsubhub"], function($, utils, pubsubhub) {
+define([
+  "core/pubsubhub",
+  "core/utils",
+  "deps/jquery",
+], function(pubsubhub, utils) {
   // --- JQUERY EXTRAS -----------------------------------------------------------------------
   // Applies to any jQuery object containing elements, changes their name to the one give, and
   // return a jQuery object containing the new elements

js/core/markdown.js

@@ -44,18 +44,21 @@
  **/
 "use strict";
 define([
-  "marked",
+  "deps/marked",
   "core/utils",
-  "highlight",
-  "beautify-html",
+  "deps/highlight",
+  "deps/beautify-html",
   "core/beautify-options",
 ], function(marked, utils, hljs, beautify, beautifyOps) {
   var defaultLanguages = Object.freeze([
     "css",
     "html",
+    "http",
     "js",
     "json",
+    "markdown",
     "xml",
+    "xquery",
   ]);
 
   hljs.configure({

js/core/style.js

@@ -11,7 +11,7 @@
 "use strict";
 define(
   [
-    "text!core/css/respec2.css",
+    "deps/text!core/css/respec2.css",
     "core/utils",
   ],
   function(css, utils) {