From c3bd40ab0436895155e23155ece1bedbe6f1574f Mon Sep 17 00:00:00 2001 From: Vitaly Puzrin Date: Sat, 20 Dec 2014 08:23:12 +0300 Subject: [PATCH] Configs & code cleanup --- .eslintignore | 3 +-- .gitignore | 1 - .nojekyll | 0 .npmignore | 2 +- Makefile | 2 +- benchmark/implementations/commonmark-reference/index.js | 5 ++--- benchmark/implementations/current-commonmark/index.js | 4 ++-- benchmark/implementations/current/index.js | 4 ++-- benchmark/implementations/marked-0.3.2/index.js | 4 ++-- bower.json | 1 + demo/.eslintrc | 7 ------- demo/assets/index.js | 3 +++ test/.eslintrc | 3 +++ test/commonmark.js | 1 - test/markdown-it.js | 1 - test/misc.js | 1 - test/ruler.js | 1 - test/utils.js | 1 - 18 files changed, 18 insertions(+), 26 deletions(-) delete mode 100644 .nojekyll delete mode 100644 demo/.eslintrc create mode 100644 test/.eslintrc diff --git a/.eslintignore b/.eslintignore index e07fb01..2ee8d41 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,6 +1,5 @@ -benchmark/implementations/ coverage/ demo/sample.js demo-web/ dist/ -node_modules/ +node_modules diff --git a/.gitignore b/.gitignore index dcf22ab..25fbf5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ node_modules/ coverage/ - diff --git a/.nojekyll b/.nojekyll deleted file mode 100644 index e69de29..0000000 diff --git a/.npmignore b/.npmignore index c4d613d..62fc05d 100644 --- a/.npmignore +++ b/.npmignore @@ -1,8 +1,8 @@ benchmark/ coverage/ demo/ +docs/ support/ test/ .* Makefile - diff --git a/Makefile b/Makefile index ae30624..613e9c7 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ gh-pages: browserify demo rm -rf ./demo-web lint: - eslint --reset ./ + eslint --reset . test: lint NODE_ENV=test mocha -R spec diff --git a/benchmark/implementations/commonmark-reference/index.js b/benchmark/implementations/commonmark-reference/index.js index e13d16a..d51f73e 100644 --- a/benchmark/implementations/commonmark-reference/index.js +++ b/benchmark/implementations/commonmark-reference/index.js @@ -1,4 +1,4 @@ -'use strict' +'use strict'; var commonmark = require('commonmark'); var parser = new commonmark.DocParser(); @@ -6,5 +6,4 @@ var renderer = new commonmark.HtmlRenderer(); exports.run = function(data) { return renderer.render(parser.parse(data)); -} - +}; diff --git a/benchmark/implementations/current-commonmark/index.js b/benchmark/implementations/current-commonmark/index.js index 188323f..feec1dc 100644 --- a/benchmark/implementations/current-commonmark/index.js +++ b/benchmark/implementations/current-commonmark/index.js @@ -1,7 +1,7 @@ -'use strict' +'use strict'; var md = require('../../../')('commonmark'); exports.run = function(data) { return md.render(data); -} +}; diff --git a/benchmark/implementations/current/index.js b/benchmark/implementations/current/index.js index 0d1238c..7a5c320 100644 --- a/benchmark/implementations/current/index.js +++ b/benchmark/implementations/current/index.js @@ -1,4 +1,4 @@ -'use strict' +'use strict'; var md = require('../../../')({ html: true, @@ -8,4 +8,4 @@ var md = require('../../../')({ exports.run = function(data) { return md.render(data); -} +}; diff --git a/benchmark/implementations/marked-0.3.2/index.js b/benchmark/implementations/marked-0.3.2/index.js index 04dae17..6aa3a4a 100644 --- a/benchmark/implementations/marked-0.3.2/index.js +++ b/benchmark/implementations/marked-0.3.2/index.js @@ -1,7 +1,7 @@ -'use strict' +'use strict'; var marked = require('marked'); exports.run = function(data) { return marked(data); -} +}; diff --git a/bower.json b/bower.json index f66b3fe..98b4822 100644 --- a/bower.json +++ b/bower.json @@ -16,6 +16,7 @@ "bower_components", "coverage", "demo", + "docs", "lib", "node_modules", "support", diff --git a/demo/.eslintrc b/demo/.eslintrc deleted file mode 100644 index 16b8bce..0000000 --- a/demo/.eslintrc +++ /dev/null @@ -1,7 +0,0 @@ -env: - node: false - browser: true - -globals: - $: false - _: false diff --git a/demo/assets/index.js b/demo/assets/index.js index bb98170..c6e750e 100644 --- a/demo/assets/index.js +++ b/demo/assets/index.js @@ -1,6 +1,9 @@ (function () { 'use strict'; + /*eslint-env browser*/ + /*global $, _*/ + var mdHtml, mdSrc, permalink, scrollMap; var defaults = { diff --git a/test/.eslintrc b/test/.eslintrc new file mode 100644 index 0000000..1ec0565 --- /dev/null +++ b/test/.eslintrc @@ -0,0 +1,3 @@ +env: + node: true + mocha: true diff --git a/test/commonmark.js b/test/commonmark.js index 51cfaa6..b1a6927 100644 --- a/test/commonmark.js +++ b/test/commonmark.js @@ -1,4 +1,3 @@ -/*global describe*/ 'use strict'; diff --git a/test/markdown-it.js b/test/markdown-it.js index 0c3cf05..49bb212 100644 --- a/test/markdown-it.js +++ b/test/markdown-it.js @@ -1,4 +1,3 @@ -/*global describe*/ 'use strict'; diff --git a/test/misc.js b/test/misc.js index 7168d4b..bcbb41a 100644 --- a/test/misc.js +++ b/test/misc.js @@ -1,4 +1,3 @@ -/*global describe, it*/ 'use strict'; diff --git a/test/ruler.js b/test/ruler.js index 72eb0f4..5d96136 100644 --- a/test/ruler.js +++ b/test/ruler.js @@ -1,4 +1,3 @@ -/*global describe, it*/ 'use strict'; diff --git a/test/utils.js b/test/utils.js index 88f826e..125ce8e 100644 --- a/test/utils.js +++ b/test/utils.js @@ -1,4 +1,3 @@ -/*global describe, it*/ 'use strict';