diff --git a/package.json b/package.json index 6d324abbf0e..3d4ec9452e2 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "eslint-plugin-jest": "^24.0.2", "eslint-plugin-jsdoc": "^30.6.2", "eslint-plugin-jsx-a11y": "^6.3.1", - "eslint-plugin-monorepo": "^0.2.1", + "eslint-plugin-monorepo": "^0.3.2", "eslint-plugin-react": "^7.21.2", "eslint-plugin-react-hooks": "^4.1.2", "eslint-plugin-rulesdir": "^0.1.0", diff --git a/patches/eslint-plugin-monorepo+0.3.2.patch b/patches/eslint-plugin-monorepo+0.3.2.patch new file mode 100644 index 00000000000..b72e8183c55 --- /dev/null +++ b/patches/eslint-plugin-monorepo+0.3.2.patch @@ -0,0 +1,41 @@ +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 b01f59a6629..3810f3cb9db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10187,10 +10187,10 @@ eslint-plugin-jsx-a11y@^6.3.1: jsx-ast-utils "^2.4.1" language-tags "^1.0.5" -eslint-plugin-monorepo@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-monorepo/-/eslint-plugin-monorepo-0.2.1.tgz#96cfc4af241077675f40d7017377897fb8ea537b" - integrity sha512-82JaAjuajVAsDT+pMvdt275H6F55H3MEofaMZbJurGqfXpPDT4eayTgYyyjfd1XR8VD1S+ORbuHCULnSqNyD9g== +eslint-plugin-monorepo@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-monorepo/-/eslint-plugin-monorepo-0.3.2.tgz#bc546cbe84b21ae6a7622f261bf9fe73b1524367" + integrity sha512-CypTAqHjTR05XxzqDj7x88oVu2GiqqQA/datD9kIwciHzpj0oE4YbTdyEFFKADgd7dbd21KliSlUpOvo626FBw== dependencies: eslint-module-utils "^2.1.1" get-monorepo-packages "^1.1.0"