From b2fd517bdef998d02b1ba69ce7785447727e6520 Mon Sep 17 00:00:00 2001
From: Nathan Vasse <nathan.vasse@gmail.com>
Date: Fri, 17 Mar 2023 11:50:49 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7(eslint)=20update=20eslint=20config?=
 =?UTF-8?q?=20to=20make=20import/order=20work?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The autofix of import/order was not taken into account due to
a misconfiguration.
---
 packages/eslint-config-custom/.eslintrc.json     | 6 ++++--
 packages/eslint-config-custom/package.json       | 3 ++-
 packages/react/.eslintrc.json                    | 2 +-
 packages/tokens/src/bin/ThemeGenerator.ts        | 2 +-
 packages/tokens/src/bin/tests/Cunningham.spec.ts | 2 +-
 yarn.lock                                        | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/eslint-config-custom/.eslintrc.json b/packages/eslint-config-custom/.eslintrc.json
index 89f0ca3..9a4ec9a 100644
--- a/packages/eslint-config-custom/.eslintrc.json
+++ b/packages/eslint-config-custom/.eslintrc.json
@@ -26,7 +26,7 @@
       "jsx": true
     }
   },
-  "plugins": ["formatjs", "@typescript-eslint"],
+  "plugins": ["formatjs", "@typescript-eslint", "import"],
   /* Disable some rules to be iso with tslint which was previously used */
   "rules": {
     "@typescript-eslint/explicit-member-accessibility": ["error", { "accessibility": "no-public" }],
@@ -84,6 +84,8 @@
   },
   "settings": {
     "polyfills": ["fetch", "Promise"],
-    "import/resolver": "webpack"
+    "import/resolver": {
+      "typescript": true
+    }
   }
 }
diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json
index bde8812..487053a 100644
--- a/packages/eslint-config-custom/package.json
+++ b/packages/eslint-config-custom/package.json
@@ -7,10 +7,11 @@
     "@typescript-eslint/eslint-plugin": "5.47.1",
     "@typescript-eslint/parser": "5.47.1",
     "eslint": "8.30.0",
-    "eslint-config-next": "13.1.1",
     "eslint-config-airbnb": "19.0.4",
     "eslint-config-airbnb-typescript": "17.0.0",
+    "eslint-config-next": "13.1.1",
     "eslint-config-prettier": "8.5.0",
+    "eslint-import-resolver-typescript": "3.5.3",
     "eslint-import-resolver-webpack": "0.13.2",
     "eslint-plugin-compat": "4.0.2",
     "eslint-plugin-formatjs": "4.3.9",
diff --git a/packages/react/.eslintrc.json b/packages/react/.eslintrc.json
index 77b5a20..86885e9 100644
--- a/packages/react/.eslintrc.json
+++ b/packages/react/.eslintrc.json
@@ -7,6 +7,6 @@
     "project": "./tsconfig.eslint.json"
   },
   "rules": {
-    "import/no-extraneous-dependencies": ["error", {"devDependencies": ["vite.config.ts", "cunningham.ts","**/*.stories.tsx", "**/*.spec.tsx", "src/tests/*"]}]
+    "import/no-extraneous-dependencies": ["error", {"devDependencies": ["vite.config.ts", "vite.icons.config.ts", "vite.fonts.config.ts","cunningham.ts","**/*.stories.tsx", "**/*.spec.tsx", "src/tests/*"]}]
   }
 }
\ No newline at end of file
diff --git a/packages/tokens/src/bin/ThemeGenerator.ts b/packages/tokens/src/bin/ThemeGenerator.ts
index 6f02e87..7bc8566 100644
--- a/packages/tokens/src/bin/ThemeGenerator.ts
+++ b/packages/tokens/src/bin/ThemeGenerator.ts
@@ -3,8 +3,8 @@ import chalk from "chalk";
 import figlet from "figlet";
 import { getConfig } from "ConfigLoader";
 import { tokensGenerator } from "TokensGenerator";
-import { Generators } from "Generators";
 import { workPath } from "Paths";
+import { Generators } from "Generators";
 
 export const buildTheme = async () => {
   const options = program.opts();
diff --git a/packages/tokens/src/bin/tests/Cunningham.spec.ts b/packages/tokens/src/bin/tests/Cunningham.spec.ts
index f7b4a3e..c0400fd 100644
--- a/packages/tokens/src/bin/tests/Cunningham.spec.ts
+++ b/packages/tokens/src/bin/tests/Cunningham.spec.ts
@@ -1,10 +1,10 @@
 import * as fs from "fs";
 import * as path from "path";
 import * as child_process from "child_process";
+import * as util from "util";
 import { run } from "ThemeGenerator";
 import { cleanup } from "tests/Utils";
 // eslint-disable-next-line import/no-extraneous-dependencies
-import * as util from "util";
 import Config from "../Config";
 
 jest.mock("../Paths", () => ({
diff --git a/yarn.lock b/yarn.lock
index 4fc09fb..46b26a7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6882,7 +6882,7 @@ eslint-import-resolver-node@^0.3.6, eslint-import-resolver-node@^0.3.7:
     is-core-module "^2.11.0"
     resolve "^1.22.1"
 
-eslint-import-resolver-typescript@^3.5.2:
+eslint-import-resolver-typescript@^3.5.2, eslint-import-resolver-typescript@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.5.3.tgz#db5ed9e906651b7a59dd84870aaef0e78c663a05"
   integrity sha512-njRcKYBc3isE42LaTcJNVANR3R99H9bAxBDMNDr2W7yq5gYPxbU3MkdhsQukxZ/Xg9C2vcyLlDsbKfRDg0QvCQ==