Skip to content

Commit

Permalink
Switched to eslint-plugin-ghost (#9835)
Browse files Browse the repository at this point in the history 
refs #9834

- @todo: the test env eslint needs to use the plugin, not part of this PR
  • Loading branch information
@lunaticmonk @kirrg001
lunaticmonk authored and kirrg001 committed Sep 17, 2018
1 parent d0d3eed commit efd1587
Show file tree
Hide file tree
Showing 36 changed files with 134 additions and 364 deletions.
303 changes: 6 additions & 297 deletions .eslintrc.json
View file
Expand Up @@ -3,301 +3,10 @@
"es6": true,
"node": true
},
"extends": "eslint:recommended",
"rules": {
"accessor-pairs": "error",
"array-bracket-newline": "off",
"array-bracket-spacing": [
"error",
"never"
],
"array-callback-return": "off",
"array-element-newline": "off",
"arrow-body-style": [
"error",
"always"
],
"arrow-parens": [
"error",
"always"
],
"arrow-spacing": [
"error",
{
"after": true,
"before": true
}
],
"block-scoped-var": "error",
"brace-style": [
"error",
"1tbs",
{
"allowSingleLine": true
}
],
"callback-return": "error",
"camelcase": [
"error",
{
"properties": "never"
}
],
"capitalized-comments": "off",
"class-methods-use-this": "off",
"comma-dangle": "error",
"comma-spacing": "error",
"comma-style": [
"error",
"last"
],
"complexity": "off",
"computed-property-spacing": [
"error",
"never"
],
"consistent-return": "off",
"consistent-this": "off",
"curly": "error",
"default-case": "error",
"dot-location": [
"error",
"property"
],
"dot-notation": "error",
"eol-last": "error",
"eqeqeq": "error",
"for-direction": "error",
"func-call-spacing": "error",
"func-name-matching": "off",
"func-names": "off",
"func-style": "off",
"function-paren-newline": "off",
"generator-star-spacing": "error",
"getter-return": "error",
"global-require": "off",
"guard-for-in": "error",
"handle-callback-err": "error",
"id-blacklist": "error",
"id-length": "off",
"id-match": "error",
"indent": [
"error",
4,
{
"SwitchCase": 1
}
],
"indent-legacy": "off",
"init-declarations": "off",
"jsx-quotes": "error",
"key-spacing": "error",
"keyword-spacing": "error",
"line-comment-position": "off",
"linebreak-style": [
"error",
"unix"
],
"lines-around-comment": "off",
"lines-around-directive": "off",
"lines-between-class-members": [
"error",
"always"
],
"max-depth": "error",
"max-len": "off",
"max-lines": "off",
"max-nested-callbacks": "error",
"max-params": "off",
"max-statements": "off",
"max-statements-per-line": "off",
"multiline-comment-style": "off",
"multiline-ternary": "off",
"new-parens": "error",
"newline-after-var": "off",
"newline-before-return": "off",
"newline-per-chained-call": "off",
"no-alert": "error",
"no-array-constructor": "error",
"no-await-in-loop": "error",
"no-bitwise": "off",
"no-buffer-constructor": "off",
"no-caller": "error",
"no-catch-shadow": "error",
"no-confusing-arrow": "error",
"no-continue": "error",
"no-div-regex": "off",
"no-duplicate-imports": "error",
"no-else-return": "off",
"no-empty-function": "off",
"no-eq-null": "error",
"no-eval": "error",
"no-extend-native": "error",
"no-extra-bind": "error",
"no-extra-label": "error",
"no-extra-parens": "off",
"no-floating-decimal": "error",
"no-implicit-globals": "error",
"no-implied-eval": "error",
"no-inline-comments": "off",
"no-inner-declarations": [
"error",
"functions"
],
"no-invalid-this": "error",
"no-iterator": "error",
"no-label-var": "error",
"no-labels": "error",
"no-lone-blocks": "error",
"no-lonely-if": "off",
"no-loop-func": "error",
"no-magic-numbers": "off",
"no-mixed-operators": "off",
"no-mixed-requires": "off",
"no-multi-assign": "off",
"no-multi-spaces": "off",
"no-multi-str": "error",
"no-multiple-empty-lines": ["error", {"max": 1}],
"no-native-reassign": "error",
"no-negated-condition": "off",
"no-negated-in-lhs": "error",
"no-nested-ternary": "off",
"no-new": "error",
"no-new-func": "error",
"no-new-object": "error",
"no-new-require": "error",
"no-new-wrappers": "error",
"no-octal-escape": "error",
"no-param-reassign": "off",
"no-path-concat": "off",
"no-plusplus": "error",
"no-process-env": "off",
"no-process-exit": "off",
"no-proto": "error",
"no-prototype-builtins": "off",
"no-restricted-globals": "error",
"no-restricted-imports": "error",
"no-restricted-modules": "error",
"no-restricted-properties": "error",
"no-restricted-syntax": "error",
"no-return-assign": "error",
"no-return-await": "error",
"no-script-url": "error",
"no-self-compare": "error",
"no-sequences": "error",
"no-shadow": "off",
"no-shadow-restricted-names": "error",
"no-spaced-func": "error",
"no-sync": "off",
"no-tabs": "error",
"no-template-curly-in-string": "error",
"no-ternary": "off",
"no-throw-literal": "error",
"no-trailing-spaces": "error",
"no-undef-init": "error",
"no-undefined": "off",
"no-underscore-dangle": "off",
"no-unmodified-loop-condition": "error",
"no-unneeded-ternary": "off",
"no-use-before-define": "off",
"no-useless-call": "error",
"no-useless-computed-key": "error",
"no-useless-concat": "off",
"no-useless-constructor": "error",
"no-useless-escape": "off",
"no-useless-rename": "error",
"no-useless-return": "error",
"no-var": "off",
"no-void": "error",
"no-warning-comments": "off",
"no-whitespace-before-property": "error",
"no-with": "error",
"nonblock-statement-body-position": "error",
"object-curly-newline": [
"error",
{
"consistent": true
}
],
"object-curly-spacing": [
"error",
"never"
],
"object-property-newline": [
"error",
{
"allowMultiplePropertiesPerLine": true
}
],
"object-shorthand": "off",
"one-var": "off",
"one-var-declaration-per-line": "off",
"operator-assignment": "off",
"operator-linebreak": "off",
"padded-blocks": [
"error",
"never"
],
"padding-line-between-statements": "error",
"prefer-arrow-callback": "off",
"prefer-const": "off",
"prefer-destructuring": "off",
"prefer-numeric-literals": "error",
"prefer-promise-reject-errors": "off",
"prefer-reflect": "off",
"prefer-rest-params": "off",
"prefer-spread": "off",
"prefer-template": "off",
"quote-props": [
"error",
"as-needed"
],
"quotes": ["error", "single"],
"radix": "off",
"require-await": "error",
"require-jsdoc": "off",
"rest-spread-spacing": "error",
"semi": ["error", "always"],
"semi-spacing": "error",
"semi-style": [
"error",
"last"
],
"sort-imports": "error",
"sort-keys": "off",
"sort-vars": "off",
"space-before-blocks": "error",
"space-before-function-paren": [
"error",
{
"anonymous": "always",
"named": "never"
}
],
"space-in-parens": [
"error",
"never"
],
"space-infix-ops": "error",
"space-unary-ops": "error",
"spaced-comment": "error",
"strict": "off",
"switch-colon-spacing": "error",
"symbol-description": "error",
"template-curly-spacing": [
"error",
"never"
],
"template-tag-spacing": "error",
"unicode-bom": [
"error",
"never"
],
"valid-jsdoc": "off",
"vars-on-top": "off",
"wrap-iife": "off",
"wrap-regex": "off",
"yield-star-spacing": "error",
"yoda": "error"
}
"plugins": [
"ghost"
],
"extends": [
"plugin:ghost/node"
]
}
8 changes: 6 additions & 2 deletions core/server/api/authentication.js
View file
Expand Up @@ -326,7 +326,9 @@ authentication = {
updatedUser.set('status', 'active');
return updatedUser.save(options);
})
.catch(common.errors.ValidationError, (err) => { return Promise.reject(err); })
.catch(common.errors.ValidationError, (err) => {
return Promise.reject(err);
})
.catch((err) => {
if (common.errors.utils.isIgnitionError(err)) {
return Promise.reject(err);
Expand Down Expand Up @@ -411,7 +413,9 @@ authentication = {
roles: [invite.toJSON().role_id]
}, options);
})
.then(() => { return invite.destroy(options); });
.then(() => {
return invite.destroy(options);
});
}

