From 07593240993e6bc0e81f3fc5502d4c2d79896033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=AF=E5=88=83?= Date: Tue, 7 Apr 2020 19:31:51 +0800 Subject: [PATCH 1/5] Upgrade: some (dev) deps 1. after upgrading eslint-plugin-jsdoc, it reports: "Invalid JSDoc tag name "template" jsdoc/check-tag-names" it was fixed by added setting.jsdoc.mode: typescript (refs:https://github.com/gajus/eslint-plugin-jsdoc#check-tag-names) 2. the following deps were not upgraded: * levn (was upgraded in eslint/eslint#13140) * ignore (it has a few breaking change) --- .eslintrc.js | 5 ++++ lib/shared/relative-module-resolver.js | 4 +++ package.json | 34 +++++++++++++------------- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index a857d977ba2..96140560a59 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -53,6 +53,11 @@ module.exports = { parserOptions: { ecmaVersion: 2020 }, + settings: { + jsdoc: { + mode: "typescript" + } + }, rules: { "eslint-plugin/consistent-output": "error", "eslint-plugin/no-deprecated-context-methods": "error", diff --git a/lib/shared/relative-module-resolver.js b/lib/shared/relative-module-resolver.js index 80335c5cfca..dd2eebd0831 100644 --- a/lib/shared/relative-module-resolver.js +++ b/lib/shared/relative-module-resolver.js @@ -11,8 +11,12 @@ const Module = require("module"); * `Module.createRequire` is added in v12.2.0. It supports URL as well. * We only support the case where the argument is a filepath, not a URL. */ +<<<<<<< HEAD // eslint-disable-next-line node/no-unsupported-features/node-builtins, node/no-deprecated-api const createRequire = Module.createRequire || Module.createRequireFromPath; +======= +const createRequire = Module.createRequire || Module.createRequireFromPath; // eslint-disable-line node/no-unsupported-features/node-builtins, node/no-deprecated-api +>>>>>>> Upgrade: some (dev) deps module.exports = { diff --git a/package.json b/package.json index a4c16472460..cc3b89e8f84 100644 --- a/package.json +++ b/package.json @@ -48,8 +48,8 @@ "dependencies": { "@babel/code-frame": "^7.0.0", "ajv": "^6.10.0", - "chalk": "^3.0.0", - "cross-spawn": "^7.0.1", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", "debug": "^4.0.1", "doctrine": "^3.0.0", "eslint-scope": "^5.0.0", @@ -75,10 +75,10 @@ "natural-compare": "^1.4.0", "optionator": "^0.9.1", "progress": "^2.0.0", - "regexpp": "^3.0.0", - "semver": "^7.1.1", + "regexpp": "^3.1.0", + "semver": "^7.2.1", "strip-ansi": "^6.0.0", - "strip-json-comments": "^3.0.1", + "strip-json-comments": "^3.1.0", "table": "^5.2.3", "text-table": "^0.2.0", "v8-compile-cache": "^2.0.3" @@ -93,39 +93,39 @@ "common-tags": "^1.8.0", "core-js": "^3.1.3", "dateformat": "^3.0.3", - "ejs": "^2.6.1", + "ejs": "^3.0.2", "eslint": "file:.", "eslint-config-eslint": "file:packages/eslint-config-eslint", "eslint-plugin-eslint-plugin": "^2.2.1", "eslint-plugin-internal-rules": "file:tools/internal-rules", - "eslint-plugin-jsdoc": "^15.9.5", + "eslint-plugin-jsdoc": "^22.1.0", "eslint-plugin-node": "^11.1.0", "eslint-release": "^1.2.0", "eslump": "^2.0.0", "esprima": "^4.0.1", - "glob": "^7.1.3", + "glob": "^7.1.6", "jsdoc": "^3.5.5", "karma": "^4.0.1", - "karma-chrome-launcher": "^2.2.0", + "karma-chrome-launcher": "^3.1.0", "karma-mocha": "^1.3.0", "karma-mocha-reporter": "^2.2.3", "karma-webpack": "^4.0.0-rc.6", "leche": "^2.2.3", - "lint-staged": "^8.1.5", + "lint-staged": "^10.1.2", "load-perf": "^0.2.0", - "markdownlint": "^0.15.0", - "markdownlint-cli": "^0.17.0", + "markdownlint": "^0.19.0", + "markdownlint-cli": "^0.22.0", "memfs": "^3.0.1", - "mocha": "^6.1.2", + "mocha": "^7.1.1", "mocha-junit-reporter": "^1.23.0", "npm-license": "^0.3.3", - "nyc": "^14.1.1", + "nyc": "^15.0.1", "proxyquire": "^2.0.1", - "puppeteer": "^1.18.0", - "recast": "^0.18.1", + "puppeteer": "^2.1.1", + "recast": "^0.19.0", "regenerator-runtime": "^0.13.2", "shelljs": "^0.8.2", - "sinon": "^7.3.2", + "sinon": "^9.0.1", "temp": "^0.9.0", "webpack": "^4.35.0", "webpack-cli": "^3.3.5", From 19473780b091fa12e03441f768097806c5e4b7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=AF=E5=88=83?= Date: Tue, 7 Apr 2020 21:57:43 +0800 Subject: [PATCH 2/5] Chore: update eslint-config-eslint peer deps --- packages/eslint-config-eslint/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/eslint-config-eslint/package.json b/packages/eslint-config-eslint/package.json index afbe4f55819..f971606c06d 100644 --- a/packages/eslint-config-eslint/package.json +++ b/packages/eslint-config-eslint/package.json @@ -20,8 +20,8 @@ "homepage": "https://eslint.org", "bugs": "https://github.com/eslint/eslint/issues/", "peerDependencies": { - "eslint-plugin-jsdoc": "^15.9.5", - "eslint-plugin-node": "^9.0.0" + "eslint-plugin-jsdoc": ">=22.1.0", + "eslint-plugin-node": ">=11.1.0" }, "keywords": [ "eslintconfig", From 0ef3d7f450f592deb8f4e791cddd9b1bc7ab1f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=AF=E5=88=83?= Date: Wed, 8 Apr 2020 11:05:33 +0800 Subject: [PATCH 3/5] fix conflicts --- lib/shared/relative-module-resolver.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/shared/relative-module-resolver.js b/lib/shared/relative-module-resolver.js index dd2eebd0831..430f810862b 100644 --- a/lib/shared/relative-module-resolver.js +++ b/lib/shared/relative-module-resolver.js @@ -11,12 +11,7 @@ const Module = require("module"); * `Module.createRequire` is added in v12.2.0. It supports URL as well. * We only support the case where the argument is a filepath, not a URL. */ -<<<<<<< HEAD -// eslint-disable-next-line node/no-unsupported-features/node-builtins, node/no-deprecated-api -const createRequire = Module.createRequire || Module.createRequireFromPath; -======= const createRequire = Module.createRequire || Module.createRequireFromPath; // eslint-disable-line node/no-unsupported-features/node-builtins, node/no-deprecated-api ->>>>>>> Upgrade: some (dev) deps module.exports = { From 7a547123972d070dc8bb77d87c20355193a27f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=AF=E5=88=83?= Date: Wed, 8 Apr 2020 11:47:24 +0800 Subject: [PATCH 4/5] Chore: review suggestions --- lib/shared/relative-module-resolver.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/shared/relative-module-resolver.js b/lib/shared/relative-module-resolver.js index 430f810862b..80335c5cfca 100644 --- a/lib/shared/relative-module-resolver.js +++ b/lib/shared/relative-module-resolver.js @@ -11,7 +11,8 @@ const Module = require("module"); * `Module.createRequire` is added in v12.2.0. It supports URL as well. * We only support the case where the argument is a filepath, not a URL. */ -const createRequire = Module.createRequire || Module.createRequireFromPath; // eslint-disable-line node/no-unsupported-features/node-builtins, node/no-deprecated-api +// eslint-disable-next-line node/no-unsupported-features/node-builtins, node/no-deprecated-api +const createRequire = Module.createRequire || Module.createRequireFromPath; module.exports = { From 4793ae73bf646d46d17efbc4f8c2b56082ac6101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=AF=E5=88=83?= Date: Wed, 8 Apr 2020 19:03:59 +0800 Subject: [PATCH 5/5] Chore: add a comment --- .eslintrc.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.eslintrc.js b/.eslintrc.js index 96140560a59..a53fedba15b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -53,6 +53,11 @@ module.exports = { parserOptions: { ecmaVersion: 2020 }, + + /* + * it fixes eslint-plugin-jsdoc's reports: "Invalid JSDoc tag name "template" jsdoc/check-tag-names" + * refs: https://github.com/gajus/eslint-plugin-jsdoc#check-tag-names + */ settings: { jsdoc: { mode: "typescript"