Skip to content

Commit

Permalink
merge conflict fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
trueadm committed Jan 10, 2016
2 parents fa2027d + 08a7a72 commit 868ac43
Show file tree
Hide file tree
Showing 195 changed files with 18,281 additions and 40,832 deletions.
20 changes: 0 additions & 20 deletions .editorconfig

This file was deleted.

3 changes: 0 additions & 3 deletions .env

This file was deleted.

4 changes: 4 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
dist/*
examples/*
packages/*
tools/*
node_modules/*
**/node_modules/*
config/**
**/__tests__
308 changes: 152 additions & 156 deletions .eslintrc → .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,156 +1,152 @@
{
"root": true,
"parser": "babel-eslint",
"globals": {
"document": true,
"window": true,
"spy",
"mocha",
"stub",
"beforeEach",
"useFakeTimers": true,
"useFakeXMLHttpRequest": true,
"useFakeServer": true
},
"ecmaFeatures": {
"jsx": true,
"modules": true,
"es6": true
},
"env": {
"browser": true,
"es6": true,
"mocha": true,
"node": true

},
"rules": {
"comma-dangle": 2,
"no-cond-assign": [2, "except-parens"],
"no-console": 0,
"no-constant-condition": 2,
"no-debugger": 1,
"no-dupe-args": 2,
"no-dupe-keys": 2,
"no-duplicate-case": 2,
"no-empty-character-class": 2,
"no-empty": 0,
"no-ex-assign": 2,
"no-extra-semi": 2,
"no-func-assign": 2,
"no-inner-declarations": [2, "both"],
"no-invalid-regexp": 2,
"no-irregular-whitespace": 2,
"no-negated-in-lhs": 2,
"no-obj-calls": 2,
"no-regex-spaces": 2,
"no-sparse-arrays": 2,
"no-unreachable": 2,
"use-isnan": 2,
"valid-typeof": 2,
"no-unexpected-multiline": 2,
"accessor-pairs": [2, {
"setWithoutGet": true
}],
"curly": [2, "all"],
"eqeqeq": [2, "allow-null"],
"no-alert": 1,
"no-div-regex": 2,
"no-eq-null": 2,
"no-eval": 2,
"no-fallthrough": 2,
"no-floating-decimal": 2,
"no-implied-eval": 2,
"no-invalid-this": 2,
"no-loop-func": 2,
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-native-reassign": 2,
"no-new-func": 2,
"no-new-wrappers": 2,
"no-new": 2,
"no-octal": 2,
"no-redeclare": [2, {
"builtinGlobals":true
}],
"no-return-assign": [2, "except-parens"],
"no-with": 2,
"radix": 2,
"vars-on-top": 2,
"wrap-iife": [2, "inside"],
"yoda": 2,
"strict": [2, "never"],
"no-delete-var": 2,
"no-shadow-restricted-names": 2,
/* "no-shadow": 2, */
"no-undef": 2,
"no-unused-vars": [2, "local"],
"no-use-before-define": [2, "nofunc"],
"array-bracket-spacing": [2, "always", {
"singleValue": false,
"objectsInArrays": false,
"arraysInArrays": false
}],
"indent": [2, "tab", {
"SwitchCase": 1
}],
"key-spacing": [2, {
"afterColon": true
}],
"lines-around-comment": [2, {
"beforeBlockComment": true,
"allowBlockStart": true,
"allowBlockEnd": true,
"allowObjectStart": true,
"allowObjectEnd": true
}],
"linebreak-style": [2, "unix"],
"new-cap": [2, {
"newIsCap": true,
"capIsNew":true
}],
"new-parens": 2,
"newline-after-var": [2, "always"],
"no-array-constructor": 2,
"no-mixed-spaces-and-tabs": 2,
"no-multiple-empty-lines": [2, {
"max": 1
}],
"no-new-object": 2,
"no-spaced-func": 2,
"no-trailing-spaces": 2,
"object-curly-spacing": [2, "always", {
"arraysInObjects": true,
"objectsInObjects": true
}],
"padded-blocks": [0, "never"],
"quote-props": [2, "as-needed"],
"quotes": [2, "single", "avoid-escape"],
"semi-spacing": [2, {
"after": true
}],
"semi": [2, "always"],
"space-after-keywords": [2, "always"],
"space-before-blocks": [2, "always"],
"space-before-function-paren": [2, {
"anonymous": "always",
"named": "never"
}],
"space-in-parens": [2, "always"],
"space-infix-ops": 2,
"space-return-throw-case": 2,
"space-unary-ops": [2, {
"words": true
}],
"spaced-comment": [2, "always", {
"exceptions": ["*"]
}],
"wrap-regex": 2,
"constructor-super": 2,
"no-class-assign": 2,
"no-const-assign": 2,
"no-this-before-super": 2,
"no-var": 2,
"prefer-spread": 2
}
}
{
"root": true,
"parser": "babel-eslint",
"globals": {
"document": true,
"window": true,
"spy": true,
"mocha": true,
"stub": true,
"beforeEach": true,
"useFakeTimers": true,
"useFakeXMLHttpRequest": true,
"useFakeServer": true
},
"ecmaFeatures": {
"jsx": true,
"modules": true,
"es6": true
},
"env": {
"browser": true,
"es6": true,
"mocha": true,
"node": true
},
"rules": {
"comma-dangle": 2,
"no-cond-assign": [2, "except-parens"],
"no-console": 0,
"no-constant-condition": 2,
"no-debugger": 1,
"no-dupe-args": 2,
"no-dupe-keys": 2,
"no-duplicate-case": 2,
"no-empty-character-class": 2,
"no-ex-assign": 2,
"no-extra-semi": 2,
"no-func-assign": 2,
"no-inner-declarations": [2, "both"],
"no-invalid-regexp": 2,
"no-irregular-whitespace": 2,
"no-negated-in-lhs": 2,
"no-obj-calls": 2,
"no-regex-spaces": 2,
"no-sparse-arrays": 2,
"no-unreachable": 2,
"use-isnan": 2,
"valid-typeof": 2,
"no-unexpected-multiline": 2,
"accessor-pairs": [2, {
"setWithoutGet": true
}],
"curly": [2, "all"],
"eqeqeq": [2, "allow-null"],
"no-alert": 1,
"no-div-regex": 2,
"no-eq-null": 2,
"no-eval": 2,
"no-fallthrough": 2,
"no-floating-decimal": 2,
"no-implied-eval": 2,
"no-invalid-this": 2,
"no-loop-func": 2,
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-native-reassign": 2,
"no-new-func": 2,
"no-new-wrappers": 2,
"no-new": 2,
"no-octal": 2,
"no-redeclare": [2, {
"builtinGlobals":true
}],
"no-return-assign": [2, "except-parens"],
"no-with": 2,
"radix": 2,
"vars-on-top": 2,
"wrap-iife": [2, "inside"],
"yoda": 2,
"strict": [2, "never"],
"no-delete-var": 2,
"no-shadow-restricted-names": 2,
"no-unused-vars": 0,
"no-use-before-define": [2, "nofunc"],
"array-bracket-spacing": [2, "always", {
"singleValue": false,
"objectsInArrays": false,
"arraysInArrays": false
}],
"indent": [2, "tab", {
"SwitchCase": 1
}],
"key-spacing": [2, {
"afterColon": true
}],
"lines-around-comment": [2, {
"beforeBlockComment": true,
"allowBlockStart": true,
"allowBlockEnd": true,
"allowObjectStart": true,
"allowObjectEnd": true
}],
"linebreak-style": [0, "unix"],
"new-cap": [2, {
"newIsCap": true,
"capIsNew":true
}],
"new-parens": 2,
"newline-after-var": [0, "always"],
"no-array-constructor": 2,
"no-mixed-spaces-and-tabs": 2,
"no-multiple-empty-lines": [2, {
"max": 1
}],
"no-new-object": 2,
"no-spaced-func": 2,
"no-trailing-spaces": 2,
"object-curly-spacing": [2, "always", {
"arraysInObjects": true,
"objectsInObjects": true
}],
"padded-blocks": [0, "never"],
"quote-props": [2, "as-needed"],
"quotes": [2, "single", "avoid-escape"],
"semi-spacing": [2, {
"after": true
}],
"semi": [2, "always"],
"space-after-keywords": [2, "always"],
"space-before-keywords": [2, "always"],
"space-before-function-paren": [2, {
"anonymous": "always",
"named": "never"
}],
"space-in-parens": [2, "never"],
"space-infix-ops": 2,
"space-return-throw-case": 2,
"space-unary-ops": [2, {
"words": true
}],
"spaced-comment": [2, "always", {
"exceptions": ["*"]
}],
"wrap-regex": 2,
"constructor-super": 2,
"no-class-assign": 2,
"no-const-assign": 2,
"no-this-before-super": 2,
"no-var": 2,
"prefer-spread": 2
}
}
1 change: 0 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ bower.json
coverage
config
dist/*.map
lib
test
Loading

0 comments on commit 868ac43

Please sign in to comment.