From bc7e2a5fd49e392bc363836377f1413c65062c49 Mon Sep 17 00:00:00 2001
From: Artur <artur@vaadin.com>
Date: Sun, 14 Nov 2021 22:48:39 +0200
Subject: [PATCH] fix: Use correct URL for generated/vaadin.ts (#12352)

Fixes #12351
---
 flow-server/src/main/resources/vite.generated.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/flow-server/src/main/resources/vite.generated.ts b/flow-server/src/main/resources/vite.generated.ts
index 3c57cbd0d6b..3f2a0280135 100644
--- a/flow-server/src/main/resources/vite.generated.ts
+++ b/flow-server/src/main/resources/vite.generated.ts
@@ -71,6 +71,7 @@ function runWatchDog(watchDogPort) {
 
 export const vaadinConfig: UserConfigFn = (env) => {
   const devMode = env.mode === 'development';
+  const basePath = env.mode === 'production' ? '' : '/VAADIN/';
 
   if (devMode && process.env.watchDogPort) {
     // Open a connection with the Java dev-mode handler in order to finish
@@ -79,7 +80,7 @@ export const vaadinConfig: UserConfigFn = (env) => {
   }
   return {
     root: 'frontend',
-    base: env.mode === 'production' ? '' : '/VAADIN/',
+    base: basePath,
     resolve: {
       alias: {
         themes: themeFolder,
@@ -116,7 +117,7 @@ export const vaadinConfig: UserConfigFn = (env) => {
             }
             const vaadinScript: HtmlTagDescriptor = {
               tag: 'script',
-              attrs: { type: 'module', src: './generated/vaadin.ts' },
+              attrs: { type: 'module', src: devMode ? '/VAADIN/generated/vaadin.ts' : './generated/vaadin.ts' },
               injectTo: 'head'
             };
             return [vaadinScript];