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

Update eslint to version 3.0.1 πŸš€ #300

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
# Project specific config
language: node_js # For lint tools
node_js: "5"

os:
- linux
- osx
Expand All @@ -11,6 +8,10 @@ env:
- ATOM_CHANNEL=stable
- ATOM_CHANNEL=beta

# Installed for linting the project
language: node_js
node_js: "6"

# Generic setup follows
script: 'curl -s https://raw.githubusercontent.com/atom/ci/master/build-package.sh | sh'

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ environment:
- ATOM_CHANNEL: beta

install:
- ps: Install-Product node 5 # For lint tools
- ps: Install-Product node 6 # For lint tools

build_script:
- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/atom/ci/master/build-package.ps1'))
Expand Down
7 changes: 5 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ test:
override:
- atom -v
- apm -v
- ./node_modules/.bin/eslint lib
- ./node_modules/.bin/eslint spec
- npm run lint
- apm test

machine:
node:
version: 6
21 changes: 11 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,32 @@
},
"devDependencies": {
"babel-eslint": "^6.0.3",
"eslint": "^2.9.0",
"eslint-config-airbnb-base": "^3.0.1",
"eslint-plugin-import": "^1.7.0"
"eslint": "^3.0.1",
"eslint-config-airbnb-base": "^4.0.0",
"eslint-plugin-import": "^1.10.2"
},
"eslintConfig": {
"rules": {
"comma-dangle": [
2,
"error",
"never"
],
"no-console": 0,
"no-console": "off",
"semi": [
2,
"error",
"never"
],
"global-require": 0,
"no-nested-ternary": 0,
"global-require": "off",
"no-nested-ternary": "off",
"import/no-unresolved": [
2,
"error",
{
"ignore": [
"atom"
]
}
]
],
"import/no-extraneous-dependencies": "off"
},
"extends": "airbnb-base",
"parser": "babel-eslint",
Expand Down
2 changes: 1 addition & 1 deletion spec/linter-jshint-spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use babel'

import linter from '../lib/main'
import * as path from 'path'
import linter from '../lib/main'

const bitwisePath = path.join(__dirname, 'fixtures', 'bitwise', 'bitwise.js')
const syntaxPath = path.join(__dirname, 'fixtures', 'syntax', 'badSyntax.js')
Expand Down