diff --git a/eslint.config.mjs b/eslint.config.mjs index cf21376634c..b7edea1e6b1 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -3,7 +3,7 @@ import rulesdir from "eslint-plugin-rulesdir"; import jsxA11Y from "eslint-plugin-jsx-a11y"; import reactHooks from "eslint-plugin-react-hooks"; import jest from "eslint-plugin-jest"; -import monorepo from "eslint-plugin-monorepo"; +import monorepo from "@jdb8/eslint-plugin-monorepo"; import * as rspRules from "eslint-plugin-rsp-rules"; import { fixupPluginRules } from "@eslint/compat"; import globals from "globals"; diff --git a/package.json b/package.json index c319d29251a..7a6d48695bc 100644 --- a/package.json +++ b/package.json @@ -84,6 +84,7 @@ "@eslint/eslintrc": "^3.1.0", "@eslint/js": "^9.12.0", "@faker-js/faker": "^8.4.1", + "@jdb8/eslint-plugin-monorepo": "^1.0.1", "@octokit/rest": "*", "@parcel/bundler-library": "2.11.1-dev.3224", "@parcel/config-default": "2.0.0-dev.1601", @@ -150,7 +151,6 @@ "eslint-plugin-jest": "^28.8.3", "eslint-plugin-jsdoc": "^50.4.1", "eslint-plugin-jsx-a11y": "^6.10.0", - "eslint-plugin-monorepo": "^0.3.2", "eslint-plugin-react": "^7.37.1", "eslint-plugin-react-hooks": "^5.0.0", "eslint-plugin-rulesdir": "^0.2.2", diff --git a/patches/eslint-plugin-monorepo+0.3.2.patch b/patches/eslint-plugin-monorepo+0.3.2.patch deleted file mode 100644 index b72e8183c55..00000000000 --- a/patches/eslint-plugin-monorepo+0.3.2.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/node_modules/eslint-plugin-monorepo/lib/rules/no-relative-import.js b/node_modules/eslint-plugin-monorepo/lib/rules/no-relative-import.js -index 1298280..5a2b425 100644 ---- a/node_modules/eslint-plugin-monorepo/lib/rules/no-relative-import.js -+++ b/node_modules/eslint-plugin-monorepo/lib/rules/no-relative-import.js -@@ -19,10 +19,6 @@ var _pathIsInside = require('path-is-inside'); - - var _pathIsInside2 = _interopRequireDefault(_pathIsInside); - --var _minimatch = require('minimatch'); -- --var _minimatch2 = _interopRequireDefault(_minimatch); -- - var _path = require('path'); - - var _path2 = _interopRequireDefault(_path); -@@ -40,12 +36,15 @@ var meta = exports.meta = { - - var create = exports.create = function create(context) { - var _context$options = _slicedToArray(context.options, 1), -- moduleUtilOptions = _context$options[0]; -+ moduleUtilOptions = _context$options[0]; - - var sourceFsPath = context.getFilename(); - var packages = (0, _getMonorepoPackages2.default)(process.cwd()); - - return (0, _moduleVisitor2.default)(function (node) { -+ if (!node.value.includes('..')) { -+ return; -+ } - var resolvedPath = (0, _resolve2.default)(node.value, context); - var packageDir = getPackageDir(sourceFsPath, packages); - -@@ -73,7 +72,7 @@ var create = exports.create = function create(context) { - - var getPackageDir = function getPackageDir(filePath, packages) { - var match = packages.find(function (pkg) { -- return (0, _minimatch2.default)(filePath, _path2.default.join(pkg.location, '**')); -+ return (0, _pathIsInside2.default)(filePath, pkg.location); - }); - if (match) { - return match.location; diff --git a/yarn.lock b/yarn.lock index a53036f4918..51bd53d2dc9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2592,6 +2592,21 @@ __metadata: languageName: node linkType: hard +"@jdb8/eslint-plugin-monorepo@npm:^1.0.1": + version: 1.0.1 + resolution: "@jdb8/eslint-plugin-monorepo@npm:1.0.1" + dependencies: + eslint-module-utils: "npm:^2.1.1" + get-monorepo-packages: "npm:^1.1.0" + globby: "npm:^7.1.1" + load-json-file: "npm:^4.0.0" + minimatch: "npm:^3.0.4" + parse-package-name: "npm:^0.1.0" + path-is-inside: "npm:^1.0.2" + checksum: 10c0/fd0a95355a33bbfc3e14fbadd99641d6c7e3f77fa6c83d54dc5e98bb19b97a4470cb17ad634aea8392877bdd49033e15635b1607a424c7b76eb01694312c4ea1 + languageName: node + linkType: hard + "@jest/console@npm:^29.7.0": version: 29.7.0 resolution: "@jest/console@npm:29.7.0" @@ -17271,21 +17286,6 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-monorepo@npm:^0.3.2": - version: 0.3.2 - resolution: "eslint-plugin-monorepo@npm:0.3.2" - dependencies: - eslint-module-utils: "npm:^2.1.1" - get-monorepo-packages: "npm:^1.1.0" - globby: "npm:^7.1.1" - load-json-file: "npm:^4.0.0" - minimatch: "npm:^3.0.4" - parse-package-name: "npm:^0.1.0" - path-is-inside: "npm:^1.0.2" - checksum: 10c0/9a3c49c0b998207c4c931aeb8f77a7c0930e298076989b2f073d4314ac785f4b72a4763b5b3a992754544bd7c34c44696c6e3561afb137e2f890f0c7db91e5a3 - languageName: node - linkType: hard - "eslint-plugin-react-hooks@npm:^5.0.0": version: 5.0.0 resolution: "eslint-plugin-react-hooks@npm:5.0.0" @@ -29270,6 +29270,7 @@ __metadata: "@eslint/eslintrc": "npm:^3.1.0" "@eslint/js": "npm:^9.12.0" "@faker-js/faker": "npm:^8.4.1" + "@jdb8/eslint-plugin-monorepo": "npm:^1.0.1" "@octokit/rest": "npm:*" "@parcel/bundler-library": "npm:2.11.1-dev.3224" "@parcel/config-default": "npm:2.0.0-dev.1601" @@ -29336,7 +29337,6 @@ __metadata: eslint-plugin-jest: "npm:^28.8.3" eslint-plugin-jsdoc: "npm:^50.4.1" eslint-plugin-jsx-a11y: "npm:^6.10.0" - eslint-plugin-monorepo: "npm:^0.3.2" eslint-plugin-react: "npm:^7.37.1" eslint-plugin-react-hooks: "npm:^5.0.0" eslint-plugin-rulesdir: "npm:^0.2.2"