From 906af5db533ee9356b61a7f3844339d3d77cbbb4 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 3 Feb 2023 16:48:43 +0100
Subject: [PATCH] cli: remove unnecessary lint rules and fix issues

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/cli/config/eslint-factory.js     | 8 +-------
 packages/cli/package.json                 | 1 -
 packages/cli/src/lib/version.ts           | 2 +-
 packages/core-plugin-api/src/app/types.ts | 2 +-
 packages/create-app/src/index.ts          | 1 +
 packages/create-app/src/lib/versions.ts   | 2 +-
 6 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/packages/cli/config/eslint-factory.js b/packages/cli/config/eslint-factory.js
index f344af4ab0..dde853fdff 100644
--- a/packages/cli/config/eslint-factory.js
+++ b/packages/cli/config/eslint-factory.js
@@ -64,7 +64,7 @@ function createConfig(dir, extraConfig = {}) {
       ...(extraExtends ?? []),
     ],
     parser: '@typescript-eslint/parser',
-    plugins: ['import', 'monorepo', ...(plugins ?? [])],
+    plugins: ['import', ...(plugins ?? [])],
     env: {
       jest: true,
       ...env,
@@ -87,7 +87,6 @@ function createConfig(dir, extraConfig = {}) {
       '@typescript-eslint/no-shadow': 'error',
       '@typescript-eslint/no-redeclare': 'error',
       'no-undef': 'off',
-      'monorepo/no-relative-import': 'error',
       'import/newline-after-import': 'error',
       'no-unused-expressions': 'off',
       '@typescript-eslint/no-unused-expressions': 'error',
@@ -110,9 +109,6 @@ function createConfig(dir, extraConfig = {}) {
             ...(restrictedSrcImports ?? []),
           ],
           patterns: [
-            // Avoid cross-package imports
-            '**/../../**/*/src/**',
-            '**/../../**/*/src',
             // Prevent imports of stories or tests
             '*.stories*',
             '*.test*',
@@ -162,8 +158,6 @@ function createConfig(dir, extraConfig = {}) {
                 ...(restrictedImports ?? []),
                 ...(restrictedTestImports ?? []),
               ],
-              // Avoid cross-package imports
-              patterns: ['**/../../**/*/src/**', '**/../../**/*/src'],
             },
           ],
         },
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 909ac8460c..359f16adfa 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -76,7 +76,6 @@
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-jest": "^27.0.0",
     "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-monorepo": "^0.3.2",
     "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.3.0",
     "eslint-webpack-plugin": "^3.1.1",
diff --git a/packages/cli/src/lib/version.ts b/packages/cli/src/lib/version.ts
index 5a199236f5..bf89842d5f 100644
--- a/packages/cli/src/lib/version.ts
+++ b/packages/cli/src/lib/version.ts
@@ -19,7 +19,7 @@ import semver from 'semver';
 import { paths } from './paths';
 import { Lockfile } from './versioning';
 
-/* eslint-disable monorepo/no-relative-import */
+/* eslint-disable @backstage/no-relative-monorepo-imports */
 
 /*
 This is a list of all packages used by the templates. If dependencies are added or removed,
diff --git a/packages/core-plugin-api/src/app/types.ts b/packages/core-plugin-api/src/app/types.ts
index 2a71eda1f4..f3e0547ca4 100644
--- a/packages/core-plugin-api/src/app/types.ts
+++ b/packages/core-plugin-api/src/app/types.ts
@@ -17,7 +17,7 @@
 // This is a bit of a hack that we use to avoid having to redeclare these types
 // within this package or have an explicit dependency on core-app-api.
 // These types end up being inlined and duplicated into this package at build time.
-// eslint-disable-next-line no-restricted-imports
+// eslint-disable-next-line @backstage/no-relative-monorepo-imports
 export type {
   BootErrorPageProps,
   SignInPageProps,
diff --git a/packages/create-app/src/index.ts b/packages/create-app/src/index.ts
index 216fab6740..fa235e6175 100644
--- a/packages/create-app/src/index.ts
+++ b/packages/create-app/src/index.ts
@@ -22,6 +22,7 @@
 
 import { program } from 'commander';
 import { exitWithError } from './lib/errors';
+// eslint-disable-next-line @backstage/no-relative-monorepo-imports
 import { version } from '../../../package.json';
 import createApp from './createApp';
 
diff --git a/packages/create-app/src/lib/versions.ts b/packages/create-app/src/lib/versions.ts
index b89b1d5463..72f5c2c9d5 100644
--- a/packages/create-app/src/lib/versions.ts
+++ b/packages/create-app/src/lib/versions.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* eslint-disable monorepo/no-relative-import */
+/* eslint-disable @backstage/no-relative-monorepo-imports */
 
 /*
 This is a list of all packages used by the template. If dependencies are added or removed,