From 92abfffe84d2623b70d4341a1992dc6dba05644a Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 7 Feb 2022 12:18:20 +0100
Subject: [PATCH] cli: deduplicate no-extraneous-dependencies lint rule

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/cli/config/eslint.backend.js | 12 +-----------
 packages/cli/config/eslint.js         | 22 ++++++----------------
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/packages/cli/config/eslint.backend.js b/packages/cli/config/eslint.backend.js
index a97f26f8da..0aec1c247f 100644
--- a/packages/cli/config/eslint.backend.js
+++ b/packages/cli/config/eslint.backend.js
@@ -58,7 +58,7 @@ module.exports = {
     'import/no-extraneous-dependencies': [
       'error',
       {
-        devDependencies: false,
+        devDependencies: ['**/*.test.*', 'src/setupTests.*', 'dev/**'],
         optionalDependencies: true,
         peerDependencies: true,
         bundledDependencies: true,
@@ -97,16 +97,6 @@ module.exports = {
     {
       files: ['*.test.*', 'src/setupTests.*', 'dev/**'],
       rules: {
-        // Tests are allowed to import dev dependencies
-        'import/no-extraneous-dependencies': [
-          'error',
-          {
-            devDependencies: true,
-            optionalDependencies: true,
-            peerDependencies: true,
-            bundledDependencies: true,
-          },
-        ],
         'no-restricted-syntax': ['error', ...globalRestrictedSyntax],
       },
     },
diff --git a/packages/cli/config/eslint.js b/packages/cli/config/eslint.js
index 781af13577..e81e309f72 100644
--- a/packages/cli/config/eslint.js
+++ b/packages/cli/config/eslint.js
@@ -53,7 +53,12 @@ module.exports = {
     'import/no-extraneous-dependencies': [
       'error',
       {
-        devDependencies: false,
+        devDependencies: [
+          '**/*.test.*',
+          '**/*.stories.*',
+          'src/setupTests.*',
+          'dev/**',
+        ],
         optionalDependencies: true,
         peerDependencies: true,
         bundledDependencies: true,
@@ -101,20 +106,5 @@ module.exports = {
         'no-undef': 'off',
       },
     },
-    {
-      files: ['*.test.*', '*.stories.*', 'src/setupTests.*', 'dev/**'],
-      rules: {
-        // Tests are allowed to import dev dependencies
-        'import/no-extraneous-dependencies': [
-          'error',
-          {
-            devDependencies: true,
-            optionalDependencies: true,
-            peerDependencies: true,
-            bundledDependencies: true,
-          },
-        ],
-      },
-    },
   ],
 };