Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

reverts use of semistandard directly (#2648) #2795

Merged
merged 2 commits into from
May 12, 2017
Merged

reverts use of semistandard directly (#2648) #2795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31bfa5a
Revert "use `semistandard` directly"
boneskull May 9, 2017
9731be7
lint test/integration/fixtures/simple-reporter.js
boneskull May 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .eslintrc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
env:
node: true
browser: true
parserOptions:
ecmaVersion: 5
sourceType: script
extends: semistandard
rules:
strict:
- error
- safe
6 changes: 2 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BROWSERIFY := "node_modules/.bin/browserify"
SEMISTANDARD:= "node_modules/.bin/semistandard"
ESLINT := "node_modules/.bin/eslint"
KARMA := "node_modules/.bin/karma"
MOCHA := "bin/mocha"
NYC := "node_modules/.bin/nyc"
Expand Down Expand Up @@ -34,9 +34,7 @@ clean:

lint:
@printf "==> [Test :: Lint]\n"
$(SEMISTANDARD) $(SRC)
$(SEMISTANDARD) --env mocha --global assert --global expect --global run $(TESTS)
$(SEMISTANDARD) bin/* scripts/*.js *.js
$(ESLINT) . "bin/*"

test-node: test-bdd test-tdd test-qunit test-exports test-unit test-integration test-jsapi test-compilers test-glob test-requires test-reporters test-only test-global-only

Expand Down
4 changes: 4 additions & 0 deletions lib/browser/.eslintrc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
env:
node: false
browser: false
commonjs: true
12 changes: 5 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,11 @@
"browserify": "^13.0.0",
"coffee-script": "^1.10.0",
"coveralls": "^2.11.15",
"eslint": "^3.11.1",
"eslint-config-semistandard": "^7.0.0",
"eslint-config-standard": "^6.2.1",
"eslint-plugin-promise": "^3.4.0",
"eslint-plugin-standard": "2.0.1",
"expect.js": "^0.3.1",
"istanbul-combine": "^0.3.0",
"karma": "1.3.0",
Expand All @@ -337,7 +342,6 @@
"os-name": "^2.0.1",
"phantomjs": "1.9.8",
"rimraf": "^2.5.2",
"semistandard": "^9.2.1",
"should": "^11.1.1",
"through2": "^2.0.1",
"watchify": "^3.7.0"
Expand Down Expand Up @@ -370,11 +374,5 @@
"phantomjs",
"lodash.create"
]
},
"semistandard": {
"ignore": [
"/mocha.js",
"/lib/to-iso-string/**/*.js"
]
}
}
7 changes: 7 additions & 0 deletions test/.eslintrc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
env:
mocha: true
globals:
expect: false
assert: false
# https://github.com/sindresorhus/globals/pull/102
run: false
2 changes: 2 additions & 0 deletions test/integration/fixtures/simple-reporter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

var baseReporter = require('../../../lib/reporters/base');
module.exports = simplereporter;

Expand Down