Skip to content
This repository was archived by the owner on Aug 7, 2023. It is now read-only.

Commit e604c6e

Browse files
committed
Merge pull request #109 from AtomLinter/eslint-config-airbnb-base
Move to eslint-config-airbnb-base
2 parents d3db9c9 + 122d438 commit e604c6e

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

package.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,23 @@
2525
},
2626
"devDependencies": {
2727
"coffeelint": "^1.15.0",
28-
"eslint": "^2.7.0",
29-
"eslint-config-airbnb": "^7.0.0",
30-
"eslint-plugin-react": "^4.2.3"
28+
"eslint": "^2.8.0",
29+
"eslint-config-airbnb-base": "^1.0.4",
30+
"eslint-plugin-import": "^1.6.0"
3131
},
3232
"package-deps": [
3333
"linter"
3434
],
3535
"scripts": {
36-
"lint": "./node_modules/.bin/coffeelint lib"
36+
"lint": "coffeelint lib && eslint spec",
37+
"test": "apm test"
3738
},
3839
"eslintConfig": {
39-
"extends": "airbnb/base",
40+
"extends": "airbnb-base",
41+
"rules": {
42+
"global-require": 0,
43+
"import/no-unresolved": [2, {"ignore": ["atom"]}]
44+
},
4045
"globals": {
4146
"atom": true
4247
},

spec/.eslintrc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
2-
"globals": {
3-
"waitsForPromise": true
4-
},
52
"env": {
6-
"jasmine": true
3+
"jasmine": true,
4+
"atomtest": true
75
}
86
}

spec/linter-csslint-spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const projectPath = path.join(__dirname, 'fixtures', 'project');
1010
const projectBadPath = path.join(projectPath, 'files', 'badWC.css');
1111

1212
describe('The csslint provider for Linter', () => {
13-
const lint = require('../lib/main').provideLinter().lint;
13+
const lint = require('../lib/main.coffee').provideLinter().lint;
1414

1515
beforeEach(() => {
1616
atom.workspace.destroyActivePaneItem();

0 commit comments

Comments
 (0)