diff --git a/package.json b/package.json index f243490b..1996f268 100644 --- a/package.json +++ b/package.json @@ -62,10 +62,9 @@ "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", + "node-gyp": "^9.2.0", "node-ssdp": "^4.0.1", "qrcode": "^1.5.1", "request": "^2.88.2", @@ -83,7 +82,7 @@ "@types/adm-zip": "^0.5.0", "@types/discord-rpc": "4.0.3", "@types/express": "^4.17.14", - "@types/node": "^18.8.0", + "@types/node": "^18.8.2", "@types/qrcode-terminal": "^0.12.0", "@types/ws": "^8.5.3", "electron": "github:castlabs/electron-releases", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dd9583b5..b3e8cee7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,7 +6,7 @@ specifiers: '@types/adm-zip': ^0.5.0 '@types/discord-rpc': 4.0.3 '@types/express': ^4.17.14 - '@types/node': ^18.8.0 + '@types/node': ^18.8.2 '@types/qrcode-terminal': ^0.12.0 '@types/ws': ^8.5.3 adm-zip: 0.4.10 @@ -32,11 +32,10 @@ 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 - node-gyp: ^9.1.0 + node-gyp: ^9.2.0 node-ssdp: ^4.0.1 prettier: 2.7.1 qrcode: ^1.5.1 @@ -75,10 +74,9 @@ 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 + node-gyp: 9.2.0 node-ssdp: 4.0.1 qrcode: 1.5.1 request: 2.88.2 @@ -96,7 +94,7 @@ devDependencies: '@types/adm-zip': 0.5.0 '@types/discord-rpc': 4.0.3 '@types/express': 4.17.14 - '@types/node': 18.8.0 + '@types/node': 18.8.2 '@types/qrcode-terminal': 0.12.0 '@types/ws': 8.5.3 electron: github.com/castlabs/electron-releases/cc5e2588f96875758f022c2a50426d34e7988ced @@ -1781,7 +1779,7 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} dependencies: '@gar/promisify': 1.1.3 - semver: 7.3.7 + semver: 7.3.8 dev: false /@npmcli/move-file/2.0.1: @@ -1964,14 +1962,14 @@ packages: /@types/adm-zip/0.5.0: resolution: {integrity: sha512-FCJBJq9ODsQZUNURo5ILAQueuA8WJhRvuihS3ke2iI25mJlfV2LK8jG2Qj2z2AWg8U0FtWWqBHVRetceLskSaw==} dependencies: - '@types/node': 18.8.0 + '@types/node': 18.8.2 dev: true /@types/body-parser/1.19.2: resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} dependencies: '@types/connect': 3.4.35 - '@types/node': 18.8.0 + '@types/node': 18.8.2 dev: true /@types/cacheable-request/6.0.2: @@ -1979,13 +1977,13 @@ packages: dependencies: '@types/http-cache-semantics': 4.0.1 '@types/keyv': 3.1.4 - '@types/node': 18.8.0 + '@types/node': 18.8.2 '@types/responselike': 1.0.0 /@types/connect/3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 18.8.0 + '@types/node': 18.8.2 dev: true /@types/debug/4.1.7: @@ -2018,7 +2016,7 @@ packages: /@types/express-serve-static-core/4.17.31: resolution: {integrity: sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==} dependencies: - '@types/node': 18.8.0 + '@types/node': 18.8.2 '@types/qs': 6.9.7 '@types/range-parser': 1.2.4 dev: true @@ -2035,14 +2033,14 @@ packages: /@types/fs-extra/9.0.13: resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==} dependencies: - '@types/node': 18.8.0 + '@types/node': 18.8.2 dev: true /@types/glob/7.2.0: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: '@types/minimatch': 5.1.2 - '@types/node': 18.8.0 + '@types/node': 18.8.2 dev: true /@types/html-minifier-terser/5.1.2: @@ -2059,7 +2057,7 @@ packages: /@types/keyv/3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 18.8.0 + '@types/node': 18.8.2 /@types/long/4.0.2: resolution: {integrity: sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==} @@ -2077,22 +2075,22 @@ packages: resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==} dev: true - /@types/node/16.11.63: - resolution: {integrity: sha512-3OxnrEQLBz8EIIaHpg3CibmTAEGkDBcHY4fL5cnBwg2vd2yvHrUDGWxK+MlYPeXWWIoJJW79dGtU+oeBr6166Q==} + /@types/node/16.11.64: + resolution: {integrity: sha512-z5hPTlVFzNwtJ2LNozTpJcD1Cu44c4LNuzaq1mwxmiHWQh2ULdR6Vjwo1UGldzRpzL0yUEdZddnfqGW2G70z6Q==} dev: true /@types/node/16.9.1: resolution: {integrity: sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==} dev: false - /@types/node/18.8.0: - resolution: {integrity: sha512-u+h43R6U8xXDt2vzUaVP3VwjjLyOJk6uEciZS8OSyziUQGOwmk+l+4drxcsDboHXwyTaqS1INebghmWMRxq3LA==} + /@types/node/18.8.2: + resolution: {integrity: sha512-cRMwIgdDN43GO4xMWAfJAecYn8wV4JbsOGHNfNUIDiuYkUYAR5ec4Rj7IO2SAhFPEfpPtLtUTbbny/TCT7aDwA==} /@types/plist/3.0.2: resolution: {integrity: sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw==} requiresBuild: true dependencies: - '@types/node': 18.8.0 + '@types/node': 18.8.2 xmlbuilder: 15.1.1 dev: true optional: true @@ -2112,7 +2110,7 @@ packages: /@types/responselike/1.0.0: resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} dependencies: - '@types/node': 18.8.0 + '@types/node': 18.8.2 /@types/semver/7.3.12: resolution: {integrity: sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==} @@ -2122,7 +2120,7 @@ packages: resolution: {integrity: sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==} dependencies: '@types/mime': 3.0.1 - '@types/node': 18.8.0 + '@types/node': 18.8.2 dev: true /@types/source-list-map/0.1.2: @@ -2152,7 +2150,7 @@ packages: /@types/webpack-sources/3.2.0: resolution: {integrity: sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==} dependencies: - '@types/node': 18.8.0 + '@types/node': 18.8.2 '@types/source-list-map': 0.1.2 source-map: 0.7.4 dev: true @@ -2160,7 +2158,7 @@ packages: /@types/webpack/4.41.32: resolution: {integrity: sha512-cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg==} dependencies: - '@types/node': 18.8.0 + '@types/node': 18.8.2 '@types/tapable': 1.0.8 '@types/uglify-js': 3.17.0 '@types/webpack-sources': 3.2.0 @@ -2171,7 +2169,7 @@ packages: /@types/ws/8.5.3: resolution: {integrity: sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==} dependencies: - '@types/node': 18.8.0 + '@types/node': 18.8.2 dev: true /@types/yargs-parser/21.0.0: @@ -2188,7 +2186,7 @@ packages: resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==} requiresBuild: true dependencies: - '@types/node': 18.8.0 + '@types/node': 18.8.2 dev: true optional: true @@ -2516,7 +2514,7 @@ packages: minimatch: 3.1.2 read-config-file: 6.2.0 sanitize-filename: 1.6.3 - semver: 7.3.7 + semver: 7.3.8 tar: 6.1.11 temp-file: 3.4.0 transitivePeerDependencies: @@ -2954,8 +2952,8 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001414 - electron-to-chromium: 1.4.271 + caniuse-lite: 1.0.30001415 + electron-to-chromium: 1.4.272 node-releases: 2.0.6 update-browserslist-db: 1.0.9_browserslist@4.21.4 dev: true @@ -3167,8 +3165,8 @@ packages: engines: {node: '>=10'} dev: true - /caniuse-lite/1.0.30001414: - resolution: {integrity: sha512-t55jfSaWjCdocnFdKQoO+d2ct9C59UZg4dY3OnUlSZ447r8pUtIKdp0hpAzrGFultmTC+Us+KpKi4GZl/LXlFg==} + /caniuse-lite/1.0.30001415: + resolution: {integrity: sha512-ER+PfgCJUe8BqunLGWd/1EY4g8AzQcsDAVzdtMGKVtQEmKAwaFfU6vb7EAVIqTMYsqxBorYZi2+22Iouj/y7GQ==} dev: true /caseless/0.12.0: @@ -3472,7 +3470,7 @@ packages: json-schema-typed: 7.0.3 onetime: 5.1.2 pkg-up: 3.1.0 - semver: 7.3.7 + semver: 7.3.8 dev: false /config-chain/1.1.13: @@ -4198,8 +4196,8 @@ packages: type-fest: 2.19.0 dev: false - /electron-to-chromium/1.4.271: - resolution: {integrity: sha512-BCPBtK07xR1/uY2HFDtl3wK2De66AW4MSiPlLrnPNxKC/Qhccxd59W73654S3y6Rb/k3hmuGJOBnhjfoutetXA==} + /electron-to-chromium/1.4.272: + resolution: {integrity: sha512-KS6gPPGNrzpVv9HzFVq+Etd0AjZEPr5pvaTBn2yD6KV4+cKW4I0CJoJNgmTG6gUQPAMZ4wIPtcOuoou3qFAZCA==} dev: true /electron-updater/5.2.1: @@ -4212,7 +4210,7 @@ packages: lazy-val: 1.0.5 lodash.escaperegexp: 4.1.2 lodash.isequal: 4.5.0 - semver: 7.3.7 + semver: 7.3.8 typed-emitter: 2.1.0 transitivePeerDependencies: - supports-color @@ -4258,7 +4256,7 @@ packages: mini-css-extract-plugin: 0.9.0_webpack@5.74.0 node-loader: 0.6.0 read-config-file: 4.0.1 - semver: 7.3.7 + semver: 7.3.8 source-map-support: 0.5.21 style-loader: 1.3.0_webpack@5.74.0 terser-webpack-plugin: 2.3.8_rhnferxm57s4tezaxssnppm5v4 @@ -5154,7 +5152,7 @@ packages: es6-error: 4.1.1 matcher: 3.0.0 roarr: 2.15.4 - semver: 7.3.7 + semver: 7.3.8 serialize-error: 7.0.1 dev: true optional: true @@ -6119,7 +6117,7 @@ packages: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 18.8.0 + '@types/node': 18.8.2 merge-stream: 2.0.0 supports-color: 8.1.1 dev: true @@ -6596,10 +6594,6 @@ 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'} @@ -6910,7 +6904,7 @@ packages: resolution: {integrity: sha512-p+0xx5ruIQ+8X57CRIMxbTZRT7tU0Tjn2C/aAK68AEMrbGsCo6IjnDdPNhEyyjWCT4bRtzomXchYd3sSgk3BJQ==} engines: {node: '>=10'} dependencies: - semver: 7.3.7 + semver: 7.3.8 dev: false /node-addon-api/1.7.2: @@ -6936,8 +6930,8 @@ packages: engines: {node: '>= 6.0.0'} dev: true - /node-gyp/9.1.0: - resolution: {integrity: sha512-HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g==} + /node-gyp/9.2.0: + resolution: {integrity: sha512-/+/YxGfIJOh/fnMsr4Ep0v6oOIjnO1BgLd2dcDspBX1spTkQU7xSIox5RdRE/2/Uq3ZwK8Z5swRIbMUmPlslmg==} engines: {node: ^12.22 || ^14.13 || >=16} hasBin: true dependencies: @@ -6945,10 +6939,10 @@ packages: glob: 7.2.3 graceful-fs: 4.2.10 make-fetch-happen: 10.2.1 - nopt: 5.0.0 + nopt: 6.0.0 npmlog: 6.0.2 rimraf: 3.0.2 - semver: 7.3.7 + semver: 7.3.8 tar: 6.1.11 which: 2.0.2 transitivePeerDependencies: @@ -6977,9 +6971,9 @@ packages: - supports-color dev: false - /nopt/5.0.0: - resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==} - engines: {node: '>=6'} + /nopt/6.0.0: + resolution: {integrity: sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==} + engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} hasBin: true dependencies: abbrev: 1.1.1 @@ -7626,7 +7620,7 @@ packages: '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 '@types/long': 4.0.2 - '@types/node': 18.8.0 + '@types/node': 18.8.2 long: 4.0.0 dev: false @@ -8192,8 +8186,8 @@ packages: hasBin: true dev: true - /semver/7.3.7: - resolution: {integrity: sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==} + /semver/7.3.8: + resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==} engines: {node: '>=10'} hasBin: true dependencies: @@ -9230,7 +9224,7 @@ packages: is-yarn-global: 0.3.0 latest-version: 5.1.0 pupa: 2.1.1 - semver: 7.3.7 + semver: 7.3.8 semver-diff: 3.1.1 xdg-basedir: 4.0.0 dev: true @@ -9867,7 +9861,7 @@ packages: requiresBuild: true dependencies: '@electron/get': 2.0.1 - '@types/node': 16.11.63 + '@types/node': 16.11.64 extract-zip: 2.0.1 transitivePeerDependencies: - supports-color @@ -9893,7 +9887,7 @@ packages: dependencies: debug: 4.3.4 dns-js: github.com/ciderapp/node-dns-js/212b6c903db40bcd501af741e51cd20d676acbc9 - semver: 7.3.7 + semver: 7.3.8 transitivePeerDependencies: - supports-color dev: false diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 3c8cad0e..f0b4731a 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -18,10 +18,6 @@ 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