Merge branch 'develop' of https://github.com/ciderapp/Cider into develop

.circleci/config.yml

@@ -16,6 +16,9 @@ jobs:
       - run:
           name: Install Dependencies
           command: yarn install --immutable
+      - run:
+          name: Install Playwright
+          command: yarn playwright install --with-deps
       - save_cache:
           name: Save Yarn Package Cache
           key: yarn-packages-{{ checksum "yarn.lock" }}

src/__tests__/base.test.ts

@@ -1,20 +1,23 @@
 import { _electron as electron } from "playwright";
 import { test, expect } from "@playwright/test";
-import { join } from "path";
+import { resolve } from "path";
 import * as fs from "fs";
 
 test("Launch electron app", async () => {
 
 	const paths = {
-		"main": join(__dirname, "../../build/main"),
+		"mainBuild": resolve(__dirname, "../../build/"),
-		"root": join(__dirname, "../../"),
+		"main": resolve(__dirname, "../main"),
+		"root": resolve(__dirname, "../../"),
+		"cwd": __dirname,
+		"processcwd": process.cwd()
 	}
 
 	console.log(paths)
 
 	console.log(fs.readdirSync(paths.main))
 
-	const electronApp = await electron.launch({ args: [paths.main], cwd: paths.root });
+	const electronApp = await electron.launch({ args: ['build/index.js'], cwd: paths.root });
 
 	const appPath = await electronApp.evaluate(async ({ app }) => {
 		// This runs in the main Electron process, parameter here is always

src/main/base/app.ts

@@ -238,9 +238,6 @@ export class AppEvents {
             }
         })
 
-        console.log("THISHI ISFJDKIASKJDBKDJSFDLJ<KBSIJUBSDFKJBSKJDBFIKJSBDIHJNFSIHNB ")
-        console.log(utils.getWindow())
-
         utils.getWindow().on('show', () => {
             this.setTray(true)
         })

tsconfig.json

@@ -18,6 +18,6 @@
     ]
   },
   "include": [
-    "src/**/*"
+    "src/main/*"
   ]
-}
+}