From d53d474243a6cd9f6d8a3060f2683eb64ae42884 Mon Sep 17 00:00:00 2001
From: Akos Kitta <kittaakos@typefox.io>
Date: Wed, 29 Jan 2020 11:42:49 +0100
Subject: [PATCH] Disabled the window reload in the bundled app.

This change is a NOOP for the electron application started in dev mode.

Closes arduino/arduino-pro-ide#187

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
---
 .gitignore                           | 2 +-
 electron/build/template-package.json | 8 ++++++++
 electron/packager/index.js           | 4 ++++
 electron/packager/package.json       | 1 +
 electron/packager/yarn.lock          | 5 +++++
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 45be90d0..e622e8e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ downloads/
 build/
 !electron/build/
 src-gen/
-*-app/*webpack.config.js
+*webpack.config.js
 .DS_Store
 /workspace/static
 .DS_Store
diff --git a/electron/build/template-package.json b/electron/build/template-package.json
index d433c809..66c3ffe3 100644
--- a/electron/build/template-package.json
+++ b/electron/build/template-package.json
@@ -28,6 +28,14 @@
   "// Notes:": [
     "The resolution for `fs-extra` was required due to this: https://spectrum.chat/theia/general/our-theia-electron-builder-app-no-longer-starts~f5cf09a0-6d88-448b-8818-24ad0ec2ee7c"
   ],
+  "theia": {
+    "target": "electron",
+    "frontend": {
+      "config": {
+        "disallowReloadKeybinding": true
+      }
+    }
+  },
   "build": {
     "productName": "Arduino Pro IDE",
     "appId": "arduino.ProIDE",
diff --git a/electron/packager/index.js b/electron/packager/index.js
index 6daf4644..974a2438 100644
--- a/electron/packager/index.js
+++ b/electron/packager/index.js
@@ -8,6 +8,7 @@
     shell.env.THEIA_ELECTRON_SKIP_REPLACE_FFMPEG = '1'; // Do not run the ffmpeg validation for the packager.
     shell.env.NODE_OPTIONS = '--max_old_space_size=4096'; // Increase heap size for the CI
     const utils = require('./utils');
+    const merge = require('deepmerge');
     const { version, release } = utils.versionInfo();
 
     echo(`📦  Building ${release ? 'release ' : ''}version '${version}'...`);
@@ -81,9 +82,12 @@
     template.build.files = [...template.build.files, ...unusedDependencies.map(name => `!node_modules/${name}`)];
     pkg.dependencies = { ...pkg.dependencies, ...template.dependencies };
     pkg.devDependencies = { ...pkg.devDependencies, ...template.devDependencies };
+    // Deep-merging the Theia application configuration. We enable the electron window reload in dev mode but not for the final product. (arduino/arduino-pro-ide#187)
+    const theia = merge((pkg.theia || {}), (template.theia || {}));
     fs.writeFileSync(path('..', 'build', 'package.json'), JSON.stringify({
         ...pkg,
         ...template,
+        theia,
         dependencies: pkg.dependencies,
         devDependencies: pkg.devDependencies
     }, null, 2));
diff --git a/electron/packager/package.json b/electron/packager/package.json
index c65617b1..a122eb5d 100644
--- a/electron/packager/package.json
+++ b/electron/packager/package.json
@@ -12,6 +12,7 @@
   "author": "Arduino SA",
   "license": "MIT",
   "dependencies": {
+    "deepmerge": "4.2.2",
     "depcheck": "^0.7.1",
     "shelljs": "^0.8.3",
     "yargs": "^12.0.5"
diff --git a/electron/packager/yarn.lock b/electron/packager/yarn.lock
index 05520728..40643eab 100644
--- a/electron/packager/yarn.lock
+++ b/electron/packager/yarn.lock
@@ -200,6 +200,11 @@ decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
+deepmerge@4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+
 depcheck@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/depcheck/-/depcheck-0.7.1.tgz#d4ef8511620fc5c783dafe27887cfdab533b1215"