diff --git a/demo/test/snapshots/linting-config.test.js.md b/demo/test/snapshots/linting-config.test.js.md index 16e074b..518a0eb 100644 --- a/demo/test/snapshots/linting-config.test.js.md +++ b/demo/test/snapshots/linting-config.test.js.md @@ -38,13 +38,12 @@ Generated by [AVA](https://ava.li). "react-hooks",␊ "import",␊ "@babel",␊ - "json",␊ + "jsdoc",␊ "you-dont-need-lodash-underscore",␊ "prettier",␊ "test-selectors",␊ "sonarjs",␊ "promise",␊ - "jsdoc",␊ "html",␊ "deprecate",␊ "bestpractices"␊ @@ -65,6 +64,9 @@ Generated by [AVA](https://ava.li). "@babel/semi": [␊ "off"␊ ],␊ + "@typescript-eslint/block-spacing": [␊ + "off"␊ + ],␊ "@typescript-eslint/brace-style": [␊ "off"␊ ],␊ @@ -80,6 +82,9 @@ Generated by [AVA](https://ava.li). "@typescript-eslint/indent": [␊ "off"␊ ],␊ + "@typescript-eslint/key-spacing": [␊ + "off"␊ + ],␊ "@typescript-eslint/keyword-spacing": [␊ "off"␊ ],␊ @@ -713,12 +718,6 @@ Generated by [AVA](https://ava.li). "jsdoc/valid-types": [␊ "warn"␊ ],␊ - "json/*": [␊ - "error",␊ - {␊ - "allowComments": true␊ - }␊ - ],␊ "jsx-a11y/accessible-emoji": [␊ "off"␊ ],␊ diff --git a/demo/test/snapshots/linting-config.test.js.snap b/demo/test/snapshots/linting-config.test.js.snap index 23bb3a4..1fd2fae 100644 Binary files a/demo/test/snapshots/linting-config.test.js.snap and b/demo/test/snapshots/linting-config.test.js.snap differ diff --git a/es6.js b/es6.js index 84a5dd2..6fd58fc 100644 --- a/es6.js +++ b/es6.js @@ -10,6 +10,7 @@ module.exports = { extends: [ '@fs/eslint-config-frontier-react/es6', '@fs/eslint-config-frontier-react/json', + '@fs/eslint-config-frontier-react/jsdoc', '@fs/eslint-config-frontier-react/dont-need-lodash', '@fs/eslint-config-frontier-react/typescript', '@fs/eslint-config-frontier-react/prettierSetup', // Always have prettier last so it can override format rules in the extends before it @@ -18,7 +19,6 @@ module.exports = { 'eslint-plugin-bestpractices', 'eslint-plugin-deprecate', 'eslint-plugin-html', - 'eslint-plugin-jsdoc', 'eslint-plugin-promise', 'eslint-plugin-sonarjs', 'eslint-plugin-test-selectors', @@ -94,61 +94,6 @@ module.exports = { // ] }, overrides: [ - { - files: ['*.js?(x)', '*.html'], - rules: { - 'valid-jsdoc': ['warn'], - // jsdoc/check-access - 'jsdoc/check-alignment': 'warn', - // jsdoc/check-indentation - // jsdoc/check-line-alignment - 'jsdoc/check-param-names': 'warn', - // jsdoc/check-property-names - 'jsdoc/check-syntax': 'warn', - 'jsdoc/check-tag-names': 'warn', - 'jsdoc/check-types': 'warn', - // jsdoc/check-values - // jsdoc/empty-tags - 'jsdoc/implements-on-classes': 'warn', - 'jsdoc/match-description': 'warn', - // jsdoc/match-name - // jsdoc/multiline-blocks - // jsdoc/newline-after-description - // jsdoc/no-bad-blocks - // jsdoc/no-defaults - // jsdoc/no-missing-syntax - // jsdoc/no-multi-asterisks - // jsdoc/no-restricted-syntax - // jsdoc/no-types - // jsdoc/no-undefined-types - 2020-01-23: This was broken in eslint-plugin-jsdoc#8 in 2019-06, and hasn't gotten much better. Disabled, for now. Check back later. - // jsdoc/require-asterisk-prefix - // jsdoc/require-description-complete-sentence - 'jsdoc/require-description': 'warn', - // jsdoc/require-example - // jsdoc/require-file-overview - 'jsdoc/require-hyphen-before-param-description': 'warn', - // jsdoc/require-jsdoc - 'jsdoc/require-param-description': 'warn', - 'jsdoc/require-param-name': 'warn', - 'jsdoc/require-param-type': 'warn', - 'jsdoc/require-param': 'warn', - // 'jsdoc/require-property': 'warn', - // 'jsdoc/require-property-description': 'warn', - // 'jsdoc/require-property-name': 'warn', - // 'jsdoc/require-property-type': 'warn' - 'jsdoc/require-returns-check': 'warn', - 'jsdoc/require-returns-description': 'warn', - 'jsdoc/require-returns-type': 'warn', - 'jsdoc/require-returns': 'warn', - // jsdoc/require-throws - // jsdoc/require-yields - // jsdoc/require-yields-check - // jsdoc/sort-tags - // jsdoc/tag-lines - // jsdoc/text-escaping - 'jsdoc/valid-types': 'warn', - }, - }, { files: ['*.stories.*', '*test*', '**/test/**', '**/*mock*/**', '*mock*', '**/setupTests.*'], extends: ['@fs/eslint-config-frontier-react/jest'], diff --git a/package.json b/package.json index 8b7e774..d9a1a8e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eslint-config-tree", - "version": "6.0.0-alpha.0", + "version": "6.0.0-alpha.1", "description": "Shared Tree configuration that contains overrides and enhancements on top of the base frontier configuration.", "main": "index.js", "repository": { @@ -28,7 +28,6 @@ "eslint-plugin-bestpractices": "github:skye2k2/eslint-plugin-bestpractices", "eslint-plugin-deprecate": "^0.7.0", "eslint-plugin-html": "^7.1.0", - "eslint-plugin-jsdoc": "^40.0.0", "eslint-plugin-promise": "^6.1.1", "eslint-plugin-sonarjs": "^0.18.0", "eslint-plugin-test-selectors": "^2.0.4" @@ -44,11 +43,11 @@ } }, "scripts": { - "lint": "eslint demo --ext .html,.js,.json", - "lint:fix": "eslint demo --ext .html,.js,.json --fix", - "lint:quiet": "eslint demo --ext .html,.js,.json --quiet", - "lint:report": "eslint demo --ext .html,.js,.json '**/*.html' --format html --output-file ./reports/linting/linting_report.html & eslint demo --ext .html,.js,.json --format json --output-file ./reports/linting/linting_report.json", - "lint:snapshot": "eslint demo --ext .html,.js,.json --no-color --output-file ./demo/test/snapshots/local-linting-output.txt; eslint --print-config file.js > ./demo/test/snapshots/local-linting-final-config.json; npm run test:format", + "lint": "eslint demo", + "lint:fix": "eslint demo --fix", + "lint:quiet": "eslint demo --quiet", + "lint:report": "eslint demo '**/*.html' --format html --output-file ./reports/linting/linting_report.html & eslint demo --format json --output-file ./reports/linting/linting_report.json", + "lint:snapshot": "eslint demo --no-color --output-file ./demo/test/snapshots/local-linting-output.txt; eslint --print-config file.js > ./demo/test/snapshots/local-linting-final-config.json; npm run test:format", "preinstall": "git config --global url.https://github.com/.insteadOf git://github.com/", "postinstall": "npm rebuild husky", "test": "npm run lint:snapshot; ava",