Skip to content

Commit

Permalink
Updated packages; Updated ESLint rules; Updated Travis CI NodeJS vers…
Browse files Browse the repository at this point in the history
…ions
  • Loading branch information
nicjansma committed Dec 15, 2016
1 parent fc767e8 commit 65666a9
Show file tree
Hide file tree
Showing 4 changed files with 81 additions and 25 deletions.
62 changes: 59 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,63 @@
{
"rules": {
// enabled over default
//
// v1.0 rules
//
"camelcase": 2,
"comma-spacing": 2,
"curly": [2, "all"],
"dot-notation": [2, { "allowKeywords": true }],
"eol-last": 2,
"eqeqeq": 2,
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
"new-cap": 2,
"new-parens": 2,
"no-alert": 2,
"no-array-constructor": 2,
"no-caller": 2,
"no-catch-shadow": 2,
"no-eval": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-extra-parens": [2, "functions"],
"no-implied-eval": 2,
"no-iterator": 2,
"no-label-var": 2,
"no-labels": 2,
"no-lone-blocks": 2,
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-native-reassign": 2,
"no-new": 2,
"no-new-func": 2,
"no-new-object": 2,
"no-new-wrappers": 2,
"no-octal-escape": 2,
"no-process-exit": 2,
"no-proto": 2,
"no-return-assign": 2,
"no-script-url": 2,
"no-sequences": 2,
"no-shadow": 2,
"no-shadow-restricted-names": 2,
"no-spaced-func": 2,
"no-trailing-spaces": 2,
"no-undef-init": 2,
"no-unused-expressions": 2,
"no-use-before-define": 2,
"no-with": 2,
"quotes": [2, "double"],
"semi": 2,
"semi-spacing": [2, {"before": false, "after": true}],
"space-infix-ops": 2,
"keyword-spacing": 2,
"space-unary-ops": [2, { "words": true, "nonwords": false }],
"strict": [2, "function"],
"yoda": [2, "never"],

//
// Enabled over default
//
"valid-jsdoc": [1, {
"requireReturn": false,
"prefer": {
Expand Down Expand Up @@ -33,10 +90,9 @@
"computed-property-spacing": 1,
"array-bracket-spacing": 1,
"space-in-parens": 1,
"space-unary-ops": 1,
"spaced-comment": 1,
"max-len": [1, 120, 4],

//
// Disabled rules
//
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
language: node_js
node_js:
- "node"
- "6"
- "5"
- "4"
- "0.12"
- "0.11"
- "0.10"
before_install:
- npm install -g grunt-cli bower
- bower install
6 changes: 3 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ module.exports = function(grunt) {
},
build: {
options: {
"output-file": "eslint.xml",
"format": "jslint-xml",
"silent": true
outputFile: "eslint.xml",
format: "jslint-xml",
silent: true
},
src: [
"Gruntfile.js",
Expand Down
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,26 @@
"license": "MIT",
"devDependencies": {
"expect.js": "^0.3.1",
"grunt": "^0.4.5",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-concat": "^0.5.1",
"grunt-contrib-uglify": "^0.8.0",
"grunt-karma": "^0.10.1",
"grunt-mocha-test": "^0.12.7",
"gruntify-eslint": "^1.0.1",
"karma": "^0.12.31",
"karma-coverage": "^0.2.7",
"karma-expect": "^1.1.0",
"karma-mocha": "^0.1.10",
"karma-phantomjs-launcher": "^0.1.4",
"karma-tap-reporter": "0.0.3",
"mocha": "^2.2.1",
"uglify-js": "1.2.x"
"grunt": "^1.0.1",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-uglify": "^2.0.0",
"grunt-karma": "^2.0.0",
"grunt-mocha-test": "^0.13.2",
"gruntify-eslint": "^3.1.0",
"karma": "^1.3.0",
"karma-coverage": "^1.1.1",
"karma-expect": "^1.1.3",
"karma-mocha": "^1.3.0",
"karma-phantomjs-launcher": "^1.0.2",
"karma-tap-reporter": "0.0.6",
"mocha": "^3.2.0",
"uglify-js": "2.7.x"
},
"scripts": {
"test": "grunt travis --verbose"
},
"dependencies": {
"crypto-js": ">= 3.1.2-1"
"crypto-js": ">=3.1.9-1"
}
}

0 comments on commit 65666a9

Please sign in to comment.