Merge pull request #29 from Yoctol/upgrade

update for 0.7.0
Yoctol · Sep 19, 2016 · 68dc439 · 68dc439
2 parents 52cfa4b + 222c3a0
commit 68dc439
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+0.7.0 / 2016-09-19
+==================
+- [deps] Update `eslint` to `3.5.0`
+- [deps] Update `eslint-config-airbnb-base` to `7.1.0`
+- [breaking] disable `max-len` for ` // eslint-disable-line ` pattern
+
 0.6.0 / 2016-09-08
 ==================
 - [deps] Update `eslint` to `3.4.0`

diff --git a/README.md b/README.md
@@ -56,6 +56,13 @@ See [Airbnb's overarching ESLint config](https://npmjs.com/eslint-config-airbnb)
 
 ```
 - linebreak-style: 'off'
+- max-len: ['error', 100, 2, {
+  ignorePattern: ' // eslint-disable-line ',
+  ignoreUrls: true,
+  ignoreComments: false,
+  ignoreStrings: true,
+  ignoreTemplateLiterals: true,
+}]
 - no-plusplus: ['error', { allowForLoopAfterthoughts: true }]
 - no-underscore-dangle: 'off'
 ```

diff --git a/package.json b/package.json
@@ -24,14 +24,14 @@
   },
   "homepage": "https://github.com/Yoctol/eslint-config-yoctol-base",
   "dependencies": {
-    "eslint-config-airbnb-base": "^7.0.0"
+    "eslint-config-airbnb-base": "^7.1.0"
   },
   "devDependencies": {
-    "eslint": "^3.4.0",
+    "eslint": "^3.5.0",
     "eslint-plugin-import": "^1.14.0"
   },
   "peerDependencies": {
-    "eslint": "^3.4.0",
+    "eslint": "^3.5.0",
     "eslint-plugin-import": "^1.14.0"
   },
   "engines": {

diff --git a/rules/style.js b/rules/style.js
@@ -1,14 +1,27 @@
 module.exports = {
   rules: {
     // allow both 'LF' and 'CRLF' as linebreaks
+    // http://eslint.org/docs/rules/linebreak-style
     // Proposal - https://github.com/Yoctol/eslint-config-yoctol-base/issues/25
     'linebreak-style': 'off',
 
+    // specify the maximum length of a line in your program
+    // http://eslint.org/docs/rules/max-len
+    // Proposal - https://github.com/Yoctol/eslint-config-yoctol-base/issues/24
+    'max-len': ['error', 100, 2, {
+      ignorePattern: ' // eslint-disable-line ',
+      ignoreUrls: true,
+      ignoreComments: false,
+      ignoreStrings: true,
+      ignoreTemplateLiterals: true,
+    }],
+
     // disallow use of unary operators, ++ and --
     // http://eslint.org/docs/rules/no-plusplus
     'no-plusplus': ['error', { allowForLoopAfterthoughts: true }],
 
     // allow dangling underscores in identifiers
+    // http://eslint.org/docs/rules/no-underscore-dangle
     // Proposal - https://github.com/Yoctol/eslint-config-yoctol-base/issues/3
     'no-underscore-dangle': 'off',
   }