From 6907c6bf0fedfaf84b8264f779ec0cdd07a75c4b Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Sun, 21 May 2023 09:49:12 +0300
Subject: [PATCH] Adjust electron build (#9473)

---
 .github/workflows/push-master.yml                    |  1 +
 package.json                                         | 10 +++++-----
 .../apps-electron/electron-builder.yml               | 12 ++++++------
 packages/apps-electron/package.json                  |  6 ++++++
 yarn.lock                                            |  7 +++++--
 5 files changed, 23 insertions(+), 13 deletions(-)
 rename electron-builder.yml => packages/apps-electron/electron-builder.yml (57%)

diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
index 1983875f74..bbd3ae9cd0 100644
--- a/.github/workflows/push-master.yml
+++ b/.github/workflows/push-master.yml
@@ -84,6 +84,7 @@ jobs:
         # GitHub token, automatically provided to the action
         # (No need to define this secret in the repo settings)
         github_token: ${{ secrets.GITHUB_TOKEN }}
+        args: '--project packages/apps-electron'
         build_script_name: build:release:electron
         # If the commit is tagged with a version (e.g. "v1.0.0"),
         # release the app after building
diff --git a/package.json b/package.json
index e92f9c1967..2d79ecb831 100644
--- a/package.json
+++ b/package.json
@@ -53,10 +53,10 @@
     "docs": "echo \"skipping docs\"",
     "lint": "polkadot-dev-run-lint",
     "packElectron": "yarn build:release:electron && yarn clean:electronRelease && electron-builder build -mwl",
-    "packElectron:linux": "yarn build:release:electron && electron-builder build --linux",
-    "packElectron:mac": "yarn build:release:electron && electron-builder build --mac",
-    "packElectron:test": "yarn build:release:electron && electron-builder --dir",
-    "packElectron:win": "yarn build:release:electron && electron-builder build --win",
+    "packElectron:linux": "yarn build:release:electron && electron-builder build --linux --project packages/apps-electron",
+    "packElectron:mac": "yarn build:release:electron && electron-builder build --mac --project packages/apps-electron",
+    "packElectron:test": "yarn build:release:electron && electron-builder --dir --project packages/apps-electron",
+    "packElectron:win": "yarn build:release:electron && electron-builder build --win --project packages/apps-electron",
     "postinstall": "polkadot-dev-yarn-only",
     "postinstall:electron": "electron-builder install-app-deps",
     "start": "yarn clean && cd packages/apps && yarn polkadot-exec-webpack serve --config webpack.serve.cjs --port 3000",
@@ -82,7 +82,7 @@
     "concurrently": "^8.0.1",
     "devtron": "^1.4.0",
     "dnslink-cloudflare": "^3.0.0",
-    "electron": "^24.2.0",
+    "electron": "24.2.0",
     "electron-builder": "23.6.0",
     "electron-builder-notarize": "^1.5.1",
     "extensionless": "^1.4.5",
diff --git a/electron-builder.yml b/packages/apps-electron/electron-builder.yml
similarity index 57%
rename from electron-builder.yml
rename to packages/apps-electron/electron-builder.yml
index df6ad0a93c..b46672a5d5 100644
--- a/electron-builder.yml
+++ b/packages/apps-electron/electron-builder.yml
@@ -2,18 +2,18 @@
 productName: Polkadot-JS Apps
 artifactName: Polkadot-JS-Apps-${version}.${ext}
 files:
-  - "./packages/apps-electron/build"
-  - "./packages/apps-electron/assets"
-  - "./packages/apps-electron/appleEntitlements"
+  - "./build"
+  - "./assets"
+  - "./appleEntitlements"
 appId: com.polkadotjs.polkadotjs-apps
 mac:
   artifactName: Polkadot-JS-Apps-mac-${version}.${ext}
   category: public.app-category.finance
-  entitlements: "./packages/apps-electron/appleEntitlements/entitlements.mac.plist"
+  entitlements: "./appleEntitlements/entitlements.mac.plist"
   extendInfo:
     NSCameraUsageDescription: "This app requires camera access to capture account data on imports"
   hardenedRuntime: true
 directories:
-  buildResources: "./packages/apps-electron/assets"
-  output: "./packages/apps-electron/release"
+  buildResources: "./assets"
+  output: "./release"
 afterSign: electron-builder-notarize
diff --git a/packages/apps-electron/package.json b/packages/apps-electron/package.json
index 566e98770c..0a3753bc4d 100644
--- a/packages/apps-electron/package.json
+++ b/packages/apps-electron/package.json
@@ -1,5 +1,7 @@
 {
+  "author": "Jaco Greeff <jacogr@gmail.com>",
   "bugs": "https://github.com/polkadot-js/apps/issues",
+  "description": "An Apps portal into the Polkadot network",
   "engines": {
     "node": ">=16"
   },
@@ -14,6 +16,7 @@
   },
   "sideEffects": false,
   "version": "0.130.2-16-x",
+  "main": "build/electron.js",
   "dependencies": {
     "@polkadot/dev": "^0.75.2",
     "@polkadot/react-components": "^0.130.2-16-x",
@@ -26,6 +29,9 @@
   "devDependencies": {
     "@types/tmp": "^0.2.3",
     "copy-webpack-plugin": "^11.0.0",
+    "electron": "24.2.0",
+    "electron-builder": "23.6.0",
+    "electron-builder-notarize": "^1.5.1",
     "html-webpack-plugin": "^5.5.1",
     "tmp": "^0.2.1"
   },
diff --git a/yarn.lock b/yarn.lock
index f04ddd5460..35fb44303a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1869,6 +1869,9 @@ __metadata:
     "@polkadot/react-components": ^0.130.2-16-x
     "@types/tmp": ^0.2.3
     copy-webpack-plugin: ^11.0.0
+    electron: 24.2.0
+    electron-builder: 23.6.0
+    electron-builder-notarize: ^1.5.1
     electron-log: ^5.0.0-beta.23
     electron-updater: ^5.3.0
     html-webpack-plugin: ^5.5.1
@@ -7606,7 +7609,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron@npm:^24.2.0":
+"electron@npm:24.2.0":
   version: 24.2.0
   resolution: "electron@npm:24.2.0"
   dependencies:
@@ -13744,7 +13747,7 @@ fsevents@~2.3.2:
     concurrently: ^8.0.1
     devtron: ^1.4.0
     dnslink-cloudflare: ^3.0.0
-    electron: ^24.2.0
+    electron: 24.2.0
     electron-builder: 23.6.0
     electron-builder-notarize: ^1.5.1
     extensionless: ^1.4.5