Revert "Migrated to electron 2.0.x"

package-lock.json

@@ -6055,13 +6055,20 @@
       "integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="
     },
     "electron": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-2.0.1.tgz",
-      "integrity": "sha512-piSwY2P7L6NWx672MNdSvtGPdQP/mhwAg8ICN6ofTTItPkd7D6kNHBPkq+DXwZcXVH1EifYR9yD/l3Xw1haVpQ==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.1.tgz",
+      "integrity": "sha1-GbbznyAT4gSpGmC8MIbcekoH7Yg=",
       "requires": {
         "@types/node": "^8.0.24",
         "electron-download": "^3.0.1",
         "extract-zip": "^1.0.3"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "8.10.13",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.13.tgz",
+          "integrity": "sha512-AorNXRHoPVxIUIVmr6uJXRnvlPOSNKAJF5jZ1JOj1/IxYMocZzvQooNeLU02Db6kpy1IVIySTOvuIxmUF1HrOg=="
+        }
       }
     },
     "electron-builder": {
@@ -6224,6 +6231,16 @@
             "klaw": "^1.0.0",
             "path-is-absolute": "^1.0.0",
             "rimraf": "^2.2.8"
+          },
+          "dependencies": {
+            "klaw": {
+              "version": "1.3.1",
+              "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+              "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
+              "requires": {
+                "graceful-fs": "^4.1.9"
+              }
+            }
           }
         },
         "jsonfile": {
@@ -7780,13 +7797,11 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -7799,18 +7814,15 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -7913,8 +7925,7 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "ini": {
           "version": "1.3.5",
@@ -7924,7 +7935,6 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -7937,15 +7947,13 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "minipass": {
           "version": "2.2.4",
@@ -7966,7 +7974,6 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -8039,8 +8046,7 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -9007,9 +9013,9 @@
       }
     },
     "home-path": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.6.tgz",
-      "integrity": "sha512-wo+yjrdAtoXt43Vy92a+0IPCYViiyLAHyp0QVS4xL/tfvVz5sXIW1ubLZk3nhVkD92fQpUMKX+fzMjr5F489vw=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.5.tgz",
+      "integrity": "sha1-eIspgVsS1Tus9XVkhHbm+QQdEz8="
     },
     "homedir-polyfill": {
       "version": "1.0.1",
@@ -10877,14 +10883,6 @@
         "is-buffer": "^1.1.5"
       }
     },
-    "klaw": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-      "requires": {
-        "graceful-fs": "^4.1.9"
-      }
-    },
     "last-run": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",

package.json

@@ -1,5 +1,5 @@
 {
   "scripts": {
-    "bootstrap": "lerna bootstrap --hoist"
+    "bootstrap": "lerna bootstrap"
   }
 }

packages/app/client/src/ui/editor/welcomePage/index.tsx

@@ -152,7 +152,7 @@ class WelcomePage extends React.Component<Props, {}> {
   render() {
     return (
       <GenericDocument style={ CSS }>
-        <LargeHeader>Welcome to the Bot Framework Emulator</LargeHeader>
+        <LargeHeader>Welcome to the Bot Framework Emulator!</LargeHeader>
         <Row>
           <Column>
             <div className="section">

packages/app/main/package.json

@@ -52,7 +52,7 @@
     "concurrently": "^3.5.1",
     "cross-env": "^5.1.3",
     "del": "^3.0.0",
-    "electron": "2.0.x",
+    "electron": "1.8.1",
     "electron-builder": "^20.10.0",
     "electron-builder-http": "^19.27.5",
     "electron-builder-lib": "^20.11.1",

packages/app/main/src/services/contextMenuService.ts

@@ -53,7 +53,7 @@ export class ContextMenuService {
       });
       const menu = ContextMenuService.currentMenu = Menu.buildFromTemplate(template);
 
-      menu.popup({});
+      menu.popup();
     });
   }
 }