Merge pull request #360 from twbs/deps

Update dependencies.
This commit is contained in:
XhmikosR 2016-03-14 10:41:34 +02:00
Родитель 9da4bd59cd 043509d688
Коммит 3960b0d946
10 изменённых файлов: 1718 добавлений и 1596 удалений

Просмотреть файл

@ -1,15 +1,19 @@
{
"root": true,
"rules": {
"array-bracket-spacing": [2, "never"],
"block-scoped-var": 2,
"brace-style": [2, "stroustrup"],
"camelcase": 2,
"comma-spacing": [2, {"before": false, "after": true}],
"comma-style": [2, "last"],
"computed-property-spacing": [2, "never"],
"consistent-this": [2, "self"],
"curly": 2,
"eol-last": 2,
"eqeqeq": 2,
"key-spacing": [2, {"beforeColon": false, "afterColon": true}],
"keyword-spacing": [2, {"before": true, "after": true}],
"new-cap": 2,
"new-parens": 2,
"no-array-constructor": 2,
@ -34,6 +38,7 @@
"no-trailing-spaces": 2,
"no-underscore-dangle": 0,
"no-void": 2,
"object-curly-spacing": [2, "never"],
"one-var": [2, "never"],
"operator-assignment": [2, "always"],
"padded-blocks": 0,
@ -41,14 +46,11 @@
"radix": 2,
"semi": [2, "always"],
"semi-spacing": [2, {"before": false, "after": true}],
"space-after-keywords": [2, "always", {"checkFunctionKeyword": true}],
"space-before-blocks": [2, "always"],
"space-before-function-parentheses": [2, {"anonymous": "always", "named": "never"}],
"space-in-brackets": [2, "never"],
"space-before-function-paren": [2, {"anonymous": "always", "named": "never"}],
"spaced-comment": [0, "always"],
"space-in-parens": [2, "never"],
"space-return-throw-case": 2,
"space-unary-ops": [2, {"words": true, "nonwords": false}],
"spaced-line-comment": [2, "always"],
"vars-on-top": 0,
"wrap-iife": [2, "inside"],
"yoda": [2, "never"]

14
.gitattributes поставляемый
Просмотреть файл

@ -1,7 +1,9 @@
# Enforce Unix newlines
*.css text eol=lf
*.html text eol=lf
*.js text eol=lf
*.json text eol=lf
*.md text eol=lf
*.yml text eol=lf
bin/www text eol=lf
*.css text eol=lf
*.html text eol=lf
*.js text eol=lf
*.json text eol=lf
*.md text eol=lf
*.yml text eol=lf

Просмотреть файл

@ -10,8 +10,7 @@
"noarg": true,
"node": true,
"noempty": true,
"plusplus": false,
"predef": ["exports"],
"sub": true,
"undef": true
"undef": true,
"unused": "vars"
}

Просмотреть файл

@ -28,7 +28,7 @@ module.exports = function (grunt) {
banner: (
"/*!\n * Bootlint v<%= pkg.version %> (<%= pkg.homepage %>)\n" +
" * <%= pkg.description %>\n" +
" * Copyright (c) 2014-2015 Christopher Rebert\n" +
" * Copyright (c) 2014-2016 Christopher Rebert\n" +
" * Licensed under the MIT License (https://github.com/twbs/bootlint/blob/master/LICENSE).\n" +
" */\n"
),

Просмотреть файл

@ -1,6 +1,6 @@
The MIT License (MIT)
Copyright (c) 2014-2015 Christopher Rebert
Copyright (c) 2014-2016 Christopher Rebert
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

Просмотреть файл

@ -198,4 +198,4 @@ See the [GitHub Releases page](https://github.com/twbs/bootlint/releases) for de
## License
Copyright (c) 2014-2015 Christopher Rebert. Licensed under the MIT License.
Copyright (c) 2014-2016 Christopher Rebert. Licensed under the MIT License.

Просмотреть файл

@ -33,22 +33,36 @@
"url": "https://github.com/twbs/bootlint.git"
},
"license": "MIT",
"dependencies": {
"binary-search": "^1.2.0",
"bluebird": "^3.0.5",
"body-parser": "^1.14.1",
"chalk": "^1.1.1",
"cheerio": "^0.20.0",
"commander": "^2.9.0",
"debug": "^2.1.1",
"express": "^4.11.2",
"glob": "^7.0.3",
"morgan": "^1.5.1",
"semver": "^5.0.3",
"void-elements": "^2.0.1"
},
"devDependencies": {
"coveralls": "^2.11.2",
"grunt": "^0.4.5",
"grunt-banner": "^0.6.0",
"grunt-browserify": "^4.0.1",
"grunt-contrib-clean": "^0.7.0",
"grunt-contrib-jshint": "^0.11.0",
"grunt-contrib-nodeunit": "^0.4.1",
"grunt-contrib-qunit": "^0.7.0",
"grunt-browserify": "^5.0.0",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-jshint": "^1.0.0",
"grunt-contrib-nodeunit": "^1.0.0",
"grunt-contrib-qunit": "^1.0.1",
"grunt-contrib-watch": "^0.6.1",
"grunt-eslint": "^10.0.0",
"grunt-eslint": "^18.0.0",
"grunt-exec": "^0.4.6",
"grunt-jscs": "^1.5.0",
"jquery": "~2.1.3",
"grunt-jscs": "^2.8.0",
"jquery": "^2.2.1",
"jscoverage": "^0.6.0",
"jscs-jsdoc": "^0.4.5",
"jscs-jsdoc": "^1.3.1",
"load-grunt-tasks": "^3.1.0",
"nodeunit": "^0.9.0",
"npm-shrinkwrap": "^200.1.0",
@ -56,20 +70,6 @@
"sinon": "^1.12.2",
"time-grunt": "^1.0.0"
},
"dependencies": {
"binary-search": "^1.2.0",
"bluebird": "^3.0.5",
"body-parser": "^1.14.1",
"chalk": "^1.1.1",
"cheerio": "^0.19.0",
"commander": "^2.9.0",
"debug": "^2.1.1",
"express": "^4.11.2",
"glob": "^6.0.1",
"morgan": "^1.5.1",
"semver": "^5.0.3",
"void-elements": "^2.0.1"
},
"main": "./src/bootlint.js",
"bin": {
"bootlint": "./src/cli-main.js"

Просмотреть файл

@ -1,7 +1,7 @@
/*!
* Bootlint - an HTML linter for Bootstrap projects
* https://github.com/twbs/bootlint
* Copyright (c) 2014-2015 Christopher Rebert
* Copyright (c) 2014-2016 Christopher Rebert
* Licensed under the MIT License.
*/

3220
test-infra/npm-shrinkwrap.json сгенерированный

Разница между файлами не показана из-за своего большого размера Загрузить разницу

9
test/lib/jquery.min.js поставляемый

Различия файлов скрыты, потому что одна или несколько строк слишком длинны