fix(javite-webmvc): add local server URL before entry

javite-projects · Jun 26, 2024 · f13d45c · f13d45c
1 parent a9d61aa
commit f13d45c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/javite-webmvc-jre8/src/main/java/com/javite/spring/tags/ViteImport.java b/javite-webmvc-jre8/src/main/java/com/javite/spring/tags/ViteImport.java
@@ -135,7 +135,7 @@ private void handleProdEnvironment(JspWriter out, ServletContext servletContext,
 
     private void handleDevEnvironment(JspWriter out, String localServerUrl) throws IOException {
         String viteClientScriptTag = HtmlUtils.generateScriptTag(localServerUrl + "/@vite/client");
-        String entryScriptTag = HtmlUtils.generateScriptTag(this.entry != null ? this.entry : "src/main.js");
+        String entryScriptTag = HtmlUtils.generateScriptTag(localServerUrl + "/" + entry);
 
         out.print(viteClientScriptTag);
         out.print(entryScriptTag);

diff --git a/javite-webmvc/src/main/java/com/javite/spring/tags/ViteImport.java b/javite-webmvc/src/main/java/com/javite/spring/tags/ViteImport.java
@@ -9,14 +9,13 @@
 import jakarta.servlet.jsp.JspWriter;
 import jakarta.servlet.jsp.PageContext;
 import jakarta.servlet.jsp.tagext.SimpleTagSupport;
+import java.io.IOException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.lang.Nullable;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-import java.io.IOException;
-
 /**
  * Custom JSP tag to import Vite-generated assets.
  * <p>
@@ -136,7 +135,7 @@ private void handleProdEnvironment(JspWriter out, ServletContext servletContext,
 
     private void handleDevEnvironment(JspWriter out, String localServerUrl) throws IOException {
         String viteClientScriptTag = HtmlUtils.generateScriptTag(localServerUrl + "/@vite/client");
-        String entryScriptTag = HtmlUtils.generateScriptTag(this.entry != null ? this.entry : "src/main.js");
+        String entryScriptTag = HtmlUtils.generateScriptTag(localServerUrl + "/" + entry);
 
         out.print(viteClientScriptTag);
         out.print(entryScriptTag);

diff --git a/javite-webmvc/src/test/java/com/javite/spring/tags/ViteImportTest.java b/javite-webmvc/src/test/java/com/javite/spring/tags/ViteImportTest.java
@@ -1,9 +1,11 @@
 package com.javite.spring.tags;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import static org.mockito.Mockito.contains;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import com.javite.config.ViteProperties;
-import com.javite.util.ManifestUtils;
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.jsp.JspWriter;
 import jakarta.servlet.jsp.PageContext;
@@ -15,8 +17,6 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-import static org.mockito.Mockito.*;
-
 public class ViteImportTest {
 
     @Mock
@@ -56,7 +56,7 @@ void testDoTagDebugMode() throws Exception {
         viteImport.doTag();
 
         verify(jspWriter).print("<script type=\"module\" src=\"http://localhost:5173/@vite/client\"></script>");
-        verify(jspWriter).print("<script type=\"module\" src=\"main.js\"></script>");
+        verify(jspWriter).print("<script type=\"module\" src=\"http://localhost:5173/main.js\"></script>");
     }
 
     @Test