SQUASH ME Merge branch 'master' into steelbrain/improve

Squash this commit in before final merge.

Author: Arcanemagus

CHANGELOG.md

@@ -1,3 +1,9 @@
+### v5.2.5
+
+* Fix file import resolution (#340)
+* Fix a bug detecting `.eslintrc.js` configurations (#343)
+* Fix file now uses the same worker as for linting (#307)
+
 ### v5.2.4
 
 * Update dependencies to bring in some bug fixes

circle.yml

@@ -1,11 +1,16 @@
 dependencies:
   pre:
+    # Force updating wget due to the current containers being too out of date
     - sudo apt-get update
     - sudo apt-get install wget
-  post:
+  override:
     - wget -O atom-amd64.deb https://atom.io/download/deb
+    # - sudo apt-get update # Cut out until wget is fixed on the containers
     - sudo dpkg --install atom-amd64.deb || true
     - sudo apt-get -f install -y
+    - atom -v
+    - apm -v
+    - apm install
 test:
   override:
     - npm run lint

package.json

@@ -2,7 +2,7 @@
   "name": "linter-eslint",
   "main": "./lib/main",
   "activationCommands": [],
-  "version": "5.2.4",
+  "version": "5.2.5",
   "description": "Lint JavaScript on the fly, using ESLint",
   "repository": "https://github.com/AtomLinter/linter-eslint.git",
   "license": "MIT",
@@ -28,8 +28,7 @@
     "babel-eslint": "^4.1.6",
     "babel-preset-steelbrain": "^1.0.0",
     "babel-preset-steelbrain-legacy": "^1.0.0",
-    "eslint-config-airbnb": "latest",
-    "eslint-config-steelbrain": "latest",
+    "eslint-config-airbnb": "^1.0.2",
     "eslint-plugin-import": "^0.11.0",
     "eslint-plugin-react": "^3.10.0",
     "shelljs": "^0.5.3"
@@ -45,16 +44,21 @@
     }
   },
   "eslintConfig": {
-    "extends": "steelbrain",
     "rules": {
       "no-empty": 0,
       "no-console": 0,
       "no-new": 0,
+      "no-extra-semi": 1,
+      "semi": 0,
+      "func-names": 0,
+      "strict": [0, "never"],
+      "comma-dangle": 0,
       "semi": [
         2,
         "never"
       ]
     },
+    "extends": "airbnb/base",
     "parser": "babel-eslint",
     "globals": {
       "atom": "true"