Merge pull request #1061 from JetBrains/dependabot/npm_and_yarn/packa…

…ges/generator/app/templates/electron-tw-5.0.7
JetBrains · Jul 22, 2019 · f0d2cb6 · f0d2cb6
2 parents 993b725 + 0ed785b
commit f0d2cb6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/packages/generator/app/templates/karma.conf.js b/packages/generator/app/templates/karma.conf.js
@@ -71,17 +71,19 @@ module.exports = config => {
 
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: ['Electron'],
-
-    electronOpts: {
-      show: false,
-      skipTaskbar: true,
-      height: 1024,
-      width: 768,
-      webPreferences: {
-        pageVisibility: true
-      },
-      commandLineSwitches: ['--no-sandbox']
+    browsers: ['CustomElectron'],
+
+    customLaunchers: {
+      CustomElectron: {
+        base: 'Electron',
+        browserWindowOptions: {
+          show: false,
+          skipTaskbar: true,
+          height: 1024,
+          width: 768
+        },
+        flags: ['--no-sandbox']
+      }
     },
 
     // Continuous Integration mode

diff --git a/packages/generator/app/templates/package.json b/packages/generator/app/templates/package.json
@@ -53,13 +53,13 @@
     "chai-as-promised": "^7.1.1",
     "chai-dom": "^1.8.1",
     "chai-enzyme": "1.0.0-beta.1",
-    "electron": "^4.1.4",
+    "electron": "^5.0.7",
     "enzyme": "^3.10.0",
     "enzyme-adapter-react-16": "^1.14.0",
     "eslint": "^5.16.0",
     "karma": "^4.2.0",
     "karma-chai-plugins": "^0.9.0",
-    "karma-electron-launcher": "^0.2.0",
+    "karma-electron": "^6.3.0",
     "karma-mocha": "^1.3.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-teamcity-reporter": "^1.1.0",