fix: repair of build output + fix of csp string

Author: JesseKoldewijn

.exec/exec-debug-bundle-unix.sh

@@ -0,0 +1 @@
+./src-tauri/target/debug/graphite-desktop

.exec/exec-debug-bundle-win.sh

@@ -0,0 +1 @@
+./src-tauri/target/debug/graphite-desktop.exe

package.json

@@ -1,14 +1,16 @@
 {
   "name": "graphite-desktop",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
     "dev:native": "tauri dev",
     "build": "next build",
     "start": "npx serve@latest out",
     "start:native-unix": "./.exec/exec-bundle-unix.sh",
+    "start:native-unix-debug": "./.exec/exec-debug-bundle-unix.sh",
     "start:native-win": "./.exec/exec-bundle-unix.sh",
+    "start:native-win-debug": "./.exec/exec-debug-bundle-unix.sh",
     "tauri": "tauri",
     "prettier": "prettier --write ./src/**/*.{ts,tsx,css}",
     "fix:version-mismatch": "node ./.fix-versions.cjs",

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "graphite_desktop"
-version = "0.4.1"
+version = "0.5.0"
 description = "A simple desktop app for Graphite"
 authors = ["GlitchTech Developments"]
 license = "MIT"

src-tauri/Cargo.toml

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "GraphiteDesktop",
-    "version": "0.4.1"
+    "version": "0.5.0"
   },
   "tauri": {
     "allowlist": {
@@ -38,7 +38,7 @@
       ]
     },
     "security": {
-      "csp": "default-src * 'self' data: tauri://*, https://app.graphite.dev"
+      "csp": "default-src * 'self' data: tauri://* https://app.graphite.dev"
     },
     "windows": [
       {

src-tauri/tauri.conf.json

@@ -24,34 +24,34 @@ const Logo = () => {
 const App = () => {
   return (
     <Suspense>
-      {/* <SplashScreenProvider key={new Date().getMilliseconds()}> */}
-      <div className="g-wrapper">
-        <div className="g-content">
-          <div className="g-content-wrapper">
-            <div className="g-bg-plus"></div>
-            <div className="flex flex-1 items-center justify-center">
-              <div className="g-card min-w-[350px]">
-                <Logo />
-                <div className="flex w-full flex-col px-[var(--space-xxl)] text-center">
-                  <span className="w-full text-[24px] font-medium">
-                    Welcome to Graphite
-                  </span>
-                  <span className="mt-2 w-full">
-                    Checking status of Graphite Web
-                    <LoadingDots key={new Date().getMilliseconds()} />
-                  </span>
-                  <span className="mt-2 w-full">
-                    If you see this screen for more than 2 seconds, please
-                    right-click on the window content and press
-                    &apos;Reload&apos;
-                  </span>
+      <SplashScreenProvider key={new Date().getMilliseconds()}>
+        <div className="g-wrapper">
+          <div className="g-content">
+            <div className="g-content-wrapper">
+              <div className="g-bg-plus"></div>
+              <div className="flex flex-1 items-center justify-center">
+                <div className="g-card min-w-[350px]">
+                  <Logo />
+                  <div className="flex w-full flex-col px-[var(--space-xxl)] text-center">
+                    <span className="w-full text-[24px] font-medium">
+                      Welcome to Graphite
+                    </span>
+                    <span className="mt-2 w-full">
+                      Checking status of Graphite Web
+                      <LoadingDots key={new Date().getMilliseconds()} />
+                    </span>
+                    <span className="mt-2 w-full">
+                      If you see this screen for more than 2 seconds, please
+                      right-click on the window content and press
+                      &apos;Reload&apos;
+                    </span>
+                  </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
-      </div>
-      {/* </SplashScreenProvider> */}
+      </SplashScreenProvider>
     </Suspense>
   );
 };

src/app/page.tsx

@@ -4,7 +4,6 @@ import { isNative } from "./isNativeRuntime";
 export const invokeSplashScreenCloseFunction = async () => {
   try {
     const url = "https://app.graphite.dev";
-
     const remoteAvailableCheck = await checkWebsiteAvailability(url);
 
     const invokeNativeCloseCall = async () => {
@@ -13,19 +12,21 @@ export const invokeSplashScreenCloseFunction = async () => {
     };
 
     if (!remoteAvailableCheck) {
-      console.log("remote not available", remoteAvailableCheck);
+      console.error("remote not available", remoteAvailableCheck);
       return;
     }
 
     const pushToLocation = async () => {
+      console.debug("pushing to graphite web-app");
       if (isNative) {
-        invokeNativeCloseCall();
+        await invokeNativeCloseCall();
       } else {
         window.location.assign(url);
       }
     };
     setTimeout(pushToLocation, 1800);
   } catch (error: any) {
+    console.error(error);
     throw new Error(error.message);
   }
 };

src/utils/spashHandler.ts

@@ -1,15 +1,20 @@
 import plugin from "tailwindcss/plugin";
 
-/** @type {import('tailwindcss').Config} */
-export default {
-  content: ["./src/**/*.{tsx,ts}", "./**/*.html"],
+/** @type {import("tailwindcss").Config} */
+const config = {
+  content: ["./src/**/*.{js,ts,jsx,tsx,mdx}"],
   theme: {
     extend: {
       textShadow: {
         sm: "0 1px 2px var(--tw-shadow-color)",
         DEFAULT: "0 2px 4px var(--tw-shadow-color)",
         lg: "0 8px 16px var(--tw-shadow-color)",
       },
+      backgroundImage: {
+        "gradient-radial": "radial-gradient(var(--tw-gradient-stops))",
+        "gradient-conic":
+          "conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))",
+      },
     },
   },
   corePlugins: {
@@ -18,7 +23,7 @@ export default {
   plugins: [
     require.resolve("@tailwindcss/aspect-ratio"),
     require.resolve("@tailwindcss/container-queries"),
-    plugin(({ matchUtilities, addUtilities, theme }) => {
+    plugin(({ matchUtilities, theme }) => {
       matchUtilities(
         {
           "text-shadow": (value) => ({
@@ -30,3 +35,4 @@ export default {
     }),
   ],
 };
+export default config;