Skip to content

Commit

Permalink
Merge branch 'develop' into gh-pages
Browse files Browse the repository at this point in the history
* develop:
  v6.1.5
  chore(package): update snyk to version 1.21.2 (#980)
  chore(package): update snyk to version 1.21.1 (#979)
  fix: kill nightmare if response.code not 200 or doc is not a respec doc (#977)
  chore(fetch): patch to latest
  chore(package): update deps
  chore(CHANGELOG): regenerate
  fix: allow karma-edge-launcher on local tests (#963)
  chore(package): update snyk to version 1.20.0 (#974)
  • Loading branch information
marcoscaceres committed Nov 30, 2016
2 parents 51f63a8 + 9e04c6c commit 6399664
Show file tree
Hide file tree
Showing 7 changed files with 113 additions and 33 deletions.
70 changes: 70 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,75 @@
# Change Log

## [v6.1.4](https://github.com/w3c/respec/tree/v6.1.4) (2016-11-17)
[Full Changelog](https://github.com/w3c/respec/compare/v6.1.3...v6.1.4)

**Implemented enhancements:**

- Updated W3C translations link [\#973](https://github.com/w3c/respec/pull/973) ([plehegar](https://github.com/plehegar))

## [v6.1.3](https://github.com/w3c/respec/tree/v6.1.3) (2016-11-17)
[Full Changelog](https://github.com/w3c/respec/compare/v6.1.2...v6.1.3)

**Fixed bugs:**

- Travis and git+ssh: github uris [\#972](https://github.com/w3c/respec/issues/972)

## [v6.1.2](https://github.com/w3c/respec/tree/v6.1.2) (2016-11-10)
[Full Changelog](https://github.com/w3c/respec/compare/v6.1.1...v6.1.2)

**Merged pull requests:**

- Update fs-promise to version 1.0.0 🚀 [\#968](https://github.com/w3c/respec/pull/968) ([greenkeeperio-bot](https://github.com/greenkeeperio-bot))
- karma-detect-browsers@2.2.2 breaks build 🚨 [\#967](https://github.com/w3c/respec/pull/967) ([greenkeeperio-bot](https://github.com/greenkeeperio-bot))

## [v6.1.1](https://github.com/w3c/respec/tree/v6.1.1) (2016-11-08)
[Full Changelog](https://github.com/w3c/respec/compare/v6.1.0...v6.1.1)

## [v6.1.0](https://github.com/w3c/respec/tree/v6.1.0) (2016-11-04)
[Full Changelog](https://github.com/w3c/respec/compare/v6.0.2...v6.1.0)

**Fixed bugs:**

- Deprecate lc related things [\#953](https://github.com/w3c/respec/issues/953)

**Closed issues:**

- "Unable to test GitHub repository" on Snyk site [\#960](https://github.com/w3c/respec/issues/960)
- Example style gets broken [\#958](https://github.com/w3c/respec/issues/958)
- Make copydeps.sh Windows compatible [\#954](https://github.com/w3c/respec/issues/954)
- Add developers guide [\#931](https://github.com/w3c/respec/issues/931)
- Ol' school web idl deprecation warning is pointing to wrong palce [\#874](https://github.com/w3c/respec/issues/874)
- User's guide needs cleanup [\#858](https://github.com/w3c/respec/issues/858)
- About ReSpec should use package.json [\#642](https://github.com/w3c/respec/issues/642)

**Merged pull requests:**

- BREAKING CHANGE: remove LC as status \(closes \#953\) [\#962](https://github.com/w3c/respec/pull/962) ([marcoscaceres](https://github.com/marcoscaceres))
- Use http-server in the start and server scripts [\#961](https://github.com/w3c/respec/pull/961) ([nickmccurdy](https://github.com/nickmccurdy))
- Fixes for Windows testing [\#959](https://github.com/w3c/respec/pull/959) ([nickmccurdy](https://github.com/nickmccurdy))
- refactor\(copydeps\): convert to nodejs script \(closes \#954\) [\#957](https://github.com/w3c/respec/pull/957) ([marcoscaceres](https://github.com/marcoscaceres))
- Style optimization [\#955](https://github.com/w3c/respec/pull/955) ([marcoscaceres](https://github.com/marcoscaceres))

## [v6.0.2](https://github.com/w3c/respec/tree/v6.0.2) (2016-10-31)
[Full Changelog](https://github.com/w3c/respec/compare/v6.0.1...v6.0.2)

**Merged pull requests:**

- fix\(save-html\): buttonCSS variable was undefined [\#956](https://github.com/w3c/respec/pull/956) ([marcoscaceres](https://github.com/marcoscaceres))

## [v6.0.1](https://github.com/w3c/respec/tree/v6.0.1) (2016-10-31)
[Full Changelog](https://github.com/w3c/respec/compare/v6.0.0...v6.0.1)

**Closed issues:**

- Using respec for non-w3c specs [\#950](https://github.com/w3c/respec/issues/950)
- Safari no longer rendering ReSpec and gives an error [\#949](https://github.com/w3c/respec/issues/949)

**Merged pull requests:**

- feat\(.travis.yml\): use yarn instead of npm for install [\#947](https://github.com/w3c/respec/pull/947) ([marcoscaceres](https://github.com/marcoscaceres))
- Update epipebomb to version 1.0.0 🚀 [\#946](https://github.com/w3c/respec/pull/946) ([greenkeeperio-bot](https://github.com/greenkeeperio-bot))

## [v6.0.0](https://github.com/w3c/respec/tree/v6.0.0) (2016-10-12)
[Full Changelog](https://github.com/w3c/respec/compare/v5.1.0...v6.0.0)

Expand Down
2 changes: 1 addition & 1 deletion builds/respec-w3c-common.build.js.map

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions builds/respec-w3c-common.js

Large diffs are not rendered by default.

32 changes: 19 additions & 13 deletions js/deps/fetch.js
Expand Up @@ -178,6 +178,16 @@
return promise
}

function readArrayBufferAsText(buf) {
var view = new Uint8Array(buf)
var chars = new Array(view.length)

for (var i = 0; i < view.length; i++) {
chars[i] = String.fromCharCode(view[i])
}
return chars.join('')
}

function bufferClone(buf) {
if (buf.slice) {
return buf.slice(0)
Expand Down Expand Up @@ -241,6 +251,14 @@
return Promise.resolve(new Blob([this._bodyText]))
}
}

this.arrayBuffer = function() {
if (this._bodyArrayBuffer) {
return consumed(this) || Promise.resolve(this._bodyArrayBuffer)
} else {
return this.blob().then(readBlobAsArrayBuffer)
}
}
}

this.text = function() {
Expand All @@ -252,26 +270,14 @@
if (this._bodyBlob) {
return readBlobAsText(this._bodyBlob)
} else if (this._bodyArrayBuffer) {
var view = new Uint8Array(this._bodyArrayBuffer)
var str = String.fromCharCode.apply(null, view)
return Promise.resolve(str)
return Promise.resolve(readArrayBufferAsText(this._bodyArrayBuffer))
} else if (this._bodyFormData) {
throw new Error('could not read FormData body as text')
} else {
return Promise.resolve(this._bodyText)
}
}

if (support.arrayBuffer) {
this.arrayBuffer = function() {
if (this._bodyArrayBuffer) {
return consumed(this) || Promise.resolve(this._bodyArrayBuffer)
} else {
return this.blob().then(readBlobAsArrayBuffer)
}
}
}

if (support.formData) {
this.formData = function() {
return this.text().then(decode)
Expand Down
4 changes: 3 additions & 1 deletion karma.conf.js
Expand Up @@ -22,7 +22,9 @@ module.exports = function(config) {
enabled: true,
usePhantomJS: false,
postDetection(browsers){
return browsers;
return browsers
// Remove IE
.filter(browser => browser !== 'IE');
}
},

Expand Down
16 changes: 8 additions & 8 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "respec",
"version": "6.1.4",
"version": "6.1.5",
"license": "W3C",
"description": "A technical specification pre-processor.",
"engines": {
Expand All @@ -17,7 +17,7 @@
"devDependencies": {
"chai": "^3.5.0",
"domReady": "github:requirejs/domReady",
"handlebars": "^4.0.5",
"handlebars": "^4.0.6",
"http-server": "^0.9.0",
"jasmine-core": "^2.5.2",
"jasmine-reporters": "^2.2.0",
Expand All @@ -27,25 +27,25 @@
"jshint": "^2.9.4",
"karma": "^1.3.0",
"karma-chrome-launcher": "^2.0.0",
"karma-detect-browsers": "^2.2.2",
"karma-detect-browsers": "^2.2.3",
"karma-edge-launcher": "^0.1.1",
"karma-firefox-launcher": "^1.0.0",
"karma-ie-launcher": "^1.0.0",
"karma-jasmine": "^1.0.2",
"karma-mocha": "^1.3.0",
"karma-mocha-reporter": "^2.2.0",
"karma-mocha-reporter": "^2.2.1",
"karma-opera-launcher": "^1.0.0",
"karma-requirejs": "^1.1.0",
"karma-safari-launcher": "^1.0.0",
"karma-safaritechpreview-launcher": "0.0.5",
"karma-verbose-summary-reporter": "0.0.1",
"mocha": "^3.1.2",
"moment": "^2.15.2",
"moment": "^2.16.0",
"promise-polyfill": "^6.0.2",
"requirejs": "^2.3.2",
"text": "github:requirejs/text",
"uglify-js": "^2.7.4",
"webidl2": "^2.0.11",
"whatwg-fetch": "^2.0.0"
"whatwg-fetch": "^2.0.1"
},
"scripts": {
"build": "npm run build:highlight && npm run build:respec-w3c-common",
Expand Down Expand Up @@ -80,7 +80,7 @@
"marked": "^0.3.6",
"nightmare": "^2.8.1",
"prompt": "^1.0.0",
"snyk": "1.19.1"
"snyk": "1.21.2"
},
"snyk": true
}
2 changes: 2 additions & 0 deletions tools/respecDocWriter.js
Expand Up @@ -96,6 +96,7 @@ const tasks = {
if (response.code !== 200) {
const warn = colors.warn(`📡 HTTP Error ${response.code}:`);
const msg = `${warn} ${colors.debug(url)}`;
nightmare.proc.kill();
throw new Error(msg);
}
const isRespecDoc = yield nightmare
Expand All @@ -113,6 +114,7 @@ const tasks = {
});
if(!isRespecDoc){
const msg = `${colors.warn("💣 Not a ReSpec source document?")} ${colors.debug(url)}`;
nightmare.proc.kill();
throw new Error(msg);
}
const html = yield nightmare
Expand Down

0 comments on commit 6399664

Please sign in to comment.