Skip to content

Commit

Permalink
Update deps (#232)
Browse files Browse the repository at this point in the history
* Update deps

* Fix eslint

* Update .travis.yml
  • Loading branch information
fb55 committed May 11, 2018
1 parent a706ab0 commit 27c55b2
Show file tree
Hide file tree
Showing 13 changed files with 131 additions and 134 deletions.
3 changes: 1 addition & 2 deletions .eslintrc
Expand Up @@ -77,8 +77,7 @@
2,
"tab",
{
"SwitchCase": 1,
"VariableDeclarator": 0
"SwitchCase": 1
}
],
"linebreak-style": [
Expand Down
6 changes: 2 additions & 4 deletions .travis.yml
@@ -1,16 +1,14 @@
language: node_js
node_js:
- stable
- unstable
- 10
- 8
- 6
- 4
- 0.12

sudo: false

matrix:
fast_finish: true
allow_failures:
- node_js: unstable

script: npm run coveralls
6 changes: 3 additions & 3 deletions lib/FeedHandler.js
@@ -1,6 +1,6 @@
var index = require("./index.js"),
DomHandler = index.DomHandler,
DomUtils = index.DomUtils;
var index = require("./index.js");
var DomHandler = index.DomHandler;
var DomUtils = index.DomUtils;

//TODO: make this a streamable handler
function FeedHandler(callback, options){
Expand Down
8 changes: 4 additions & 4 deletions lib/Parser.js
Expand Up @@ -106,11 +106,11 @@ function Parser(cbs, options){
this.endIndex = null;

this._lowerCaseTagNames = "lowerCaseTags" in this._options ?
!!this._options.lowerCaseTags :
!this._options.xmlMode;
!!this._options.lowerCaseTags :
!this._options.xmlMode;
this._lowerCaseAttributeNames = "lowerCaseAttributeNames" in this._options ?
!!this._options.lowerCaseAttributeNames :
!this._options.xmlMode;
!!this._options.lowerCaseAttributeNames :
!this._options.xmlMode;

if(this._options.Tokenizer) {
Tokenizer = this._options.Tokenizer;
Expand Down
172 changes: 86 additions & 86 deletions lib/Tokenizer.js
@@ -1,88 +1,88 @@
module.exports = Tokenizer;

var decodeCodePoint = require("entities/lib/decode_codepoint.js"),
entityMap = require("entities/maps/entities.json"),
legacyMap = require("entities/maps/legacy.json"),
xmlMap = require("entities/maps/xml.json"),

i = 0,

TEXT = i++,
BEFORE_TAG_NAME = i++, //after <
IN_TAG_NAME = i++,
IN_SELF_CLOSING_TAG = i++,
BEFORE_CLOSING_TAG_NAME = i++,
IN_CLOSING_TAG_NAME = i++,
AFTER_CLOSING_TAG_NAME = i++,

//attributes
BEFORE_ATTRIBUTE_NAME = i++,
IN_ATTRIBUTE_NAME = i++,
AFTER_ATTRIBUTE_NAME = i++,
BEFORE_ATTRIBUTE_VALUE = i++,
IN_ATTRIBUTE_VALUE_DQ = i++, // "
IN_ATTRIBUTE_VALUE_SQ = i++, // '
IN_ATTRIBUTE_VALUE_NQ = i++,

//declarations
BEFORE_DECLARATION = i++, // !
IN_DECLARATION = i++,

//processing instructions
IN_PROCESSING_INSTRUCTION = i++, // ?

//comments
BEFORE_COMMENT = i++,
IN_COMMENT = i++,
AFTER_COMMENT_1 = i++,
AFTER_COMMENT_2 = i++,

//cdata
BEFORE_CDATA_1 = i++, // [
BEFORE_CDATA_2 = i++, // C
BEFORE_CDATA_3 = i++, // D
BEFORE_CDATA_4 = i++, // A
BEFORE_CDATA_5 = i++, // T
BEFORE_CDATA_6 = i++, // A
IN_CDATA = i++, // [
AFTER_CDATA_1 = i++, // ]
AFTER_CDATA_2 = i++, // ]

//special tags
BEFORE_SPECIAL = i++, //S
BEFORE_SPECIAL_END = i++, //S

BEFORE_SCRIPT_1 = i++, //C
BEFORE_SCRIPT_2 = i++, //R
BEFORE_SCRIPT_3 = i++, //I
BEFORE_SCRIPT_4 = i++, //P
BEFORE_SCRIPT_5 = i++, //T
AFTER_SCRIPT_1 = i++, //C
AFTER_SCRIPT_2 = i++, //R
AFTER_SCRIPT_3 = i++, //I
AFTER_SCRIPT_4 = i++, //P
AFTER_SCRIPT_5 = i++, //T

BEFORE_STYLE_1 = i++, //T
BEFORE_STYLE_2 = i++, //Y
BEFORE_STYLE_3 = i++, //L
BEFORE_STYLE_4 = i++, //E
AFTER_STYLE_1 = i++, //T
AFTER_STYLE_2 = i++, //Y
AFTER_STYLE_3 = i++, //L
AFTER_STYLE_4 = i++, //E

BEFORE_ENTITY = i++, //&
BEFORE_NUMERIC_ENTITY = i++, //#
IN_NAMED_ENTITY = i++,
IN_NUMERIC_ENTITY = i++,
IN_HEX_ENTITY = i++, //X

j = 0,

SPECIAL_NONE = j++,
SPECIAL_SCRIPT = j++,
SPECIAL_STYLE = j++;
var decodeCodePoint = require("entities/lib/decode_codepoint.js");
var entityMap = require("entities/maps/entities.json");
var legacyMap = require("entities/maps/legacy.json");
var xmlMap = require("entities/maps/xml.json");

var i = 0;

var TEXT = i++;
var BEFORE_TAG_NAME = i++; //after <
var IN_TAG_NAME = i++;
var IN_SELF_CLOSING_TAG = i++;
var BEFORE_CLOSING_TAG_NAME = i++;
var IN_CLOSING_TAG_NAME = i++;
var AFTER_CLOSING_TAG_NAME = i++;

//attributes
var BEFORE_ATTRIBUTE_NAME = i++;
var IN_ATTRIBUTE_NAME = i++;
var AFTER_ATTRIBUTE_NAME = i++;
var BEFORE_ATTRIBUTE_VALUE = i++;
var IN_ATTRIBUTE_VALUE_DQ = i++; // "
var IN_ATTRIBUTE_VALUE_SQ = i++; // '
var IN_ATTRIBUTE_VALUE_NQ = i++;

//declarations
var BEFORE_DECLARATION = i++; // !
var IN_DECLARATION = i++;

//processing instructions
var IN_PROCESSING_INSTRUCTION = i++; // ?

//comments
var BEFORE_COMMENT = i++;
var IN_COMMENT = i++;
var AFTER_COMMENT_1 = i++;
var AFTER_COMMENT_2 = i++;

//cdata
var BEFORE_CDATA_1 = i++; // [
var BEFORE_CDATA_2 = i++; // C
var BEFORE_CDATA_3 = i++; // D
var BEFORE_CDATA_4 = i++; // A
var BEFORE_CDATA_5 = i++; // T
var BEFORE_CDATA_6 = i++; // A
var IN_CDATA = i++; // [
var AFTER_CDATA_1 = i++; // ]
var AFTER_CDATA_2 = i++; // ]

//special tags
var BEFORE_SPECIAL = i++; //S
var BEFORE_SPECIAL_END = i++; //S

var BEFORE_SCRIPT_1 = i++; //C
var BEFORE_SCRIPT_2 = i++; //R
var BEFORE_SCRIPT_3 = i++; //I
var BEFORE_SCRIPT_4 = i++; //P
var BEFORE_SCRIPT_5 = i++; //T
var AFTER_SCRIPT_1 = i++; //C
var AFTER_SCRIPT_2 = i++; //R
var AFTER_SCRIPT_3 = i++; //I
var AFTER_SCRIPT_4 = i++; //P
var AFTER_SCRIPT_5 = i++; //T

var BEFORE_STYLE_1 = i++; //T
var BEFORE_STYLE_2 = i++; //Y
var BEFORE_STYLE_3 = i++; //L
var BEFORE_STYLE_4 = i++; //E
var AFTER_STYLE_1 = i++; //T
var AFTER_STYLE_2 = i++; //Y
var AFTER_STYLE_3 = i++; //L
var AFTER_STYLE_4 = i++; //E

var BEFORE_ENTITY = i++; //&
var BEFORE_NUMERIC_ENTITY = i++; //#
var IN_NAMED_ENTITY = i++;
var IN_NUMERIC_ENTITY = i++;
var IN_HEX_ENTITY = i++; //X

var j = 0;

var SPECIAL_NONE = j++;
var SPECIAL_SCRIPT = j++;
var SPECIAL_STYLE = j++;

function whitespace(c){
return c === " " || c === "\n" || c === "\t" || c === "\f" || c === "\r";
Expand Down Expand Up @@ -179,7 +179,7 @@ Tokenizer.prototype._stateBeforeTagName = function(c){
this._sectionStart = this._index + 1;
} else {
this._state = (!this._xmlMode && (c === "s" || c === "S")) ?
BEFORE_SPECIAL : IN_TAG_NAME;
BEFORE_SPECIAL : IN_TAG_NAME;
this._sectionStart = this._index;
}
};
Expand Down Expand Up @@ -328,8 +328,8 @@ Tokenizer.prototype._stateInAttributeValueNoQuotes = function(c){

Tokenizer.prototype._stateBeforeDeclaration = function(c){
this._state = c === "[" ? BEFORE_CDATA_1 :
c === "-" ? BEFORE_COMMENT :
IN_DECLARATION;
c === "-" ? BEFORE_COMMENT :
IN_DECLARATION;
};

Tokenizer.prototype._stateInDeclaration = function(c){
Expand Down
8 changes: 4 additions & 4 deletions lib/WritableStream.js
@@ -1,9 +1,9 @@
module.exports = Stream;

var Parser = require("./Parser.js"),
WritableStream = require("stream").Writable || require("readable-stream").Writable,
StringDecoder = require("string_decoder").StringDecoder,
Buffer = require("buffer").Buffer;
var Parser = require("./Parser.js");
var WritableStream = require("stream").Writable || require("readable-stream").Writable;
var StringDecoder = require("string_decoder").StringDecoder;
var Buffer = require("buffer").Buffer;

function Stream(cbs, options){
var parser = this._parser = new Parser(cbs, options);
Expand Down
4 changes: 2 additions & 2 deletions lib/index.js
@@ -1,5 +1,5 @@
var Parser = require("./Parser.js"),
DomHandler = require("domhandler");
var Parser = require("./Parser.js");
var DomHandler = require("domhandler");

function defineProp(name, value){
delete module.exports[name];
Expand Down
6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -43,10 +43,10 @@
"readable-stream": "^2.0.2"
},
"devDependencies": {
"coveralls": "^2.11.4",
"coveralls": "^3.0.1",
"eslint": "^4.19.1",
"istanbul": "^0.4.3",
"mocha": "^2.2.5",
"eslint": "^2.12.0",
"mocha": "^5.1.1",
"mocha-lcov-reporter": "^1.2.0"
},
"browser": {
Expand Down
10 changes: 5 additions & 5 deletions test/02-stream.js
@@ -1,7 +1,7 @@
var helper = require("./test-helper.js"),
Stream = require("..").WritableStream,
fs = require("fs"),
path = require("path");
var helper = require("./test-helper.js");
var Stream = require("..").WritableStream;
var fs = require("fs");
var path = require("path");

helper.mochaTest("Stream", __dirname, function(test, cb){
var filePath = path.join(__dirname, "Documents", test.file);
Expand All @@ -18,6 +18,6 @@ helper.mochaTest("Stream", __dirname, function(test, cb){
else stream.end(data);
});
}
), test.options)
), test.options)
).on("error", cb);
});
8 changes: 4 additions & 4 deletions test/03-feed.js
@@ -1,9 +1,9 @@
//Runs tests for feeds

var helper = require("./test-helper.js"),
FeedHandler = require("..").RssHandler,
fs = require("fs"),
path = require("path");
var helper = require("./test-helper.js");
var FeedHandler = require("..").RssHandler;
var fs = require("fs");
var path = require("path");

helper.mochaTest("Feeds", __dirname, function(test, cb){
fs.readFile(
Expand Down
4 changes: 2 additions & 2 deletions test/api.js
@@ -1,5 +1,5 @@
var htmlparser2 = require(".."),
assert = require("assert");
var htmlparser2 = require("..");
var assert = require("assert");

describe("API", function(){

Expand Down
26 changes: 13 additions & 13 deletions test/test-helper.js
@@ -1,9 +1,9 @@
var htmlparser2 = require(".."),
fs = require("fs"),
path = require("path"),
assert = require("assert"),
Parser = htmlparser2.Parser,
CollectingHandler = htmlparser2.CollectingHandler;
var htmlparser2 = require("..");
var fs = require("fs");
var path = require("path");
var assert = require("assert");
var Parser = htmlparser2.Parser;
var CollectingHandler = htmlparser2.CollectingHandler;

exports.writeToParser = function(handler, options, data){
var parser = new Parser(handler, options);
Expand Down Expand Up @@ -66,13 +66,13 @@ exports.mochaTest = function(name, root, test){
var dir = path.join(root, name);

fs
.readdirSync(dir)
.filter(RegExp.prototype.test, /^[^\._]/) //ignore all files with a leading dot or underscore
.map(function(name){
return path.join(dir, name);
})
.map(require)
.forEach(runTest);
.readdirSync(dir)
.filter(RegExp.prototype.test, /^[^._]/) //ignore all files with a leading dot or underscore
.map(function(name){
return path.join(dir, name);
})
.map(require)
.forEach(runTest);
}

function runTest(file){
Expand Down
4 changes: 2 additions & 2 deletions test/unicode.js
@@ -1,5 +1,5 @@
var htmlparser2 = require(".."),
assert = require("assert");
var htmlparser2 = require("..");
var assert = require("assert");

describe("WritableStream", function(){

Expand Down

0 comments on commit 27c55b2

Please sign in to comment.