Move to vue

Author: Explosion-Scratch

.DS_Store

@@ -17,3 +17,5 @@ release-zip/
 scripts/_vue.js
 src/photon
 bin
+src/renderer-app/public/photon/
+src/renderer-app/public/*.js

.gitignore

@@ -7,7 +7,7 @@
   "scripts": {
     "fullclean": "rm -rf dist .crush *.log vendor release build && bun install",
     "clear:userdata": "rm -rf \"$HOME/Library/Application Support/WhisperMac\" \"$HOME/Library/Application Support/Electron\" \"$HOME/Library/Application Support/whispermac\" \"$HOME/Library/Application Support/electron\" .whispermac-data",
-    "build": "tsc && node scripts/copy-assets.js && node scripts/prep-vad-assets.js",
+    "build": "tsc && cd src/renderer-app && bun run build && cd ../.. && node scripts/copy-assets.js && node scripts/prep-vad-assets.js",
     "killothers": "echo 'Noop'",
     "start": "bun run killothers && electron dist/main.js",
     "dev": "nodemon --exec \"bun run single-dev\" --ignore dist --ignore photon --ignore .crush",
@@ -55,6 +55,7 @@
     "concurrently": "^8.0.0",
     "electron": "^25.0.0",
     "electron-builder": "^24.0.0",
+    "esbuild": "^0.27.1",
     "nodemon": "^3.0.0",
     "sharp": "^0.34.3",
     "typescript": "^5.0.0"

bun.lock

@@ -200,38 +200,26 @@ async function discoverFilesRecursive(dirPath, extensions = EXTENSIONS) {
   return files;
 }
 
-// Parallel renderer file copying
+// Copy only error.html from old renderer (deprecated - everything else uses Vue app now)
 async function copyRendererFiles() {
-  console.log("\n📁 Copying renderer files...");
+  console.log("\n📁 Copying error.html from old renderer...");
 
   if (!fs.existsSync(distDir)) {
     fs.mkdirSync(distDir, { recursive: true });
   }
 
-  // Discover all renderer files
-  const rendererFiles = await discoverFiles(srcDir, EXTENSIONS);
-
-  // Create copy operations
-  const operations = rendererFiles.map((srcFile) => ({
-    src: srcFile,
-    dest: path.join(distDir, path.basename(srcFile)),
-    type: "renderer",
-  }));
-
-  // Add Vue.js copy operation if it exists
-  if (fs.existsSync(vueSrcPath)) {
-    operations.push({
-      src: vueSrcPath,
-      dest: vueDistPath,
-      type: "vue",
-    });
-  }
-
-  if (operations.length > 0) {
+  // Only copy error.html as it's still used by ErrorWindowService
+  const errorHtmlPath = path.join(srcDir, "error.html");
+  if (fs.existsSync(errorHtmlPath)) {
+    const operations = [{
+      src: errorHtmlPath,
+      dest: path.join(distDir, "error.html"),
+      type: "renderer",
+    }];
     totalOperations += operations.length;
     await parallelCopy(operations);
   } else {
-    console.log("No renderer files found to copy");
+    console.log("No error.html found to copy");
   }
 }
 

native/.DS_Store

@@ -1,91 +1,19 @@
 #!/usr/bin/env node
 
-const fs = require("fs");
-const path = require("path");
-
-function ensureDir(dirPath) {
-  if (!fs.existsSync(dirPath)) {
-    fs.mkdirSync(dirPath, { recursive: true });
-  }
-}
-
-function copyFile(fromPath, toPath) {
-  ensureDir(path.dirname(toPath));
-  fs.copyFileSync(fromPath, toPath);
-  console.log(
-    `Copied ${path.basename(fromPath)} -> ${path.relative(
-      path.join(__dirname, ".."),
-      toPath,
-    )}`,
-  );
-}
-
-function copyDirFiltered(fromDir, toDir, allowedExtensions) {
-  if (!fs.existsSync(fromDir)) return;
-  ensureDir(toDir);
-  const items = fs.readdirSync(fromDir);
-  for (const item of items) {
-    const src = path.join(fromDir, item);
-    const dest = path.join(toDir, item);
-    const stat = fs.statSync(src);
-    if (stat.isDirectory()) {
-      copyDirFiltered(src, dest, allowedExtensions);
-    } else {
-      const ext = path.extname(item).toLowerCase();
-      if (!allowedExtensions || allowedExtensions.includes(ext)) {
-        copyFile(src, dest);
-      }
-    }
-  }
-}
-
-(function main() {
-  const projectRoot = path.join(__dirname, "..");
-  const distRendererDir = path.join(projectRoot, "dist/renderer");
-
-  ensureDir(distRendererDir);
-
-  const vadWebDist = path.join(
-    projectRoot,
-    "node_modules/@ricky0123/vad-web/dist",
-  );
-  const ortWebDist = path.join(
-    projectRoot,
-    "node_modules/onnxruntime-web/dist",
-  );
-
-  const vadFiles = [
-    "bundle.min.js",
-    "vad.worklet.bundle.min.js",
-    "silero_vad_v5.onnx",
-    "silero_vad_legacy.onnx",
-  ];
-  for (const file of vadFiles) {
-    const src = path.join(vadWebDist, file);
-    const dest = path.join(distRendererDir, file);
-    if (!fs.existsSync(src)) {
-      console.warn(`WARN: Missing ${src}; did you install dependencies?`);
-      continue;
-    }
-    copyFile(src, dest);
-  }
-
-  const allowedExtensions = [".js", ".mjs", ".wasm"];
-  if (fs.existsSync(ortWebDist)) {
-    copyDirFiltered(ortWebDist, distRendererDir, allowedExtensions);
-  } else {
-    console.warn(
-      `WARN: ${ortWebDist} not found; skipping onnxruntime-web copy.`,
-    );
-  }
-
-  // Copy audio visualizer script into dist/renderer
-  const visualizerSrc = path.join(
-    projectRoot,
-    "src/renderer/audio-visualizer.js",
-  );
-  const visualizerDest = path.join(distRendererDir, "audio-visualizer.js");
-  if (fs.existsSync(visualizerSrc)) {
-    copyFile(visualizerSrc, visualizerDest);
-  }
-})();
+/**
+ * This script has been deprecated.
+ * 
+ * VAD assets are now copied automatically via vite-plugin-static-copy
+ * configured in src/renderer-app/vite.config.ts
+ * 
+ * The Vite plugin copies the following files during build:
+ * - vad.worklet.bundle.min.js (from @ricky0123/vad-web)
+ * - silero_vad_v5.onnx (from @ricky0123/vad-web)
+ * - silero_vad_legacy.onnx (from @ricky0123/vad-web)
+ * - *.wasm files (from onnxruntime-web)
+ * - *.mjs files (from onnxruntime-web)
+ * 
+ * This file is kept for reference but no longer performs any operations.
+ */
+
+console.log("prep-vad-assets.js: VAD assets are now handled by vite-plugin-static-copy in renderer-app/vite.config.ts");