chore: clean up

apps/desktop2/.gitignore

@@ -22,3 +22,5 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
+src/router.gen.ts

apps/desktop2/src/app.tsx

@@ -6,10 +6,10 @@ import React, { StrictMode } from "react";
 import ReactDOM from "react-dom/client";
 import { I18nextProvider } from "react-i18next";
 import "./app.css";
-import i18n from "./i18n";
+import i18n from "./locale";
 
 // Import the generated route tree
-import { routeTree } from "./tree.gen";
+import { routeTree } from "./router.gen";
 
 const queryClient = new QueryClient();
 const router = createRouter({
@@ -17,8 +17,6 @@ const router = createRouter({
 	context: {
 		queryClient,
 	},
-	defaultPreload: "intent",
-	defaultPreloadStaleTime: 0,
 });
 
 declare module "@tanstack/react-router" {

apps/desktop2/src/tree.gen.ts

@@ -1,99 +0,0 @@
-/* prettier-ignore-start */
-
-/* eslint-disable */
-
-// @ts-nocheck
-
-// noinspection JSUnusedGlobalSymbols
-
-// This file is auto-generated by TanStack Router
-
-import { createFileRoute } from '@tanstack/react-router'
-
-// Import Routes
-
-import { Route as rootRoute } from './routes/__root'
-import { Route as AppImport } from './routes/app'
-import { Route as IndexImport } from './routes/index'
-import { Route as LandingIndexImport } from './routes/landing/index'
-
-// Create Virtual Routes
-
-const AuthImportLazyImport = createFileRoute('/auth/import')()
-const AuthCreateLazyImport = createFileRoute('/auth/create')()
-const AppSpaceLazyImport = createFileRoute('/app/space')()
-
-// Create/Update Routes
-
-const AppRoute = AppImport.update({
-  path: '/app',
-  getParentRoute: () => rootRoute,
-} as any)
-
-const IndexRoute = IndexImport.update({
-  path: '/',
-  getParentRoute: () => rootRoute,
-} as any)
-
-const LandingIndexRoute = LandingIndexImport.update({
-  path: '/landing/',
-  getParentRoute: () => rootRoute,
-} as any)
-
-const AuthImportLazyRoute = AuthImportLazyImport.update({
-  path: '/auth/import',
-  getParentRoute: () => rootRoute,
-} as any).lazy(() => import('./routes/auth/import.lazy').then((d) => d.Route))
-
-const AuthCreateLazyRoute = AuthCreateLazyImport.update({
-  path: '/auth/create',
-  getParentRoute: () => rootRoute,
-} as any).lazy(() => import('./routes/auth/create.lazy').then((d) => d.Route))
-
-const AppSpaceLazyRoute = AppSpaceLazyImport.update({
-  path: '/space',
-  getParentRoute: () => AppRoute,
-} as any).lazy(() => import('./routes/app/space.lazy').then((d) => d.Route))
-
-// Populate the FileRoutesByPath interface
-
-declare module '@tanstack/react-router' {
-  interface FileRoutesByPath {
-    '/': {
-      preLoaderRoute: typeof IndexImport
-      parentRoute: typeof rootRoute
-    }
-    '/app': {
-      preLoaderRoute: typeof AppImport
-      parentRoute: typeof rootRoute
-    }
-    '/app/space': {
-      preLoaderRoute: typeof AppSpaceLazyImport
-      parentRoute: typeof AppImport
-    }
-    '/auth/create': {
-      preLoaderRoute: typeof AuthCreateLazyImport
-      parentRoute: typeof rootRoute
-    }
-    '/auth/import': {
-      preLoaderRoute: typeof AuthImportLazyImport
-      parentRoute: typeof rootRoute
-    }
-    '/landing/': {
-      preLoaderRoute: typeof LandingIndexImport
-      parentRoute: typeof rootRoute
-    }
-  }
-}
-
-// Create and export the route tree
-
-export const routeTree = rootRoute.addChildren([
-  IndexRoute,
-  AppRoute.addChildren([AppSpaceLazyRoute]),
-  AuthCreateLazyRoute,
-  AuthImportLazyRoute,
-  LandingIndexRoute,
-])
-
-/* prettier-ignore-end */

apps/desktop2/tailwind.config.js

@@ -1,4 +1,6 @@
-import sharedConfig from "@lume/tailwindcss";
+/** @type {import('tailwindcss').Config} */
+
+import preset from "@lume/tailwindcss";
 
 const config = {
   content: [
@@ -8,7 +10,7 @@ const config = {
     "../../packages/ui/**/*{.js,.ts,.jsx,.tsx}",
     "index.html",
   ],
-  presets: [sharedConfig],
+  presets: [preset],
 };
 
 export default config;

apps/desktop2/tsr.config.json

@@ -1,6 +1,6 @@
 {
 	"routesDirectory": "./src/routes",
-	"generatedRouteTree": "./src/tree.gen.ts",
+	"generatedRouteTree": "./src/router.gen.ts",
 	"routeFileIgnorePrefix": "-",
 	"quoteStyle": "single"
 }

packages/ark/src/ark.ts

@@ -1,4 +1,4 @@
-import { type CurrentAccount, Event, Keys, Metadata } from "@lume/types";
+import type { CurrentAccount, Event, Keys, Metadata } from "@lume/types";
 import { invoke } from "@tauri-apps/api/core";
 
 export class Ark {

packages/ark/src/index.ts

@@ -1,7 +1,6 @@
 export * from "./provider";
 export * from "./hooks/useEvent";
 export * from "./hooks/useProfile";
-export * from "./hooks/useRelayList";
 export * from "./components/user";
 export * from "./components/column";
 export * from "./components/note";

packages/ark/tailwind.config.js

@@ -1,8 +1,10 @@
-import sharedConfig from "@lume/tailwindcss";
+/** @type {import('tailwindcss').Config} */
+
+import preset from "@lume/tailwindcss";
 
 const config = {
 	content: ["./src/**/*.{js,ts,jsx,tsx}"],
-	presets: [sharedConfig],
+	presets: [preset],
 };
 
 export default config;

packages/tailwindcss/package.json

@@ -13,10 +13,7 @@
 		"@tailwindcss/forms": "^0.5.7",
 		"@tailwindcss/typography": "^0.5.10",
 		"tailwind-scrollbar": "^3.0.5",
-		"tailwindcss": "^3.4.1"
-	},
-	"dependencies": {
-		"@evilmartians/harmony": "^1.2.0",
+		"tailwindcss": "^3.4.1",
 		"tailwindcss-radix-colors": "^1.2.0"
 	}
 }

packages/tailwindcss/tailwind.config.js

@@ -1,3 +1,4 @@
+/** @type {import('tailwindcss').Config} */
 
 const config = {
   theme: {