Merge remote-tracking branch upstream/master into buames/merge-upstream (#10)

Author: buames

.editorconfig

@@ -8,4 +8,7 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 end_of_line = lf
 # editorconfig-tools is unable to ignore longs strings or urls
-max_line_length = null
+max_line_length = off
+
+[CHANGELOG.md]
+indent_size = false

.travis.yml

@@ -1,12 +1,10 @@
 language: node_js
 node_js:
+  - "12"
+  - "11"
   - "10"
   - "9"
   - "8"
-  - "7"
-  - "6"
-  - "5"
-  - "4"
 before_install:
   - 'nvm install-latest-npm'
 install:
@@ -18,37 +16,37 @@ script:
 sudo: false
 env:
   matrix:
+    - 'TEST=true ESLINT=6 PACKAGE=eslint-config-airbnb-base'
+    - 'TEST=true ESLINT=6 PACKAGE=eslint-config-airbnb'
     - 'TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb-base'
     - 'TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb'
-    - 'TEST=true ESLINT=4 PACKAGE=eslint-config-airbnb-base'
-    - 'TEST=true ESLINT=4 PACKAGE=eslint-config-airbnb'
 matrix:
   fast_finish: true
   include:
     - node_js: "lts/*"
-      env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-airbnb-base
+      env: PREPUBLISH=true ESLINT=6 PACKAGE=eslint-config-airbnb-base
     - node_js: "lts/*"
-      env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-airbnb
+      env: PREPUBLISH=true ESLINT=6 PACKAGE=eslint-config-airbnb
     - node_js: "lts/*"
-      env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-airbnb-base
+      env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-airbnb-base
     - node_js: "lts/*"
-      env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-airbnb
+      env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-airbnb
     - node_js: "lts/*"
       env: LINT=true
-  exclude:
-    - node_js: "5"
+    - node_js: "7"
       env: TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb-base
-    - node_js: "5"
+    - node_js: "7"
       env: TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb
-    - node_js: "4"
+    - node_js: "6"
       env: TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb-base
-    - node_js: "4"
+    - node_js: "6"
       env: TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb
+  exclude:
   allow_failures:
+    - node_js: "11"
     - node_js: "9"
     - node_js: "7"
-    - node_js: "5"
+    - env: PREPUBLISH=true ESLINT=6 PACKAGE=eslint-config-airbnb-base
+    - env: PREPUBLISH=true ESLINT=6 PACKAGE=eslint-config-airbnb
     - env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-airbnb-base
     - env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-airbnb
-    - env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-airbnb-base
-    - env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-airbnb