okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Core 2022-10-03 23:19:31 +01:00
commit fed178efcb
No known key found for this signature in database
GPG key ID: 2AB8327FBA02D1C0
4 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
msft-test.json
View file

@ -1,7 +1,7 @@
{ {
"electronVersion": "16.0.7", "electronVersion": "16.2.8",
"electronDownload": { "electronDownload": {
"version": "16.0.7+wvcus", "version": "16.2.8+wvcus",
"mirror": "https://github.com/castlabs/electron-releases/releases/download/v" "mirror": "https://github.com/castlabs/electron-releases/releases/download/v"
}, },
"appId": "cider", "appId": "cider",

1
package.json
View file

@ -62,6 +62,7 @@
"jimp": "^0.16.2", "jimp": "^0.16.2",
"lastfmapi": "^0.1.1", "lastfmapi": "^0.1.1",
"mdns-js": "github:ciderapp/node-mdns-js", "mdns-js": "github:ciderapp/node-mdns-js",
"mica-electron": "^1.0.7",
"mpris-service": "^2.1.2", "mpris-service": "^2.1.2",
"music-metadata": "7.12.6", "music-metadata": "7.12.6",
"node-gyp": "^9.1.0", "node-gyp": "^9.1.0",

6
pnpm-lock.yaml generated
View file

@ -32,6 +32,7 @@ specifiers:
lastfmapi: ^0.1.1 lastfmapi: ^0.1.1
less: ^4.1.3 less: ^4.1.3
mdns-js: github:ciderapp/node-mdns-js mdns-js: github:ciderapp/node-mdns-js
mica-electron: ^1.0.7
mpris-service: ^2.1.2 mpris-service: ^2.1.2
music-metadata: 7.12.6 music-metadata: 7.12.6
musickit-typescript: ^1.2.4 musickit-typescript: ^1.2.4
@ -74,6 +75,7 @@ dependencies:
jimp: 0.16.2 jimp: 0.16.2
lastfmapi: 0.1.1 lastfmapi: 0.1.1
mdns-js: github.com/ciderapp/node-mdns-js/d8f658b623233c3cf58be229332f3342f553cde2 mdns-js: github.com/ciderapp/node-mdns-js/d8f658b623233c3cf58be229332f3342f553cde2
mica-electron: 1.0.7
mpris-service: 2.1.2 mpris-service: 2.1.2
music-metadata: 7.12.6 music-metadata: 7.12.6
node-gyp: 9.1.0 node-gyp: 9.1.0
@ -6594,6 +6596,10 @@ packages:
resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==} resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}
engines: {node: '>= 0.6'} 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: /micromatch/3.1.10_supports-color@6.1.0:
resolution: {integrity: sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==} resolution: {integrity: sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==}
engines: {node: '>=0.10.0'} engines: {node: '>=0.10.0'}

4
src/main/base/browserwindow.ts
View file

@ -18,6 +18,10 @@ import wallpaper from "wallpaper";
import * as AdmZip from "adm-zip"; import * as AdmZip from "adm-zip";
import { LocalFiles } from "../providers/local/"; import { LocalFiles } from "../providers/local/";
//@ts-ignore
import { EFFECT, PARAMS, MicaBrowserWindow } from "mica-electron";
// sorry Core. - cryptofyre
/** /**
* @file Creates the BrowserWindow * @file Creates the BrowserWindow
* @author CiderCollective * @author CiderCollective