[desktop] Fix yarn build

desktop/.gitignore

@@ -1,12 +1,18 @@
 # Node
 node_modules/
 
-# electron-builder
-dist/
-
 # macOS
 .DS_Store
 
+# Editors
+.vscode/
+
 # Local env files
 .env
 .env.*.local
+
+# tsc transpiles src/**/*.ts and emits the generated JS into app/
+app/
+
+# electron-builder
+dist/

desktop/.prettierignore

@@ -1,3 +1 @@
 thirdparty/
-public/
-*.md

desktop/README.md

@@ -14,7 +14,7 @@ To know more about Ente, see [our main README](../README.md) or visit
 >
 > We moved a few things around when switching to a monorepo recently, so this
 > folder might not build with the instructions below. Hang tight, we're on it,
-> will fix things if.
+> and will fix.
 
 Fetch submodules
 
@@ -31,7 +31,7 @@ yarn install
 Run the app
 
 ```sh
-yarn start
+yarn dev
 ```
 
 To recompile automatically using electron-reload, run this in a separate

desktop/package.json

@@ -8,13 +8,13 @@
     "scripts": {
         "build": "yarn build-renderer && yarn build-main",
         "build-main": "yarn install && tsc",
-        "build-renderer": "cd ui && yarn install && yarn export:photos",
+        "build-renderer": "cd ../web && yarn install && yarn build:photos",
+        "dev": "concurrently \"yarn dev-main\" \"yarn dev-renderer\"",
+        "dev-main": "yarn build-main && electron app/main.js",
+        "dev-renderer": "cd ../web && yarn install && yarn dev:photos",
         "postinstall": "electron-builder install-app-deps",
         "lint": "yarn prettier --check . && eslint \"src/**/*.{js,jsx,ts,tsx}\"",
         "lint-fix": "yarn prettier --write . && eslint --fix .",
-        "start": "concurrently \"yarn start-main\" \"yarn start-renderer\"",
-        "start-main": "yarn build-main && electron app/main.js",
-        "start-renderer": "cd ui && yarn install && yarn dev:photos",
         "test-release": "cross-env IS_TEST_RELEASE=true yarn build && electron-builder --config.compression=store",
         "watch": "tsc -w"
     },

desktop/tsconfig.json

@@ -5,11 +5,13 @@
         "esModuleInterop": true,
         "noImplicitAny": true,
         "sourceMap": true,
+        /* Emit the generated JS into app/ */
         "outDir": "app",
         "baseUrl": "src",
         "paths": {
             "*": ["node_modules/*"]
         }
     },
-    "include": ["src/**/*"]
+    /* transpile all ts files in src/ */
+    "include": ["src/**/*.ts"]
 }

web/.gitignore

@@ -1,14 +1,17 @@
 # Node
 node_modules/
 
-# Next.js
-.next/
-out/
-next-env.d.ts
-
 # macOS
 .DS_Store
 
+# Editors
+.vscode/
+
 # Local env files
 .env
 .env.*.local
+
+# Next.js
+.next/
+out/
+next-env.d.ts