Skip to content

Commit

Permalink
Merge pull request #98 from SOASTA/soasta-2016-q2
Browse files Browse the repository at this point in the history
SOASTA 2016 Q2 Contributions
  • Loading branch information
nicjansma committed Oct 19, 2016
2 parents 27aeed6 + acc915a commit d49b90d
Show file tree
Hide file tree
Showing 408 changed files with 18,444 additions and 2,520 deletions.
3 changes: 2 additions & 1 deletion .bowerrc
@@ -1,4 +1,5 @@
{
"directory": "tests/vendor",
"color" : false
"color" : false,
"interactive": false
}
126 changes: 97 additions & 29 deletions .eslintrc
@@ -1,42 +1,110 @@
{
"env": {
"browser":true
"browser": true
},
"plugins": [
"html"
],
"globals": {
"BOOMR":true,
"BOOMR_start":true,
"BOOMR_lstart":true,
"BOOMR_onload":true,
"BOOMR_test":true,
"console":false,
"unescape":false,
"BOOMR_configt":true,
"BOOMR_check_doc_domain":true
"BOOMR": true,
"BOOMR_start": true,
"BOOMR_lstart": true,
"BOOMR_onload": true,
"BOOMR_test": true,
"console": false,
"unescape": false,
"BOOMR_configt": true,
"BOOMR_check_doc_domain": true
},
"rules": {
"no-mixed-spaces-and-tabs":[2, true],
"console":0,
"camelcase":0,
"strict":0,
"quotes":[2, "double", "avoid-escape"],
"new-cap":0,
"space-infix-ops":0,
"no-console":0,
"no-delete-var":0,
"no-underscore-dangle":0,
"no-multi-spaces":0,
"dot-notation":[2, {"allowKeywords": false}],
"space-unary-ops":0,
"key-spacing":0,
"no-empty":2,
//
// Rules that were enabled by default in pre-1.0 eslint
// https://github.com/eslint/eslint/blob/master/docs/user-guide/migrating-to-1.0.0.md
// re-enable all the ones we are not specifically disabling
//
"no-alert": 2,
"no-array-constructor": 2,
"no-caller": 2,
"no-catch-shadow": 2,
"no-eval": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-implied-eval": 2,
"no-iterator": 2,
"no-label-var": 2,
"no-labels": 2,
"no-lone-blocks": 2,
"no-loop-func": 2,
"no-multi-str": 2,
"no-native-reassign": 2,
"no-new": 2,
"no-new-func": 2,
"no-new-object": 2,
"no-new-wrappers": 2,
"no-octal-escape": 2,
"no-process-exit": 2,
"no-proto": 2,
"no-return-assign": 2,
"no-script-url": 2,
"no-sequences": 2,
"no-shadow": 2,
"no-shadow-restricted-names": 2,
"no-spaced-func": 2,
"no-undef-init": 2,
"no-unused-expressions": 2,
"no-use-before-define": 2,
"no-with": 2,
"comma-spacing": 2,
"curly": [2, "all"],
"eol-last": 2,
"no-extra-parens": [2, "functions"],
"eqeqeq": 2,
"new-parens": 2,
"semi": 2,
"space-infix-ops": 2,
"yoda": [2, "never"],

//
// Changes over defaults
//
"keyword-spacing": 2,
"no-mixed-spaces-and-tabs": [2, true],
"quotes": [2, "double", "avoid-escape"],
"dot-notation": [2, {"allowKeywords": false}],
"space-unary-ops": 1,
"key-spacing": [1, {"beforeColon": false, "afterColon": true, "mode": "minimum"}],
"no-empty": 2,
"brace-style": [1, "stroustrup", { "allowSingleLine": true }],
"space-after-keywords": [2, "always"],
"no-space-before-semi": 0,
"indent": [2, "tab"],
"semi-spacing": [2, {"before": false, "after": true}],
"indent": [2, "tab", {"VariableDeclarator": 0}],
"space-before-function-paren": [2, "never"],
"no-trailing-spaces": [2, { skipBlankLines: false }]
"no-trailing-spaces": [2, { "skipBlankLines": false }],
"linebreak-style": [2, "unix"],
"comma-dangle": [2, "never"],

//
// Disabled rules
//

// We have a lot of variables in underscore_casing
"camelcase": 0,

// Not ready for strict-mode yet
"strict": 0,

// We have some functions like BOOMR_check_doc_domain or BOOMR.
"new-cap": 0,

// We use console.log for debugging
"no-console": 0,

// We use _s in a couple places for internal vars
"no-underscore-dangle": 0,

// We delete some global vars for compat with older IE versions
"no-delete-var": 0,

// We use spaces for alignment in many places
"no-multi-spaces": 0
}
}
6 changes: 4 additions & 2 deletions .gitignore
Expand Up @@ -2,8 +2,6 @@
*.swp
/boomerang-*.js
build/*
build/
hint.log
*.log
*.diff
.project
Expand All @@ -13,10 +11,14 @@ tests/coverage/
tests/results/*
tests/pages/*
node_modules/
build/
tests/server/env.json
npm-debug.log
/tests/e2e/e2e.json
/tests/e2e/e2e-debug.json
tests/page-templates/12-react/support/app-component.js
tests/page-templates/12-react/support/app-component.js.map
tests/page-templates/12-react/support/app.js
*.#*
*#*
*~

0 comments on commit d49b90d

Please sign in to comment.