Update dependencies: browserify to 14.4.0, eslint to 4.2.0, nodeunit to 0.11.1, uglify-js to 3.0.25.

This commit is contained in:
David Anson 2017-07-17 22:23:00 -07:00
parent 0a678d25c1
commit 0211abf1ba
5 changed files with 29 additions and 19 deletions

View file

@ -1,13 +1,14 @@
{ {
"parser": "espree", "parser": "espree",
"ecmaFeatures": {},
"env": { "env": {
"node": true "node": true
}, },
"rules": { "rules": {
"accessor-pairs": "error", "accessor-pairs": "error",
"array-bracket-newline": "error",
"array-bracket-spacing": ["error", "always"], "array-bracket-spacing": ["error", "always"],
"array-callback-return": "error", "array-callback-return": "error",
"array-element-newline": "off",
"arrow-body-style": "error", "arrow-body-style": "error",
"arrow-parens": "error", "arrow-parens": "error",
"arrow-spacing": "error", "arrow-spacing": "error",
@ -32,11 +33,13 @@
"dot-notation": "error", "dot-notation": "error",
"eol-last": "error", "eol-last": "error",
"eqeqeq": "error", "eqeqeq": "error",
"for-direction": "error",
"func-call-spacing": "error", "func-call-spacing": "error",
"func-name-matching": "off", "func-name-matching": "off",
"func-names": "error", "func-names": "error",
"func-style": ["error", "declaration"], "func-style": ["error", "declaration"],
"generator-star-spacing": "error", "generator-star-spacing": "error",
"getter-return": "error",
"global-require": "off", "global-require": "off",
"guard-for-in": "error", "guard-for-in": "error",
"handle-callback-err": "error", "handle-callback-err": "error",
@ -44,6 +47,7 @@
"id-length": "off", "id-length": "off",
"id-match": "error", "id-match": "error",
"indent": ["error", 2, { "SwitchCase": 1 }], "indent": ["error", 2, { "SwitchCase": 1 }],
"indent-legacy": "off",
"init-declarations": "error", "init-declarations": "error",
"jsx-quotes": "error", "jsx-quotes": "error",
"key-spacing": "error", "key-spacing": "error",
@ -69,6 +73,7 @@
"no-array-constructor": "error", "no-array-constructor": "error",
"no-await-in-loop": "error", "no-await-in-loop": "error",
"no-bitwise": "off", "no-bitwise": "off",
"no-buffer-constructor": "error",
"no-caller": "error", "no-caller": "error",
"no-case-declarations": "error", "no-case-declarations": "error",
"no-catch-shadow": "error", "no-catch-shadow": "error",
@ -209,6 +214,7 @@
"operator-assignment": "error", "operator-assignment": "error",
"operator-linebreak": ["error", "after"], "operator-linebreak": ["error", "after"],
"padded-blocks": "off", "padded-blocks": "off",
"padding-line-between-statements": "off",
"prefer-arrow-callback": "off", "prefer-arrow-callback": "off",
"prefer-const": "off", "prefer-const": "off",
"prefer-destructuring": "off", "prefer-destructuring": "off",
@ -227,6 +233,7 @@
"rest-spread-spacing": "error", "rest-spread-spacing": "error",
"semi": "error", "semi": "error",
"semi-spacing": "error", "semi-spacing": "error",
"semi-style": "error",
"sort-imports": "error", "sort-imports": "error",
"sort-keys": "off", "sort-keys": "off",
"sort-vars": "error", "sort-vars": "error",
@ -237,6 +244,7 @@
"space-unary-ops": "error", "space-unary-ops": "error",
"spaced-comment": "error", "spaced-comment": "error",
"strict": "error", "strict": "error",
"switch-colon-spacing": "error",
"symbol-description": "error", "symbol-description": "error",
"template-curly-spacing": "error", "template-curly-spacing": "error",
"template-tag-spacing": "error", "template-tag-spacing": "error",

View file

@ -66,12 +66,12 @@
sanitize(result.errorContext) + sanitize(result.errorContext) +
"\"</span>]" : "\"</span>]" :
""); "");
/* + (result.errorRange ? /* + (result.errorRange ?
" <u style='white-space: pre-wrap'>" + " <u style='white-space: pre-wrap'>" +
lines[result.lineNumber - 1].substr( lines[result.lineNumber - 1].substr(
result.errorRange[0] - 1, result.errorRange[1]) + result.errorRange[0] - 1, result.errorRange[1]) +
"</u>" : "</u>" :
""); */ ""); */
}).join("<br/>"); }).join("<br/>");
} }

