✨ Règle eslint pour trier les imports dans les fichiers de l'app ssr (#…

…1544)
MTES-MCT · Jan 19, 2024 · 762cecb · 762cecb
2 parents ad2a312 + 38c58ba
commit 762cecb
Show file tree

Hide file tree

Showing 76 changed files with 315 additions and 167 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -174,7 +174,7 @@
     "eslint": "^8.48.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-import-resolver-typescript": "^3.6.0",
-    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-storybook": "^0.6.14",
     "eslint-plugin-unused-imports": "^2.0.0",
     "glob": "^8.1.0",

diff --git a/packages/applications/ssr/.eslintrc.json b/packages/applications/ssr/.eslintrc.json
@@ -2,6 +2,31 @@
   "extends": "next/core-web-vitals",
   "rules": {
     "import/no-unassigned-import": "off",
-    "react/no-unescaped-entities": "off"
+    "react/no-unescaped-entities": "off",
+    "import/order": [
+      "error", {
+        "newlines-between": "always",
+        "pathGroupsExcludedImportTypes": ["builtin"],
+        "groups": [
+          "builtin",
+          "external",
+          "internal",
+          "parent",
+          "index"
+        ],
+        "pathGroups": [
+          {
+            "pattern": "@potentiel*/**",
+            "group": "internal",
+            "position": "before"
+          },
+          {
+            "pattern": "@/**",
+            "group": "parent",
+            "position": "before"
+          }
+        ]
+      }
+    ]
   }
-}
+}
diff --git a/packages/applications/ssr/package.json b/packages/applications/ssr/package.json
@@ -7,6 +7,7 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
+    "lint:fix": "next lint --fix",
     "predev": "only-include-used-icons",
     "prebuild": "only-include-used-icons"
   },

diff --git a/packages/applications/ssr/src/app/BootstrapApp.tsx b/packages/applications/ssr/src/app/BootstrapApp.tsx
@@ -1,6 +1,7 @@
-import { getAuthenticatedUser } from '@/utils/getAuthenticatedUser.handler';
 import { mediator } from 'mediateur';
 
