sillsdev · hahn-kev · Jan 8, 2025 · Jan 7, 2025 · Jan 7, 2025 · Jan 7, 2025
diff --git a/backend/FwLite/FwLiteMaui/MainPage.xaml b/backend/FwLite/FwLiteMaui/MainPage.xaml
@@ -6,7 +6,7 @@
              x:Class="FwLiteMaui.MainPage">
     <BlazorWebView x:Name="blazorWebView" HostPage="wwwroot/index.html">
         <BlazorWebView.RootComponents>
-            <RootComponent Selector="#app" ComponentType="{x:Type shared:Routes}"/>
+            <RootComponent Selector="#app" ComponentType="{x:Type shared:Root}"/>
         </BlazorWebView.RootComponents>
     </BlazorWebView>
 

diff --git a/backend/FwLite/FwLiteMaui/wwwroot/index.html b/backend/FwLite/FwLiteMaui/wwwroot/index.html
@@ -6,16 +6,6 @@
     <title>FwLiteMaui</title>
     <base href="/" />
     <link rel="icon" type="image/png" href="_content/FwLiteShared/favicon.png"/>
-    <script>
-        window.invokeOnWindow = function (methodName, args) {
-            if (!(methodName in window)) {
-                //todo not sure how to handle this for now, maybe we wait until the app is ready?
-                console.error(`Method ${methodName} not found`);
-                return;
-            }
-            window[methodName](...args);
-        };
-    </script>
 </head>
 
 <body>

diff --git a/backend/FwLite/FwLiteShared/Layout/SvelteLayout.razor b/backend/FwLite/FwLiteShared/Layout/SvelteLayout.razor
@@ -1,13 +1,21 @@
 @inherits LayoutComponentBase
 @using FwLiteShared.Services
+@using Microsoft.Extensions.Hosting
 @using Microsoft.Extensions.Logging
 @inject IJSRuntime JS
 @inject ILogger<SvelteLayout> Logger
 @inject FwLiteProvider FwLiteProvider
+@inject IHostEnvironment Environment;
 @implements IAsyncDisposable
-
-<link rel="modulepreload" href="@Assets["_content/FwLiteShared/viewer/svelte-ux.js"]">
-<link rel="stylesheet" href="@Assets["_content/FwLiteShared/viewer/index.css"]"/>
+@if (useDevAssets)
+{
+    <script type="module" src="http://localhost:5173/@@vite/client"></script>
+}
+else
+{
+    <link rel="modulepreload" href="@Assets["_content/FwLiteShared/viewer/svelte-ux.js"]">
+    <link rel="stylesheet" href="@Assets["_content/FwLiteShared/viewer/main.css"]"/>
+}
 <script>
     window['setOverrideService'] = (key, service) => {
         window.lexbox ??= {};
@@ -16,7 +24,11 @@
           window.lexbox.DotNetServiceProvider.setOverrideServices(window.lexbox.FwLiteProvider);
         }
         const services = window.lexbox.FwLiteProvider;
-        services[key] = service;
+        if (service) {
+            services[key] = service;
+        } else {
+            delete services[key];
+        }
     };
     //called from FwLiteProvider.InjectCrdtProject
     window['notifyEntryUpdated'] = (projectName, entry) => {
@@ -32,6 +44,8 @@
 @Body
 
 @code {
+    private bool useDevAssets => Environment.IsDevelopment();
+    // private bool useDevAssets => false;
     private IJSObjectReference? module;
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
@@ -44,8 +58,14 @@
                 await FwLiteProvider.SetService(JS, serviceKey, service);
             }
 
-            module = await JS.InvokeAsync<IJSObjectReference>("import",
-                "/" + Assets["_content/FwLiteShared/viewer/index.js"]);
+            if (useDevAssets)
+            {
+                module = await JS.InvokeAsync<IJSObjectReference>("import", "http://localhost:5173/src/main.ts");
+            } else
+            {
+                module = await JS.InvokeAsync<IJSObjectReference>("import",
+                    "/" + Assets["_content/FwLiteShared/viewer/main.js"]);
+            }
         }
     }
 

diff --git a/backend/FwLite/FwLiteShared/Pages/CrdtProject.razor b/backend/FwLite/FwLiteShared/Pages/CrdtProject.razor
@@ -13,8 +13,9 @@
 
     private IAsyncDisposable? _disposable;
 
-    protected override async Task OnInitializedAsync()
+    protected override async Task OnAfterRenderAsync(bool firstRender)
     {
+        if (!firstRender) return;
         var fwLiteProvider = ScopedServices.GetRequiredService<FwLiteProvider>();
         _disposable = await fwLiteProvider.InjectCrdtProject(JS, ScopedServices, ProjectName);
     }

diff --git a/backend/FwLite/FwLiteShared/Pages/FwdataProject.razor b/backend/FwLite/FwLiteShared/Pages/FwdataProject.razor
@@ -13,8 +13,9 @@
 
     private IAsyncDisposable? _disposable;
 
-    protected override async Task OnInitializedAsync()
+    protected override async Task OnAfterRenderAsync(bool firstRender)
     {
+        if (!firstRender) return;
         var fwLiteProvider = ScopedServices.GetRequiredService<FwLiteProvider>();
         _disposable = await fwLiteProvider.InjectFwDataProject(JS, ScopedServices, ProjectName);
     }

diff --git a/backend/FwLite/FwLiteShared/Pages/Home.razor b/backend/FwLite/FwLiteShared/Pages/Home.razor
@@ -8,8 +8,9 @@
 @*this looks empty because it is, but it's required to declare the route which is then used by the svelte router*@
 @code
 {
-    protected override async Task OnInitializedAsync()
+    protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        await FwLiteProvider.SetService(JS, DotnetService.MiniLcmApi, null);
+        if (firstRender)
+            await FwLiteProvider.SetService(JS, DotnetService.MiniLcmApi, null);
     }
 }
