From fa32829b2e6a4fb47a91f0d1e62a82f4d73206d6 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Wed, 29 Mar 2023 22:15:55 -0700
Subject: [PATCH] Fix build

---
 index.html                                |  2 +-
 src-tauri/src/main.rs                     | 31 ++++++++++-------------
 src-tauri/tauri.conf.json                 | 14 +++++++++-
 src-web/components/App.tsx                | 12 ++++-----
 src-web/components/AppRouter.tsx          |  9 +++----
 src-web/components/core/Editor/Editor.tsx |  7 ++---
 src-web/components/core/Editor/index.tsx  |  5 +++-
 src-web/hooks/useTauriListeners.ts        |  8 ++++++
 src-web/main.tsx                          |  3 +++
 9 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/index.html b/index.html
index 72141867..a50c3894 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Yaak App</title>
-  <script src="http://localhost:8097"></script>
+<!--  <script src="http://localhost:8097"></script>-->
   <style>
       body {
           background-color: white;
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index b0391109..7b4ce383 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -56,6 +56,7 @@ async fn migrate_db(
     println!("Running migrations at {}", p.to_string_lossy());
     let m = Migrator::new(p).await.expect("Failed to load migrations");
     m.run(pool).await.expect("Failed to run migrations");
+    println!("Migrations complete");
     Ok(())
 }
 
@@ -611,7 +612,8 @@ fn create_window(handle: AppHandle<Wry>, app_id: String) -> Window<Wry> {
         .add_item(
             CustomMenuItem::new("toggle_sidebar".to_string(), "Toggle Sidebar")
                 .accelerator("CmdOrCtrl+b"),
-        );
+        )
+        .add_item(CustomMenuItem::new("new_window".to_string(), "New Window"));
     if is_dev() {
         test_menu = test_menu
             .add_native_item(MenuItem::Separator)
@@ -622,8 +624,7 @@ fn create_window(handle: AppHandle<Wry>, app_id: String) -> Window<Wry> {
             .add_item(
                 CustomMenuItem::new("toggle_devtools".to_string(), "Open Devtools")
                     .accelerator("CmdOrCtrl + Option + i"),
-            )
-            .add_item(CustomMenuItem::new("new_window".to_string(), "New Window"));
+            );
     }
 
     let submenu = Submenu::new("Test Menu", test_menu);
@@ -631,20 +632,16 @@ fn create_window(handle: AppHandle<Wry>, app_id: String) -> Window<Wry> {
     let window_num = handle.windows().len();
     let window_id = format!("{}_{}", app_id, window_num);
     let menu = default_menu.add_submenu(submenu);
-    let win = tauri::WindowBuilder::new(
-        &handle,
-        window_id,
-        tauri::WindowUrl::App("workspaces".into()),
-    )
-    .menu(menu)
-    .fullscreen(false)
-    .resizable(true)
-    .inner_size(1100.0, 600.0)
-    .hidden_title(true)
-    .title("Yaak")
-    .title_bar_style(TitleBarStyle::Overlay)
-    .build()
-    .expect("failed to build window");
+    let win = tauri::WindowBuilder::new(&handle, window_id, tauri::WindowUrl::App("".into()))
+        .menu(menu)
+        .fullscreen(false)
+        .resizable(true)
+        .inner_size(1100.0, 600.0)
+        .hidden_title(true)
+        .title("Yaak")
+        .title_bar_style(TitleBarStyle::Overlay)
+        .build()
+        .expect("failed to build window");
 
     let win2 = win.clone();
     win.on_menu_event(move |event| match event.menu_item_id() {
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index c505acad..b0bd548c 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -11,7 +11,19 @@
     "version": "0.0.2"
   },
   "tauri": {
-    "windows": [],
+    "windows": [
+      {
+        "fullscreen": false,
+        "hiddenTitle": true,
+        "resizable": true,
+        "title": "Yaak",
+        "titleBarStyle": "Overlay",
+        "height": 600,
+        "width": 1100,
+        "minWidth": 400,
+        "minHeight": 400
+      }
+    ],
     "allowlist": {
       "all": false,
       "fs": {
diff --git a/src-web/components/App.tsx b/src-web/components/App.tsx
index eb20739d..49246e2c 100644
--- a/src-web/components/App.tsx
+++ b/src-web/components/App.tsx
@@ -5,6 +5,7 @@ import { invoke } from '@tauri-apps/api';
 import { listen } from '@tauri-apps/api/event';
 import { appWindow } from '@tauri-apps/api/window';
 import { MotionConfig } from 'framer-motion';
+import { Suspense } from 'react';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import { HelmetProvider } from 'react-helmet-async';
@@ -128,10 +129,6 @@ await listen('send_request', async () => {
   await invoke('send_request', { requestId });
 });
 
-await listen('refresh', () => {
-  location.reload();
-});
-
 await listen('zoom', ({ payload: zoomDelta }: { payload: number }) => {
   const fontSize = parseFloat(window.getComputedStyle(document.documentElement).fontSize);
 
@@ -148,14 +145,17 @@ await listen('zoom', ({ payload: zoomDelta }: { payload: number }) => {
 });
 
 export function App() {
+  console.log('STARTING APP');
   return (
     <QueryClientProvider client={queryClient}>
       <MotionConfig transition={{ duration: 0.1 }}>
         <HelmetProvider>
           <DndProvider backend={HTML5Backend}>
             <DialogProvider>
-              <AppRouter />
-              {/*<ReactQueryDevtools initialIsOpen={false} />*/}
+              <Suspense>
+                <AppRouter />
+                {/*<ReactQueryDevtools initialIsOpen={false} />*/}
+              </Suspense>
             </DialogProvider>
           </DndProvider>
         </HelmetProvider>
diff --git a/src-web/components/AppRouter.tsx b/src-web/components/AppRouter.tsx
index d6390b44..4aaf8e12 100644
--- a/src-web/components/AppRouter.tsx
+++ b/src-web/components/AppRouter.tsx
@@ -1,4 +1,3 @@
-import { Suspense } from 'react';
 import { createBrowserRouter, Navigate, RouterProvider } from 'react-router-dom';
 import { routePaths } from '../hooks/useRoutes';
 import { useTauriListeners } from '../hooks/useTauriListeners';
@@ -35,10 +34,8 @@ const router = createBrowserRouter([
 ]);
 
 export function AppRouter() {
+  console.log('AppRouter');
   useTauriListeners();
-  return (
-    <Suspense>
-      <RouterProvider router={router} />
-    </Suspense>
-  );
+  console.log('AppRouter 2');
+  return <RouterProvider router={router} />;
 }
diff --git a/src-web/components/core/Editor/Editor.tsx b/src-web/components/core/Editor/Editor.tsx
index d522fecc..1506783f 100644
--- a/src-web/components/core/Editor/Editor.tsx
+++ b/src-web/components/core/Editor/Editor.tsx
@@ -92,11 +92,8 @@ export function Editor({
 
   useEffect(() => {
     if (cm.current === null) return;
-    const { view, languageCompartment } = cm.current;
-    const newDoc = defaultValue;
-    view.dispatch({ changes: { from: 0, to: view.state.doc.length, insert: newDoc ?? '' } });
-    const ext = getLanguageExtension({ contentType, useTemplating, autocomplete });
-    view.dispatch({ effects: languageCompartment.reconfigure(ext) });
+    const { view } = cm.current;
+    view.dispatch({ changes: { from: 0, to: view.state.doc.length, insert: defaultValue ?? '' } });
   }, [forceUpdateKey]);
 
   // Initialize the editor when ref mounts
diff --git a/src-web/components/core/Editor/index.tsx b/src-web/components/core/Editor/index.tsx
index 48c6255a..6c98eb59 100644
--- a/src-web/components/core/Editor/index.tsx
+++ b/src-web/components/core/Editor/index.tsx
@@ -1,7 +1,10 @@
 import { memo } from 'react';
+import * as editor from './Editor';
 
 export type { EditorProps } from './Editor';
-const editor = await import('./Editor');
+// TODO: Figure out why code-splitting breaks production build from
+//   showing any content
+// const editor = await import('./Editor');
 
 export const Editor = memo(editor.Editor);
 export const graphql = editor.graphql;
diff --git a/src-web/hooks/useTauriListeners.ts b/src-web/hooks/useTauriListeners.ts
index 6ae7888c..fc2f8e07 100644
--- a/src-web/hooks/useTauriListeners.ts
+++ b/src-web/hooks/useTauriListeners.ts
@@ -1,4 +1,5 @@
 import { useQueryClient } from '@tanstack/react-query';
+import { listen } from '@tauri-apps/api/event';
 import { appWindow } from '@tauri-apps/api/window';
 import { useEffect } from 'react';
 import { debounce } from '../lib/debounce';
@@ -27,6 +28,13 @@ export function useTauriListeners() {
         else unsubFns.push(unsub);
       });
 
+    listen('refresh', () => {
+      location.reload();
+    }).then((unsub) => {
+      if (unmounted) unsub();
+      else unsubFns.push(unsub);
+    });
+
     appWindow
       .listen(
         'updated_request',
diff --git a/src-web/main.tsx b/src-web/main.tsx
index d6d8f379..3277b874 100644
--- a/src-web/main.tsx
+++ b/src-web/main.tsx
@@ -1,3 +1,4 @@
+console.log('FIRST 0');
 import { StrictMode } from 'react';
 import ReactDOM from 'react-dom/client';
 import { App } from './components/App';
@@ -5,7 +6,9 @@ import { getKeyValue } from './lib/keyValueStore';
 import { getPreferredAppearance, setAppearance } from './lib/theme/window';
 import './main.css';
 
+console.log('FIRST');
 setAppearance(await getKeyValue({ key: 'appearance', fallback: getPreferredAppearance() }));
+console.log('SECOND');
 
 // root holds our app's root DOM Element:
 ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(