gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: simplify eslint configuration (#44347)

Browse Source 
* chore: extend import/recommended

* chore: use recommended lint rules

* refactor: apply lint rules

* chore: drop used config
This commit is contained in:
Oliver Eyton-Williams
2021-12-02 01:01:12 +01:00
committed by GitHub
parent 4a4aa1f2f9
commit efba2e777d
16 changed files with 46 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
.eslintrc-base.json
View File

@ -1,179 +0,0 @@
{
"rules": {
"max-len": [
"error",
{ "code": 80, "ignoreUrls": true, "ignoreTemplateLiterals": true }
],
"block-scoped-var": 0,
"brace-style": [2, "1tbs", { "allowSingleLine": true }],
"camelcase": 2,
"comma-dangle": 2,
"comma-spacing": [2, { "before": false, "after": true }],
"comma-style": [2, "last"],
"complexity": 0,
"consistent-return": 2,
"consistent-this": 0,
"curly": 2,
"default-case": 2,
"dot-notation": 0,
"eol-last": 2,
"eqeqeq": 2,
"func-call-spacing": 2,
"func-names": 0,
"func-style": 0,
"guard-for-in": 2,
"handle-callback-err": 2,
"import/default": 2,
"import/export": 2,
"import/extensions": [0, "always"],
"import/first": 2,
"import/named": 2,
"import/namespace": 2,
"import/newline-after-import": 2,
"import/no-duplicates": 2,
"import/no-unresolved": [2, { "commonjs": true }],
"import/order": [2, { "alphabetize": { "order": "asc" } }],
"import/unambiguous": 2,
"import/no-anonymous-default-export": 2,
"jsx-quotes": [2, "prefer-single"],
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
"keyword-spacing": [2],
"max-depth": 0,
"max-nested-callbacks": 0,
"max-params": 0,
"max-statements": 0,
"new-cap": 0,
"new-parens": 2,
"no-alert": 2,
"no-array-constructor": 2,
"no-bitwise": 2,
"no-caller": 2,
"no-cond-assign": 2,
"no-console": 0,
"no-constant-condition": 2,
"no-control-regex": 2,
"no-debugger": 2,
"no-delete-var": 2,
"no-div-regex": 2,
"no-dupe-keys": 2,
"no-else-return": 0,
"no-empty": 2,
"no-empty-character-class": 2,
"no-eq-null": 2,
"no-eval": 2,
"no-ex-assign": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-extra-boolean-cast": 2,
"no-extra-parens": 0,
"no-extra-semi": 2,
"no-fallthrough": 2,
"no-floating-decimal": 2,
"no-func-assign": 2,
"no-global-assign": 2,
"no-implied-eval": 2,
"no-inline-comments": 2,
"no-inner-declarations": 2,
"no-invalid-regexp": 2,
"no-irregular-whitespace": 2,
"no-iterator": 2,
"no-label-var": 2,
"no-labels": 2,
"no-lone-blocks": 2,
"no-lonely-if": 2,
"no-loop-func": 2,
"no-mixed-requires": 0,
"no-mixed-spaces-and-tabs": 2,
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-multiple-empty-lines": [2, { "max": 2 }],
"no-nested-ternary": 2,
"no-new": 2,
"no-new-func": 2,
"no-new-object": 2,
"no-new-require": 2,
"no-new-wrappers": 2,
"no-obj-calls": 2,
"no-octal": 2,
"no-octal-escape": 2,
"no-path-concat": 2,
"no-plusplus": 0,
"no-process-env": 0,
"no-process-exit": 2,
"no-proto": 2,
"no-regex-spaces": 2,
"no-reserved-keys": 0,
"no-restricted-modules": 0,
"no-return-assign": 2,
"no-script-url": 2,
"no-self-compare": 2,
"no-sequences": 2,
"no-shadow": 0,
"no-shadow-restricted-names": 2,
"no-sparse-arrays": 2,
"no-sync": 0,
"no-ternary": 0,
"no-trailing-spaces": 2,
"no-undef": 2,
"no-undef-init": 2,
"no-undefined": 2,
"no-underscore-dangle": 0,
"no-unreachable": 2,
"no-unsafe-negation": 2,
"no-unused-expressions": 2,
"no-unused-vars": 2,
"no-use-before-define": 0,
"no-useless-rename": 2,
"no-void": 0,
"no-warning-comments": [2, { "terms": ["fixme"], "location": "start" }],
"no-with": 2,
"one-var": 0,
"operator-assignment": 0,
"padded-blocks": 0,
"prefer-object-spread/prefer-object-spread": 2,
"quote-props": [2, "as-needed"],
"quotes": [2, "single", "avoid-escape"],
"radix": 2,
"react/display-name": 2,
"react/jsx-boolean-value": [2, "always"],
"react/jsx-closing-bracket-location": [
2,
{ "selfClosing": "line-aligned", "nonEmpty": "props-aligned" }
],
"react/jsx-no-undef": 2,
"react/jsx-sort-props": [2, { "ignoreCase": true }],
"react/jsx-uses-react": 2,
"react/jsx-uses-vars": 2,
"react/jsx-wrap-multilines": 2,
"react/jsx-fragments": 2,
"react/no-did-mount-set-state": 2,
"react/no-did-update-set-state": 2,
"react/no-multi-comp": [2, { "ignoreStateless": true }],
"react/no-unescaped-entities": 0,
"react/no-unknown-property": 2,
"react/prop-types": 2,
"react/react-in-jsx-scope": 2,
"react/self-closing-comp": 2,
"react/sort-prop-types": 2,
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "error",
"semi": [2, "always"],
"semi-spacing": [2, { "before": false, "after": true }],
"sort-vars": 0,
"space-before-blocks": [2, "always"],
"space-before-function-paren": [2, "never"],
"space-in-brackets": 0,
"space-in-parens": 0,
"space-infix-ops": 2,
"space-unary-ops": [2, { "words": true, "nonwords": false }],
"spaced-comment": [2, "always", { "exceptions": ["-"] }],
"strict": 0,
"use-isnan": 2,
"valid-jsdoc": 0,
"valid-typeof": 2,
"vars-on-top": 0,
"wrap-iife": [2, "any"],
"wrap-regex": 2,
"yoda": 0
}
}

33
.eslintrc.json
View File

@ -9,20 +9,14 @@
"parser": "babel-eslint",
"root": true,
"extends": [
"./.eslintrc-base.json",
"eslint:recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"plugin:import/recommended",
"plugin:import/typescript",
"plugin:jsx-a11y/recommended",
"prettier"
],
"plugins": [
"react",
"import",
"prefer-object-spread",
"react-hooks",
"jsx-a11y",
"jest-dom",
"testing-library"
],
"globals": {
"Promise": true,
"window": true,
@ -33,11 +27,13 @@
},
"settings": {
"react": {
"version": "16.4.2",
"import/ignore": ["\\.json$"],
"import/extensions": [".js", ".jsx", ".tsx", ".ts"]
},
"import/ignore": ["node_modules"]
"version": "16.4.2"
}
},
"rules": {
"import/named": 2,
"import/no-named-as-default": 0,
"import/no-named-as-default-member": 0
},
"overrides": [
{
@ -56,6 +52,7 @@
],
"plugins": ["@typescript-eslint"],
"rules": {
"import/named": 0,
"@typescript-eslint/naming-convention": [
"error",
{
@ -104,7 +101,11 @@
"./tools/ui-components/**/*.test.[jt]s?(x)",
"./client/**/*.test.[jt]s?(x)"
],
"extends": ["plugin:testing-library/react", "plugin:jest-dom/recommended"]
"extends": [
"plugin:testing-library/react",
"plugin:jest-dom/recommended"
],
"rules": { "import/named": 2 }
},
{
"files": ["cypress/**/*.js"],

3
client/i18n/schema-validation.js
View File

@ -202,7 +202,8 @@ const motivationSchemaValidation = languages => {
if (
!fileJson.motivationalQuotes.every(
object =>
object.hasOwnProperty('quote') && object.hasOwnProperty('author')
Object.prototype.hasOwnProperty.call(object, 'quote') &&
Object.prototype.hasOwnProperty.call(object, 'author')
)
) {
console.warn(`${language}/motivation.json has malformed quote objects.`);

1
client/plugins/fcc-source-challenges/create-challenge-nodes.js
View File

@ -31,7 +31,6 @@ function createChallengeNode(challenge, reporter) {
type: challenge.challengeType === 7 ? 'CertificateNode' : 'ChallengeNode'
};
/* eslint-disable prefer-object-spread/prefer-object-spread */
return JSON.parse(
JSON.stringify(
Object.assign(

2
client/plugins/fcc-source-challenges/gatsby-node.js
View File

@ -29,7 +29,7 @@ exports.sourceNodes = function sourceChallengesSourceNodes(
}
const { createNode } = actions;
const watcher = chokidar.watch(curriculumPath, {
ignored: /(^|[\/\\])\../,
ignored: /(^|[/\\])\../,
ignoreInitial: true,
persistent: true,
usePolling: true,

2
client/src/client/frame-runner.ts
View File

@ -62,7 +62,7 @@ async function initTestFrame(e: InitTestFrameArg = { code: {} }) {
Object.freeze(o);
Object.getOwnPropertyNames(o).forEach(function (prop) {
if (
o.hasOwnProperty(prop) &&
Object.prototype.hasOwnProperty.call(o, prop) &&
o[prop] !== null &&
(typeof o[prop] === 'object' || typeof o[prop] === 'function') &&
!Object.isFrozen(o[prop])

5
client/src/components/helpers/skeleton-sprite.tsx
View File

@ -2,10 +2,7 @@ import React from 'react';
import styles from './skeleton-styles';
// TODO: unsure about parameter typing
function SkeletonSprite({}: React.FC<
React.ComponentPropsWithoutRef<'svg'>
>): JSX.Element {
function SkeletonSprite(): JSX.Element {
return (
<div className='sprite-container'>
<style dangerouslySetInnerHTML={{ __html: styles }} />

2
client/src/components/search/with-instant-search.tsx
View File

@ -109,7 +109,7 @@ function InstantSearchRoot({
if (
location.state &&
typeof location.state === 'object' &&
location.state.hasOwnProperty('query')
Object.prototype.hasOwnProperty.call(location.state, 'query')
) {
updateSearchQuery(location.state.query);
} else if (location.search) {

2
client/src/templates/Challenges/utils/build.js
View File

@ -92,7 +92,7 @@ const buildFunctions = {
export function canBuildChallenge(challengeData) {
const { challengeType } = challengeData;
return buildFunctions.hasOwnProperty(challengeType);
return Object.prototype.hasOwnProperty.call(buildFunctions, challengeType);
}
export async function buildChallenge(challengeData, options) {

5
client/src/templates/Introduction/super-block-intro.tsx
View File

@ -122,7 +122,10 @@ const SuperBlockIntroductionPage = (props: SuperBlockProp) => {
if (
location.state &&
typeof location.state === 'object' &&
location.state.hasOwnProperty('breadcrumbBlockClick')
Object.prototype.hasOwnProperty.call(
location.state,
'breadcrumbBlockClick'
)
) {
return location.state.breadcrumbBlockClick;
}

1
cypress/integration/learn/challenges/projects.js
View File

@ -1,4 +1,3 @@
/* global cy */
import { SuperBlocks } from '../../../../config/certification-settings';
const selectors = {

15
package-lock.json generated
View File

@ -64,7 +64,7 @@
"eslint-plugin-jsx-a11y": "6.5.1",
"eslint-plugin-prefer-object-spread": "1.2.1",
"eslint-plugin-react": "7.27.1",
"eslint-plugin-react-hooks": "2.5.1",
"eslint-plugin-react-hooks": "^4.3.0",
"eslint-plugin-testing-library": "4.12.4",
"execa": "5.1.1",
"faker": "5.5.3",
@ -11731,14 +11731,15 @@
}
},
"node_modules/eslint-plugin-react-hooks": {
"version": "2.5.1",
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz",
"integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=7"
"node": ">=10"
},
"peerDependencies": {
"eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0"
"eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
}
},
"node_modules/eslint-plugin-react/node_modules/estraverse": {
@ -32638,7 +32639,9 @@
}
},
"eslint-plugin-react-hooks": {
"version": "2.5.1",
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz",
"integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==",
"dev": true,
"requires": {}
},

2
package.json
View File

@ -143,7 +143,7 @@
"eslint-plugin-jsx-a11y": "6.5.1",
"eslint-plugin-prefer-object-spread": "1.2.1",
"eslint-plugin-react": "7.27.1",
"eslint-plugin-react-hooks": "2.5.1",
"eslint-plugin-react-hooks": "^4.3.0",
"eslint-plugin-testing-library": "4.12.4",
"execa": "5.1.1",
"faker": "5.5.3",

2
tools/challenge-helper-scripts/create-project.ts
View File

@ -230,7 +230,7 @@ prompt([
if (!block.length) {
return 'please enter a short name';
}
if (/[^a-z0-9\-]/.test(block)) {
if (/[^a-z0-9-]/.test(block)) {
return 'please use alphanumerical characters and kebab case';
}
return true;

7
tools/crowdin/actions/remove-deleted-files/index.js
View File

@ -35,7 +35,12 @@ const removeDeletedFiles = async projectId => {
return { ...obj, [filename]: 1 };
}, {});
for (let { fileId, path: crowdinFilePath } of crowdinFiles) {
if (!curriculumLookup.hasOwnProperty(crowdinFilePath)) {
if (
!Object.prototype.hasOwnProperty.call(
curriculumLookup,
crowdinFilePath
)
) {
await deleteFile(projectId, fileId, crowdinFilePath);
}
}

2
tools/scripts/lint/linter/markdown-prism.js
View File

@ -16,7 +16,7 @@ module.exports = {
if (baseLang && !lang) {
onError({
lineNumber: codeBlock.lineNumber,
detail: `\'${baseLang}\' is not recognised.`
detail: `'${baseLang}' is not recognised.`
});
}
});