Default buildResources is build

desktop/.gitignore

@@ -11,10 +11,11 @@ node_modules/
 .env
 .env.*.local
 
-# Generated code during build
+# tsc transpiles src/**/*.ts and emits the generated JS into app
-# - tsc transpiles src/**/*.ts and emits the generated JS into build/app
+app/
-# - The out dir from the photos web app is symlinked to build/out
+
-build/
+# out is a symlink to the photos web app's dir
+out
 
 # electron-builder
 dist/

desktop/package.json

@@ -4,14 +4,16 @@
     "private": true,
     "description": "Desktop client for Ente Photos",
     "author": "Ente <code@ente.io>",
-    "main": "build/app/main.js",
+    "main": "app/main.js",
     "scripts": {
-        "build": "mkdir -p build && yarn build-renderer && yarn build-main",
+        "build": "yarn build-renderer && yarn build-main",
-        "build-main": "tsc && electron-builder --config.compression=store",
+        "build-local": "yarn build-renderer && yarn build-main-local",
-        "build-renderer": "cd ../web && yarn install && yarn build:photos && cd ../desktop/build && rm -f out && ln -sf ../../web/apps/photos/out",
+        "build-main": "tsc && electron-builder",
+        "build-main-local": "tsc && electron-builder --config.compression=store",
+        "build-renderer": "cd ../web && yarn install && yarn build:photos && cd ../desktop && rm -f out && ln -sf ../web/apps/photos/out",
         "dev": "concurrently \"yarn dev-main\" \"yarn dev-renderer\"",
         "dev-main": "tsc && electron build/app/main.js",
-        "dev-renderer": "cd ../web && yarn install && yarn dev:photos && cd ../desktop/build && rm -f out && ln -sf ../../web/apps/photos/out",
+        "dev-renderer": "cd ../web && yarn install && yarn dev:photos",
         "postinstall": "electron-builder install-app-deps",
         "lint": "yarn prettier --check . && eslint \"src/**/*.ts\"",
         "lint-fix": "yarn prettier --write . && eslint --fix .",
@@ -110,26 +112,20 @@
             "x64ArchFiles": "Contents/Resources/ggmlclip-mac"
         },
         "afterSign": "electron-builder-notarize",
-        "extraFiles": [
-            {
-                "from": "resources",
-                "to": "resources",
-                "filter": [
-                    "**/*"
-                ]
-            }
-        ],
         "asarUnpack": [
             "node_modules/ffmpeg-static/bin/${os}/${arch}/ffmpeg",
             "node_modules/ffmpeg-static/index.js",
             "node_modules/ffmpeg-static/package.json"
         ],
-        "files": [
+        "extraFiles": [
-            "build/app/**/*",
             {
-                "from": "build/out",
+                "from": "build",
-                "to": "out"
+                "to": "resources"
             }
+        ],
+        "files": [
+            "app/**/*",
+            "out"
         ]
     },
     "productName": "ente",

desktop/tsconfig.json

@@ -3,8 +3,8 @@
         "target": "es2021",
         "module": "commonjs",
         "esModuleInterop": true,
-        /* Emit the generated JS into build/app */
+        /* Emit the generated JS into app */
-        "outDir": "build/app",
+        "outDir": "app",
         "noImplicitAny": true,
         "sourceMap": true,
         "baseUrl": "src",