function formatResponse() {
Expand Down
8 changes: 6 additions & 2 deletions core/server/api/invites.js
View file
Expand Up @@ -162,7 +162,9 @@ const invites = {

return invite.destroy(options);
})
.then(() => { return options; });
.then(() => {
return options;
});
}

function validation(options) {
Expand Down Expand Up @@ -202,7 +204,9 @@ const invites = {
message: common.i18n.t('errors.api.invites.notAllowedToInvite')
}));
}
}).then(() => { return options; });
}).then(() => {
return options;
});
}

function checkIfUserExists(options) {
Expand Down
8 changes: 6 additions & 2 deletions core/server/api/notifications.js
View file
Expand Up @@ -167,7 +167,9 @@ notifications = {

// CASE: remove any existing release notifications if a new release notification comes in
if (hasReleaseNotification) {
remove(allNotifications, (el) => { return !el.custom; });
remove(allNotifications, (el) => {
return !el.custom;
});
}

// CASE: nothing to add, skip
Expand All @@ -194,7 +196,9 @@ notifications = {
}]
}, internalContext);
})
.then(() => { return _private.publicResponse(addedNotifications); });
.then(() => {
return _private.publicResponse(addedNotifications);
});
}

tasks = [
Expand Down
2 changes: 1 addition & 1 deletion core/server/api/utils.js
View file
Expand Up @@ -115,7 +115,7 @@ utils = {
from: {isDate: true},
to: {isDate: true},
fields: {matches: /^[\w, ]+$/},
order: {matches: /^[a-z0-9_,\. ]+$/i},
order: {matches: /^[a-z0-9_,. ]+$/i},
name: {},
email: {isEmail: true}
},
Expand Down
2 changes: 1 addition & 1 deletion core/server/apps/amp/lib/helpers/amp_content.js
View file
Expand Up @@ -134,7 +134,7 @@ function getAmperizeHTML(html, post) {
if (err) {
if (err.src) {
logging.error(new errors.GhostError({
message: `AMP HTML couldn\'t get parsed: ${err.src}`,
message: `AMP HTML couldn't get parsed: ${err.src}`,
err: err,
context: post.url,
help: i18n.t('errors.apps.appWillNotBeLoaded.help')
Expand Down

0 comments on commit efd1587

Please sign in to comment.