Skip to content

Commit

Permalink
Merge pull request #49 from motin/improvements-2
Browse files Browse the repository at this point in the history
Improvements sourced from several shield add-on repositories
  • Loading branch information
biancadanforth authored Mar 9, 2018
2 parents 2bf2dea + 8257f9b commit 6aabef0
Show file tree
Hide file tree
Showing 41 changed files with 1,390 additions and 3,185 deletions.
13 changes: 9 additions & 4 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
addon/StudyUtils.jsm
# for circleCI; don't eslint code in the Firefox directory
firefox
# do not lint/format generated artifacts
dist
OLD
package-lock.json
# makes sure that eslintrc.js gets linted/formatted
!.eslintrc.js
# do not lint/format bundled util libraries (PioneerUtils.jsm is included for Pioneer Shield studies only; eventually it will be merged with StudyUtils.jsm)
addon/StudyUtils.jsm
addon/PioneerUtils.jsm
# for circleCI; don't lint/format code in the Firefox directory
firefox
# don't lint/format package.json since npm install formats it differently by default
package.json
30 changes: 13 additions & 17 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,17 @@
*/

module.exports = {
"parserOptions": {
"ecmaVersion": 8,
"sourceType": "module",
"ecmaFeatures": {
"jsx": false,
"experimentalObjectRestSpread": true,
parserOptions: {
ecmaVersion: 8,
sourceType: "module",
ecmaFeatures: {
jsx: false,
experimentalObjectRestSpread: true,
},
},
env: {
"es6": true,
es6: true,
// 'browser-window': false

},
extends: [
"eslint:recommended",
Expand All @@ -28,23 +27,20 @@ module.exports = {
"plugin:mozilla/recommended",
],

plugins: [
"json",
"mozilla",
],
plugins: ["json", "mozilla"],

rules: {
"babel/new-cap": "off",
"comma-dangle": ["error", "always-multiline"],
"eqeqeq": "error",
"indent": ["warn", 2, {SwitchCase: 1}],
eqeqeq: "error",
indent: ["warn", 2, { SwitchCase: 1 }],
"mozilla/no-aArgs": "warn",
"mozilla/balanced-listeners": 0,
"mozilla/balanced-listeners": "off",
"no-console": "warn",
"no-shadow": ["error"],
"no-shadow": "error",
"no-unused-vars": "error",
"prefer-const": "warn",
"prefer-spread": "error",
"semi": ["error", "always"],
semi: ["error", "always"],
},
};
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ install.rdf
*.xpi
node_modules
addon/StudyUtils.jsm
addon/PioneerUtils.jsm
Loading

0 comments on commit 6aabef0

Please sign in to comment.