Skip to content

Tech/upstream electron #3664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions electron-builder.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
appId: com.heroicgameslauncher.hgl
productName: Heroic
afterSign: sign/afterSign.js
afterPack: sign/afterPack.js
files:
- build/**/*
- node_modules/**/*
Expand All @@ -16,9 +15,6 @@ asarUnpack:
- build/icon-light.png
- build/webviewPreload.js

electronDownload:
mirror: https://github.com/castlabs/electron-releases/releases/download/v

protocols:
- name: heroic
schemes:
Expand All @@ -42,8 +38,6 @@ mac:
icon: build/icon.icns
entitlements: build/entitlements.mac.plist
entitlementsInherit: build/entitlements.mac.plist
notarize:
appBundleId: com.heroicgameslauncher.hgl
extendInfo:
com.apple.security.cs.allow-jit: true
asarUnpack:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
"@typescript-eslint/parser": "5.47.1",
"@vitejs/plugin-react-swc": "3.2.0",
"cross-env": "7.0.3",
"electron": "castlabs/electron-releases#29.1.3+wvcus",
"electron": "29.1.3",
"electron-builder": "24.13.3",
"electron-devtools-installer": "3.2.0",
"eslint": "8.36.0",
Expand Down
9 changes: 0 additions & 9 deletions sign/afterPack.js

This file was deleted.

7 changes: 1 addition & 6 deletions sign/afterSign.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
const notarize = require("./notarize").default
const vmp = require("./vmp").default

exports.default = async function (context) {
await notarize(context);
console.log("Finshed Signing, signing with VMP if on Windows. Platform:", context.packager.platform.name)
if (context.packager.platform.name === 'windows') {
console.log("Signing with VMP on Windows")
await vmp(context);
}
console.log("Finshed Signing, Notarizing with Apple")
}
45 changes: 0 additions & 45 deletions sign/vmp.js

This file was deleted.

12 changes: 0 additions & 12 deletions src/backend/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import {
protocol,
screen,
clipboard,
components,
session
} from 'electron'
import 'backend/updater'
Expand Down Expand Up @@ -324,17 +323,6 @@ if (!gotTheLock) {
)
}

if (!process.env.CI) {
await components.whenReady().catch((e) => {
logError([
'Failed to download / update DRM components.',
'Make sure you do not block update.googleapis.com domain if you want to use WideVine in Browser sideloaded apps',
e
])
})
logInfo(['DRM module staus', components.status()])
}

// try to fix notification app name on windows
if (isWindows) {
app.setAppUserModelId('Heroic Games Launcher')
Expand Down
Loading
Loading