From 16cb2cf88beb752dab101c193cbeb65cf947f3ba Mon Sep 17 00:00:00 2001 From: Akos Kitta Date: Mon, 13 Jul 2020 15:06:43 +0200 Subject: [PATCH] ATL-240: Fixed the VS Code extensions in the app. Signed-off-by: Akos Kitta --- electron/build/scripts/arduino-pro-ide-electron-main.js | 9 +++++++++ electron/build/template-package.json | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 electron/build/scripts/arduino-pro-ide-electron-main.js diff --git a/electron/build/scripts/arduino-pro-ide-electron-main.js b/electron/build/scripts/arduino-pro-ide-electron-main.js new file mode 100644 index 00000000..82a63fbe --- /dev/null +++ b/electron/build/scripts/arduino-pro-ide-electron-main.js @@ -0,0 +1,9 @@ +const os = require('os'); +const path = require('path'); +// Enables the discovery of the VS Code extensions in the embedded `plugins` folder in the final app. +process.env.THEIA_DEFAULT_PLUGINS = `local-dir:${path.resolve(__dirname, '..', 'plugins')}`; +process.env.THEIA_PLUGINS = [ + process.env.THEIA_PLUGINS, + `local-dir:${path.resolve(os.homedir(), '.arduinoProIDE', 'plugins')}` +].filter(Boolean).join(','); +require('../src-gen/frontend/electron-main.js'); diff --git a/electron/build/template-package.json b/electron/build/template-package.json index b928587a..c4a8b0cc 100644 --- a/electron/build/template-package.json +++ b/electron/build/template-package.json @@ -1,5 +1,5 @@ { - "main": "src-gen/frontend/electron-main.js", + "main": "scripts/arduino-pro-ide-electron-main.js", "author": "Arduino SA", "resolutions": { "**/fs-extra": "^4.0.3" @@ -54,6 +54,7 @@ "files": [ "src-gen", "lib", + "scripts", "!node_modules/**/*.{ts,map}", "!node_modules/**/*.spec.js", "!node_modules/@theia/**/test/*",