Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Fix desktop build issues (#53)
Hakan Shehu574f617f9017
diff --git a/.gitignore b/.gitignoreindex c0fb1eee..bf75ec9c 100644--- a/.gitignore+++ b/.gitignore@@ -158,6 +158,8 @@ apps/desktop/assets/emojis.svgapps/desktop/assets/icons.svgapps/desktop/assets/fonts/neotrax.otfapps/desktop/assets/colanode-logo-black.png+apps/desktop/assets/colanode-logo-black.ico+apps/desktop/assets/colanode-logo-black.icns# Ignore web assetsapps/web/public/assets/emojis.dbdiff --git a/apps/desktop/package.json b/apps/desktop/package.jsonindex a530432d..19286099 100644--- a/apps/desktop/package.json+++ b/apps/desktop/package.json@@ -30,6 +30,7 @@"@tailwindcss/postcss": "^4.1.8","@types/better-sqlite3": "^7.6.13","@types/electron-squirrel-startup": "^1.0.2",+ "@vitejs/plugin-react": "^4.5.2","electron": "^36.4.0","vite": "^6.3.5"},diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.jsonindex ff9b11ac..378299b1 100644--- a/apps/desktop/tsconfig.json+++ b/apps/desktop/tsconfig.json@@ -3,21 +3,23 @@"display": "Desktop","extends": "../../tsconfig.base.json","compilerOptions": {+ "target": "ES2022","module": "ESNext",+ "moduleResolution": "bundler",+ "lib": ["ES2022", "DOM", "DOM.Iterable"],"noImplicitAny": true,"sourceMap": true,"outDir": "dist",- "moduleResolution": "bundler","resolveJsonModule": true,"jsx": "react-jsx",+ "baseUrl": ".","paths": {"@colanode/desktop/*": ["src/*"],"@colanode/core/*": ["../../packages/core/src/*"],"@colanode/crdt/*": ["../../packages/crdt/src/*"],"@colanode/client/*": ["../../packages/client/src/*"],"@colanode/ui/*": ["../../packages/ui/src/*"]- },- "lib": ["dom"]+ }},"references": [{ "path": "../../packages/core/tsconfig.json" },@@ -25,5 +27,5 @@{ "path": "../../packages/client/tsconfig.json" },{ "path": "../../packages/ui/tsconfig.json" }],- "include": ["src", "forge.env.d.ts"]+ "include": ["forge.env.d.ts", "src/**/*.ts", "src/**/*.tsx"]}diff --git a/apps/desktop/vite.base.config.ts b/apps/desktop/vite.base.config.tsindex d491b16d..54e48cff 100644--- a/apps/desktop/vite.base.config.ts+++ b/apps/desktop/vite.base.config.ts@@ -1,3 +1,5 @@+/// <reference types="./forge.env.d.ts" />+import { builtinModules } from 'node:module';import type { AddressInfo } from 'node:net';import path from 'path';@@ -75,7 +77,7 @@ export function getBuildDefine(env: ConfigEnv<'build'>) {};return { ...acc, ...def };},- {} as Record<string, any>+ {} as Record<string, string | undefined>);return define;diff --git a/apps/desktop/vite.main.config.ts b/apps/desktop/vite.main.config.tsindex 21f02813..2cda117e 100644--- a/apps/desktop/vite.main.config.ts+++ b/apps/desktop/vite.main.config.ts@@ -1,3 +1,5 @@+/// <reference types="./forge.env.d.ts" />+import path from 'path';import type { ConfigEnv, UserConfig } from 'vite';diff --git a/apps/desktop/vite.preload.config.ts b/apps/desktop/vite.preload.config.tsindex ad4e67e5..e76d5923 100644--- a/apps/desktop/vite.preload.config.ts+++ b/apps/desktop/vite.preload.config.ts@@ -1,3 +1,5 @@+/// <reference types="./forge.env.d.ts" />+import path from 'path';import type { ConfigEnv, UserConfig } from 'vite';diff --git a/apps/desktop/vite.renderer.config.ts b/apps/desktop/vite.renderer.config.tsindex 3b16f91a..11701cb5 100644--- a/apps/desktop/vite.renderer.config.ts+++ b/apps/desktop/vite.renderer.config.ts@@ -1,5 +1,8 @@+/// <reference types="./forge.env.d.ts" />+import path from 'path';+import react from '@vitejs/plugin-react';import type { ConfigEnv, UserConfig } from 'vite';import { defineConfig } from 'vite';@@ -18,9 +21,8 @@ export default defineConfig((env) => {build: {outDir: `.vite/renderer/${name}`,},- plugins: [pluginExposeRenderer(name)],+ plugins: [react(), pluginExposeRenderer(name)],resolve: {- preserveSymlinks: true,alias: {'@colanode/desktop': path.resolve(__dirname, './src'),'@colanode/core': path.resolve(__dirname, '../../packages/core/src'),diff --git a/package-lock.json b/package-lock.jsonindex 0057c35b..d7dd1f57 100644--- a/package-lock.json+++ b/package-lock.json@@ -63,6 +63,7 @@"@tailwindcss/postcss": "^4.1.8","@types/better-sqlite3": "^7.6.13","@types/electron-squirrel-startup": "^1.0.2",+ "@vitejs/plugin-react": "^4.5.2","electron": "^36.4.0","vite": "^6.3.5"}diff --git a/scripts/src/postinstall/index.ts b/scripts/src/postinstall/index.tsindex abb9b62d..c9de594b 100644--- a/scripts/src/postinstall/index.ts+++ b/scripts/src/postinstall/index.ts@@ -74,6 +74,16 @@ const execute = () => {path.resolve(IMAGES_DIR, 'colanode-logo-black.png'),path.resolve(DESKTOP_ASSETS_DIR, 'colanode-logo-black.png'));++ copyFile(+ path.resolve(IMAGES_DIR, 'colanode-logo-black.ico'),+ path.resolve(DESKTOP_ASSETS_DIR, 'colanode-logo-black.ico')+ );++ copyFile(+ path.resolve(IMAGES_DIR, 'colanode-logo-black.icns'),+ path.resolve(DESKTOP_ASSETS_DIR, 'colanode-logo-black.icns')+ );};execute();