Merge branch 'develop' into gh-pages

* develop: v11.4.2 chore(.travis): switch to yarn (#1187) fix(core/webidl): fix link to HTML spec (#1191) chore(package): update dependencies docs: Fix a typo in README.md (#1188) Feat: Use Process 2017 in the starter spec (#1189) docs: http -> https (#1190) chore(.travis): cache node modules fix(karma): filter ordering broke Travis chore(deps/highlighter): updated highlighter Revert "security(.travis.yaml): run synk at install time" chore(package): drop back to WebIDL 2.2.0 security(.travis.yaml): run synk at install time chore(pacakge): temporarily lock webidl2.js version chore(pacakge): temporarily lock webidl2.js version refactor(best-practices-spec): unjquery Revert "chore(package): update deps" chore(deps/highlighter): patched highlighter chore(package): update deps chore(package): update deps
w3c · May 1, 2017 · fb64311 · fb64311
2 parents 5112934 + da7c142
commit fb64311
Show file tree

Hide file tree

Showing 12 changed files with 1,090 additions and 504 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ node_js:
   - v6.10
 
 install:
-  - npm install
+  - yarn install
 
 before_install:
   - "export DISPLAY=:99.0"
@@ -29,7 +29,9 @@ addons:
       - google-chrome-stable
 
 script:
-  - npm run pretest
-  - npm run build
-  - npm run test:headless
+  - yarn run pretest
+  - yarn run build
+  - yarn run test:headless
   - travis_retry karma start --single-run --reporters mocha karma.conf.js
+
+cache: yarn
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting one of the [W3C Obuds](http://www.w3.org/Consortium/pwe/#ombuds)
+reported by contacting one of the [W3C Ombuds](https://www.w3.org/Consortium/pwe/#ombuds)
 or one of the Maintainers:
 
  * [Marcos Caceres](mailto:marcos@marcosc.com)
@@ -64,7 +64,7 @@ or one of the Maintainers:
  * [Dominique Hazaël-Massieux](mailto:dom@w3.org)
 
 All complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances (see [Procedures](http://www.w3.org/Consortium/pwe/#Procedures)).
+is deemed necessary and appropriate to the circumstances (see [Procedures](https://www.w3.org/Consortium/pwe/#Procedures)).
 The maintainers and W3C are obligated to maintain confidentiality with regard
 to the reporter of an incident. Further details of specific enforcement policies
 may be posted separately.

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ We have extensive documentation on [how to use ReSpec](https://github.com/w3c/re
 If you are new to spec writing, we strongly encourage you to read:
 
   * [API Design Principles](https://w3ctag.github.io/design-principles/)
-  * [Writing Promise-Using Specifications](http://www.w3.org/2001/tag/doc/promises-guide)
+  * [Writing Promise-Using Specifications](https://www.w3.org/2001/tag/doc/promises-guide)
   * [Privacy and Security Self-Review Questionnaire](https://w3ctag.github.io/security-questionnaire/)
 
 ## Getting help
@@ -37,11 +37,11 @@ content.
 ## Bibliographical references
 
 Bibliographical references have been moved out of ReSpec. You want to use
-[speref.org](http://www.specref.org/).
+[specref.org](http://www.specref.org/).
 
 ## Want to see complete documentation?
 
-[Documentation for ReSpec](http://github.com/w3c/respec/wiki/) is available in our wiki.
+[Documentation for ReSpec](https://github.com/w3c/respec/wiki) is available in our wiki.
 
 ## Contribute
 Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
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/examples/starter.html b/examples/starter.html
@@ -11,7 +11,7 @@
           name: "Your Name",
           url: "http://your-site.com",
         }],
-        processVersion: 2015,
+        processVersion: 2017,
         edDraftURI: "http://some.github.repo",
         shortName: "dahut"
       };

diff --git a/js/deps/highlight.js b/js/deps/highlight.js
@@ -1,4 +1,4 @@
-/*! highlight.js v9.10.0 | BSD3 License | git.io/hljslicense */
+/*! highlight.js v9.11.0 | BSD3 License | git.io/hljslicense */
 (function(factory) {
 
   // Find the global object for export to both the browser and web workers.
@@ -47,19 +47,11 @@
     languages: undefined
   };
 
-  // Object map that is used to escape some common HTML characters.
-  var escapeRegexMap = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;'
-  };
 
   /* Utility functions */
 
   function escape(value) {
-    return value.replace(/[&<>]/gm, function(character) {
-      return escapeRegexMap[character];
-    });
+    return value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
   }
 
   function tag(node) {
@@ -176,7 +168,7 @@
     }
 
     function open(node) {
-      function attr_str(a) {return ' ' + a.nodeName + '="' + escape(a.value) + '"';}
+      function attr_str(a) {return ' ' + a.nodeName + '="' + escape(a.value).replace('"', '&quot;') + '"';}
       result += '<' + tag(node) + ArrayProto.map.call(node.attributes, attr_str).join('') + '>';
     }
 
@@ -737,7 +729,7 @@
     contains: [hljs.BACKSLASH_ESCAPE]
   };
   hljs.PHRASAL_WORDS_MODE = {
-    begin: /\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|like)\b/
+    begin: /\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/
   };
   hljs.COMMENT = function (begin, end, inherits) {
     var mode = hljs.inherit(

diff --git a/karma.conf.js b/karma.conf.js
@@ -28,7 +28,10 @@ module.exports = function (config) {
     },
 
     // list of files / patterns to load in the browser
-    files: [{
+    files: [
+      "js/deps/jquery.js",
+      "js/deps/fetch.js",
+      {
         pattern: "builds/**/*.*",
         included: false,
         served: true,
@@ -49,8 +52,6 @@ module.exports = function (config) {
         included: false,
         served: true,
       },
-      "js/deps/jquery.js",
-      "js/deps/fetch.js",
       "tests/spec/SpecHelper.js",
       "tests/test-main.js",
     ],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "respec",
-  "version": "11.4.1",
+  "version": "11.4.2",
   "license": "W3C",
   "description": "A technical specification pre-processor.",
   "engines": {
@@ -15,23 +15,23 @@
   },
   "author": "Robin Berjon",
   "devDependencies": {
-    "babel-cli": "^6.24.0",
-    "clipboard": "^1.6.1",
-    "babel-plugin-transform-async-to-generator": "^6.22.0",
-    "babel-plugin-transform-es2015-modules-amd": "^6.24.0",
-    "babel-preset-env": "^1.3.2",
+    "babel-cli": "^6.24.1",
+    "babel-plugin-transform-async-to-generator": "^6.24.1",
+    "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+    "babel-preset-env": "^1.4.0",
     "chai": "^3.5.0",
+    "clipboard": "^1.6.1",
     "domReady": "github:requirejs/domReady",
     "glob": "^7.1.1",
-    "handlebars": "^4.0.6",
+    "handlebars": "^4.0.7",
     "http-server": "^0.9.0",
-    "jasmine-core": "^2.5.2",
+    "jasmine-core": "^2.6.1",
     "jasmine-reporters": "^2.2.1",
     "jquery": "^3.2.1",
     "js-beautify": "^1.6.12",
     "jscs": "^3.0.7",
     "jshint": "^2.9.4",
-    "karma": "^1.5.0",
+    "karma": "^1.6.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-detect-browsers": "^2.2.5",
     "karma-edge-launcher": "^0.4.1",
@@ -44,12 +44,12 @@
     "karma-safari-launcher": "^1.0.0",
     "karma-safaritechpreview-launcher": "0.0.5",
     "karma-verbose-summary-reporter": "0.0.1",
-    "mocha": "^3.2.0",
+    "mocha": "^3.3.0",
     "moment": "^2.18.1",
     "requirejs": "^2.3.3",
     "text": "github:requirejs/text",
-    "uglify-js": "^2.8.21",
-    "webidl2": "^2.3.0",
+    "uglify-js": "^2.8.22",
+    "webidl2": "2.2.0",
     "whatwg-fetch": "^2.0.3"
   },
   "scripts": {
@@ -79,7 +79,7 @@
   },
   "dependencies": {
     "colors": "^1.1.2",
-    "command-line-args": "^4.0.2",
+    "command-line-args": "^4.0.3",
     "command-line-usage": "^4.0.0",
     "epipebomb": "^1.0.0",
     "express": "^4.15.2",
@@ -90,7 +90,7 @@
     "marked": "^0.3.6",
     "nightmare": "^2.10.0",
     "prompt": "^1.0.0",
-    "snyk": "^1.26.1"
+    "snyk": "^1.29.0"
   },
   "snyk": true
 }
diff --git a/src/core/webidl.js b/src/core/webidl.js
@@ -234,13 +234,13 @@ function typeIsWhitespace(webIdlType) {
 }
 
 const extenedAttributesLinks = new Map([
-  ["CEReactions", "HTML51#cereactions"],
+  ["CEReactions", "HTML#cereactions"],
   ["Clamp", "WEBIDL#Clamp"],
   ["Constructor", "WEBIDL#Constructor"],
   ["EnforceRange", "WEBIDL#EnforceRange"],
   ["Exposed", "WEBIDL#Exposed"],
   ["Global", "WEBIDL#Global"],
-  ["HTMLConstructor", "HTML51#htmlconstructor"],
+  ["HTMLConstructor", "HTML#htmlconstructor"],
   ["LegacyArrayClass", "WEBIDL-LS#LegacyArrayClass"],
   ["LegacyUnenumerableNamedProperties", "WEBIDL-LS#LegacyUnenumerableNamedProperties"],
   ["LenientSetter", "WEBIDL-LS#LenientSetter"],

diff --git a/tests/spec/core/best-practices-spec.js b/tests/spec/core/best-practices-spec.js
@@ -16,11 +16,11 @@ describe("Core — Best Practices", function() {
     };
     makeRSDoc(ops, function(doc) {
       var pls = doc.body.querySelectorAll("span.practicelab");
-      var $bps = $("#bp-summary", doc);
+      var bps = doc.querySelector("#bp-summary");
       expect(pls.item(0).textContent).toEqual("Best Practice 1: BP1");
       expect(pls.item(1).textContent).toEqual("Best Practice 2: BP2");
-      expect($bps.find("h2, h3, h4, h5, h6").text()).toEqual("Best Practices Summary");
-      expect($bps.find("ul li").length).toEqual(2);
+      expect(bps.querySelector("h2, h3, h4, h5, h6").textContent).toEqual("Best Practices Summary");
+      expect(bps.querySelectorAll("ul li").length).toEqual(2);
     }).then(done);
   });
 });