From 06eb4963cefff5ccdc21846d63fc90a6e2f6dcdf Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 25 Sep 2024 21:30:45 +0200 Subject: [PATCH] React: apply prettier-plugin-organize-imports --- .../react/security/jwt/domain/ReactJwtModuleFactory.java | 2 +- .../react/core/src/main/webapp/app/index.tsx.mustache | 2 +- .../webapp/app/login/primary/loginForm/index.tsx.mustache | 2 +- .../webapp/app/login/primary/loginModal/index.tsx.mustache | 6 +++--- .../webapp/unit/common/services/storage.test.ts.mustache | 2 +- .../unit/login/primary/loginForm/index.test.tsx.mustache | 2 +- .../unit/login/primary/loginModal/index.test.tsx.mustache | 6 +++--- .../test/webapp/unit/login/services/login.test.ts.mustache | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/tech/jhipster/lite/generator/client/react/security/jwt/domain/ReactJwtModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/client/react/security/jwt/domain/ReactJwtModuleFactory.java index d3074641b48..b857280a167 100644 --- a/src/main/java/tech/jhipster/lite/generator/client/react/security/jwt/domain/ReactJwtModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/client/react/security/jwt/domain/ReactJwtModuleFactory.java @@ -83,7 +83,7 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) { .add(LOGIN_FORM_MATCHER, properties.indentation().times(4) + "") .and() .in(path("src/main/webapp/app/index.tsx")) - .add(lineBeforeText("import { createRoot } from 'react-dom/client';"), "import { NextUIProvider } from '@nextui-org/react';") + .add(lineBeforeText("import React from 'react';"), "import { NextUIProvider } from '@nextui-org/react';") .add(regex("\\s+"), """ diff --git a/src/main/resources/generator/client/react/core/src/main/webapp/app/index.tsx.mustache b/src/main/resources/generator/client/react/core/src/main/webapp/app/index.tsx.mustache index af46811591d..0c99f1a2043 100644 --- a/src/main/resources/generator/client/react/core/src/main/webapp/app/index.tsx.mustache +++ b/src/main/resources/generator/client/react/core/src/main/webapp/app/index.tsx.mustache @@ -1,7 +1,7 @@ +import App from '@/common/primary/app/App'; import React from 'react'; import { createRoot } from 'react-dom/client'; import './index.css'; -import App from '@/common/primary/app/App'; const container = document.getElementById('root'); const root = createRoot(container!); diff --git a/src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginForm/index.tsx.mustache b/src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginForm/index.tsx.mustache index d52ed16bdf4..2bf275fd4a2 100644 --- a/src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginForm/index.tsx.mustache +++ b/src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginForm/index.tsx.mustache @@ -1,5 +1,5 @@ -import { createContext, useState, useMemo, useCallback } from 'react'; import { Button } from '@nextui-org/react'; +import { createContext, useCallback, useMemo, useState } from 'react'; import LoginModal from '@/login/primary/loginModal'; diff --git a/src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginModal/index.tsx.mustache b/src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginModal/index.tsx.mustache index 02234e19a20..1920d6a9ad0 100644 --- a/src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginModal/index.tsx.mustache +++ b/src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginModal/index.tsx.mustache @@ -1,12 +1,12 @@ +import { Button, Input, Modal, ModalBody, ModalContent, ModalHeader, Spacer } from '@nextui-org/react'; import { useCallback, useContext, useState } from 'react'; import { useForm } from 'react-hook-form'; -import { Button, Input, Modal, ModalBody, ModalContent, ModalHeader, Spacer } from '@nextui-org/react'; -import { EyeSlashFilledIcon } from './EyeSlashFilledIcon'; import { EyeFilledIcon } from './EyeFilledIcon'; +import { EyeSlashFilledIcon } from './EyeSlashFilledIcon'; -import { login } from '@/login/services/login'; import { UserInfoContext } from '@/login/primary/loginForm'; +import { login } from '@/login/services/login'; import './LoginModal.scss'; diff --git a/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/common/services/storage.test.ts.mustache b/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/common/services/storage.test.ts.mustache index 5c06cddd11c..3519b3a6c86 100644 --- a/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/common/services/storage.test.ts.mustache +++ b/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/common/services/storage.test.ts.mustache @@ -1,4 +1,4 @@ -import { describe, it, expect } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { getLocalStorage, removeLocalStorage, setLocalStorage } from '@/common/services/storage'; diff --git a/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/primary/loginForm/index.test.tsx.mustache b/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/primary/loginForm/index.test.tsx.mustache index 862e959512a..513c72e1621 100644 --- a/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/primary/loginForm/index.test.tsx.mustache +++ b/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/primary/loginForm/index.test.tsx.mustache @@ -1,5 +1,5 @@ import axios from 'axios'; -import { vi, describe, it, expect } from 'vitest'; +import { describe, expect, it, vi } from 'vitest'; import LoginForm from '@/login/primary/loginForm/index'; import { act, fireEvent, render } from '@testing-library/react'; diff --git a/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/primary/loginModal/index.test.tsx.mustache b/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/primary/loginModal/index.test.tsx.mustache index 8dcb3de2fb0..0bfd9b2e3fb 100644 --- a/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/primary/loginModal/index.test.tsx.mustache +++ b/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/primary/loginModal/index.test.tsx.mustache @@ -1,9 +1,9 @@ +import { act, fireEvent, render } from '@testing-library/react'; import axios from 'axios'; -import { render, fireEvent, act } from '@testing-library/react'; -import { describe, it, expect } from 'vitest'; +import { describe, expect, it } from 'vitest'; -import LoginModal from '@/login/primary/loginModal'; import { UserInfoContext } from '@/login/primary/loginForm'; +import LoginModal from '@/login/primary/loginModal'; const setUsername = vi.fn(); const setToken = vi.fn(); diff --git a/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/services/login.test.ts.mustache b/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/services/login.test.ts.mustache index 90ad343384c..6dc303494e6 100644 --- a/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/services/login.test.ts.mustache +++ b/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/services/login.test.ts.mustache @@ -1,5 +1,5 @@ import axios from 'axios'; -import { describe, it, expect, vi } from 'vitest'; +import { describe, expect, it, vi } from 'vitest'; import { login } from '@/login/services/login';