Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade: some (dev) deps #13155

Merged
merged 5 commits into from Apr 24, 2020
Merged

Upgrade: some (dev) deps #13155

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0759324
Upgrade: some (dev) deps
aladdin-add Apr 7, 2020
1947378
Chore: update eslint-config-eslint peer deps
aladdin-add Apr 7, 2020
0ef3d7f
fix conflicts
aladdin-add Apr 8, 2020
7a54712
Chore: review suggestions
aladdin-add Apr 8, 2020
4793ae7
Chore: add a comment
aladdin-add Apr 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .eslintrc.js
View file
Open in desktop
Expand Up @@ -53,6 +53,11 @@ module.exports = {
parserOptions: {
ecmaVersion: 2020
},
settings: {
jsdoc: {
mode: "typescript"
kaicataldo marked this conversation as resolved.
Show resolved Hide resolved
}
},
rules: {
"eslint-plugin/consistent-output": "error",
"eslint-plugin/no-deprecated-context-methods": "error",
Expand Down
3 changes: 1 addition & 2 deletions lib/shared/relative-module-resolver.js
View file
Open in desktop
Expand Up @@ -11,8 +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.
*/
// 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
aladdin-add marked this conversation as resolved.
Show resolved Hide resolved

module.exports = {

Expand Down
34 changes: 17 additions & 17 deletions package.json
View file
Open in desktop
Expand Up @@ -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",
Expand All @@ -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"
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-config-eslint/package.json
View file
Open in desktop
Expand Up @@ -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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thanks for catching this. I missed this in my PR.

"eslint-plugin-jsdoc": ">=22.1.0",
"eslint-plugin-node": ">=11.1.0"
},
"keywords": [
"eslintconfig",
Expand Down