Permalink
Browse files

run update

  • Loading branch information...
1 parent c82d86a commit 892b6d503d42a1ba125e9b8f13a4c8bca9e52436 @jonschlinkert jonschlinkert committed Jan 8, 2017
Showing with 64 additions and 210 deletions.
  1. +2 −11 .editorconfig
  2. +36 −189 .eslintrc.json
  3. +19 −6 .gitignore
  4. +6 −3 .travis.yml
  5. +1 −1 LICENSE
View
@@ -1,4 +1,3 @@
-# http://editorconfig.org
root = true
[*]
@@ -9,14 +8,6 @@ indent_size = 2
trim_trailing_whitespace = true
insert_final_newline = true
-[*.md]
+[{**/{actual,fixtures,expected,templates}/**,*.md}]
trim_trailing_whitespace = false
-insert_final_newline = false
-
-[**/{actual,fixtures,expected}/**]
-trim_trailing_whitespace = false
-insert_final_newline = false
-
-[**/templates/**]
-trim_trailing_whitespace = false
-insert_final_newline = false
+insert_final_newline = false
View
@@ -3,105 +3,39 @@
"modules": true,
"experimentalObjectRestSpread": true
},
+
"env": {
"browser": false,
"es6": true,
"node": true,
"mocha": true
},
+
"globals": {
"document": false,
"navigator": false,
"window": false
},
+
"rules": {
"accessor-pairs": 2,
- "arrow-spacing": [
- 2,
- {
- "before": true,
- "after": true
- }
- ],
- "block-spacing": [
- 2,
- "always"
- ],
- "brace-style": [
- 2,
- "1tbs",
- {
- "allowSingleLine": true
- }
- ],
- "comma-dangle": [
- 2,
- "never"
- ],
- "comma-spacing": [
- 2,
- {
- "before": false,
- "after": true
- }
- ],
- "comma-style": [
- 2,
- "last"
- ],
+ "arrow-spacing": [2, { "before": true, "after": true }],
+ "block-spacing": [2, "always"],
+ "brace-style": [2, "1tbs", { "allowSingleLine": true }],
+ "comma-dangle": [2, "never"],
+ "comma-spacing": [2, { "before": false, "after": true }],
+ "comma-style": [2, "last"],
"constructor-super": 2,
- "curly": [
- 2,
- "multi-line"
- ],
- "dot-location": [
- 2,
- "property"
- ],
+ "curly": [2, "multi-line"],
+ "dot-location": [2, "property"],
"eol-last": 2,
- "eqeqeq": [
- 2,
- "allow-null"
- ],
- "generator-star-spacing": [
- 2,
- {
- "before": true,
- "after": true
- }
- ],
- "handle-callback-err": [
- 2,
- "^(err|error)$"
- ],
- "indent": [
- 2,
- 2,
- {
- "SwitchCase": 1
- }
- ],
- "key-spacing": [
- 2,
- {
- "beforeColon": false,
- "afterColon": true
- }
- ],
- "keyword-spacing": [
- 2,
- {
- "before": true,
- "after": true
- }
- ],
- "new-cap": [
- 2,
- {
- "newIsCap": true,
- "capIsNew": false
- }
- ],
+ "eqeqeq": [2, "allow-null"],
+ "generator-star-spacing": [2, { "before": true, "after": true }],
+ "handle-callback-err": [2, "^(err|error)$" ],
+ "indent": [2, 2, { "SwitchCase": 1 }],
+ "key-spacing": [2, { "beforeColon": false, "afterColon": true }],
+ "keyword-spacing": [2, { "before": true, "after": true }],
+ "new-cap": [2, { "newIsCap": true, "capIsNew": false }],
"new-parens": 2,
"no-array-constructor": 2,
"no-caller": 2,
@@ -121,18 +55,12 @@
"no-extend-native": 2,
"no-extra-bind": 2,
"no-extra-boolean-cast": 2,
- "no-extra-parens": [
- 2,
- "functions"
- ],
+ "no-extra-parens": [2, "functions"],
"no-fallthrough": 2,
"no-floating-decimal": 2,
"no-func-assign": 2,
"no-implied-eval": 2,
- "no-inner-declarations": [
- 2,
- "functions"
- ],
+ "no-inner-declarations": [2, "functions"],
"no-invalid-regexp": 2,
"no-irregular-whitespace": 2,
"no-iterator": 2,
@@ -142,12 +70,7 @@
"no-mixed-spaces-and-tabs": 2,
"no-multi-spaces": 2,
"no-multi-str": 2,
- "no-multiple-empty-lines": [
- 2,
- {
- "max": 1
- }
- ],
+ "no-multiple-empty-lines": [2, { "max": 1 }],
"no-native-reassign": 0,
"no-negated-in-lhs": 2,
"no-new": 2,
@@ -173,103 +96,27 @@
"no-undef": 2,
"no-undef-init": 2,
"no-unexpected-multiline": 2,
- "no-unneeded-ternary": [
- 2,
- {
- "defaultAssignment": false
- }
- ],
+ "no-unneeded-ternary": [2, { "defaultAssignment": false }],
"no-unreachable": 2,
- "no-unused-vars": [
- 2,
- {
- "vars": "all",
- "args": "none"
- }
- ],
+ "no-unused-vars": [2, { "vars": "all", "args": "none" }],
"no-useless-call": 0,
"no-with": 2,
- "one-var": [
- 0,
- {
- "initialized": "never"
- }
- ],
- "operator-linebreak": [
- 0,
- "after",
- {
- "overrides": {
- "?": "before",
- ":": "before"
- }
- }
- ],
- "padded-blocks": [
- 0,
- "never"
- ],
- "quotes": [
- 2,
- "single",
- "avoid-escape"
- ],
+ "one-var": [0, { "initialized": "never" }],
+ "operator-linebreak": [0, "after", { "overrides": { "?": "before", ":": "before" } }],
+ "padded-blocks": [0, "never"],
+ "quotes": [2, "single", "avoid-escape"],
"radix": 2,
- "semi": [
- 2,
- "always"
- ],
- "semi-spacing": [
- 2,
- {
- "before": false,
- "after": true
- }
- ],
- "space-before-blocks": [
- 2,
- "always"
- ],
- "space-before-function-paren": [
- 2,
- "never"
- ],
- "space-in-parens": [
- 2,
- "never"
- ],
+ "semi": [2, "always"],
+ "semi-spacing": [2, { "before": false, "after": true }],
+ "space-before-blocks": [2, "always"],
+ "space-before-function-paren": [2, "never"],
+ "space-in-parens": [2, "never"],
"space-infix-ops": 2,
- "space-unary-ops": [
- 2,
- {
- "words": true,
- "nonwords": false
- }
- ],
- "spaced-comment": [
- 0,
- "always",
- {
- "markers": [
- "global",
- "globals",
- "eslint",
- "eslint-disable",
- "*package",
- "!",
- ","
- ]
- }
- ],
+ "space-unary-ops": [2, { "words": true, "nonwords": false }],
+ "spaced-comment": [0, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!", ","] }],
"use-isnan": 2,
"valid-typeof": 2,
- "wrap-iife": [
- 2,
- "any"
- ],
- "yoda": [
- 2,
- "never"
- ]
+ "wrap-iife": [2, "any"],
+ "yoda": [2, "never"]
}
}
View
@@ -1,14 +1,27 @@
+# always ignore files
*.DS_Store
*.sublime-*
-.DS_store
-/actual/
-_gh_pages
-bower_components
+
+# test related, or directories generated by tests
+test/actual
+actual
coverage
-example.js
+.nyc*
+
+# npm
node_modules
npm-debug.log
+
+# yarn
+yarn.lock
+yarn-error.log
+
+# misc
+_gh_pages
+_draft
+_drafts
+bower_components
+vendor
temp
tmp
TODO.md
-vendor
View
@@ -1,13 +1,16 @@
sudo: false
+os:
+ - linux
+ - osx
language: node_js
node_js:
+ - node
- '6'
- - '5'
- '4'
- '0.12'
- '0.10'
matrix:
- fast_finish: true
allow_failures:
- - node_js: '0.10'
+ - node_js: '4'
- node_js: '0.12'
+ - node_js: '0.10'
View
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2013-2015, Jon Schlinkert, Brian Woodward.
+Copyright (c) 2013-2015, 2017, Jon Schlinkert, Brian Woodward
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

0 comments on commit 892b6d5

Please sign in to comment.