View file

@ -356,10 +356,10 @@ function markdownlint(options, callback) {
var strings = options.strings || {}; var strings = options.strings || {};
var config = options.config || { "default": true }; var config = options.config || { "default": true };
var frontMatter = (options.frontMatter === undefined) ? var frontMatter = (options.frontMatter === undefined) ?
shared.frontMatterRe : options.frontMatter; shared.frontMatterRe : options.frontMatter;
var noInlineConfig = !!options.noInlineConfig; var noInlineConfig = !!options.noInlineConfig;
var resultVersion = (options.resultVersion === undefined) ? var resultVersion = (options.resultVersion === undefined) ?
1 : options.resultVersion; 1 : options.resultVersion;
var synchronous = (callback === markdownlintSynchronousCallback); var synchronous = (callback === markdownlintSynchronousCallback);
var results = new Results(); var results = new Results();
// Helper to lint the next file in the array // Helper to lint the next file in the array

View file

@ -26,16 +26,16 @@
"markdown-it": "^8.3.1" "markdown-it": "^8.3.1"
}, },
"devDependencies": { "devDependencies": {
"browserify": "^14.3.0", "browserify": "^14.4.0",
"cpy-cli": "^1.0.1", "cpy-cli": "^1.0.1",
"eslint": "^3.19.0", "eslint": "^4.2.0",
"glob": "^7.1.2", "glob": "^7.1.2",
"istanbul": "^0.4.5", "istanbul": "^0.4.5",
"nodeunit": "^0.11.0", "nodeunit": "^0.11.1",
"q": "^1.5.0", "q": "^1.5.0",
"rimraf": "^2.6.1", "rimraf": "^2.6.1",
"tv4": "^1.3.0", "tv4": "^1.3.0",
"uglify-js": "^3.0.9" "uglify-js": "^3.0.25"
}, },
"keywords": [ "keywords": [
"markdown", "markdown",

View file

@ -1349,9 +1349,10 @@ module.exports.configMultiple = function configMultiple(test) {
markdownlint.readConfig("./test/config-grandparent.json", markdownlint.readConfig("./test/config-grandparent.json",
function callback(err, actual) { function callback(err, actual) {
test.ifError(err); test.ifError(err);
var expected = shared.assign(shared.assign(shared.assign({}, var expected = shared.assign(
require("./config-child.json")), shared.assign(
require("./config-parent.json")), shared.assign({}, require("./config-child.json")),
require("./config-parent.json")),
require("./config-grandparent.json")); require("./config-grandparent.json"));
delete expected.extends; delete expected.extends;
test.deepEqual(actual, expected, "Config object not correct."); test.deepEqual(actual, expected, "Config object not correct.");
@ -1426,9 +1427,10 @@ module.exports.configAbsoluteSync = function configAbsoluteSync(test) {
module.exports.configMultipleSync = function configMultipleSync(test) { module.exports.configMultipleSync = function configMultipleSync(test) {
test.expect(1); test.expect(1);
var actual = markdownlint.readConfigSync("./test/config-grandparent.json"); var actual = markdownlint.readConfigSync("./test/config-grandparent.json");
var expected = shared.assign(shared.assign(shared.assign({}, var expected = shared.assign(
require("./config-child.json")), shared.assign(
require("./config-parent.json")), shared.assign({}, require("./config-child.json")),
require("./config-parent.json")),
require("./config-grandparent.json")); require("./config-grandparent.json"));
delete expected.extends; delete expected.extends;
test.deepEqual(actual, expected, "Config object not correct."); test.deepEqual(actual, expected, "Config object not correct.");