From e251bbb4383fe2cec79e7eb1263f3408f1541df1 Mon Sep 17 00:00:00 2001 From: Anthony Le Courric Date: Mon, 11 Sep 2023 13:56:18 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8(eslint-config-custom)=20prob=20ord?= =?UTF-8?q?er=20with=20windows?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With Windows the order of the imports was not the same as with Linux, this was causing the linter to fail with CI. We force the import starting with ":" to the internal group to fix this issue. --- packages/eslint-config-custom/.eslintrc.json | 8 +++++++- packages/react/package.json | 2 +- .../react/src/components/Forms/Checkbox/index.spec.tsx | 2 +- packages/react/src/components/Forms/Input/index.spec.tsx | 2 +- packages/react/src/components/Forms/Radio/index.spec.tsx | 2 +- packages/react/src/components/Forms/Switch/index.spec.tsx | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/eslint-config-custom/.eslintrc.json b/packages/eslint-config-custom/.eslintrc.json index c8f9243..0eb459e 100644 --- a/packages/eslint-config-custom/.eslintrc.json +++ b/packages/eslint-config-custom/.eslintrc.json @@ -56,7 +56,13 @@ "sibling", "index" ], - "alphabetize": { "order": "ignore" } + "alphabetize": { "order": "ignore" }, + "pathGroups": [ + { + "pattern": "+(:)/**", + "group": "internal" + } + ] } ], "import/prefer-default-export": "off", diff --git a/packages/react/package.json b/packages/react/package.json index d18eba0..285fa88 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -25,7 +25,7 @@ "dist/" ], "scripts": { - "lint": "eslint . 'src/**/*.{ts,tsx}'", + "lint": "eslint . \"src/**/*.{ts,tsx}\"", "dev": "yarn storybook", "build": "bash ./build", "build:watch": "yarn build && vite build --mode watch", diff --git a/packages/react/src/components/Forms/Checkbox/index.spec.tsx b/packages/react/src/components/Forms/Checkbox/index.spec.tsx index a4fad2b..cc7d57f 100644 --- a/packages/react/src/components/Forms/Checkbox/index.spec.tsx +++ b/packages/react/src/components/Forms/Checkbox/index.spec.tsx @@ -1,12 +1,12 @@ import userEvent from "@testing-library/user-event"; import React from "react"; import { render, screen } from "@testing-library/react"; -import { FieldProps } from "../Field"; import { Checkbox, CheckboxGroup, CheckboxOnlyProps, } from ":/components/Forms/Checkbox/index"; +import { FieldProps } from "../Field"; const spyError = vi.spyOn(global.console, "error"); diff --git a/packages/react/src/components/Forms/Input/index.spec.tsx b/packages/react/src/components/Forms/Input/index.spec.tsx index ef1a036..3fb1e00 100644 --- a/packages/react/src/components/Forms/Input/index.spec.tsx +++ b/packages/react/src/components/Forms/Input/index.spec.tsx @@ -2,9 +2,9 @@ import { render, screen, waitFor } from "@testing-library/react"; import React, { useRef } from "react"; import userEvent from "@testing-library/user-event"; import { expect } from "vitest"; -import { FieldProps } from "../Field"; import { Input, InputOnlyProps } from ":/components/Forms/Input/index"; import { Button } from ":/components/Button"; +import { FieldProps } from "../Field"; const spyError = vi.spyOn(global.console, "error"); diff --git a/packages/react/src/components/Forms/Radio/index.spec.tsx b/packages/react/src/components/Forms/Radio/index.spec.tsx index b41f210..3ae7a02 100644 --- a/packages/react/src/components/Forms/Radio/index.spec.tsx +++ b/packages/react/src/components/Forms/Radio/index.spec.tsx @@ -1,12 +1,12 @@ import userEvent from "@testing-library/user-event"; import React from "react"; import { render, screen } from "@testing-library/react"; -import { FieldProps } from "../Field"; import { Radio, RadioGroup, RadioOnlyProps, } from ":/components/Forms/Radio/index"; +import { FieldProps } from "../Field"; const spyError = vi.spyOn(global.console, "error"); diff --git a/packages/react/src/components/Forms/Switch/index.spec.tsx b/packages/react/src/components/Forms/Switch/index.spec.tsx index 2a30781..2cc74a2 100644 --- a/packages/react/src/components/Forms/Switch/index.spec.tsx +++ b/packages/react/src/components/Forms/Switch/index.spec.tsx @@ -1,8 +1,8 @@ import { render, screen } from "@testing-library/react"; import React from "react"; import userEvent from "@testing-library/user-event"; -import { FieldProps } from "../Field"; import { Switch, SwitchOnlyProps } from ":/components/Forms/Switch/index"; +import { FieldProps } from "../Field"; const spyError = vi.spyOn(global.console, "error");