diff --git a/backend/FwLite/FwLiteShared/Root.razor b/backend/FwLite/FwLiteShared/Root.razor
@@ -0,0 +1,14 @@
+<script>
+    window.invokeOnWindow = function (methodName, args) {
+        if (!(methodName in window)) {
+            //todo not sure how to handle this for now, maybe we wait until the app is ready?
+            console.error(`Method ${methodName} not found`);
+            return;
+        }
+        window[methodName](...args);
+    };
+</script>
+<Routes/>
+@code {
+
+}
diff --git a/backend/FwLite/FwLiteShared/Routes.razor b/backend/FwLite/FwLiteShared/Routes.razor
@@ -1,8 +1,15 @@
 @inject IJSRuntime jsRuntime
 @code {
+    bool firstNavigation = true;
     private async Task OnNavigateAsync(NavigationContext context)
     {
-        await jsRuntime.DurableInvokeVoidAsync("svelteNavigate", context.Path);
+        if (firstNavigation)
+        {
+            firstNavigation = false;
+            return;
+        }
+        if (RendererInfo.IsInteractive)
+            await jsRuntime.DurableInvokeVoidAsync("svelteNavigate", context.Path);
     }
 }
 <Router AppAssembly="typeof(Layout.SvelteLayout).Assembly" OnNavigateAsync="OnNavigateAsync">

diff --git a/backend/FwLite/FwLiteWeb/Components/App.razor b/backend/FwLite/FwLiteWeb/Components/App.razor
@@ -5,22 +5,11 @@
     <meta charset="utf-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <base href="/"/>
-    <link rel="icon" type="image/png" href="_content/FwLiteShared/favicon.png"/>
-    <HeadOutlet @rendermode="new InteractiveServerRenderMode(prerender: false)"/>
-    <script>
-        window.invokeOnWindow = function (methodName, args) {
-            if (!(methodName in window)) {
-                //todo not sure how to handle this for now, maybe we wait until the app is ready?
-                console.error(`Method ${methodName} not found`);
-                return;
-            }
-            window[methodName](...args);
-        };
-    </script>
+    <link rel="icon" type="image/png" href="_content/FwLiteShared/viewer/icon.svg"/>
 </head>
 
 <body>
-<Routes @rendermode="new InteractiveServerRenderMode(prerender: false)"/>
+<Root @rendermode="new InteractiveServerRenderMode(prerender:false)"/>
 <script src="_framework/blazor.web.js"></script>
 </body>
 

diff --git a/frontend/viewer/src/lib/append-head-hack.ts b/frontend/viewer/src/lib/append-head-hack.ts
@@ -0,0 +1,16 @@
+if (import.meta.env.DEV) {
+  //when in dev mode, svelte and vite want to put style sheets in the head
+  //however blazor will remove them, so we need to put them in the body instead
+  // eslint-disable-next-line @typescript-eslint/unbound-method
+  const headerAppend = document.head.appendChild;
+  document.head.appendChild = function newAppend<T extends Node>(node: T) {
+    //this is used for both svelte and vite imports
+    if (node.nodeName === 'STYLE') {
+      document.getElementById('svelte-app')?.appendChild(node);
+    } else {
+      headerAppend.call(document.head, node);
+    }
+    return node;
+  };
+}
+
diff --git a/frontend/viewer/src/main.ts b/frontend/viewer/src/main.ts
@@ -1,5 +1,6 @@
 //*// v1 Run with normal Svelte App (advantages: tailwind classes stay up to date)
-
+import 'vite/modulepreload-polyfill';
+import './lib/append-head-hack';
 import './app.postcss';
 
 import App from './App.svelte';
@@ -9,9 +10,3 @@ setupDotnetServiceProvider();
 new App({
   target: document.getElementById('svelte-app')!,
 });
-
-/*/// v2 Run with web-component in shadow dom
-
-import './web-component';
-
-//*/
diff --git a/frontend/viewer/vite.config.ts b/frontend/viewer/vite.config.ts
@@ -3,10 +3,11 @@ import {svelte} from '@sveltejs/vite-plugin-svelte';
 import {svelteTesting} from '@testing-library/svelte/vite';
 
 // https://vitejs.dev/config/
-export default defineConfig(({ mode }) => {
+export default defineConfig(({ mode, command }) => {
   const webComponent = mode === 'web-component';
   return {
-    base: '/_content/FwLiteShared/viewer',
+    base: !webComponent && command == "build" ? '/_content/FwLiteShared/viewer' : '/',
+
     build: {
       ...(webComponent ? {
         lib: {
@@ -16,11 +17,13 @@ export default defineConfig(({ mode }) => {
         outDir: 'dist-web-component',
       } : {
         outDir: '../../backend/FwLite/FwLiteShared/wwwroot/viewer',
+        manifest: true,
       }),
       minify: false,
       sourcemap: true,
       chunkSizeWarningLimit: 1000,
       rollupOptions: {
+        input: webComponent ? undefined : ['src/main.ts'],
         output: {
           entryFileNames: '[name].js',
           chunkFileNames: '[name].js',
@@ -46,18 +49,9 @@ export default defineConfig(({ mode }) => {
         handler(warning);
       },
     }), svelteTesting()],
-    ...(!webComponent ? {
-      server: {
-        open: 'http://localhost:5173/testing/project-view',
-        proxy: {
-          '/api': {
-            target: 'http://localhost:5137',
-            secure: false,
-            ws: true
-          }
-        }
-      }
-    } : {}),
+    server: {
+      origin: 'http://localhost:5173',
+    },
     test: {
       environment: 'happy-dom',
       setupFiles: ['./vitest-setup.js'],