From ed25e616c20edc079defead5f483dd0ca2a5965b Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Mon, 3 Oct 2022 08:52:05 -0500 Subject: [PATCH 1/6] pogchamp --- msft-test.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/msft-test.json b/msft-test.json index a6a7a2c3..5a2ac1e5 100644 --- a/msft-test.json +++ b/msft-test.json @@ -1,7 +1,7 @@ { - "electronVersion": "16.0.7", + "electronVersion": "16.2.8", "electronDownload": { - "version": "16.0.7+wvcus", + "version": "16.2.8+wvcus", "mirror": "https://github.com/castlabs/electron-releases/releases/download/v" }, "appId": "cider", From 56df0dd18b0504abc4b3713f539751a02278c6c5 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Mon, 3 Oct 2022 09:27:35 -0500 Subject: [PATCH 2/6] balls --- package.json | 1 + src/main/base/app.ts | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package.json b/package.json index f9adc733..f243490b 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,7 @@ "jimp": "^0.16.2", "lastfmapi": "^0.1.1", "mdns-js": "github:ciderapp/node-mdns-js", + "mica-electron": "^1.0.7", "mpris-service": "^2.1.2", "music-metadata": "7.12.6", "node-gyp": "^9.1.0", diff --git a/src/main/base/app.ts b/src/main/base/app.ts index c9ce81a9..10048fb3 100644 --- a/src/main/base/app.ts +++ b/src/main/base/app.ts @@ -5,6 +5,10 @@ import * as log from "electron-log"; import * as os from "os"; import { utils } from "./utils"; +//@ts-ignore +import { EFFECT, PARAMS, MicaBrowserwindow } from "mica-electron"; +// sorry Core. - cryptofyre + /** * @file Creates App instance * @author CiderCollective From db7b4481ed8d18065b7627705204d22f7acc2f24 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Mon, 3 Oct 2022 14:28:42 +0000 Subject: [PATCH 3/6] chore: Updated Lockfile --- pnpm-lock.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 986847ea..7b51e79f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,6 +32,7 @@ specifiers: lastfmapi: ^0.1.1 less: ^4.1.3 mdns-js: github:ciderapp/node-mdns-js + mica-electron: ^1.0.7 mpris-service: ^2.1.2 music-metadata: 7.12.6 musickit-typescript: ^1.2.4 @@ -74,6 +75,7 @@ dependencies: jimp: 0.16.2 lastfmapi: 0.1.1 mdns-js: github.com/ciderapp/node-mdns-js/d8f658b623233c3cf58be229332f3342f553cde2 + mica-electron: 1.0.7 mpris-service: 2.1.2 music-metadata: 7.12.6 node-gyp: 9.1.0 @@ -6594,6 +6596,10 @@ packages: resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==} engines: {node: '>= 0.6'} + /mica-electron/1.0.7: + resolution: {integrity: sha512-kbplHsZR6vijilqpNaL0TNrtWn790ZlEcGUvvXVfydVlsvrH/NOxTMY0kAIdyDZ2zZhibKrGHK9RBci0RiIArA==} + dev: false + /micromatch/3.1.10_supports-color@6.1.0: resolution: {integrity: sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==} engines: {node: '>=0.10.0'} From fc3a37f83b743f6fd38ced3be623384c07c409ee Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Mon, 3 Oct 2022 09:28:51 -0500 Subject: [PATCH 4/6] this triggered me --- src/main/base/app.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/base/app.ts b/src/main/base/app.ts index 10048fb3..98338605 100644 --- a/src/main/base/app.ts +++ b/src/main/base/app.ts @@ -6,7 +6,7 @@ import * as os from "os"; import { utils } from "./utils"; //@ts-ignore -import { EFFECT, PARAMS, MicaBrowserwindow } from "mica-electron"; +import { EFFECT, PARAMS, MicaBrowserWindow } from "mica-electron"; // sorry Core. - cryptofyre /** From 7ffd1667072380e9509ce4d8f4869a9c341282e4 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Mon, 3 Oct 2022 09:32:18 -0500 Subject: [PATCH 5/6] you should not be here. --- src/main/base/app.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/base/app.ts b/src/main/base/app.ts index 98338605..c9ce81a9 100644 --- a/src/main/base/app.ts +++ b/src/main/base/app.ts @@ -5,10 +5,6 @@ import * as log from "electron-log"; import * as os from "os"; import { utils } from "./utils"; -//@ts-ignore -import { EFFECT, PARAMS, MicaBrowserWindow } from "mica-electron"; -// sorry Core. - cryptofyre - /** * @file Creates App instance * @author CiderCollective From 12755ba9fbdce576202ebf802a4c1a1bfdc94cc6 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Mon, 3 Oct 2022 09:32:24 -0500 Subject: [PATCH 6/6] bruhmoment --- src/main/base/browserwindow.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index f0b4731a..3c8cad0e 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -18,6 +18,10 @@ import wallpaper from "wallpaper"; import * as AdmZip from "adm-zip"; import { LocalFiles } from "../providers/local/"; +//@ts-ignore +import { EFFECT, PARAMS, MicaBrowserWindow } from "mica-electron"; +// sorry Core. - cryptofyre + /** * @file Creates the BrowserWindow * @author CiderCollective