Update Electron to v6 (#3785)

* 3.0.0 * 3.0.2 * Save * Save * Upgrade yarn lock packages * update node-gyp and node-pty * update travis and appveyor to node 12 * appveyor is outdated as always * update travis to xenial * update [email protected] * update yarn.lock * update electron to 6.0.8 * move node-pty to the correct package.json * Fix linting failure * Update yarn lockfile to try to fix appveyor build * Remove unnecessary changes from package.json * Try to fix appveyor by using a newer image * Fix linting after my last change * update electron to 6.0.9 * install windows-build-tools on appveyor * fix syntax * switch back to 2017 image * remove old resolutions field * revert accidental version change * update electron to 6.0.11 and electron-rebuild to 1.8.6 * downgrade yarn to 1.18 until this issue is resolved yarnpkg/yarn#7584 * update node-gyp to 6.0.0 and generate a fresh yarn lockfile * update react and a few other dependencies * fix lint * this should actually be electron-builder, I think! * update a few dependencies * change to electron-store electron-config was renamed to electron-store a while ago * update xterm to v4.1.0 and ora to 4.0.2 * move pify to app/package.json * TODO: Revert maybe. Throw a fit on every change to maybe fix the resizing issues * a * fix react ref problem * fix split view focus problem * remove the unnecessary fit * remove the init col and row * fix the problem that cannot show about hyper * update electron to 6.0.12 * fix lint * add more todos for componentWillReceiveProps deprecation * update babel and plugins Co-authored-by: Juan Campa <[email protected]> Co-authored-by: Benjamin Staneck <[email protected]> Co-authored-by: ivan <[email protected]>
vercel · Oct 10, 2019 · 6039acd · 6039acd
1 parent ab0c8fe
commit 6039acd
Show file tree

Hide file tree

Showing 19 changed files with 2,990 additions and 3,246 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,7 @@
       "request": "launch",
       "name": "Launch Hyper",
       "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
-      "program": "${workspaceRoot}/app/index.js",
+      "program": "${workspaceRoot}/target/index.js",
       "protocol": "inspector"
     },
      {

diff --git a/.yarnrc b/.yarnrc
@@ -1 +1,7 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+child-concurrency "1"
+lastUpdateCheck 1570388773781
 save-exact true
diff --git a/app/config/windows.js b/app/config/windows.js
@@ -1,4 +1,4 @@
-const Config = require('electron-config');
+const Config = require('electron-store');
 
 const defaults = {
   windowPosition: [50, 50],

diff --git a/app/notify.js b/app/notify.js
@@ -14,7 +14,10 @@ let buffer = [];
 
 app.on('ready', () => {
   const win_ = new BrowserWindow({
-    show: false
+    show: false,
+    webPreferences: {
+      nodeIntegration: true
+    }
   });
   const url = 'file://' + resolve(isDev ? __dirname : app.getAppPath(), 'notify.html');
   win_.loadURL(url);

diff --git a/app/package.json b/app/package.json
@@ -14,23 +14,24 @@
     "color": "2.0.1",
     "convert-css-color-name-to-hex": "0.1.1",
     "default-shell": "1.0.1",
-    "electron-config": "2.0.0",
+    "electron-store": "5.0.0",
     "electron-fetch": "1.3.0",
     "electron-is-dev": "1.0.1",
     "electron-squirrel-startup": "1.0.0",
     "file-uri-to-path": "1.0.0",
     "fs-extra": "7.0.1",
     "git-describe": "4.0.2",
-    "lodash": "4.17.13",
+    "lodash": "4.17.15",
     "mkdirp": "0.5.1",
-    "ms": "2.1.1",
-    "node-pty": "0.8.1",
+    "ms": "2.1.2",
+    "node-pty": "0.9.0-beta26",
     "os-locale": "3.1.0",
     "parse-url": "3.0.2",
+    "pify": "4.0.1",
     "queue": "4.4.2",
-    "react": "16.2.0",
-    "react-dom": "16.2.1",
-    "semver": "5.5.0",
+    "react": "16.10.2",
+    "react-dom": "16.10.2",
+    "semver": "6.3.0",
     "shell-env": "0.3.0",
     "uuid": "3.2.1",
     "winreg": "1.2.4"

diff --git a/app/plugins.js b/app/plugins.js
@@ -1,7 +1,7 @@
 const {app, dialog} = require('electron');
 const {resolve, basename} = require('path');
 const {writeFileSync} = require('fs');
-const Config = require('electron-config');
+const Config = require('electron-store');
 const ms = require('ms');
 
 const React = require('react');

diff --git a/app/ui/window.js b/app/ui/window.js
@@ -38,6 +38,7 @@ module.exports = class Window {
         show: process.env.HYPER_DEBUG || process.env.HYPERTERM_DEBUG || isDev,
         acceptFirstMouse: true,
         webPreferences: {
+          nodeIntegration: true,
           navigateOnDragDrop: true
         }
       },
@@ -110,10 +111,9 @@ module.exports = class Window {
     function createSession(extraOptions = {}) {
       const uid = uuid.v4();
 
+      // remove the rows and cols, the wrong value of them will break layout when init create
       const defaultOptions = Object.assign(
         {
-          rows: 40,
-          cols: 100,
           cwd: workingDirectory,
           splitDirection: undefined,
           shell: cfg.shell,