diff --git a/package.json b/package.json index 56d851bb9..b1d064a25 100644 --- a/package.json +++ b/package.json @@ -7,36 +7,36 @@ "dependencies": { "comment-parser": "^0.7.5", "debug": "^4.1.1", - "jsdoctypeparser": "^8.0.0", - "lodash": "^4.17.15", + "jsdoctypeparser": "^9.0.0", + "lodash": "^4.17.19", "regextras": "^0.7.1", "semver": "^7.3.2", "spdx-expression-parse": "^3.0.1" }, "description": "JSDoc linting rules for ESLint.", "devDependencies": { - "@babel/cli": "^7.10.4", - "@babel/core": "^7.10.4", - "@babel/node": "^7.10.4", + "@babel/cli": "^7.10.5", + "@babel/core": "^7.11.0", + "@babel/node": "^7.10.5", "@babel/plugin-transform-flow-strip-types": "^7.10.4", - "@babel/preset-env": "^7.10.4", - "@babel/register": "^7.10.4", - "@typescript-eslint/parser": "^3.5.0", + "@babel/preset-env": "^7.11.0", + "@babel/register": "^7.10.5", + "@typescript-eslint/parser": "^3.8.0", "babel-eslint": "^10.1.0", "babel-plugin-add-module-exports": "^1.0.2", "babel-plugin-istanbul": "^6.0.0", "chai": "^4.2.0", "cross-env": "^7.0.2", - "eslint": "7.4.0", - "eslint-config-canonical": "^20.1.0", + "eslint": "7.6.0", + "eslint-config-canonical": "^22.0.0", "gitdown": "^3.1.3", "glob": "^7.1.6", "husky": "^4.2.5", - "mocha": "^8.0.1", + "mocha": "^8.1.0", "nyc": "^15.1.0", "rimraf": "^3.0.2", "semantic-release": "^17.1.1", - "typescript": "^3.9.6" + "typescript": "^3.9.7" }, "engines": { "node": ">=10" diff --git a/src/bin/generateReadme.js b/src/bin/generateReadme.js index 372f7ffb0..eee5fbd6e 100644 --- a/src/bin/generateReadme.js +++ b/src/bin/generateReadme.js @@ -55,7 +55,7 @@ const getAssertions = () => { }); const assertionCodes = assertionFiles.map((filePath) => { - // eslint-disable-next-line global-require, import/no-dynamic-require + // eslint-disable-next-line import/no-dynamic-require const codes = require(filePath); return { @@ -132,7 +132,6 @@ const main = async () => { } catch (error) { /* eslint-disable-next-line no-console */ console.error(error); - /* eslint-disable-next-line no-process-exit */ process.exit(1); } }; diff --git a/src/eslint/getJSDocComment.js b/src/eslint/getJSDocComment.js index 6e8dd859f..99320de4e 100644 --- a/src/eslint/getJSDocComment.js +++ b/src/eslint/getJSDocComment.js @@ -260,5 +260,7 @@ const getJSDocComment = function (sourceCode, node, settings) { return findJSDocComment(reducedNode); }; -export {getReducedASTNode, getJSDocComment, getDecorator}; +export { + getReducedASTNode, getJSDocComment, getDecorator, +}; export default getJSDocComment; diff --git a/src/iterateJsdoc.js b/src/iterateJsdoc.js index 098d73d0c..9c91b8a78 100644 --- a/src/iterateJsdoc.js +++ b/src/iterateJsdoc.js @@ -1,8 +1,12 @@ -// eslint-disable-next-line import/no-named-default -import {default as commentParser, stringify as commentStringify} from 'comment-parser'; +import { + // eslint-disable-next-line import/no-named-default + default as commentParser, stringify as commentStringify, +} from 'comment-parser'; import _ from 'lodash'; import jsdocUtils from './jsdocUtils'; -import {getJSDocComment, getReducedASTNode} from './eslint/getJSDocComment'; +import { + getJSDocComment, getReducedASTNode, +} from './eslint/getJSDocComment'; const globalState = new Map(); diff --git a/src/jsdocUtils.js b/src/jsdocUtils.js index 2ba7c95a2..ad2676bf6 100644 --- a/src/jsdocUtils.js +++ b/src/jsdocUtils.js @@ -1,5 +1,7 @@ import _ from 'lodash'; -import {jsdocTags, closureTags, typeScriptTags} from './tagNames'; +import { + jsdocTags, closureTags, typeScriptTags, +} from './tagNames'; import WarnSettings from './WarnSettings'; import getDefaultTagStructureForMode from './getDefaultTagStructureForMode'; diff --git a/src/rules/checkExamples.js b/src/rules/checkExamples.js index 3d3577fd8..60d493df7 100644 --- a/src/rules/checkExamples.js +++ b/src/rules/checkExamples.js @@ -1,7 +1,9 @@ // Todo: When peerDeps bump to ESLint 7, see about replacing `CLIEngine` // with non-deprecated `ESLint` class: // https://github.com/eslint/eslint/blob/master/docs/user-guide/migrating-to-7.0.0.md#-the-cliengine-class-has-been-deprecated -import {CLIEngine} from 'eslint'; +import { + CLIEngine, +} from 'eslint'; import iterateJsdoc from '../iterateJsdoc'; const zeroBasedLineIndexAdjust = -1; diff --git a/src/rules/checkTypes.js b/src/rules/checkTypes.js index fe78e01a2..2023146af 100644 --- a/src/rules/checkTypes.js +++ b/src/rules/checkTypes.js @@ -1,4 +1,6 @@ -import {parse, traverse, publish} from 'jsdoctypeparser'; +import { + parse, traverse, publish, +} from 'jsdoctypeparser'; import iterateJsdoc from '../iterateJsdoc'; const strictNativeTypes = [ diff --git a/src/rules/noUndefinedTypes.js b/src/rules/noUndefinedTypes.js index f24d9d075..721e721c2 100644 --- a/src/rules/noUndefinedTypes.js +++ b/src/rules/noUndefinedTypes.js @@ -1,8 +1,14 @@ import _ from 'lodash'; -import {parse as parseType, traverse} from 'jsdoctypeparser'; -import iterateJsdoc, {parseComment} from '../iterateJsdoc'; +import { + parse as parseType, traverse, +} from 'jsdoctypeparser'; +import iterateJsdoc, { + parseComment, +} from '../iterateJsdoc'; import jsdocUtils from '../jsdocUtils'; -import {getJSDocComment} from '../eslint/getJSDocComment'; +import { + getJSDocComment, +} from '../eslint/getJSDocComment'; const extraTypes = [ 'null', 'undefined', 'void', 'string', 'boolean', 'object', diff --git a/src/rules/requireDescriptionCompleteSentence.js b/src/rules/requireDescriptionCompleteSentence.js index 395b8661a..7442e6ed3 100644 --- a/src/rules/requireDescriptionCompleteSentence.js +++ b/src/rules/requireDescriptionCompleteSentence.js @@ -1,5 +1,7 @@ import _ from 'lodash'; -import {RegExtras} from 'regextras/dist/main-umd'; +import { + RegExtras, +} from 'regextras/dist/main-umd'; import iterateJsdoc from '../iterateJsdoc'; const otherDescriptiveTags = new Set([ diff --git a/src/rules/requireJsdoc.js b/src/rules/requireJsdoc.js index 03acba9e8..8331eadef 100644 --- a/src/rules/requireJsdoc.js +++ b/src/rules/requireJsdoc.js @@ -1,8 +1,12 @@ import _ from 'lodash'; import jsdocUtils from '../jsdocUtils'; import exportParser from '../exportParser'; -import {getJSDocComment, getReducedASTNode, getDecorator} from '../eslint/getJSDocComment'; -import {getSettings} from '../iterateJsdoc'; +import { + getJSDocComment, getReducedASTNode, getDecorator, +} from '../eslint/getJSDocComment'; +import { + getSettings, +} from '../iterateJsdoc'; const OPTIONS_SCHEMA = { additionalProperties: false, diff --git a/src/rules/validTypes.js b/src/rules/validTypes.js index a3fdb9d3e..a11d3f523 100644 --- a/src/rules/validTypes.js +++ b/src/rules/validTypes.js @@ -1,4 +1,6 @@ -import {parse} from 'jsdoctypeparser'; +import { + parse, +} from 'jsdoctypeparser'; import iterateJsdoc from '../iterateJsdoc'; const asExpression = /as\s+/u; diff --git a/src/tagNames.js b/src/tagNames.js index e3532c63d..0c32c0a2f 100644 --- a/src/tagNames.js +++ b/src/tagNames.js @@ -194,4 +194,6 @@ const closureTags = { unrestricted: [], }; -export {jsdocTags, closureTags, typeScriptTags}; +export { + jsdocTags, closureTags, typeScriptTags, +}; diff --git a/test/eslint/getJSDocComment.js b/test/eslint/getJSDocComment.js index 5634e7c42..554e72685 100644 --- a/test/eslint/getJSDocComment.js +++ b/test/eslint/getJSDocComment.js @@ -1,8 +1,12 @@ import { RuleTester, } from 'eslint'; -import {getJSDocComment} from '../../src/eslint/getJSDocComment'; -import {getSettings} from '../../src/iterateJsdoc'; +import { + getJSDocComment, +} from '../../src/eslint/getJSDocComment'; +import { + getSettings, +} from '../../src/iterateJsdoc'; const rule = { create (context) { diff --git a/test/iterateJsdoc.js b/test/iterateJsdoc.js index 4d3362f00..d402a05d0 100644 --- a/test/iterateJsdoc.js +++ b/test/iterateJsdoc.js @@ -3,8 +3,10 @@ import { expect, } from 'chai'; -// eslint-disable-next-line import/no-named-default -import {parseComment, default as iterateJsdoc} from '../src/iterateJsdoc'; +import { + // eslint-disable-next-line import/no-named-default + parseComment, default as iterateJsdoc, +} from '../src/iterateJsdoc'; describe('iterateJsdoc', () => { describe('constructor', () => { diff --git a/test/rules/assertions/checkTagNames.js b/test/rules/assertions/checkTagNames.js index 2bef53075..09f17964c 100644 --- a/test/rules/assertions/checkTagNames.js +++ b/test/rules/assertions/checkTagNames.js @@ -1,4 +1,6 @@ -import {jsdocTags, typeScriptTags, closureTags} from '../../../src/tagNames'; +import { + jsdocTags, typeScriptTags, closureTags, +} from '../../../src/tagNames'; const buildTagBlock = (tags) => { return '/** \n * @' + Object.keys(tags).map((tagName, idx) => { diff --git a/test/rules/index.js b/test/rules/index.js index ec6e43af2..209ffeed6 100644 --- a/test/rules/index.js +++ b/test/rules/index.js @@ -6,7 +6,6 @@ import config from '../../src'; const ruleTester = new RuleTester(); -// eslint-disable-next-line no-process-env (process.env.npm_config_rule ? process.env.npm_config_rule.split(',') : [ 'check-access', 'check-alignment', @@ -53,7 +52,7 @@ const ruleTester = new RuleTester(); ecmaVersion: 6, }; - // eslint-disable-next-line global-require, import/no-dynamic-require + // eslint-disable-next-line import/no-dynamic-require const assertions = require(`./assertions/${_.camelCase(ruleName)}`); if (!_.has(rule, 'meta.schema')) { @@ -89,7 +88,6 @@ const ruleTester = new RuleTester(); return assertion; }); - /* eslint-disable no-process-env */ if (process.env.npm_config_invalid) { const indexes = process.env.npm_config_invalid.split(','); assertions.invalid = assertions.invalid.filter((assertion, idx) => {