Merge pull request #8 from ia3andy/bump

Bump versions and improve web-bundler support
FroMage · Apr 11, 2024 · c241a6e · c241a6e
2 parents 42a7f68 + 5ad6bc6
commit c241a6e
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 14 deletions.
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/pom.xml b/pom.xml
@@ -14,9 +14,10 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-    <quarkus.platform.version>3.8.3</quarkus.platform.version>
+    <quarkus.platform.version>3.9.3</quarkus.platform.version>
     <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
-    <renarde.version>3.0.9</renarde.version>
+    <renarde.version>3.0.12</renarde.version>
+    <web-bundler.version>1.4.0</web-bundler.version>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -33,19 +34,31 @@
     <dependency>
       <groupId>io.quarkiverse.web-bundler</groupId>
       <artifactId>quarkus-web-bundler</artifactId>
-      <version>1.1.1</version>
+      <version>${web-bundler.version}</version>
     </dependency>
     <dependency>
       <groupId>org.mvnpm</groupId>
       <artifactId>bootstrap</artifactId>
       <version>5.3.1</version>
-      <scope>runtime</scope>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+          <groupId>org.mvnpm.at.popperjs</groupId>
+          <artifactId>core</artifactId>
+          <version>2.11.8</version>
+          <scope>provided</scope>
+      </dependency>
+    <dependency>
+      <groupId>org.mvnpm</groupId>
+      <artifactId>htmx.org</artifactId>
+      <version>1.9.11</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.mvnpm</groupId>
       <artifactId>bootstrap-icons</artifactId>
       <version>1.10.5</version>
-      <scope>runtime</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>io.quarkiverse.renarde</groupId>
@@ -106,11 +119,11 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-rest-client-reactive</artifactId>
+      <artifactId>quarkus-rest-client</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
+      <artifactId>quarkus-rest-jackson</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -59,3 +59,9 @@ quarkus.webauthn.login-page=/Login/login
 quarkus.default-locale=en
 # These are the supported locales (should include the default locale, but order is not important)
 quarkus.locales=en,fr
+
+# Enable auto-import for web-dependencies
+quarkus.web-bundler.dependencies.auto-import=all
+
+# This is a temporary fix because of the backoffice webjars
+quarkus.web-bundler.dependencies.compile-only=false
diff --git a/src/main/resources/templates/Todos/htmx.html b/src/main/resources/templates/Todos/htmx.html
@@ -1,9 +1,6 @@
 {#include main.html }
 {#title}Todos Htmx{/title}
 
-{#moreScripts}
-<script src="https://unpkg.com/[email protected]" integrity="sha384-xcuj3WpfgjlKF+FXhSQFQ0ZNr39ln+hwjN3npfM9VBnUskLolQAcN80McRIVOPuO" crossorigin="anonymous"></script>
-{/moreScripts}
 
 <div id="message">
 {#fragment id="message" rendered=false}

diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main.html
@@ -6,7 +6,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
         {#bundle /}
         {#insert moreStyles /}
-        <link rel="shortcut icon" type="image/png" href="/_static/bootstrap-icons/icons/check2-square.svg"/>
+        <link rel="shortcut icon" type="image/png" href="/static/images/favicon.svg"/>
         {#insert moreScripts /}
     </head>
     <body>

diff --git a/src/main/resources/web/app/main.js b/src/main/resources/web/app/main.js
@@ -1,7 +1,5 @@
 // INSERT YOUR JS HERE
-import 'bootstrap/dist/css/bootstrap.min.css';
-import 'bootstrap/dist/js/bootstrap.bundle.min.js';
-import 'bootstrap-icons/font/bootstrap-icons.min.css';
+
 
 function clearValidationError(inputElement) {
   // remove any lingering error

diff --git a/src/main/resources/web/app/main.css → src/main/resources/web/app/main.scss b/src/main/resources/web/app/main.css → src/main/resources/web/app/main.scss
diff --git a/src/main/resources/web/static/images/favicon.svg b/src/main/resources/web/static/images/favicon.svg