Update file watcher and remove elide lines (onlook-dev#1693)

* Remove elide lines

* Remove atomic write and update file watcher

Author: Kitenite

.husky/pre-commit

@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-bun run lint:precommit && bun run format:precommit && git add .
+bun run lint && bun run format && git add .

apps/studio/electron/main/assets/images.ts

@@ -3,7 +3,6 @@ import { DefaultSettings } from '@onlook/models/constants';
 import { promises as fs, readFileSync } from 'fs';
 import mime from 'mime-lite';
 import path from 'path';
-import writeFileAtomic from 'write-file-atomic';
 
 async function scanImagesDirectory(projectRoot: string): Promise<ImageContentData[]> {
     const imagesPath = path.join(projectRoot, DefaultSettings.IMAGE_FOLDER);
@@ -167,7 +166,7 @@ async function updateImageReferences(
                 return;
             }
             const updatedContent = content.replace(pattern, newImageUrl);
-            await writeFileAtomic(file, updatedContent, { encoding: 'utf8' });
+            await fs.writeFile(file, updatedContent, 'utf8');
         }),
     );
 }

apps/studio/electron/main/code/files.ts

@@ -1,7 +1,6 @@
 import { existsSync, promises as fs } from 'fs';
 import * as path from 'path';
 import prettier from 'prettier';
-import writeFileAtomic from 'write-file-atomic';
 
 export async function readFile(filePath: string): Promise<string | null> {
     try {
@@ -48,9 +47,7 @@ export async function writeFile(
         // Ensure parent directory exists
         const parentDir = path.dirname(fullPath);
         await fs.mkdir(parentDir, { recursive: true });
-
-        // Perform atomic write with proper error handling
-        await writeFileAtomic(fullPath, fileContent, { encoding });
+        await fs.writeFile(fullPath, fileContent, { encoding });
 
         if (isNewFile) {
             console.log('New file created:', fullPath);

apps/studio/electron/main/run/index.ts

@@ -14,6 +14,7 @@ class RunManager {
     private static instance: RunManager;
     private mapping = new Map<string, TemplateNode>();
     private subscription: AsyncSubscription | null = null;
+    private selfModified = new Set<string>();
     state: RunState = RunState.STOPPED;
     runningDirs = new Set<string>();
     createdFiles = new Set<string>();
@@ -129,23 +130,21 @@ class RunManager {
 
         this.subscription = await subscribe(
             folderPath,
-            (err, events) => {
+            async (err, events) => {
                 if (err) {
                     console.error(`Watcher error: ${err}`);
                     return;
                 }
 
                 for (const event of events) {
-                    if (event.type === 'update') {
+                    if (this.selfModified.has(event.path)) {
+                        this.selfModified.delete(event.path);
+                        continue;
+                    }
+                    if (event.type === 'update' || event.type === 'create') {
                         if (this.isAllowedExtension(event.path)) {
-                            this.processFileForMapping(event.path);
-                        }
-                    } else if (event.type === 'create') {
-                        if (!this.createdFiles.has(event.path)) {
-                            if (this.isAllowedExtension(event.path)) {
-                                this.processFileForMapping(event.path);
-                            }
-                            this.createdFiles.add(event.path);
+                            this.selfModified.add(event.path);
+                            await this.processFileForMapping(event.path);
                         }
                     }
                 }
@@ -182,6 +181,7 @@ class RunManager {
         }
 
         await writeFile(filePath, content);
+
         for (const [key, value] of Object.entries(newMapping)) {
             this.mapping.set(key, value);
         }
@@ -195,6 +195,7 @@ class RunManager {
         await this.clearSubscription();
         this.runningDirs.clear();
         this.mapping.clear();
+        this.selfModified.clear();
     }
 
     async cleanProjectDir(folderPath: string): Promise<void> {

apps/studio/package.json

@@ -85,7 +85,6 @@
         "ts-morph": "^25.0.0",
         "type-fest": "^4.26.1",
         "use-resize-observer": "^9.1.0",
-        "write-file-atomic": "^6.0.0",
         "zod": "^3.23.8"
     },
     "devDependencies": {
@@ -105,7 +104,6 @@
         "@types/react": "^18.2.64",
         "@types/react-dom": "^18.2.21",
         "@types/shell-quote": "^1.7.5",
-        "@types/write-file-atomic": "^4.0.3",
         "@vitejs/plugin-react": "^4.2.1",
         "autoprefixer": "^10.4.20",
         "css-tree": "^3.1.0",

bun.lock

@@ -16,23 +16,21 @@
     ],
     "scripts": {
         "build:foundation": "bun --filter @onlook/foundation build",
-        "build:cli": "bun build:foundation && bun --elide-lines 0 --filter onlook typecheck && bun --elide-lines 0 --filter onlook build",
-        "build:studio": "bun build:foundation && bun --elide-lines 0 --filter @onlook/studio build",
+        "build:cli": "bun build:foundation && bun --filter onlook typecheck && bun --filter onlook build",
+        "build:studio": "bun build:foundation && bun --filter @onlook/studio build",
         "clean": "git clean -xdf node_modules",
-        "clean:workspaces": "bun --elide-lines 0 --filter '*' clean",
-        "db:gen": "bun --elide-lines 0 --filter @onlook/supabase db:gen",
-        "db:gen:local": "bun --elide-lines 0 --filter @onlook/backend db:gen",
-        "dev:foundation": "bun --elide-lines 0 --filter @onlook/foundation dev",
-        "dev:studio": "bun --elide-lines 0 --filter @onlook/studio dev",
-        "build": "bun --elide-lines 0 --filter '*' build",
+        "clean:workspaces": "bun --filter '*' clean",
+        "db:gen": "bun --filter @onlook/supabase db:gen",
+        "db:gen:local": "bun --filter @onlook/backend db:gen",
+        "dev:foundation": "bun --filter @onlook/foundation dev",
+        "dev:studio": "bun --filter @onlook/studio dev",
+        "build": "bun --filter '*' build",
         "ci:build": "bun run build:foundation && bun --filter '*' build",
-        "dev": "bun --elide-lines 0 --filter '*' dev",
-        "test": "bun --elide-lines 0 --filter '*' test",
-        "format": "bun --elide-lines 0 --filter '*' format",
-        "format:precommit": "bun --filter '*' format",
-        "lint": "bun --elide-lines 0 --filter @onlook/studio lint",
-        "lint:precommit": "bun --filter @onlook/studio lint",
-        "typecheck": "bun --elide-lines 0 --filter '*' typecheck",
+        "dev": "bun --filter '*' dev",
+        "test": "bun --filter '*' test",
+        "format": "bun --filter '*' format",
+        "lint": "bun --filter @onlook/studio lint",
+        "typecheck": "bun --filter '*' typecheck",
         "increment_tag": "./scripts/increment_tag.sh",
         "publish_tag": "./scripts/publish_tag.sh",
         "remove_tag": "./scripts/remove_tag.sh",