Update dependencies to enable Greenkeeper 🌴 (#335)

adapt code to updated dependencies

.eslintrc.json

@@ -0,0 +1,27 @@
+{
+  "rules": {
+    "indent": [2, 2, {"SwitchCase": 1, "VariableDeclarator": 2}],
+    "curly": [2, "all"],
+    "operator-linebreak": [2, "after"],
+    "camelcase": [2, {"properties": "never"}],
+    "quotes": [2, "single"],
+    "no-multi-str": 2,
+    "no-mixed-spaces-and-tabs": 2,
+    "no-trailing-spaces": 2,
+    "space-unary-ops": [2,
+      {
+        "nonwords": false,
+        "overrides": {}
+      }
+    ],
+    "brace-style": [2, "1tbs", {"allowSingleLine": true}],
+    "keyword-spacing": [2, {}],
+    "space-infix-ops": 2,
+    "space-before-blocks": [2, "always"],
+    "eol-last": 2,
+    "space-before-function-paren": [2, "always"],
+    "array-bracket-spacing": [2, "never", {"singleValue": false}],
+    "space-in-parens": [2, "never"],
+    "no-multiple-empty-lines": 2
+  }
+}

.gitattributes

@@ -3,12 +3,13 @@
 .editorconfig export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
-.jscs.json export-ignore
+.eslintrc.json export-ignore
 .jshintignore export-ignore
 .jshintrc
 .travis.yml export-ignore
 bower.json
 Gruntfile.js export-ignore
+performance.*
 
 # Line endings control
 CHANGELOG.md text

.travis.yml

@@ -13,6 +13,10 @@ cache:
   directories:
     - node_modules
 
+# scripts
+script:
+  - 'if [ "$TRAVIS_NODE_VERSION" == "0.12" ]; then echo "Bypassing EsLint" && grunt test-old; else echo "Running normal tests" && grunt test; fi'
+
 # hooks
 notifications:
   webhooks:

Gruntfile.js

@@ -73,17 +73,15 @@ module.exports = function (grunt) {
       ]
     },
 
-    jscs: {
+    eslint: {
       options: {
-        config: '.jscs.json'
+        config: '.eslintrc.json'
       },
-      files: {
-        src: [
-          'Gruntfile.js',
-          'src/**/*.js',
-          'test/**/*.js'
-        ]
-      }
+      target: [
+        'Gruntfile.js',
+        'src/**/*.js',
+        'test/**/*.js'
+      ]
     },
 
     conventionalChangelog: {
@@ -171,7 +169,14 @@ module.exports = function (grunt) {
 
   grunt.initConfig(config);
 
-  require('load-grunt-tasks')(grunt);
+  grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-contrib-concat');
+  grunt.loadNpmTasks('grunt-contrib-uglify');
+  grunt.loadNpmTasks('grunt-conventional-changelog');
+  grunt.loadNpmTasks('grunt-conventional-github-releaser');
+  grunt.loadNpmTasks('grunt-endline');
+  grunt.loadNpmTasks('grunt-simple-mocha');
+  grunt.loadNpmTasks('grunt-contrib-jshint');
 
   grunt.registerTask('single-test', function (grep) {
     'use strict';
@@ -195,8 +200,14 @@ module.exports = function (grunt) {
     perf.generateLogs();
   });
 
-  grunt.registerTask('lint', ['jshint', 'jscs']);
+  grunt.registerTask('lint', function () {
+    'use strict';
+    grunt.loadNpmTasks('grunt-eslint');
+    grunt.task.run('jshint', 'eslint');
+  });
+
   grunt.registerTask('test', ['clean', 'lint', 'concat:test', 'simplemocha:node', 'clean']);
+  grunt.registerTask('test-old', ['concat:test', 'simplemocha:node', 'clean']);
   grunt.registerTask('performance', ['concat:test', 'performancejs', 'clean']);
   grunt.registerTask('build', ['test', 'concat:dist', 'uglify', 'endline']);
   grunt.registerTask('prep-release', ['build', 'conventionalChangelog']);

README.md

@@ -1,6 +1,6 @@
 ![Showdown][sd-logo]
 
-[![Build Status](https://travis-ci.org/showdownjs/showdown.svg?branch=master)](https://travis-ci.org/showdownjs/showdown) [![npm version](https://badge.fury.io/js/showdown.svg)](http://badge.fury.io/js/showdown) [![Bower version](https://badge.fury.io/bo/showdown.svg)](http://badge.fury.io/bo/showdown) [![Join the chat at https://gitter.im/showdownjs/showdown](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/showdownjs/showdown?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://travis-ci.org/showdownjs/showdown.svg?branch=master)](https://travis-ci.org/showdownjs/showdown) [![npm version](https://badge.fury.io/js/showdown.svg)](http://badge.fury.io/js/showdown) [![Bower version](https://badge.fury.io/bo/showdown.svg)](http://badge.fury.io/bo/showdown) [![Join the chat at https://gitter.im/showdownjs/showdown](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/showdownjs/showdown?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Greenkeeper badge](https://badges.greenkeeper.io/showdownjs/showdown.svg)](https://greenkeeper.io/)
 
 ------