diff --git a/app/lib/window.ts b/app/lib/window.ts index 01843b88..02a9f3c3 100644 --- a/app/lib/window.ts +++ b/app/lib/window.ts @@ -26,7 +26,7 @@ abstract class GlasstronWindow extends BrowserWindow { abstract setBlur (_: boolean) } -const macOSVibrancyType = process.platform === 'darwin' ? compareVersions(macOSRelease().version, '10.14', '>=') ? 'under-window' : 'dark' : null +const macOSVibrancyType = process.platform === 'darwin' ? compareVersions(macOSRelease().version || '0.0', '10.14', '>=') ? 'under-window' : 'dark' : null const activityIcon = nativeImage.createFromPath(`${app.getAppPath()}/assets/activity.png`) diff --git a/package.json b/package.json index 8f9dddd2..d4e2b4b9 100644 --- a/package.json +++ b/package.json @@ -46,9 +46,8 @@ "graceful-fs": "^4.2.10", "html-loader": "3.1.0", "json-loader": "^0.5.7", - "thenby": "^1.3.4", "lru-cache": "^6.0.0", - "macos-release": "^3.0.1", + "macos-release": "^3.1.0", "ngx-sortablejs": "^11.1.0", "ngx-toastr": "^14.0.0", "node-abi": "^3.15.0", @@ -75,6 +74,7 @@ "ssh2": "^1.10.0", "style-loader": "^3.3.1", "svg-inline-loader": "^0.8.2", + "thenby": "^1.3.4", "ts-loader": "^9.2.8", "tslib": "^2.3.1", "typedoc": "^0.22.15", diff --git a/yarn.lock b/yarn.lock index b4cabd92..abb184c1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -167,10 +167,12 @@ integrity sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ== dependencies: "@malept/cross-spawn-promise" "^1.1.0" - asar "^3.0.3" + asar "^3.1.0" debug "^4.3.1" dir-compare "^2.4.0" fs-extra "^9.0.1" + minimatch "^3.0.4" + plist "^3.0.4" "@eslint/eslintrc@^0.4.3": version "0.4.3" @@ -1560,7 +1562,7 @@ builder-util@23.0.9: "7zip-bin" "~5.1.1" "@types/debug" "^4.1.6" "@types/fs-extra" "^9.0.11" - app-builder-bin "3.7.1" + app-builder-bin "4.0.0" bluebird-lst "^1.0.9" builder-util-runtime "9.0.2" chalk "^4.1.1" @@ -2718,10 +2720,10 @@ electron-notarize@^1.2.1: debug "^4.1.1" fs-extra "^9.0.1" -electron-osx-sign@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz#fc258c5e896859904bbe3d01da06902c04b51c3a" - integrity sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ== +electron-osx-sign@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8" + integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg== dependencies: bluebird "^3.5.0" compare-version "^0.1.2" @@ -5121,10 +5123,10 @@ lzma-native@^8.0.0, lzma-native@^8.0.5: node-gyp-build "^4.2.1" readable-stream "^3.6.0" -macos-release@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-3.0.1.tgz#7d2a1329a616297db4a57f3d3ba8fa07a7caadd6" - integrity sha512-3l6OrhdDg2H2SigtuN3jBh+5dRJRWxNKuJTPBbGeNJTsmt/pj9PO25wYaNb05NuNmAsl435j4rDP6rgNXz7s7g== +macos-release@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-3.1.0.tgz#6165bb0736ae567ed6649e36ce6a24d87cbb7aca" + integrity sha512-/M/R0gCDgM+Cv1IuBG1XGdfTFnMEG6PZeT+KGWHO/OG+imqmaD9CH5vHBTycEM3+Kc4uG2Il+tFAuUWLqQOeUA== make-dir@^1.0.0: version "1.3.0" @@ -6427,7 +6429,7 @@ pkg-up@^2.0.0: dependencies: find-up "^2.1.0" -plist@^3.0.1: +plist@^3.0.1, plist@^3.0.4: version "3.0.5" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987" integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==