Merge pull request #3350 from hdurix/clean-styled

Remove no style APIs old stuff

src/main/java/tech/jhipster/lite/generator/client/react/core/application/ReactCoreApplicationService.java

@@ -14,7 +14,7 @@ public ReactCoreApplicationService() {
     factory = new ReactCoreModulesFactory();
   }
 
-  public JHipsterModule buildModuleWithStyle(JHipsterModuleProperties properties) {
-    return factory.buildModuleWithStyle(properties);
+  public JHipsterModule buildModule(JHipsterModuleProperties properties) {
+    return factory.buildModule(properties);
   }
 }

src/main/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactory.java

@@ -27,7 +27,7 @@ public class ReactCoreModulesFactory {
 
   private static final String TEST_PRIMARY = "src/test/javascript/spec/common/primary/app";
 
-  public JHipsterModule buildModuleWithStyle(JHipsterModuleProperties properties) {
+  public JHipsterModule buildModule(JHipsterModuleProperties properties) {
     //@formatter:off
     return ClientsModulesFactory.clientModuleBuilder(properties)
       .packageJson()
@@ -71,7 +71,7 @@ public JHipsterModule buildModuleWithStyle(JHipsterModuleProperties properties)
         .add(WEBAPP_SOURCE.template("index.html"), WEBAPP_DESTINATION.append("index.html"))
         .add(SOURCE.append(TEST_PRIMARY).template("App.spec.tsx"), to(TEST_PRIMARY).append("App.spec.tsx"))
         .add(WEBAPP_SOURCE.template("config/setupTests.ts"), WEBAPP_DESTINATION.append("config/setupTests.ts"))
-        .add(PRIMARY_APP_SOURCE.template("StyledApp.tsx"), PRIMARY_APP_DESTINATION.append("App.tsx"))
+        .add(PRIMARY_APP_SOURCE.template("App.tsx"), PRIMARY_APP_DESTINATION.append("App.tsx"))
         .add(PRIMARY_APP_SOURCE.template("App.css"), PRIMARY_APP_DESTINATION.append("App.css"))
         .batch(WEBAPP_SOURCE.append(CONTENT_IMAGES), WEBAPP_DESTINATION.append(CONTENT_IMAGES))
           .addFile("JHipster-Lite-neon-blue.png")

src/main/java/tech/jhipster/lite/generator/client/react/core/infrastructure/primary/ReactCoreModulesConfiguration.java

@@ -14,15 +14,15 @@ class ReactCoreModulesConfiguration {
   public static final String REACT = "react";
 
   @Bean
-  JHipsterModuleResource styledReactCoreModule(ReactCoreApplicationService react) {
+  JHipsterModuleResource reactCoreModule(ReactCoreApplicationService react) {
     return JHipsterModuleResource
       .builder()
       .slug("react-core")
       .propertiesDefinition(properties())
       .apiDoc(new JHipsterModuleApiDoc("React", "Add React+Vite with minimal CSS"))
       .organization(JHipsterModuleOrganization.builder().feature("client-core").addModuleDependency("init").build())
       .tags("client", REACT)
-      .factory(react::buildModuleWithStyle);
+      .factory(react::buildModule);
   }
 
   private JHipsterModulePropertiesDefinition properties() {

src/main/java/tech/jhipster/lite/generator/client/svelte/core/domain/SvelteModuleFactory.java

@@ -83,7 +83,7 @@ public JHipsterModule buildSvelteModule(JHipsterModuleProperties properties) {
         .add(SOURCE.file("jest.config.cjs"), to("jest.config.cjs"))
         .add(SOURCE.file("vite.config.js"), to("vite.config.js"))
         .add(SOURCE.append("src/main/webapp/routes").template("+page.svelte"), to("src/main/webapp/routes/+page.svelte"))
-        .add(PRIMARY_MAIN_SOURCE.template("StyledApp.svelte"), PRIMARY_MAIN_DESTINATION.append("App.svelte"))
+        .add(PRIMARY_MAIN_SOURCE.template("App.svelte"), PRIMARY_MAIN_DESTINATION.append("App.svelte"))
         .add(PRIMARY_TEST_SOURCE.template("App.spec.ts"), PRIMARY_TEST_DESTINATION.append("App.spec.ts"))
         .move(path(".lintstagedrc.js"), to(".lintstagedrc.cjs"))
         .batch(SOURCE.file("src/main/webapp"), to("src/main/webapp"))

src/test/features/react-jwt.feature

@@ -1,6 +1,6 @@
 Feature: React JWT
 
-  Scenario: Should apply react jwt module to styled react
+  Scenario: Should apply react jwt module to react
     When I apply modules to default project
       | init       |
       | react-core |

src/test/features/react.feature

@@ -1,8 +1,7 @@
 Feature: React modules
 
-   Scenario: Should apply styled react module
-     When I apply "react-core" module to default project with package json
+  Scenario: Should apply react module
+    When I apply "react-core" module to default project with package json
       | baseName    | jhipster            |
     Then I should have files in "src/main/webapp/app/common/primary/app"
       | App.tsx |
-

src/test/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactoryTest.java

@@ -15,7 +15,7 @@ class ReactCoreModulesFactoryTest {
 
   @Test
   void shouldBuildModuleWithStyle() {
-    JHipsterModule module = factory.buildModuleWithStyle(
+    JHipsterModule module = factory.buildModule(
       JHipsterModulesFixture.propertiesBuilder(TestFileUtils.tmpDirForTest()).projectBaseName("jhipster").build()
     );
 

src/test/java/tech/jhipster/lite/generator/client/react/security/jwt/domain/ReactJwtModuleFactoryTest.java

@@ -17,23 +17,10 @@ class ReactJwtModuleFactoryTest {
   private static final ReactJwtModuleFactory factory = new ReactJwtModuleFactory();
 
   @Test
-  void shouldBuildModuleOnNotStyledApp() {
+  void shouldBuildModule() {
     JHipsterModule module = factory.buildModule(properties());
 
-    ModuleAsserter asserter = assertThatModuleWithFiles(module, packageJsonFile(), notStyledApp());
-
-    assertReactApp(asserter);
-  }
-
-  private ModuleFile notStyledApp() {
-    return file("src/test/resources/projects/react-app/App.tsx", APP_TSX);
-  }
-
-  @Test
-  void shouldBuildModuleOnStyledApp() {
-    JHipsterModule module = factory.buildModule(properties());
-
-    ModuleAsserter asserter = assertThatModuleWithFiles(module, packageJsonFile(), styledApp(), appCss());
+    ModuleAsserter asserter = assertThatModuleWithFiles(module, packageJsonFile(), app(), appCss());
 
     assertReactApp(asserter);
     asserter
@@ -49,8 +36,8 @@ void shouldBuildModuleOnStyledApp() {
       );
   }
 
-  private ModuleFile styledApp() {
-    return file("src/test/resources/projects/react-app/StyledApp.tsx", APP_TSX);
+  private ModuleFile app() {
+    return file("src/test/resources/projects/react-app/App.tsx", APP_TSX);
   }
 
   private ModuleFile appCss() {

src/test/resources/projects/react-app/App.tsx

@@ -1,5 +1,37 @@
+import './App.css';
+
 function App() {
-  return <div id="app">Myapp</div>;
+  return (
+    <div className="App">
+      <div id="app">
+        <img alt="React logo" src="/content/images/ReactLogo.png" />
+        <br />
+        <img alt="JHipster logo" src="/content/images/JHipster-Lite-neon-blue.png" />
+        <h1>React + TypeScript + Vite</h1>
+        <p>
+          Recommended IDE setup:&nbsp;
+          <a href="https://code.visualstudio.com/" target="_blank">
+            VSCode
+          </a>
+        </p>
+
+        <p>
+          <a href="https://vitejs.dev/guide/features.html" target="_blank" rel="noopener">
+            Vite Documentation
+          </a>
+          &nbsp;|&nbsp;
+          <a href="https://reactjs.org/docs/" target="_blank">
+            React Documentation
+          </a>
+        </p>
+
+        <p>
+          Edit&nbsp;
+          <code>src/main/webapp/app/common/primary/app/App.tsx</code> to test hot module replacement.
+        </p>
+      </div>
+    </div>
+  );
 }
 
 export default App;