From 6c0cdb147f151d8c09290719696a0c3130c6edcc Mon Sep 17 00:00:00 2001 From: Anna Bocharova Date: Tue, 25 Jun 2024 12:09:12 +0200 Subject: [PATCH 1/3] Allow either import or import-x plugin as a peer dependency --- package.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index d9e4f9c..51b67ba 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,12 @@ }, "peerDependencies": { "eslint": "*", - "eslint-plugin-import": "*" + "eslint-plugin-import": "*", + "eslint-plugin-import-x": "*" + }, + "peerDependenciesMeta": { + "eslint-plugin-import": { "optional": true }, + "eslint-plugin-import-x": { "optional": true } }, "dependencies": { "debug": "^4.3.5", From 77618943b9329cbd199d81f05f9bdb430a4d5218 Mon Sep 17 00:00:00 2001 From: Anna Bocharova Date: Tue, 25 Jun 2024 10:26:12 +0000 Subject: [PATCH 2/3] Updating lock file. --- package.json | 8 ++++++-- yarn.lock | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 51b67ba..f3f988c 100644 --- a/package.json +++ b/package.json @@ -67,8 +67,12 @@ "eslint-plugin-import-x": "*" }, "peerDependenciesMeta": { - "eslint-plugin-import": { "optional": true }, - "eslint-plugin-import-x": { "optional": true } + "eslint-plugin-import": { + "optional": true + }, + "eslint-plugin-import-x": { + "optional": true + } }, "dependencies": { "debug": "^4.3.5", diff --git a/yarn.lock b/yarn.lock index eaa54e1..711e5eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6145,6 +6145,12 @@ __metadata: peerDependencies: eslint: "*" eslint-plugin-import: "*" + eslint-plugin-import-x: "*" + peerDependenciesMeta: + eslint-plugin-import: + optional: true + eslint-plugin-import-x: + optional: true languageName: unknown linkType: soft From c370a299629f88ea89e99646f25164f568b6689a Mon Sep 17 00:00:00 2001 From: Anna Bocharova Date: Wed, 26 Jun 2024 18:56:24 +0000 Subject: [PATCH 3/3] Add changeset. --- .changeset/purple-buttons-lay.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/purple-buttons-lay.md diff --git a/.changeset/purple-buttons-lay.md b/.changeset/purple-buttons-lay.md new file mode 100644 index 0000000..c8618a1 --- /dev/null +++ b/.changeset/purple-buttons-lay.md @@ -0,0 +1,5 @@ +--- +'eslint-import-resolver-typescript': patch +--- + +Allow either eslint-plugin-import-x or eslint-plugin-import plugin as a peer dependency.