summarylogtreecommitdiffstats
path: root/0001-Don-t-use-electron-to-build.patch
blob: 17b37d530d4f00862b00d71460d8ff849297b8de (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
From e8458e1231753f7853d9db150c6d021c93d81f01 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz93@gmail.com>
Date: Thu, 21 Jun 2018 05:00:37 -0400
Subject: [PATCH] Don't use electron to build

---
 shared/desktop/package.desktop.tsx   | 4 ++--
 shared/desktop/yarn-helper/index.tsx | 2 --
 shared/package.json                  | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/shared/desktop/package.desktop.tsx b/shared/desktop/package.desktop.tsx
index d921e3e7c9..8fec7e6834 100644
--- a/shared/desktop/package.desktop.tsx
+++ b/shared/desktop/package.desktop.tsx
@@ -97,7 +97,7 @@ function main() {
   // use the same version as the currently-installed electron
   console.log('Finding electron version')
   try {
-    packagerOpts.electronVersion = require('../package.json').devDependencies.electron
+    packagerOpts.electronVersion = 'unused string'
     console.log('Found electron version:', packagerOpts.electronVersion)
   } catch (err) {
     console.log("Couldn't parse yarn list to find electron:", err)
@@ -145,7 +145,7 @@ function startPack() {
                 .catch(postPackError)
             })
           })
-        } else {
+        } else if (false) {
           pack(platform, arch)
             .then(postPack(platform, arch))
             .catch(postPackError)
diff --git a/shared/desktop/yarn-helper/index.tsx b/shared/desktop/yarn-helper/index.tsx
index b80018f9f9..30f26606b4 100644
--- a/shared/desktop/yarn-helper/index.tsx
+++ b/shared/desktop/yarn-helper/index.tsx
@@ -1,6 +1,5 @@
 // Helper for cross platform yarn run script commands
 import buildCommands from './build'
-import electronComands from './electron'
 import fontCommands from './font'
 import prettierCommands from './prettier'
 import {execSync} from 'child_process'
@@ -14,7 +13,6 @@ const [, , command, ...rest] = process.argv
 const commands = {
   ...buildCommands,
   ...fontCommands,
-  ...electronComands,
   ...prettierCommands,
   help: {
     code: () => {
diff --git a/shared/package.json b/shared/package.json
index 5d51df0986..ad2944b63c 100644
--- a/shared/package.json
+++ b/shared/package.json
@@ -255,7 +255,6 @@
     "cross-env": "5.2.0",
     "css-loader": "3.1.0",
     "del": "3.0.0",
-    "electron": "6.0.9",
     "electron-packager": "14.0.6",
     "eslint": "6.2.1",
     "eslint-plugin-filenames": "1.3.2",
-- 
2.23.0