Merge pull request #612 from gagern/updates

Update dependencies to more recent version
This commit is contained in:
Kevin Barabash 2017-01-10 11:09:02 -05:00 committed by GitHub
commit 677290336a
4 changed files with 13 additions and 14 deletions

View File

@ -14,6 +14,7 @@
"eqeqeq": [2, "allow-null"],
"guard-for-in": 2,
"indent": [2, 4, {"SwitchCase": 1}],
"keyword-spacing": 2,
"linebreak-style": [2, "unix"],
"max-len": [2, 80, 4, { "ignoreUrls": true, "ignorePattern": "\\brequire\\([\"']|eslint-disable" }],
"no-alert": 2,
@ -41,12 +42,9 @@
"prefer-const": 2,
"prefer-spread": 2,
"semi": [2, "always"],
"space-after-keywords": 2,
"space-before-blocks": 2,
"space-before-function-paren": [2, "never"],
"space-before-keywords": 2,
"space-infix-ops": 2,
"space-return-throw-case": 2,
"space-unary-ops": 2,
// ---------------------------------------
// Stuff we explicitly disable.

View File

@ -30,7 +30,7 @@ $(NIS) setup: package.json
@touch $(NIS)
lint: $(NIS) katex.js server.js cli.js $(wildcard src/*.js) $(wildcard test/*.js) $(wildcard contrib/*/*.js) $(wildcard dockers/*/*.js)
./node_modules/.bin/eslint $(filter-out *.stamp,$^)
./node_modules/.bin/eslint $(filter-out %.stamp,$^)
build/katex.js: katex.js $(wildcard src/*.js) $(NIS)
$(BROWSERIFY) $< --standalone katex > $@

View File

@ -1,4 +1,5 @@
/* eslint no-console:0 */
/* eslint-env node, es6 */
/* eslint-disable no-console */
"use strict";
var childProcess = require("child_process");

View File

@ -15,20 +15,20 @@
],
"license": "MIT",
"devDependencies": {
"browserify": "^10.2.4",
"clean-css": "~2.2.15",
"eslint": "^1.10.3",
"express": "~3.3.3",
"glob": "^5.0.15",
"browserify": "^13.3.0",
"clean-css": "^3.4.23",
"eslint": "^3.13.0",
"express": "^4.14.0",
"glob": "^7.1.1",
"jasmine": "^2.3.2",
"jasmine-core": "^2.3.4",
"js-yaml": "^3.3.1",
"jspngopt": "^0.1.0",
"jspngopt": "^0.2.0",
"less": "~2.7.1",
"nomnom": "^1.8.1",
"pako": "0.2.7",
"selenium-webdriver": "^2.46.1",
"uglify-js": "~2.4.15"
"pako": "1.0.4",
"selenium-webdriver": "^2.48.2",
"uglify-js": "~2.7.5"
},
"bin": "cli.js",
"scripts": {