Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Mercury Parser Changelog

### 2.0.0 (Feb 13, 2019)

##### Commits

- [[`2afd8c9fa8`](https://github.com/postlight/mercury-parser/commit/2afd8c9fa8)] - **fix**: jquery doesn't like the case insensitive selector (#274) (Adam Pash)
- [[`9bf88b0ba3`](https://github.com/postlight/mercury-parser/commit/9bf88b0ba3)] - **chore**: refactor format output adjustments (#272) (Adam Pash)
- [[`867623ab33`](https://github.com/postlight/mercury-parser/commit/867623ab33)] - **chore**: add files to package.json (#269) (David Brownman)
- [[`ab56ce0de3`](https://github.com/postlight/mercury-parser/commit/ab56ce0de3)] - **fix**: custom parser generator (#271) (Adam Pash)
- [[`0e27448866`](https://github.com/postlight/mercury-parser/commit/0e27448866)] - **feat**: Various Character Encoding Improvements (#270) (Ben Ubois)
- [[`b3fa18b6d9`](https://github.com/postlight/mercury-parser/commit/b3fa18b6d9)] - **docs**: delete extra semicolon (#266) (Madison Kanna)
- [[`e033835c72`](https://github.com/postlight/mercury-parser/commit/e033835c72)] - **fix**: parse signature in cli (#259) (Adam Pash)
- [[`32748ad4c5`](https://github.com/postlight/mercury-parser/commit/32748ad4c5)] - **dx**: add .prettierignore (#258) (Adam Pash)
- [[`2d0f10a888`](https://github.com/postlight/mercury-parser/commit/2d0f10a888)] - **dx**: add .prettierignore (#257) (Adam Pash)
- [[`9b0664bc91`](https://github.com/postlight/mercury-parser/commit/9b0664bc91)] - **feat**: add content format output options (#256) (Adam Pash)
- [[`a57f29eec3`](https://github.com/postlight/mercury-parser/commit/a57f29eec3)] - **release**: 1.1.1 (#254) (Adam Pash)

### 1.1.1 (Feb 7, 2019)

##### Commits
Expand Down
3 changes: 2 additions & 1 deletion dist/mercury.js
Original file line number Diff line number Diff line change
Expand Up @@ -1705,7 +1705,8 @@ var Resource = {
var decodedContent = iconv.decode(content, encoding);
var $ = cheerio.load(decodedContent); // after first cheerio.load, check to see if encoding matches

var metaContentType = $('meta[http-equiv=content-type i]').attr('content') || $('meta[charset]').attr('charset');
var contentTypeSelector = cheerio.browser ? 'meta[http-equiv=content-type]' : 'meta[http-equiv=content-type i]';
var metaContentType = $(contentTypeSelector).attr('content') || $('meta[charset]').attr('charset');
var properEncoding = getEncoding(metaContentType); // if encodings in the header/body dont match, use the one in the body

if (metaContentType && properEncoding !== encoding) {
Expand Down
2 changes: 1 addition & 1 deletion dist/mercury.web.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@postlight/mercury-parser",
"version": "1.1.1",
"version": "2.0.0",
"description": "Mercury transforms web pages into clean text. Publishers and programmers use it to make the web make sense, and readers use it to read any web article comfortably.",
"author": "Postlight <mercury@postlight.com>",
"homepage": "https://mercury.postlight.com",
Expand Down