+import { getAuthenticatedUser } from '@/utils/getAuthenticatedUser.handler';
+
 mediator.register('GET_AUTHENTICATED_USER', getAuthenticatedUser);
 
 export const BootstrapApp = () => {

diff --git a/packages/applications/ssr/src/app/Providers.tsx b/packages/applications/ssr/src/app/Providers.tsx
@@ -1,9 +1,9 @@
 'use client';
 
-import React from 'react';
-import { SessionProvider } from 'next-auth/react';
-import { DsfrProvider } from '@codegouvfr/react-dsfr/next-appdir/DsfrProvider';
 import { createMuiDsfrThemeProvider } from '@codegouvfr/react-dsfr/mui';
+import { DsfrProvider } from '@codegouvfr/react-dsfr/next-appdir/DsfrProvider';
+import { SessionProvider } from 'next-auth/react';
+import React from 'react';
 
 type ProvidersProps = {
   children: React.ReactNode;

diff --git a/packages/applications/ssr/src/app/StartDsfr.tsx b/packages/applications/ssr/src/app/StartDsfr.tsx
@@ -1,9 +1,10 @@
 'use client';
 
 import { startReactDsfr } from '@codegouvfr/react-dsfr/next-appdir';
-import { defaultColorScheme } from './defaultColorScheme';
 import Link from 'next/link';
 
+import { defaultColorScheme } from './defaultColorScheme';
+
 declare module '@codegouvfr/react-dsfr/next-appdir' {
   interface RegisterLink {
     Link: typeof Link;

diff --git a/packages/applications/ssr/src/app/api/v1/taches/route.ts b/packages/applications/ssr/src/app/api/v1/taches/route.ts
@@ -1,6 +1,8 @@
-import { apiAction } from '@/utils/apiAction';
 import { mediator } from 'mediateur';
+
 import { ConsulterNombreTâchesQuery } from '@potentiel-domain/tache';
+
+import { apiAction } from '@/utils/apiAction';
 import { withUtilisateur } from '@/utils/withUtilisateur';
 
 export const dynamic = 'force-dynamic';

diff --git a/packages/applications/ssr/src/app/auth/signIn/page.tsx b/packages/applications/ssr/src/app/auth/signIn/page.tsx
@@ -1,10 +1,11 @@
 'use client';
 
-import { PageTemplate } from '@/components/templates/PageTemplate';
-import { signIn, useSession } from 'next-auth/react';
 import { redirect, useSearchParams } from 'next/navigation';
+import { signIn, useSession } from 'next-auth/react';
 import { useEffect } from 'react';
 
+import { PageTemplate } from '@/components/templates/PageTemplate';
+
 export default function SignIn() {
   const params = useSearchParams();
   const { status } = useSession();

diff --git a/packages/applications/ssr/src/app/auth/signOut/page.tsx b/packages/applications/ssr/src/app/auth/signOut/page.tsx
@@ -1,9 +1,10 @@
 'use client';
 
-import { PageTemplate } from '@/components/templates/PageTemplate';
 import { signOut } from 'next-auth/react';
 import { useEffect } from 'react';
 
+import { PageTemplate } from '@/components/templates/PageTemplate';
+
 export default function SignIn() {
   useEffect(() => {
     const autoSignout = async () => {

diff --git a/packages/applications/ssr/src/app/documents/[documentKey]/route.ts b/packages/applications/ssr/src/app/documents/[documentKey]/route.ts
@@ -1,4 +1,5 @@
 import { mediator } from 'mediateur';
+
 import { ConsulterDocumentProjetQuery } from '@potentiel-domain/document';
 
 type DocumentKeyParameter = {

diff --git a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/demander/page.tsx b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/demander/page.tsx
@@ -2,18 +2,18 @@ import { mediator } from 'mediateur';
 import { Metadata } from 'next';
 import { redirect } from 'next/navigation';
 
-import { NotFoundError } from '@potentiel-domain/core';
+import { ConsulterAppelOffreQuery } from '@potentiel-domain/appel-offre';
 import { ConsulterCandidatureQuery } from '@potentiel-domain/candidature';
+import { NotFoundError } from '@potentiel-domain/core';
 import { CahierDesCharges } from '@potentiel-domain/laureat';
-import { ConsulterAppelOffreQuery } from '@potentiel-domain/appel-offre';
 import { Routes } from '@potentiel-libraries/routes';
 
-import { IdentifiantParameter } from '@/utils/identifiantParameter';
 import {
   DemanderAbandonPage,
   DemanderAbandonPageProps,
 } from '@/components/pages/abandon/demander/DemanderAbandonPage';
 import { decodeParameter } from '@/utils/decodeParameter';
+import { IdentifiantParameter } from '@/utils/identifiantParameter';
 import { PageWithErrorHandling } from '@/utils/PageWithErrorHandling';
 
 export const metadata: Metadata = {

diff --git a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/modele-reponse/route.ts b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/modele-reponse/route.ts
@@ -1,7 +1,9 @@
 import { mediator } from 'mediateur';
-import { IdentifiantParameter } from '@/utils/identifiantParameter';
-import { decodeParameter } from '@/utils/decodeParameter';
+
 import { Abandon } from '@potentiel-domain/laureat';
+
+import { decodeParameter } from '@/utils/decodeParameter';
+import { IdentifiantParameter } from '@/utils/identifiantParameter';
 import { withUtilisateur } from '@/utils/withUtilisateur';
 
 export const GET = async (_: Request, { params: { identifiant } }: IdentifiantParameter) =>

diff --git a/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/page.tsx b/packages/applications/ssr/src/app/laureats/[identifiant]/abandon/page.tsx
@@ -1,16 +1,16 @@
 import { mediator } from 'mediateur';
 import type { Metadata } from 'next';
 
-import { Abandon } from '@potentiel-domain/laureat';
 import { ConsulterCandidatureQuery } from '@potentiel-domain/candidature';
+import { Abandon } from '@potentiel-domain/laureat';
 import { Utilisateur } from '@potentiel-domain/utilisateur';
 
 import {
   DetailAbandonPage,
   DetailAbandonPageProps,
 } from '@/components/pages/abandon/détails/DetailAbandonPage';
-import { IdentifiantParameter } from '@/utils/identifiantParameter';
 import { decodeParameter } from '@/utils/decodeParameter';
+import { IdentifiantParameter } from '@/utils/identifiantParameter';
 import { PageWithErrorHandling } from '@/utils/PageWithErrorHandling';
 import { withUtilisateur } from '@/utils/withUtilisateur';
 

diff --git a/packages/applications/ssr/src/app/layout.tsx b/packages/applications/ssr/src/app/layout.tsx
@@ -1,15 +1,18 @@
 import './global.css';
+
 import { DsfrHead } from '@codegouvfr/react-dsfr/next-appdir/DsfrHead';
 import { getHtmlAttributes } from '@codegouvfr/react-dsfr/next-appdir/getHtmlAttributes';
-import { StartDsfr } from './StartDsfr';
-import { defaultColorScheme } from './defaultColorScheme';
-import Link from 'next/link';
-import Providers from './Providers';
-import { Header } from '@/components/organisms/Header';
-import { Footer } from '@/components/organisms/Footer';
 import { SkipLinks } from '@codegouvfr/react-dsfr/SkipLinks';
 import { Metadata } from 'next';
+import Link from 'next/link';
+
+import { Footer } from '@/components/organisms/Footer';
+import { Header } from '@/components/organisms/Header';
+
 import { BootstrapApp } from './BootstrapApp';
+import { defaultColorScheme } from './defaultColorScheme';
+import Providers from './Providers';
+import { StartDsfr } from './StartDsfr';
 
 export const metadata: Metadata = {
   title: 'Potentiel',